From 809f628bc05b5bbf4eacaef86e16fd480698ee17 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Mon, 26 May 2025 22:55:57 +0800
Subject: [PATCH] Fix stop all shortcut with no active downloads

The downloading notification would keep showing.
---
 .../ehviewer/download/DownloadService.kt      | 39 +------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/download/DownloadService.kt b/app/src/main/kotlin/com/hippo/ehviewer/download/DownloadService.kt
index 16a7cd417..c3c5ad4f0 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/download/DownloadService.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/download/DownloadService.kt
@@ -27,7 +27,6 @@ import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
 import androidx.savedstate.serialization.decodeFromSavedState
 import androidx.savedstate.serialization.encodeToSavedState
@@ -114,36 +113,8 @@ class DownloadService :
                 deferredMgr.await().startAllDownload()
             }
 
-            ACTION_STOP -> {
-                val gid = intent.getLongExtra(KEY_GID, -1)
-                if (gid != -1L) {
-                    deferredMgr.await().stopDownload(gid)
-                }
-            }
-
-            ACTION_STOP_CURRENT -> deferredMgr.await().stopCurrentDownload()
-
-            ACTION_STOP_RANGE -> {
-                val gidList = intent.getLongArrayExtra(KEY_GID_LIST)
-                if (gidList != null) {
-                    deferredMgr.await().stopRangeDownload(gidList)
-                }
-            }
-
-            ACTION_STOP_ALL -> deferredMgr.await().stopAllDownload()
-
-            ACTION_DELETE -> {
-                val gid = intent.getLongExtra(KEY_GID, -1)
-                if (gid != -1L) {
-                    deferredMgr.await().deleteDownload(gid)
-                }
-            }
-
-            ACTION_DELETE_RANGE -> {
-                val gidList = intent.getLongArrayExtra(KEY_GID_LIST)
-                if (gidList != null) {
-                    deferredMgr.await().deleteRangeDownload(gidList)
-                }
+            ACTION_STOP_ALL -> deferredMgr.await().run {
+                if (isIdle) stopSelf() else stopAllDownload()
             }
 
             ACTION_CLEAR -> {
@@ -373,7 +344,6 @@ class DownloadService :
     private fun checkStopSelf() {
         launch {
             if (deferredMgr.await().isIdle) {
-                ServiceCompat.stopForeground(this@DownloadService, ServiceCompat.STOP_FOREGROUND_REMOVE)
                 stopSelf()
             }
         }
@@ -432,12 +402,7 @@ class DownloadService :
         const val ACTION_START = "start"
         const val ACTION_START_RANGE = "start_range"
         const val ACTION_START_ALL = "start_all"
-        const val ACTION_STOP = "stop"
-        const val ACTION_STOP_RANGE = "stop_range"
-        const val ACTION_STOP_CURRENT = "stop_current"
         const val ACTION_STOP_ALL = "stop_all"
-        const val ACTION_DELETE = "delete"
-        const val ACTION_DELETE_RANGE = "delete_range"
         const val ACTION_CLEAR = "clear"
         const val KEY_GALLERY_INFO = "gallery_info"
         const val KEY_LABEL = "label"