From 60caba86a530ee3d96861a72a4af1f41ea9a804d Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 8 May 2020 22:32:12 -0400
Subject: [PATCH] Remove redundant DB call in library settings (closes #3128)

(cherry picked from commit 521ebf0678c25c5cbb549898e83953c2a7362a53)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
---
 .../kanade/tachiyomi/data/backup/BackupRestoreService.kt  | 8 ++++----
 .../tachiyomi/ui/setting/SettingsLibraryController.kt     | 2 +-
 2 files changed, 5 insertions(+), 5 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 7c91033d4..19c8f7a14 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
@@ -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
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
index 704e3de62..c727ea410 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
@@ -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 {