properly clear file adding notification if forground service channel is disabled

Daniel Gultsch created 7 years ago

Change summary

src/main/java/eu/siacs/conversations/services/NotificationService.java   | 5 
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 1 
2 files changed, 6 insertions(+)

Detailed changes

src/main/java/eu/siacs/conversations/services/NotificationService.java

@@ -883,6 +883,7 @@ public class NotificationService {
         mBuilder.setProgress(100, current, false);
         mBuilder.setSmallIcon(R.drawable.ic_hourglass_empty_white_24dp);
         mBuilder.setContentIntent(createContentIntent(message.getConversation()));
+        mBuilder.setOngoing(true);
         if (Compatibility.twentySix()) {
             mBuilder.setChannelId("compression");
         }
@@ -890,6 +891,10 @@ public class NotificationService {
         notify(FOREGROUND_NOTIFICATION_ID, notification);
     }
 
+    public void dismissForcedForegroundNotification() {
+        cancel(FOREGROUND_NOTIFICATION_ID);
+    }
+
     private void notify(String tag, int id, Notification notification) {
         final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(mXmppConnectionService);
         try {

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -407,6 +407,7 @@ public class XmppConnectionService extends Service {
     public void stopForcingForegroundNotification() {
         mForceForegroundService.set(false);
         toggleForegroundService();
+        mNotificationService.dismissForcedForegroundNotification();
     }
 
     public boolean areMessagesInitialized() {