From d2bf5395040affaccc61589d8cc3b7278ff6b841 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 28 May 2020 09:09:23 -0300 Subject: [PATCH] Clear sticky WebRtcViewModel events when initiating a new call. --- .../thoughtcrime/securesms/service/WebRtcCallService.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 60e56d353c..85f98d3dd5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java @@ -431,6 +431,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer, } Log.i(TAG, "handleOutgoingCall():"); + EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class); initializeVideo(); @@ -1042,6 +1043,12 @@ public class WebRtcCallService extends Service implements CallManager.Observer, RemotePeer remotePeer = getRemotePeer(intent); Log.i(TAG, "handleEndedReceivedOfferWhileActive(): call_id: " + remotePeer.getCallId()); + + if (activePeer == null) { + Log.w(TAG, "handleEndedReceivedOfferWhileActive(): ignoring call with null activePeer"); + return; + } + switch (activePeer.getState()) { case DIALING: case REMOTE_RINGING: setCallInProgressNotification(TYPE_OUTGOING_RINGING, activePeer); break;