fix(bluetooth): check for valid response from get_bluetooth

alandtse · Aug 30, 2019 · b1422c4 · b1422c4
1 parent 9032c00
commit b1422c4
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/custom_components/alexa_media/__init__.py b/custom_components/alexa_media/__init__.py
@@ -462,10 +462,12 @@ async def update_bluetooth_state(login_obj, device_serial):
                   ['media_player']
                   [device_serial])
 
-        for b_state in bluetooth['bluetoothStates']:
-            if device_serial == b_state['deviceSerialNumber']:
-                device['bluetooth_state'] = b_state
-        return device['bluetooth_state']
+        if 'bluetoothStates' in bluetooth:
+            for b_state in bluetooth['bluetoothStates']:
+                if device_serial == b_state['deviceSerialNumber']:
+                    device['bluetooth_state'] = b_state
+                return device['bluetooth_state']
+        return None
 
     async def last_call_handler(call):
         """Handle last call service request.
@@ -588,10 +590,11 @@ async def ws_handler(message_obj):
                                   json_payload)
                     bluetooth_state = await update_bluetooth_state(login_obj,
                                                                    serial)
-                    hass.bus.async_fire(
-                        ('{}_{}'.format(DOMAIN,
-                                        hide_email(email)))[0:32],
-                        {'bluetooth_change': bluetooth_state})
+                    if bluetooth_state:
+                        hass.bus.async_fire(
+                            ('{}_{}'.format(DOMAIN,
+                                            hide_email(email)))[0:32],
+                            {'bluetooth_change': bluetooth_state})
             elif command == 'PUSH_MEDIA_QUEUE_CHANGE':
                 # Player availability update
                 serial = (json_payload['dopplerId']['deviceSerialNumber'])