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

Fix bad notification for start foreground when hanging up.

Browse source
This commit is contained in:
Clark 2023-07-25 11:30:54 -04:00 • committed by Cody Henthorne
parent 4ce512d259
commit 557ef5820e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -168,7 +168,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();
setCallNotification(true);
stop();
return START_NOT_STICKY;
}
@ -200,7 +200,7 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
}
return START_STICKY;
case ACTION_STOP:
setCallNotification();
setCallNotification(true);
stop();
return START_NOT_STICKY;
case ACTION_DENY_CALL:
@ -217,7 +217,10 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
}
private void setCallNotification() {
if (lastNotificationId != INVALID_NOTIFICATION_ID) {
setCallNotification(false);
}
private void setCallNotification(boolean stopping) {
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.");