From 02e3f3541fa291c385e5f2da8439b7115c6e4e1f Mon Sep 17 00:00:00 2001
From: Nicholas Wallace <nicholaslwallace@gmail.com>
Date: Thu, 27 Aug 2026 15:12:32 -0700
Subject: [PATCH] Simplify and revert Capacitor changes

---
 .../com/audiobookshelf/app/managers/DownloadItemManager.kt  | 4 ++--
 .../java/com/audiobookshelf/app/plugins/AbsDownloader.kt    | 5 ++---
 .../com/audiobookshelf/app/services/DownloadServiceHost.kt  | 6 +++---
 components/widgets/DownloadProgressIndicator.vue            | 4 +---
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/android/app/src/main/java/com/audiobookshelf/app/managers/DownloadItemManager.kt b/android/app/src/main/java/com/audiobookshelf/app/managers/DownloadItemManager.kt
index e9dd6150..c8b738a2 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/managers/DownloadItemManager.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/managers/DownloadItemManager.kt
@@ -52,7 +52,7 @@ class DownloadItemManager(
     fun onDownloadItem(downloadItem: DownloadItem)
     fun onDownloadItemPartUpdate(downloadItemPart: DownloadItemPart)
     fun onDownloadItemComplete(jsobj: JSObject)
-    fun onQueueChanged(hasWork: Boolean, hasItems: Boolean)
+    fun onQueueChanged(hasWork: Boolean)
   }
 
   interface InternalProgressCallback {
@@ -519,7 +519,7 @@ class DownloadItemManager(
   }
 
   private fun notifyQueueChanged() {
-    clientEventEmitter.onQueueChanged(hasWork(), downloadItemQueue.isNotEmpty())
+    clientEventEmitter.onQueueChanged(hasWork())
   }
 
   fun destroy() {
diff --git a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt
index e8e7c4ab..b2d6ebdf 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt
@@ -38,9 +38,8 @@ class AbsDownloader : Plugin() {
     override fun onDownloadItemComplete(jsobj:JSObject) {
       notifyListeners("onItemDownloadComplete", jsobj)
     }
-    override fun onQueueChanged(hasWork: Boolean, hasItems: Boolean) {
-      notifyListeners(
-              "onQueueChanged", JSObject().put("hasWork", hasWork).put("hasItems", hasItems))
+    override fun onQueueChanged(hasWork: Boolean) {
+      notifyListeners("onQueueChanged", JSObject().put("hasWork", hasWork))
     }
   })
 
diff --git a/android/app/src/main/java/com/audiobookshelf/app/services/DownloadServiceHost.kt b/android/app/src/main/java/com/audiobookshelf/app/services/DownloadServiceHost.kt
index 1743c2df..d385eb19 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/services/DownloadServiceHost.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/services/DownloadServiceHost.kt
@@ -185,8 +185,8 @@ object DownloadServiceHost {
     override fun onDownloadItemComplete(jsobj: JSObject) {
       if (bridgeReady) bridgeEmitter.onDownloadItemComplete(jsobj) else deferredCompletions.add(jsobj)
     }
-    override fun onQueueChanged(hasWork: Boolean, hasItems: Boolean) {
-      bridgeEmitter.onQueueChanged(hasWork, hasItems)
+    override fun onQueueChanged(hasWork: Boolean) {
+      bridgeEmitter.onQueueChanged(hasWork)
       service?.onQueueChanged(hasWork)
     }
   }
@@ -195,7 +195,7 @@ object DownloadServiceHost {
     override fun onDownloadItem(downloadItem: DownloadItem) = Unit
     override fun onDownloadItemPartUpdate(downloadItemPart: com.audiobookshelf.app.models.DownloadItemPart) = Unit
     override fun onDownloadItemComplete(jsobj: JSObject) = Unit
-    override fun onQueueChanged(hasWork: Boolean, hasItems: Boolean) = Unit
+    override fun onQueueChanged(hasWork: Boolean) = Unit
   }
 
   private const val NOTIFICATION_PREFERENCES = "download_notifications"
diff --git a/components/widgets/DownloadProgressIndicator.vue b/components/widgets/DownloadProgressIndicator.vue
index bc723521..625cdc4f 100644
--- a/components/widgets/DownloadProgressIndicator.vue
+++ b/components/widgets/DownloadProgressIndicator.vue
@@ -79,9 +79,7 @@ export default {
       this.$store.commit('globals/updateDownloadItemPart', itemPart)
     },
     onQueueChanged(data) {
-      if (data.hasItems === false || (data.hasItems == null && !data.hasWork)) {
-        this.$store.commit('globals/clearItemDownloads')
-      }
+      if (!data.hasWork) this.$store.commit('globals/clearItemDownloads')
     }
   },
   async mounted() {