From a747eaa3ba0546ec886b4e58646f544689df5707 Mon Sep 17 00:00:00 2001
From: Jeff Irion <JeffLIrion@users.noreply.github.com>
Date: Sat, 6 Apr 2019 08:18:50 -0700
Subject: [PATCH] Remove pycryptodome requirement for Android TV (#22552)

* Bump androidtv to 0.0.15

* Bump androidtv to 0.0.15 in manifest.json
---
 .../components/androidtv/manifest.json        |  2 +-
 .../components/androidtv/media_player.py      | 24 +++++++++----------
 requirements_all.txt                          |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/homeassistant/components/androidtv/manifest.json b/homeassistant/components/androidtv/manifest.json
index 815a97394cb..841ad299785 100644
--- a/homeassistant/components/androidtv/manifest.json
+++ b/homeassistant/components/androidtv/manifest.json
@@ -3,7 +3,7 @@
   "name": "Androidtv",
   "documentation": "https://www.home-assistant.io/components/androidtv",
   "requirements": [
-    "androidtv==0.0.14"
+    "androidtv==0.0.15"
   ],
   "dependencies": [],
   "codeowners": []
diff --git a/homeassistant/components/androidtv/media_player.py b/homeassistant/components/androidtv/media_player.py
index a62a7f2a6d9..706ef6f8402 100644
--- a/homeassistant/components/androidtv/media_player.py
+++ b/homeassistant/components/androidtv/media_player.py
@@ -18,7 +18,7 @@ import homeassistant.helpers.config_validation as cv
 
 ANDROIDTV_DOMAIN = 'androidtv'
 
-REQUIREMENTS = ['androidtv==0.0.14']
+REQUIREMENTS = ['androidtv==0.0.15']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -294,12 +294,12 @@ class ADBDevice(MediaPlayerDevice):
     @adb_decorator()
     def media_previous_track(self):
         """Send previous track command (results in rewind)."""
-        self.aftv.media_previous()
+        self.aftv.media_previous_track()
 
     @adb_decorator()
     def media_next_track(self):
         """Send next track command (results in fast-forward)."""
-        self.aftv.media_next()
+        self.aftv.media_next_track()
 
     @adb_decorator()
     def adb_command(self, cmd):
@@ -324,11 +324,11 @@ class AndroidTVDevice(ADBDevice):
                          turn_off_command)
 
         self._device = None
-        self._muted = None
         self._device_properties = self.aftv.device_properties
+        self._is_volume_muted = None
         self._unique_id = 'androidtv-{}-{}'.format(
             name, self._device_properties['serialno'])
-        self._volume = None
+        self._volume_level = None
 
     @adb_decorator(override_available=True)
     def update(self):
@@ -345,16 +345,16 @@ class AndroidTVDevice(ADBDevice):
         if not self._available:
             return
 
-        # Get the `state`, `current_app`, and `running_apps`.
-        state, self._current_app, self._device, self._muted, self._volume = \
-            self.aftv.update()
+        # Get the updated state and attributes.
+        state, self._current_app, self._device, self._is_volume_muted, \
+            self._volume_level = self.aftv.update()
 
         self._state = ANDROIDTV_STATES[state]
 
     @property
     def is_volume_muted(self):
         """Boolean if volume is currently muted."""
-        return self._muted
+        return self._is_volume_muted
 
     @property
     def source(self):
@@ -374,7 +374,7 @@ class AndroidTVDevice(ADBDevice):
     @property
     def volume_level(self):
         """Return the volume level."""
-        return self._volume
+        return self._volume_level
 
     @adb_decorator()
     def media_stop(self):
@@ -389,12 +389,12 @@ class AndroidTVDevice(ADBDevice):
     @adb_decorator()
     def volume_down(self):
         """Send volume down command."""
-        self.aftv.volume_down()
+        self._volume_level = self.aftv.volume_down(self._volume_level)
 
     @adb_decorator()
     def volume_up(self):
         """Send volume up command."""
-        self.aftv.volume_up()
+        self._volume_level = self.aftv.volume_up(self._volume_level)
 
 
 class FireTVDevice(ADBDevice):
diff --git a/requirements_all.txt b/requirements_all.txt
index 757994485a0..4493911e106 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -158,7 +158,7 @@ alpha_vantage==2.1.0
 amcrest==1.3.0
 
 # homeassistant.components.androidtv
-androidtv==0.0.14
+androidtv==0.0.15
 
 # homeassistant.components.anel_pwrctrl
 anel_pwrctrl-homeassistant==0.0.1.dev2