From de8fa0936617a79dd2f9fbd50a27dc2e32be5b54 Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Sat, 25 Mar 2017 21:38:46 +0100
Subject: [PATCH] Keep new chapters notification across updates
---
.../java/eu/kanade/tachiyomi/Constants.kt | 12 +-
.../data/library/LibraryUpdateService.kt | 228 +++++++-----------
.../data/notification/NotificationReceiver.kt | 2 +-
.../tachiyomi/ui/library/LibraryFragment.kt | 4 +-
.../res/drawable-hdpi/ic_book_white_24dp.png | Bin 0 -> 180 bytes
.../res/drawable-mdpi/ic_book_white_24dp.png | Bin 0 -> 136 bytes
.../res/drawable-xhdpi/ic_book_white_24dp.png | Bin 0 -> 197 bytes
.../drawable-xxhdpi/ic_book_white_24dp.png | Bin 0 -> 283 bytes
.../drawable-xxxhdpi/ic_book_white_24dp.png | Bin 0 -> 350 bytes
app/src/main/res/values-bg/strings.xml | 4 -
app/src/main/res/values-es/strings.xml | 6 +-
app/src/main/res/values-fr/strings.xml | 6 +-
app/src/main/res/values-it/strings.xml | 6 +-
app/src/main/res/values-pt/strings.xml | 6 +-
app/src/main/res/values-ru/strings.xml | 4 -
app/src/main/res/values-vi/strings.xml | 4 -
app/src/main/res/values/strings.xml | 6 +-
17 files changed, 102 insertions(+), 186 deletions(-)
create mode 100644 app/src/main/res/drawable-hdpi/ic_book_white_24dp.png
create mode 100644 app/src/main/res/drawable-mdpi/ic_book_white_24dp.png
create mode 100644 app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png
create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png
diff --git a/app/src/main/java/eu/kanade/tachiyomi/Constants.kt b/app/src/main/java/eu/kanade/tachiyomi/Constants.kt
index 48fec85954..6b9a416826 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/Constants.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/Constants.kt
@@ -1,10 +1,10 @@
package eu.kanade.tachiyomi
object Constants {
- const val NOTIFICATION_LIBRARY_ID = 1
- const val NOTIFICATION_UPDATER_ID = 2
- const val NOTIFICATION_DOWNLOAD_CHAPTER_ID = 3
- const val NOTIFICATION_DOWNLOAD_CHAPTER_ERROR_ID = 4
- const val NOTIFICATION_DOWNLOAD_IMAGE_ID = 5
-
+ const val NOTIFICATION_LIBRARY_PROGRESS_ID = 1
+ const val NOTIFICATION_LIBRARY_RESULT_ID = 2
+ const val NOTIFICATION_UPDATER_ID = 3
+ const val NOTIFICATION_DOWNLOAD_CHAPTER_ID = 4
+ const val NOTIFICATION_DOWNLOAD_CHAPTER_ERROR_ID = 5
+ const val NOTIFICATION_DOWNLOAD_IMAGE_ID = 6
}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
index 29a38e5966..e9a9d2e1bf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
@@ -1,10 +1,12 @@
package eu.kanade.tachiyomi.data.library
+import android.app.Notification
import android.app.PendingIntent
import android.app.Service
import android.content.Context
import android.content.Intent
import android.graphics.BitmapFactory
+import android.os.Build
import android.os.IBinder
import android.os.PowerManager
import android.support.v4.app.NotificationCompat
@@ -28,7 +30,9 @@ import eu.kanade.tachiyomi.util.*
import rx.Observable
import rx.Subscription
import rx.schedulers.Schedulers
-import uy.kohesive.injekt.injectLazy
+import timber.log.Timber
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
import java.util.*
import java.util.concurrent.atomic.AtomicInteger
@@ -40,27 +44,12 @@ import java.util.concurrent.atomic.AtomicInteger
* progress of the update, and if case of an unexpected error, this service will be silently
* destroyed.
*/
-class LibraryUpdateService : Service() {
-
- /**
- * Database helper.
- */
- val db: DatabaseHelper by injectLazy()
-
- /**
- * Source manager.
- */
- val sourceManager: SourceManager by injectLazy()
-
- /**
- * Preferences.
- */
- val preferences: PreferencesHelper by injectLazy()
-
- /**
- * Download Manager
- */
- val downloadManager: DownloadManager by injectLazy()
+class LibraryUpdateService(
+ val db: DatabaseHelper = Injekt.get(),
+ val sourceManager: SourceManager = Injekt.get(),
+ val preferences: PreferencesHelper = Injekt.get(),
+ val downloadManager: DownloadManager = Injekt.get()
+) : Service() {
/**
* Wake lock that will be held until the service is destroyed.
@@ -75,18 +64,27 @@ class LibraryUpdateService : Service() {
/**
* Pending intent of action that cancels the library update
*/
- private val cancelPendingIntent by lazy {NotificationReceiver.cancelLibraryUpdatePendingBroadcast(this)}
+ private val cancelIntent by lazy {
+ NotificationReceiver.cancelLibraryUpdatePendingBroadcast(this)
+ }
/**
- * Id of the library update notification.
+ * Bitmap of the app for notifications.
*/
- private val notificationId: Int
- get() = Constants.NOTIFICATION_LIBRARY_ID
-
private val notificationBitmap by lazy {
BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)
}
+ /**
+ * Cached progress notification to avoid creating a lot.
+ */
+ private val progressNotification by lazy { NotificationCompat.Builder(this)
+ .setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
+ .setLargeIcon(notificationBitmap)
+ .setOngoing(true)
+ .addAction(R.drawable.ic_clear_grey_24dp_img, getString(android.R.string.cancel), cancelIntent)
+ }
+
companion object {
/**
@@ -144,16 +142,20 @@ class LibraryUpdateService : Service() {
*/
override fun onCreate() {
super.onCreate()
- createAndAcquireWakeLock()
+ wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(
+ PowerManager.PARTIAL_WAKE_LOCK, "LibraryUpdateService:WakeLock")
+ wakeLock.acquire()
}
/**
- * Method called when the service is destroyed. It destroys the running subscription, resets
- * the alarm and release the wake lock.
+ * Method called when the service is destroyed. It destroys subscriptions and releases the wake
+ * lock.
*/
override fun onDestroy() {
subscription?.unsubscribe()
- destroyWakeLock()
+ if (wakeLock.isHeld) {
+ wakeLock.release()
+ }
super.onDestroy()
}
@@ -192,7 +194,7 @@ class LibraryUpdateService : Service() {
.subscribeOn(Schedulers.io())
.subscribe({
}, {
- showNotification(getString(R.string.notification_update_error), "")
+ Timber.e(it)
stopSelf(startId)
}, {
stopSelf(startId)
@@ -213,7 +215,7 @@ class LibraryUpdateService : Service() {
var listToUpdate = if (categoryId != -1)
db.getLibraryMangas().executeAsBlocking().filter { it.category == categoryId }
else {
- val categoriesToUpdate = preferences.libraryUpdateCategories().getOrDefault().map { it.toInt() }
+ val categoriesToUpdate = preferences.libraryUpdateCategories().getOrDefault().map(String::toInt)
if (categoriesToUpdate.isNotEmpty())
db.getLibraryMangas().executeAsBlocking()
.filter { it.category in categoriesToUpdate }
@@ -255,7 +257,7 @@ class LibraryUpdateService : Service() {
// Emit each manga and update it sequentially.
return Observable.from(mangaToUpdate)
// Notify manga that will update.
- .doOnNext { showProgressNotification(it, count.andIncrement, mangaToUpdate.size, cancelPendingIntent) }
+ .doOnNext { showProgressNotification(it, count.andIncrement, mangaToUpdate.size) }
// Update the chapters of the manga.
.concatMap { manga ->
updateManga(manga)
@@ -267,11 +269,11 @@ class LibraryUpdateService : Service() {
// Filter out mangas without new chapters (or failed).
.filter { pair -> pair.first.isNotEmpty() }
.doOnNext {
- if (downloadNew) {
- if (categoriesToDownload.isEmpty() || manga.category in categoriesToDownload) {
- downloadChapters(manga, it.first)
- hasDownloads = true
- }
+ if (downloadNew && (categoriesToDownload.isEmpty() ||
+ manga.category in categoriesToDownload)) {
+
+ downloadChapters(manga, it.first)
+ hasDownloads = true
}
}
// Convert to the manga that contains new chapters.
@@ -287,16 +289,17 @@ class LibraryUpdateService : Service() {
}
// Notify result of the overall update.
.doOnCompleted {
- if (newUpdates.isEmpty()) {
- cancelNotification()
- } else {
- showResultNotification(newUpdates, failedUpdates)
- if (downloadNew) {
- if (hasDownloads) {
- DownloadService.start(this)
- }
+ cancelProgressNotification()
+ if (newUpdates.isNotEmpty()) {
+ showResultNotification(newUpdates)
+ if (downloadNew && hasDownloads) {
+ DownloadService.start(this)
}
}
+
+ if (failedUpdates.isNotEmpty()) {
+ Timber.e("Failed updating: ${failedUpdates.map { it.title }}")
+ }
}
}
@@ -337,7 +340,7 @@ class LibraryUpdateService : Service() {
// Emit each manga and update it sequentially.
return Observable.from(mangaToUpdate)
// Notify manga that will update.
- .doOnNext { showProgressNotification(it, count.andIncrement, mangaToUpdate.size, cancelPendingIntent) }
+ .doOnNext { showProgressNotification(it, count.andIncrement, mangaToUpdate.size) }
// Update the details of the manga.
.concatMap { manga ->
val source = sourceManager.get(manga.source) as? HttpSource
@@ -352,73 +355,10 @@ class LibraryUpdateService : Service() {
.onErrorReturn { manga }
}
.doOnCompleted {
- cancelNotification()
+ cancelProgressNotification()
}
}
- /**
- * Returns the text that will be displayed in the notification when there are new chapters.
- *
- * @param updates a list of manga that contains new chapters.
- * @param failedUpdates a list of manga that failed to update.
- * @return the body of the notification to display.
- */
- private fun getUpdatedMangasBody(updates: List<Manga>, failedUpdates: List<Manga>): String {
- return buildString {
- if (updates.isEmpty()) {
- append(getString(R.string.notification_no_new_chapters))
- append("\n")
- } else {
- append(getString(R.string.notification_new_chapters))
- for (manga in updates) {
- append("\n")
- append(manga.title.chop(45))
- }
- }
- if (!failedUpdates.isEmpty()) {
- append("\n\n")
- append(getString(R.string.notification_manga_update_failed))
- for (manga in failedUpdates) {
- append("\n")
- append(manga.title.chop(45))
- }
- }
- }
- }
-
- /**
- * Creates and acquires a wake lock until the library is updated.
- */
- private fun createAndAcquireWakeLock() {
- wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(
- PowerManager.PARTIAL_WAKE_LOCK, "LibraryUpdateService:WakeLock")
- wakeLock.acquire()
- }
-
- /**
- * Releases the wake lock if it's held.
- */
- private fun destroyWakeLock() {
- if (wakeLock.isHeld) {
- wakeLock.release()
- }
- }
-
- /**
- * Shows the notification with the given title and body.
- *
- * @param title the title of the notification.
- * @param body the body of the notification.
- */
- private fun showNotification(title: String, body: String) {
- notificationManager.notify(notificationId, notification {
- setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
- setLargeIcon(notificationBitmap)
- setContentTitle(title)
- setContentText(body)
- })
- }
-
/**
* Shows the notification containing the currently updating manga and the progress.
*
@@ -426,52 +366,60 @@ class LibraryUpdateService : Service() {
* @param current the current progress.
* @param total the total progress.
*/
- private fun showProgressNotification(manga: Manga, current: Int, total: Int, cancelIntent: PendingIntent) {
- notificationManager.notify(notificationId, notification {
- setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
- setLargeIcon(notificationBitmap)
- setContentTitle(manga.title)
- setProgress(total, current, false)
- setOngoing(true)
- addAction(R.drawable.ic_clear_grey_24dp_img, getString(android.R.string.cancel), cancelIntent)
- })
+ private fun showProgressNotification(manga: Manga, current: Int, total: Int) {
+ notificationManager.notify(Constants.NOTIFICATION_LIBRARY_PROGRESS_ID, progressNotification
+ .setContentTitle(manga.title)
+ .setProgress(total, current, false)
+ .build())
}
-
/**
* Shows the notification containing the result of the update done by the service.
*
* @param updates a list of manga with new updates.
- * @param failed a list of manga that failed to update.
*/
- private fun showResultNotification(updates: List<Manga>, failed: List<Manga>) {
- val title = getString(R.string.notification_update_completed)
- val body = getUpdatedMangasBody(updates, failed)
+ private fun showResultNotification(updates: List<Manga>) {
+ val title = getString(R.string.notification_new_chapters)
+ val newUpdates = updates.map { it.title.chop(45) }.toMutableSet()
- notificationManager.notify(notificationId, notification {
- setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
+ // Append new chapters from a previous, existing notification
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ val previousNotification = notificationManager.activeNotifications
+ .find { it.id == Constants.NOTIFICATION_LIBRARY_RESULT_ID }
+
+ if (previousNotification != null) {
+ val oldUpdates = previousNotification.notification.extras
+ .getString(Notification.EXTRA_BIG_TEXT, "")
+ .split("\n")
+
+ newUpdates += oldUpdates
+ }
+ }
+
+ notificationManager.notify(Constants.NOTIFICATION_LIBRARY_RESULT_ID, notification {
+ setSmallIcon(R.drawable.ic_book_white_24dp)
setLargeIcon(notificationBitmap)
setContentTitle(title)
- setStyle(NotificationCompat.BigTextStyle().bigText(body))
- setContentIntent(notificationIntent)
+ setStyle(NotificationCompat.BigTextStyle().bigText(newUpdates.joinToString("\n")))
+ setContentIntent(getNotificationIntent())
setAutoCancel(true)
})
}
/**
- * Cancels the notification.
+ * Cancels the progress notification.
*/
- private fun cancelNotification() {
- notificationManager.cancel(notificationId)
+ private fun cancelProgressNotification() {
+ notificationManager.cancel(Constants.NOTIFICATION_LIBRARY_PROGRESS_ID)
}
/**
- * Property that returns an intent to open the main activity.
+ * Returns an intent to open the main activity.
*/
- private val notificationIntent: PendingIntent
- get() {
- val intent = Intent(this, MainActivity::class.java)
- intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
- return PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
- }
+ private fun getNotificationIntent(): PendingIntent {
+ val intent = Intent(this, MainActivity::class.java)
+ intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
+ return PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+ }
+
}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
index e046510175..18007bd85d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
@@ -45,7 +45,7 @@ class NotificationReceiver : BroadcastReceiver() {
ACTION_DELETE_IMAGE -> deleteImage(context, intent.getStringExtra(EXTRA_FILE_LOCATION),
intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1))
// Cancel library update and dismiss notification
- ACTION_CANCEL_LIBRARY_UPDATE -> cancelLibraryUpdate(context, Constants.NOTIFICATION_LIBRARY_ID)
+ ACTION_CANCEL_LIBRARY_UPDATE -> cancelLibraryUpdate(context, Constants.NOTIFICATION_LIBRARY_PROGRESS_ID)
// Open reader activity
ACTION_OPEN_CHAPTER -> {
openChapter(context, intent.getLongExtra(EXTRA_MANGA_ID, -1),
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
index 9160224392..0b6d92fe46 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
@@ -441,11 +441,11 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
if (presenter.editCoverWithStream(it, manga)) {
// TODO refresh cover
} else {
- context.toast(R.string.notification_manga_update_failed)
+ context.toast(R.string.notification_cover_update_failed)
}
}
} catch (error: IOException) {
- context.toast(R.string.notification_manga_update_failed)
+ context.toast(R.string.notification_cover_update_failed)
Timber.e(error)
}
}
diff --git a/app/src/main/res/drawable-hdpi/ic_book_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_book_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fd780e778540bc2d5c6f9959e44d467ddf9c998
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8wWo_?h{y4_*EVuCIPf@JJp8DH
zMZA!w{1R)+;d2vZ4v98RomwNUtyr`?Y2nXMkB_&G?5ub3bLhxadr+z|A?SjlXOl}i
zgT))ESfdjQt}A$Lx-Gz}%dLD>w_{f3{4lm(uLDZhBvUT9X4JiMST^^KUwh3LVZ{=4
e|0COPF&y9h`=<DW4R%0hFnGH9xvX<aXaWG&?n7<>
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable-mdpi/ic_book_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_book_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b02f9ac2ca8e75bc679bf906f9f044813620211
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1e@_?35R21quNZPMC~!DjJf^39
z@z&k!b$TDAl~po}UgbCCUlF*YWW2-FQ|iuj#x}MCmUC-2Fiv!;VdLOkaYEbR*8xtS
j;{DkZdS<`wxW74~_P&{E*EzE|pwSGTu6{1-oD!M<*wrss
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a5ee30413ad39c997b57f58a6e150ec9d5eb729
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D9#0p?kch)?uUqpuIEc6<E-lqK
zlJ=%kv~q2`YKKCgT(8?<1LLMY%lFRwt$O*cLV$ix%cO~`&t6eUd(HmNOhRDFjgYy_
zi$x9QGDo{_Ud+NFpzxrXL6DbsqIkoEIjjw>Jr@ieytY^0oV1HIPtBo$fsv_>>C8U<
v3Aea3{>U}jZoD}+(lGYF4A<hXuRez5m7Ka9ee{<U&|M6ku6{1-oD!M<48=&P
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d181a32150bcf934b86306b219750398149c9220
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw9(lSrhEy=Vy|pp-uz^5pVwgyJ
zhxPlztecn<`zM@vqM5_lu_P|;P{W&d{xexNFip77%Jk{q_5;`N@0_K%^n=Q|I}xkd
zW!<Ije3ChR`(pCN6YE%>yxf>|;CZvqG}%v%={nh;9nE!Se|EfIynmfWBa4uS0)+U-
zr4sO9>IT_>CtN;9bQ`|S`SI$=J~fRG=jP78Td917(RH0ozS1>@sp=CPm^f8n#8kBj
z4*hFoKUnGPe$w0*G3}EhuX0%JgVS=HY|7`jfp%wDTrk=kW-Klw7tUpLYd=uy1@+Pp
W$9+fZ#ZCf!%i!ti=d#Wzp$Py;&~)Gc
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..938eff46c509d0011f7d3c90694fe147c97de8ae
GIT binary patch
literal 350
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z^Ll!;uuoF`1bb3+(Q8(Zi(fF
z**p4m*b<kgusQ5V;QlUnN<d-4B-4gt>QB2TaC@KsA@y?3?Oh+#|Gw2ebLLFjkx6ab
z<@4^&HMY*`N;H47nYDV^+QkcHxHmkQ-N85IF~c{Pt<uaJRMz!b$zKq-X(nHwxGC7~
zfnUn@nghv44@he=GF1sHI5aRYGO=(7z!?D-F9q#YTkvGEHbc0bMm+C^N7MiR-B88q
zAmtaYd-V@vrbYi!!?WTO+Ac>+UCv=(<P?}N9nA=sSsxgW%skQevq5&^+Ru!pvVo<0
zo-;g>Ps-Ie#xO;u<3;!O7zZVj65;;z$#wSZ6V|1j?vy_N?%2fATXk#--&lN#K<@g$
ZzT42z<Ahav9WdM&JYD@<);T3K0RT>hf;RvF
literal 0
HcmV?d00001
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 69c819c4fc..f8e4452e9e 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -331,11 +331,7 @@
<!-- Library update service notifications -->
<string name="notification_update_progress">Напредък: %1$d/%2$d</string>
- <string name="notification_update_completed">Обновяването завършено.</string>
- <string name="notification_update_error">Възникна неочаквана грешка при обновяването на библиотеката.</string>
- <string name="notification_no_new_chapters">Не бяха открити нови глави.</string>
<string name="notification_new_chapters">Открити нови глави за:</string>
- <string name="notification_manga_update_failed">Не успяха да се обновят:</string>
<string name="notification_cover_update_failed">Грешка при обновяването на корицата.</string>
<string name="notification_first_add_to_library">Моля, добавете мангата в библиотеката си, преди да направите това.</string>
<string name="notification_not_connected_to_ac_title">Синхронизиране отказано</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ff82bcd3e9..781a847fd5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -265,11 +265,7 @@
<!-- Library update service notifications -->
<string name="notification_update_progress">Progreso de actualización: %1$d/%2$d</string>
- <string name="notification_update_completed">Actualización completa</string>
- <string name="notification_update_error">Se ha producido un error inesperado al actualizar la librería</string>
- <string name="notification_no_new_chapters">No se encontraron nuevos capítulos</string>
- <string name="notification_new_chapters">Capítulos nuevos encontrados para:</string>
- <string name="notification_manga_update_failed">Fallaron al actualizar:</string>
+ <string name="notification_new_chapters">Nuevos capítulos encontrados</string>
<string name="notification_first_add_to_library">Por favor añada el manga a la librería antes de hacer esto</string>
<string name="notification_not_connected_to_ac_title">Sincronización cancelada</string>
<string name="notification_not_connected_to_ac_body">El dispositivo no está cargando</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e9f448295a..acb93d103f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -313,9 +313,7 @@
<!-- Library update service notifications -->
<string name="notification_update_progress">Progression mise à jour: %1$d/%2$d</string>
- <string name="notification_update_completed">Mise à jour terminée</string>
- <string name="notification_no_new_chapters">Aucun nouveau chapitre trouvé</string>
- <string name="notification_new_chapters">Des nouveaux chapitres ont été trouvés pour :</string>
+ <string name="notification_new_chapters">Des nouveaux chapitres ont été trouvés</string>
<string name="notification_cover_update_failed">La mise à jour de la couverture a échoué</string>
<string name="notification_first_add_to_library">Veuillez ajouter le manga dans votre bibliothèque avant de faire cela</string>
<string name="notification_not_connected_to_ac_body">Non branché</string>
@@ -368,9 +366,7 @@
<string name="fifth_to_last">Du cinquième au dernier chapitre</string>
<string name="login_success">Connexion réussie</string>
<string name="manga_chapter_no_title">Pas de titre</string>
- <string name="notification_manga_update_failed">Impossible de mettre à jour le manga:</string>
<string name="notification_not_connected_to_ac_title">Synchronisation annulée</string>
- <string name="notification_update_error">Une erreur inattendue s\'est produite lors de la mise à jour de la bibliothèque</string>
<string name="pref_clear_chapter_cache">Effacer le cache des chapitres</string>
<string name="pref_remove_after_marked_as_read">Supprimer quand marqué comme lu</string>
<string name="restore_please_wait">Restauration de la sauvegarde. Veuillez patienter…</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ab7da63cd3..5415b7c218 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -322,11 +322,7 @@
<!-- Library update service notifications -->
<string name="notification_update_progress">Progressione aggiornamento: %1$d/%2$d</string>
- <string name="notification_update_completed">Aggiornamento completato</string>
- <string name="notification_update_error">Si è verificato un errore imprevisto durante l\'aggiornamento della libreria</string>
- <string name="notification_no_new_chapters">Non sono stati trovati nuovi capitoli</string>
- <string name="notification_new_chapters">Nuovi capitoli trovati per:</string>
- <string name="notification_manga_update_failed">Impossibile aggiornare:</string>
+ <string name="notification_new_chapters">Nuovi capitoli trovati</string>
<string name="notification_cover_update_failed">Impossibile aggiornare la copertina</string>
<string name="notification_first_add_to_library">Prima di fare questo per favore aggiungi il manga alla libreria</string>
<string name="notification_not_connected_to_ac_title">Sincronizzazione annullata</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 8bc775afab..3c4d015fa1 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -272,11 +272,7 @@
<!-- Library update service notifications -->
<string name="notification_update_progress">Progresso da atualização: %1$d/%2$d</string>
- <string name="notification_update_completed">Atualização completa</string>
- <string name="notification_update_error">Ocorreu um erro inesperado ao atualizar a biblioteca</string>
- <string name="notification_no_new_chapters">Sem novos capítulos encontrados</string>
- <string name="notification_new_chapters">Novos capítulos encontrados para:</string>
- <string name="notification_manga_update_failed">Falha ao atualizar a manga:</string>
+ <string name="notification_new_chapters">Novos capítulos encontrados</string>
<string name="notification_first_add_to_library">Por favor adicione a manga à sua biblioteca antes de fazer isto</string>
<string name="notification_not_connected_to_ac_title">Sincronização cancelada</string>
<string name="notification_not_connected_to_ac_body">O dispositivo não está ligado ao carregador</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6eb73b1283..40c432a9c1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -171,15 +171,11 @@
<string name="no_valid_sources">Пожалуйста включите хотя бы один источник</string>
<string name="notification_cover_update_failed">Не удалось обновить обложку</string>
<string name="notification_first_add_to_library">Пожалуйста добавьте мангу в свою библиотеку, перед тем как делать это</string>
- <string name="notification_manga_update_failed">Не удалось обновить мангу:</string>
<string name="notification_new_chapters">Новые главы найдены для:</string>
<string name="notification_no_connection_body">Соединение не доступно</string>
<string name="notification_no_connection_title">Синхронизация отменена</string>
- <string name="notification_no_new_chapters">Новые главы не найдены</string>
<string name="notification_not_connected_to_ac_body">Не заряжается</string>
<string name="notification_not_connected_to_ac_title">Синхронизация отменена</string>
- <string name="notification_update_completed">Обновление завершено</string>
- <string name="notification_update_error">Неожиданная ошибка случилась пока обновлялась библиотека</string>
<string name="notification_update_progress">Статус обновления: %1$d/%2$d</string>
<string name="on_hold">Заморожено</string>
<string name="ongoing">Выпускается</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ccaefadb8a..19deaec102 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -332,11 +332,7 @@
<!-- Library update service notifications -->
<string name="notification_update_progress">Tiến độ cập nhật: %1$d/%2$d</string>
- <string name="notification_update_completed">Cập nhật đã hoàn thành</string>
- <string name="notification_update_error">Một lỗi không mong đợi đã xảy ra khi cập nhật thư viện</string>
- <string name="notification_no_new_chapters">Không tìm thấy chương mới</string>
<string name="notification_new_chapters">Đã tìm thấy các chương mới cho:</string>
- <string name="notification_manga_update_failed">Cập nhật thất bại:</string>
<string name="notification_cover_update_failed">Cập nhật ảnh bìa thất bại</string>
<string name="notification_first_add_to_library">Hãy thêm truyện vào thư viện trước khi thực hiện</string>
<string name="notification_not_connected_to_ac_title">Đã hủy đồng bộ</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2f11f948df..f2c72db0f2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -339,11 +339,7 @@
<!-- Library update service notifications -->
<string name="notification_update_progress">Update progress: %1$d/%2$d</string>
- <string name="notification_update_completed">Update completed</string>
- <string name="notification_update_error">An unexpected error occurred while updating the library</string>
- <string name="notification_no_new_chapters">No new chapters found</string>
- <string name="notification_new_chapters">New chapters found for:</string>
- <string name="notification_manga_update_failed">Failed to update manga:</string>
+ <string name="notification_new_chapters">New chapters found</string>
<string name="notification_cover_update_failed">Failed to update cover</string>
<string name="notification_first_add_to_library">Please add the manga to your library before doing this</string>
<string name="notification_not_connected_to_ac_title">Sync canceled</string>