Check callManager reference is still valid in ListenableFutureTask ca…

…llbacks.
signalapp · Feb 26, 2020 · 1bae79a · 1bae79a
1 parent 58b7612
commit 1bae79a
Showing 1 changed file with 18 additions and 12 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
@@ -1456,30 +1456,36 @@ private class SendCallMessageListener<V> extends StateAwareListener<V> {
 
     @Override
     public void onSuccessContinue(V result) {
-      try {
-        callManager.messageSent(getCallId());
-      } catch (CallException e) {
-        callFailure("callManager.messageSent() failed: ", e);
+      if (callManager != null) {
+        try {
+          callManager.messageSent(getCallId());
+        } catch (CallException e) {
+          callFailure("callManager.messageSent() failed: ", e);
+        }
       }
     }
 
     @Override
     public void onStateChangeContinue() {
-      try {
-        callManager.messageSent(getCallId());
-      } catch (CallException e) {
-        callFailure("callManager.messageSent() failed: ", e);
+      if (callManager != null) {
+        try {
+          callManager.messageSent(getCallId());
+        } catch (CallException e) {
+          callFailure("callManager.messageSent() failed: ", e);
+        }
       }
     }
 
     @Override
     public void onFailureContinue(Throwable error) {
       Log.w(TAG, error);
 
-      try {
-        callManager.messageSendFailure(getCallId());
-      } catch (CallException e) {
-        callFailure("callManager.messageSendFailure() failed: ", e);
+      if (callManager != null) {
+        try {
+          callManager.messageSendFailure(getCallId());
+        } catch (CallException e) {
+          callFailure("callManager.messageSendFailure() failed: ", e);
+        }
       }
 
       if (activePeer == null) {