yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove redundant DB call in library settings (closes #3128)

Browse Source
This commit is contained in:
arkon 2020-05-08 22:32:12 -04:00
parent a20874f6a1
commit 521ebf0678
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
View File

@ -212,6 +212,10 @@ class BackupRestoreService : Service() {
// Restore individual manga // Restore individual manga
mangasJson.forEach { mangasJson.forEach {
if (job?.isActive != true) {
throw Exception(getString(R.string.restoring_backup_canceled))
}
restoreManga(it.asJsonObject) restoreManga(it.asJsonObject)
} }
@ -252,10 +256,6 @@ class BackupRestoreService : Service() {
?: JsonArray() ?: JsonArray()
) )
if (job?.isActive != true) {
throw Exception(getString(R.string.restoring_backup_canceled))
}
try { try {
restoreMangaData(manga, chapters, categories, history, tracks) restoreMangaData(manga, chapters, categories, history, tracks)
} catch (e: Exception) { } catch (e: Exception) {

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
View File

@ -172,7 +172,7 @@ class SettingsLibraryController : SettingsController() {
preference { preference {
titleRes = R.string.action_edit_categories titleRes = R.string.action_edit_categories
val catCount = db.getCategories().executeAsBlocking().size val catCount = dbCategories.size
summary = context.resources.getQuantityString(R.plurals.num_categories, catCount, catCount) summary = context.resources.getQuantityString(R.plurals.num_categories, catCount, catCount)
onClick { onClick {