From 9506da6dd3ba2f76de4e2781605ce8c94eabd734 Mon Sep 17 00:00:00 2001 From: Curt Brune Date: Sat, 15 Feb 2020 10:48:49 -0800 Subject: [PATCH] Validate activePeer during Bluetooth and Speaker audio state transitions. --- .../thoughtcrime/securesms/service/WebRtcCallService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 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 index 14e1469eb3..0471675a1e 100644 --- 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 @@ public class WebRtcCallService extends Service implements CallManager.Observer, 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 @@ public class WebRtcCallService extends Service implements CallManager.Observer, 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) {