blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check callManager reference is still valid in ListenableFutureTask callbacks.

master
Curt Brune 2020-02-18 09:18:54 -08:00 committed by Greyson Parrelli
parent 58b7612987
commit 1bae79af5b
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
View File

@ -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) {