From eba07485e01b87a844ab2d943426fc834cdcb8c6 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Thu, 14 Nov 2019 19:32:12 -0800
Subject: [PATCH] Chopping off longer chapter updates in notifcations if theres
 more than 5 new chapters

Fix to french strings
---
 .../kanade/tachiyomi/data/library/LibraryUpdateService.kt   | 6 +++++-
 .../eu/kanade/tachiyomi/ui/library/LibraryController.kt     | 3 +--
 app/src/main/res/values-fr/strings.xml                      | 2 +-
 app/src/main/res/values/strings.xml                         | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

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 e0b472e292..f1036e30df 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
@@ -467,7 +467,11 @@ class LibraryUpdateService(
                 setContentTitle(manga.title.chop(45))
                 color = ContextCompat.getColor(this@LibraryUpdateService, R.color.colorAccentLight)
                 setContentText(chapterNames.first())
-                setStyle(NotificationCompat.BigTextStyle().bigText(chapterNames.joinToString("\n")))
+                setStyle(NotificationCompat.BigTextStyle().bigText(
+                    if (chapterNames.size > 5) {
+                        "${chapterNames.take(4).joinToString(", ")}, " +
+                            getString(R.string.notification_and_n_more, (chapterNames.size - 4))
+                    } else chapterNames.joinToString(", ")))
                 priority = NotificationCompat.PRIORITY_HIGH
                 setGroup(Notifications.GROUP_NEW_CHAPTERS)
                 setContentIntent(
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
index cf77f861ca..8552581c8e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@@ -466,8 +466,7 @@ class LibraryController(
     }
 
     private fun startMangaMigration() {
-        migratingMangas.clear()
-        migratingMangas.addAll(selectedMangas)
+        migratingMangas = selectedMangas.distinctBy { it.id }.toMutableSet()
         destroyActionModeIfNeeded()
         val manga = migratingMangas.firstOrNull() ?: return
         val searchController = SearchController(manga)
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 201357d972..676d4705b9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -363,7 +363,7 @@
     <string name="backup_choice">Que voulez-vous sauvegarder ?</string>
     <string name="invalid_combination">Le défaut ne peut pas être selectionné avec des autres catégories</string>
     <string name="delete_downloads_for_manga">Supprimer les chapitres téléchargés ?</string>
-    <string name="notification_new_chapters_text">Pour %1$s chapitres</string>
+    <string name="notification_new_chapters_text">Pour %1$d chapitres</string>
     <string name="track">Suivi</string>
     <string name="action_sort_total">Nombre de chapitres</string>
     <string name="short_recent_updates">Actualisations</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index facf84feac..c8a8e986f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -474,6 +474,7 @@
     <string name="notification_update_progress">Update progress: %1$d/%2$d</string>
     <string name="notification_new_chapters">New chapters found</string>
     <string name="notification_new_chapters_text">For %1$d titles</string>
+    <string name="notification_and_n_more">and %1$d more.</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>