Clear sticky WebRtcViewModel events when initiating a new call.

signalapp · May 29, 2020 · d2bf539 · d2bf539
1 parent 903c398
commit d2bf539
Showing 1 changed file with 7 additions and 0 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
@@ -431,6 +431,7 @@ private void handleOutgoingCall(Intent intent) {
     }
 
     Log.i(TAG, "handleOutgoingCall():");
+    EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
 
     initializeVideo();
 
@@ -1042,6 +1043,12 @@ private void handleEndedReceivedOfferWhileActive(Intent intent) {
     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;