From 25629b5a4c8a3593df33b3e4d862bc27039cf64b Mon Sep 17 00:00:00 2001 From: FlaminSarge Date: Wed, 21 Jul 2021 14:57:33 -0700 Subject: [PATCH] Group 'Source not installed' cases in library update error log (#5589) (cherry picked from commit 88619145d816fdd3248b5c071bdd8059ab3219cb) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt --- .../kanade/tachiyomi/data/library/LibraryUpdateService.kt | 3 +++ .../main/java/eu/kanade/tachiyomi/source/SourceManager.kt | 7 +++++-- 2 files changed, 8 insertions(+), 2 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 325f7d1ea..aaa356a7f 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -398,6 +398,9 @@ class LibraryUpdateService( } catch (e: Throwable) { val errorMessage = if (e is NoChaptersException) { getString(R.string.no_chapters_error) + } else if (e is SourceManager.SourceNotInstalledException) { + // failedUpdates will already have the source, don't need to copy it into the message + getString(R.string.loader_not_implemented_error) } else { e.message } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt index 4f42d6f78..cd280aa1a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -183,11 +183,14 @@ open class SourceManager(private val context: Context) { return name } - private fun getSourceNotInstalledException(): Exception { - return Exception(context.getString(R.string.source_not_installed, id.toString())) + private fun getSourceNotInstalledException(): SourceNotInstalledException { + return SourceNotInstalledException(id) } } + inner class SourceNotInstalledException(val id: Long) : + Exception(context.getString(R.string.source_not_installed, id.toString())) + // SY --> companion object { private const val fillInSourceId = Long.MAX_VALUE