From 6713a7ae3cd37855c011d980e3534865a115d6a6 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Thu, 16 Jul 2020 22:36:01 -0400
Subject: [PATCH] Include source ID if name not found in restore error log
 (closes #3018)

---
 .../kanade/tachiyomi/data/backup/BackupRestoreService.kt | 9 ++-------
 app/src/main/res/values/strings.xml                      | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
index c57ff2051a..bf832a8fc0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
@@ -271,13 +271,8 @@ class BackupRestoreService : Service() {
             if (source != null) {
                 restoreMangaData(manga, source, chapters, categories, history, tracks)
             } else {
-                val message = if (manga.source in sourceMapping) {
-                    getString(R.string.source_not_found_name, sourceMapping[manga.source])
-                } else {
-                    getString(R.string.source_not_found)
-                }
-
-                errors.add(Date() to "${manga.title} - $message")
+                val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
+                errors.add(Date() to "${manga.title} - ${getString(R.string.source_not_found_name, sourceName)}")
             }
         } catch (e: Exception) {
             errors.add(Date() to "${manga.title} - ${e.message}")
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cb8bd55cc1..5704b2d3a0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -342,7 +342,6 @@
     <string name="pref_backup_service_category">Automatic backups</string>
     <string name="pref_backup_interval">Backup frequency</string>
     <string name="pref_backup_slots">Maximum backups</string>
-    <string name="source_not_found">Source not found</string>
     <string name="source_not_found_name">Source not found: %1$s</string>
     <string name="tracker_not_logged_in">Not logged in: %1$s</string>
     <string name="backup_created">Backup created</string>