From 9bbd03fdec87e3349b23388a01a6a81e9e81d01f Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Sat, 23 Sep 2023 18:38:30 +0530
Subject: [PATCH] *Service: Remove notifications when stopping the service

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 .../aurora/store/data/service/SelfUpdateService.kt    |  7 ++++++-
 .../com/aurora/store/data/service/UpdateService.kt    | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/aurora/store/data/service/SelfUpdateService.kt b/app/src/main/java/com/aurora/store/data/service/SelfUpdateService.kt
index 236d7ac4d..bee23b31a 100644
--- a/app/src/main/java/com/aurora/store/data/service/SelfUpdateService.kt
+++ b/app/src/main/java/com/aurora/store/data/service/SelfUpdateService.kt
@@ -9,6 +9,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.LifecycleService
 import com.aurora.Constants
+import com.aurora.extensions.isNAndAbove
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.File
 import com.aurora.store.BuildConfig
@@ -86,7 +87,11 @@ class SelfUpdateService : LifecycleService() {
     private fun destroyService() {
         Log.d("Self-update service destroyed")
         fetch.removeListener(fetchListener)
-        stopForeground(true)
+        if (isNAndAbove()) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        } else {
+            stopForeground(true)
+        }
         stopSelf()
     }
 
diff --git a/app/src/main/java/com/aurora/store/data/service/UpdateService.kt b/app/src/main/java/com/aurora/store/data/service/UpdateService.kt
index 3e95e441b..2f2ee6b86 100644
--- a/app/src/main/java/com/aurora/store/data/service/UpdateService.kt
+++ b/app/src/main/java/com/aurora/store/data/service/UpdateService.kt
@@ -9,6 +9,7 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.MutableLiveData
 import com.aurora.Constants
+import com.aurora.extensions.isNAndAbove
 import com.aurora.extensions.isOAndAbove
 import com.aurora.extensions.stackTraceToString
 import com.aurora.gplayapi.data.models.App
@@ -55,6 +56,11 @@ class UpdateService: LifecycleService() {
             if (!data && isEmptyInstalling() && fetchListeners.isEmpty() && appMetadataListeners.isEmpty()) {
                 Handler(Looper.getMainLooper()).postDelayed ({
                     if (isEmptyInstalling() && fetchListeners.isEmpty() && appMetadataListeners.isEmpty()) {
+                        if (isNAndAbove()) {
+                            stopForeground(STOP_FOREGROUND_REMOVE)
+                        } else {
+                            stopForeground(true)
+                        }
                         stopSelf()
                     }
                 }, 5 * 1000)
@@ -593,6 +599,11 @@ class UpdateService: LifecycleService() {
                 fetch.hasActiveDownloads(true) { hasActiveDownloads ->
                     if (!hasActiveDownloads && isEmptyInstalling() && fetchListeners.isEmpty() && appMetadataListeners.isEmpty()) {
                         Handler(Looper.getMainLooper()).post {
+                            if (isNAndAbove()) {
+                                stopForeground(STOP_FOREGROUND_REMOVE)
+                            } else {
+                                stopForeground(true)
+                            }
                             stopSelf()
                         }
                     }