Simplify and revert Capacitor changes

This commit is contained in:
Nicholas Wallace
2026-08-27 15:12:32 -07:00
parent f25ff6344e
commit 02e3f3541f
4 changed files with 8 additions and 11 deletions
@@ -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() {
@@ -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))
}
})
@@ -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"
@@ -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() {