Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Group 'Source not installed' cases in library update error log (#5589)

Browse Source 
(cherry picked from commit 88619145d816fdd3248b5c071bdd8059ab3219cb)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
This commit is contained in:
FlaminSarge 2021-07-21 14:57:33 -07:00 committed by Jobobby04
parent 641ad196f9
commit 25629b5a4c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,6 +398,9 @@ class LibraryUpdateService(
} catch (e: Throwable) { } catch (e: Throwable) {
val errorMessage = if (e is NoChaptersException) { val errorMessage = if (e is NoChaptersException) {
getString(R.string.no_chapters_error) 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 { } else {
e.message e.message
} }

7
app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
View File

@ -183,11 +183,14 @@ open class SourceManager(private val context: Context) {
return name return name
} }
private fun getSourceNotInstalledException(): Exception { private fun getSourceNotInstalledException(): SourceNotInstalledException {
return Exception(context.getString(R.string.source_not_installed, id.toString())) return SourceNotInstalledException(id)
} }
} }
inner class SourceNotInstalledException(val id: Long) :
Exception(context.getString(R.string.source_not_installed, id.toString()))
// SY --> // SY -->
companion object { companion object {
private const val fillInSourceId = Long.MAX_VALUE private const val fillInSourceId = Long.MAX_VALUE