Closes #774

Adamantcheese · Mar 7, 2020 · 7c5f359 · 7c5f359
1 parent 5bde49d
commit 7c5f359
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/service/SavingNotification.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/service/SavingNotification.java
@@ -75,14 +75,19 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
             if (extras.getBoolean(CANCEL_KEY)) {
                 postToEventBus(new SavingCancelRequestMessage());
+                startForeground(NOTIFICATION_ID, new Notification());
+                stopSelf();
+                return START_NOT_STICKY;
             } else {
                 doneTasks = extras.getInt(DONE_TASKS_KEY);
                 totalTasks = extras.getInt(TOTAL_TASKS_KEY);
                 startForeground(NOTIFICATION_ID, getNotification());
+                return START_STICKY;
             }
         }
-
-        return START_STICKY;
+        startForeground(NOTIFICATION_ID, new Notification());
+        stopSelf();
+        return START_NOT_STICKY;
     }
 
     private Notification getNotification() {

diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/service/WatchNotification.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/service/WatchNotification.java
@@ -142,7 +142,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         Notification notification = createNotification();
         if (notification == null) {
             Logger.d(TAG, "onStartCommand() createNotification returned null");
-
+            startForeground(NOTIFICATION_ID, new Notification());
             stopSelf();
             return START_NOT_STICKY;
         }