From ae594a0400c8404c935e143ba993a94aa4620327 Mon Sep 17 00:00:00 2001 From: Curt Brune Date: Fri, 14 Feb 2020 07:37:05 -0800 Subject: [PATCH] Check activeRemote is non-null during handleScreenOffChange() --- .../thoughtcrime/securesms/service/WebRtcCallService.java | 5 +++-- 1 file changed, 3 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 cb8ea85207..14e1469eb3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java @@ -542,8 +542,9 @@ public class WebRtcCallService extends Service implements CallManager.Observer, } private void handleScreenOffChange(Intent intent) { - if (activePeer.getState() == CallState.ANSWERING || - activePeer.getState() == CallState.LOCAL_RINGING) + if ((activePeer != null) && + (activePeer.getState() == CallState.ANSWERING || + activePeer.getState() == CallState.LOCAL_RINGING)) { Log.i(TAG, "Silencing incoming ringer..."); audioManager.silenceIncomingRinger();