empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Prevent calling service crash loop when system restarts us in background.

Browse source
This commit is contained in:
Cody Henthorne 2024-01-17 15:48:36 -05:00 • committed by Greyson Parrelli
parent ae884d79a1
commit bc5d27ed90
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcCallService.java
View file

@ -178,7 +178,7 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
if (intent == null || intent.getAction() == null) {
setCallNotification(true);
Log.w(TAG, "Service running with null intent/action likely from system restart, stopping");
stop();
return START_NOT_STICKY;
}
@ -234,9 +234,11 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
if (!stopping && lastNotificationId != INVALID_NOTIFICATION_ID) {
startForegroundCompat(lastNotificationId, lastNotification);
} else {
Log.w(TAG, "Service running without having called start first, show temp notification and terminate service.");
startForegroundCompat(CallNotificationBuilder.getStartingStoppingNotificationId(), CallNotificationBuilder.getStoppingNotification(this));
stop();
if (!stopping) {
Log.i(TAG, "Service was started without calling UPDATE first, using temporary notification.");
}
startForegroundCompat(CallNotificationBuilder.getStartingStoppingNotificationId(), stopping ? CallNotificationBuilder.getStoppingNotification(this)
: CallNotificationBuilder.getStartingNotification(this));
}
}