Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 20:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Attempt to fix crash on call hangup."

Browse Source 
This reverts commit 025411c9fb.
This commit is contained in:
Cody Henthorne
2023-07-18 17:03:40 -04:00
committed by Nicholas
parent 7375a9e06b
commit 05bbeb10da
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,6 +71,7 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
private PhoneStateListener hangUpRtcOnDeviceCallAnswered; private PhoneStateListener hangUpRtcOnDeviceCallAnswered;
private SignalAudioManager signalAudioManager; private SignalAudioManager signalAudioManager;
private int lastNotificationId; private int lastNotificationId;
private Notification lastNotification;
private boolean stopping = false; private boolean stopping = false;
public static void update(@NonNull Context context, int type, @NonNull RecipientId recipientId, boolean isVideoCall) { public static void update(@NonNull Context context, int type, @NonNull RecipientId recipientId, boolean isVideoCall) {
@@ -167,8 +168,8 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
@Override @Override
public int onStartCommand(Intent intent, int flags, int startId) { public int onStartCommand(Intent intent, int flags, int startId) {
if (intent == null || intent.getAction() == null) { if (intent == null || intent.getAction() == null) {
lastNotificationId = INVALID_NOTIFICATION_ID; setCallNotification();
stopIfUpdateNotCalledFirst(); stop();
return START_NOT_STICKY; return START_NOT_STICKY;
} }
@@ -182,7 +183,7 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
intent.getBooleanExtra(EXTRA_IS_VIDEO_CALL, false)); intent.getBooleanExtra(EXTRA_IS_VIDEO_CALL, false));
return START_STICKY; return START_STICKY;
case ACTION_SEND_AUDIO_COMMAND: case ACTION_SEND_AUDIO_COMMAND:
stopIfUpdateNotCalledFirst(); setCallNotification();
if (signalAudioManager == null) { if (signalAudioManager == null) {
signalAudioManager = SignalAudioManager.create(this, this); signalAudioManager = SignalAudioManager.create(this, this);
} }
@@ -191,7 +192,7 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
signalAudioManager.handleCommand(audioCommand); signalAudioManager.handleCommand(audioCommand);
return START_STICKY; return START_STICKY;
case ACTION_CHANGE_POWER_BUTTON: case ACTION_CHANGE_POWER_BUTTON:
stopIfUpdateNotCalledFirst(); setCallNotification();
if (intent.getBooleanExtra(EXTRA_ENABLED, false)) { if (intent.getBooleanExtra(EXTRA_ENABLED, false)) {
registerPowerButtonReceiver(); registerPowerButtonReceiver();
} else { } else {
@@ -199,15 +200,15 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
} }
return START_STICKY; return START_STICKY;
case ACTION_STOP: case ACTION_STOP:
stopIfUpdateNotCalledFirst(); setCallNotification();
stop(); stop();
return START_NOT_STICKY; return START_NOT_STICKY;
case ACTION_DENY_CALL: case ACTION_DENY_CALL:
stopIfUpdateNotCalledFirst(); setCallNotification();
callManager.denyCall(); callManager.denyCall();
return START_NOT_STICKY; return START_NOT_STICKY;
case ACTION_LOCAL_HANGUP: case ACTION_LOCAL_HANGUP:
stopIfUpdateNotCalledFirst(); setCallNotification();
callManager.localHangup(); callManager.localHangup();
return START_NOT_STICKY; return START_NOT_STICKY;
default: default:
@@ -215,8 +216,10 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
} }
} }
private void stopIfUpdateNotCalledFirst() { private void setCallNotification() {
if (lastNotificationId == INVALID_NOTIFICATION_ID) { if (lastNotificationId != INVALID_NOTIFICATION_ID) {
startForegroundCompat(lastNotificationId, lastNotification);
} else {
Log.w(TAG, "Service running without having called start first, show temp notification and terminate service."); Log.w(TAG, "Service running without having called start first, show temp notification and terminate service.");
startForegroundCompat(CallNotificationBuilder.getStartingStoppingNotificationId(), CallNotificationBuilder.getStoppingNotification(this)); startForegroundCompat(CallNotificationBuilder.getStartingStoppingNotificationId(), CallNotificationBuilder.getStoppingNotification(this));
stop(); stop();
@@ -225,11 +228,12 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
public void setCallInProgressNotification(int type, @NonNull RecipientId id, boolean isVideoCall) { public void setCallInProgressNotification(int type, @NonNull RecipientId id, boolean isVideoCall) {
lastNotificationId = CallNotificationBuilder.getNotificationId(type); lastNotificationId = CallNotificationBuilder.getNotificationId(type);
lastNotification = CallNotificationBuilder.getCallInProgressNotification(this, type, Recipient.resolved(id), isVideoCall);
startForegroundCompat(lastNotificationId, CallNotificationBuilder.getCallInProgressNotification(this, type, Recipient.resolved(id), isVideoCall)); startForegroundCompat(lastNotificationId, lastNotification);
} }
private void startForegroundCompat(int notificationId, Notification notification) { private synchronized void startForegroundCompat(int notificationId, Notification notification) {
if (stopping) { if (stopping) {
return; return;
} }
@@ -241,7 +245,7 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
} }
} }
private void stop() { private synchronized void stop() {
stopping = true; stopping = true;
stopForeground(true); stopForeground(true);
stopSelf(); stopSelf();