From bfccfba00e724953adf51018c692f923a59bbd00 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 15 Jan 2021 13:03:54 +0100 Subject: [PATCH] fix in call notification being shown twice --- .../conversations/services/XmppConnectionService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 361c1a904..e3bf3f37a 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1284,17 +1284,20 @@ public class XmppConnectionService extends Service { final OngoingCall ongoing = ongoingCall.get(); if (force || mForceDuringOnCreate.get() || mForceForegroundService.get() || ongoing != null || (Compatibility.keepForegroundService(this) && hasEnabledAccounts())) { final Notification notification; + final int id; if (ongoing != null) { notification = this.mNotificationService.getOngoingCallNotification(ongoing.id, ongoing.media); - startForeground(NotificationService.ONGOING_CALL_NOTIFICATION_ID, notification); + id = NotificationService.ONGOING_CALL_NOTIFICATION_ID; + startForeground(id, notification); mNotificationService.cancel(NotificationService.FOREGROUND_NOTIFICATION_ID); } else { notification = this.mNotificationService.createForegroundNotification(); - startForeground(NotificationService.FOREGROUND_NOTIFICATION_ID, notification); + id = NotificationService.FOREGROUND_NOTIFICATION_ID; + startForeground(id, notification); } if (!mForceForegroundService.get()) { - mNotificationService.notify(NotificationService.FOREGROUND_NOTIFICATION_ID, notification); + mNotificationService.notify(id, notification); } status = true; } else {