yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Cancel library progress notification after posting the result

Browse Source
This commit is contained in:
inorichi 2017-03-29 09:17:53 +02:00
parent e9a6f8ef46
commit 8ef3ab0d49
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
View File

@ -289,7 +289,6 @@ class LibraryUpdateService(
} }
// Notify result of the overall update. // Notify result of the overall update.
.doOnCompleted { .doOnCompleted {
cancelProgressNotification()
if (newUpdates.isNotEmpty()) { if (newUpdates.isNotEmpty()) {
showResultNotification(newUpdates) showResultNotification(newUpdates)
if (downloadNew && hasDownloads) { if (downloadNew && hasDownloads) {
@ -300,6 +299,8 @@ class LibraryUpdateService(
if (failedUpdates.isNotEmpty()) { if (failedUpdates.isNotEmpty()) {
Timber.e("Failed updating: ${failedUpdates.map { it.title }}") Timber.e("Failed updating: ${failedUpdates.map { it.title }}")
} }
cancelProgressNotification()
} }
} }
@ -389,10 +390,11 @@ class LibraryUpdateService(
if (previousNotification != null) { if (previousNotification != null) {
val oldUpdates = previousNotification.notification.extras val oldUpdates = previousNotification.notification.extras
.getString(Notification.EXTRA_BIG_TEXT, "") .getString(Notification.EXTRA_BIG_TEXT)
.split("\n")
newUpdates += oldUpdates if (!oldUpdates.isNullOrEmpty()) {
newUpdates += oldUpdates.split("\n")
}
} }
} }