From eeece55b45fb0ce33d310fae6eb0bcba7faeb23a Mon Sep 17 00:00:00 2001 From: Curt Brune Date: Fri, 14 Feb 2020 07:23:43 -0800 Subject: [PATCH] Check activeRemote is non-null during handleWiredHeadsetChange() --- .../securesms/service/WebRtcCallService.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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 e24830710a..cb8ea85207 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java @@ -521,10 +521,11 @@ public class WebRtcCallService extends Service implements CallManager.Observer, private void handleWiredHeadsetChange(Intent intent) { Log.i(TAG, "handleWiredHeadsetChange..."); - if (activePeer.getState() == CallState.CONNECTED || - activePeer.getState() == CallState.DIALING || - activePeer.getState() == CallState.RECEIVED_BUSY || - activePeer.getState() == CallState.REMOTE_RINGING) + if ((activePeer != null) && + (activePeer.getState() == CallState.CONNECTED || + activePeer.getState() == CallState.DIALING || + activePeer.getState() == CallState.RECEIVED_BUSY || + activePeer.getState() == CallState.REMOTE_RINGING)) { AudioManager audioManager = ServiceUtil.getAudioManager(this); boolean present = intent.getBooleanExtra(EXTRA_AVAILABLE, false); @@ -536,9 +537,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer, audioManager.setSpeakerphoneOn(true); } - if (activePeer != null) { - sendMessage(viewModelStateFor(activePeer), activePeer, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled); - } + sendMessage(viewModelStateFor(activePeer), activePeer, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled); } }