starred/audiobookshelf-app
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf-app.git synced 2026-09-09 19:31:51 +02:00
Code Issues 454 Packages Projects Releases 10 Wiki Activity

Simplify and revert Capacitor changes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/java/com/audiobookshelf/app/managers/DownloadItemManager.kt
+2 -2
View File
@@ -52,7 +52,7 @@ class DownloadItemManager(
fun onDownloadItem(downloadItem: DownloadItem) fun onDownloadItem(downloadItem: DownloadItem)
fun onDownloadItemPartUpdate(downloadItemPart: DownloadItemPart) fun onDownloadItemPartUpdate(downloadItemPart: DownloadItemPart)
fun onDownloadItemComplete(jsobj: JSObject) fun onDownloadItemComplete(jsobj: JSObject)
fun onQueueChanged(hasWork: Boolean, hasItems: Boolean) fun onQueueChanged(hasWork: Boolean)
} }
interface InternalProgressCallback { interface InternalProgressCallback {
@@ -519,7 +519,7 @@ class DownloadItemManager(
} }
private fun notifyQueueChanged() { private fun notifyQueueChanged() {
clientEventEmitter.onQueueChanged(hasWork(), downloadItemQueue.isNotEmpty()) clientEventEmitter.onQueueChanged(hasWork())
} }
fun destroy() { fun destroy() {
android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt
+2 -3
View File
@@ -38,9 +38,8 @@ class AbsDownloader : Plugin() {
override fun onDownloadItemComplete(jsobj:JSObject) { override fun onDownloadItemComplete(jsobj:JSObject) {
notifyListeners("onItemDownloadComplete", jsobj) notifyListeners("onItemDownloadComplete", jsobj)
} }
override fun onQueueChanged(hasWork: Boolean, hasItems: Boolean) { override fun onQueueChanged(hasWork: Boolean) {
notifyListeners( notifyListeners("onQueueChanged", JSObject().put("hasWork", hasWork))
"onQueueChanged", JSObject().put("hasWork", hasWork).put("hasItems", hasItems))
} }
}) })
android/app/src/main/java/com/audiobookshelf/app/services/DownloadServiceHost.kt
+3 -3
View File
@@ -185,8 +185,8 @@ object DownloadServiceHost {
override fun onDownloadItemComplete(jsobj: JSObject) { override fun onDownloadItemComplete(jsobj: JSObject) {
if (bridgeReady) bridgeEmitter.onDownloadItemComplete(jsobj) else deferredCompletions.add(jsobj) if (bridgeReady) bridgeEmitter.onDownloadItemComplete(jsobj) else deferredCompletions.add(jsobj)
} }
override fun onQueueChanged(hasWork: Boolean, hasItems: Boolean) { override fun onQueueChanged(hasWork: Boolean) {
bridgeEmitter.onQueueChanged(hasWork, hasItems) bridgeEmitter.onQueueChanged(hasWork)
service?.onQueueChanged(hasWork) service?.onQueueChanged(hasWork)
} }
} }
@@ -195,7 +195,7 @@ object DownloadServiceHost {
override fun onDownloadItem(downloadItem: DownloadItem) = Unit override fun onDownloadItem(downloadItem: DownloadItem) = Unit
override fun onDownloadItemPartUpdate(downloadItemPart: com.audiobookshelf.app.models.DownloadItemPart) = Unit override fun onDownloadItemPartUpdate(downloadItemPart: com.audiobookshelf.app.models.DownloadItemPart) = Unit
override fun onDownloadItemComplete(jsobj: JSObject) = 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" private const val NOTIFICATION_PREFERENCES = "download_notifications"
components/widgets/DownloadProgressIndicator.vue
+1 -3
View File
@@ -79,9 +79,7 @@ export default {
this.$store.commit('globals/updateDownloadItemPart', itemPart) this.$store.commit('globals/updateDownloadItemPart', itemPart)
}, },
onQueueChanged(data) { onQueueChanged(data) {
if (data.hasItems === false || (data.hasItems == null && !data.hasWork)) { if (!data.hasWork) this.$store.commit('globals/clearItemDownloads')
this.$store.commit('globals/clearItemDownloads')
}
} }
}, },
async mounted() { async mounted() {