Validate activePeer during Bluetooth and Speaker audio state transiti…

…ons.
signalapp · Feb 26, 2020 · 9506da6 · 9506da6
1 parent 4ea886d
commit 9506da6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
@@ -456,7 +456,9 @@ private void handleSetSpeakerAudio(Intent intent) {
       lockManager.updatePhoneState(getInCallPhoneState());
     }
 
-    sendMessage(viewModelStateFor(activePeer), activePeer, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled);
+    if (activePeer != null) {
+      sendMessage(viewModelStateFor(activePeer), activePeer, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled);
+    }
   }
 
   private void handleSetBluetoothAudio(Intent intent) {
@@ -475,7 +477,9 @@ private void handleSetBluetoothAudio(Intent intent) {
       lockManager.updatePhoneState(getInCallPhoneState());
     }
 
-    sendMessage(viewModelStateFor(activePeer), activePeer, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled);
+    if (activePeer != null) {
+      sendMessage(viewModelStateFor(activePeer), activePeer, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled);
+    }
   }
 
   private void handleSetMuteAudio(Intent intent) {