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

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

Browse Source 
(cherry picked from commit 521ebf0678c25c5cbb549898e83953c2a7362a53)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
This commit is contained in:
arkon 2020-05-08 22:32:12 -04:00 committed by Jobobby04
parent 80fa7ebe6c
commit 60caba86a5
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

@ -235,6 +235,10 @@ class BackupRestoreService : Service() {
// Restore individual manga
mangasJson.forEach {
if (job?.isActive != true) {
throw Exception(getString(R.string.restoring_backup_canceled))
}
restoreManga(it.asJsonObject)
}
@ -275,10 +279,6 @@ class BackupRestoreService : Service() {
?: JsonArray()
)
if (job?.isActive != true) {
throw Exception(getString(R.string.restoring_backup_canceled))
}
// EXH -->
manga = EXHMigrations.migrateBackupEntry(manga)
// <-- EXH

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

@ -172,7 +172,7 @@ class SettingsLibraryController : SettingsController() {
preference {
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)
onClick {