From 1bae79af5bc3d2aaedecb99805b4fcf0070b05d1 Mon Sep 17 00:00:00 2001
From: Curt Brune <curt@signal.org>
Date: Tue, 18 Feb 2020 09:18:54 -0800
Subject: [PATCH] Check callManager reference is still valid in
 ListenableFutureTask callbacks.

---
 .../securesms/service/WebRtcCallService.java  | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 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
index 8bfd126422..1ece2adf53 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
@@ -1456,19 +1456,23 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
 
     @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);
+        }
       }
     }
 
@@ -1476,10 +1480,12 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
     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) {