github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove redundant Downloader isNotification argument (#9139)

Browse source 
DownloadQueue.clear() already sets QUEUE downloads to NOT_DOWNLOADED.
This commit is contained in:
Two-Ai 2023-02-24 15:11:51 -05:00 committed by GitHub
parent 84a0044d51
commit 83a4e34095
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
View file

@ -75,11 +75,9 @@ class DownloadManager(
/** /**
* Empties the download queue. * Empties the download queue.
*
* @param isNotification value that determines if status is set (needed for view updates)
*/ */
fun clearQueue(isNotification: Boolean = false) { fun clearQueue() {
downloader.clearQueue(isNotification) downloader.clearQueue()
} }
/** /**

10
app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
View file

@ -185,18 +185,10 @@ class Downloader(
/** /**
* Removes everything from the queue. * Removes everything from the queue.
*
* @param isNotification value that determines if status is set (needed for view updates)
*/ */
fun clearQueue(isNotification: Boolean = false) { fun clearQueue() {
destroySubscriptions() destroySubscriptions()
// Needed to update the chapter view
if (isNotification) {
queue
.filter { it.status == Download.State.QUEUE }
.forEach { it.status = Download.State.NOT_DOWNLOADED }
}
queue.clear() queue.clear()
notifier.dismissProgress() notifier.dismissProgress()
} }

2
app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
View file

@ -63,7 +63,7 @@ class NotificationReceiver : BroadcastReceiver() {
downloadManager.pauseDownloads() downloadManager.pauseDownloads()
} }
// Clear the download queue // Clear the download queue
ACTION_CLEAR_DOWNLOADS -> downloadManager.clearQueue(true) ACTION_CLEAR_DOWNLOADS -> downloadManager.clearQueue()
// Launch share activity and dismiss notification // Launch share activity and dismiss notification
ACTION_SHARE_IMAGE -> ACTION_SHARE_IMAGE ->
shareImage( shareImage(