From 7d87417095b88d85c25c3f8d52eff5569e5076d2 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Tue, 21 Feb 2023 22:32:09 +0800
Subject: [PATCH] Deny mainthread db query!

---
 .../main/java/com/hippo/ehviewer/dao/EhDatabase.kt  |  4 +---
 .../eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt | 13 +++++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt b/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt
index b1c5525a2..e04dfeb61 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt
+++ b/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt
@@ -22,7 +22,5 @@ abstract class EhDatabase : RoomDatabase() {
 }
 
 fun buildMainDB(context: Context): EhDatabase {
-    // TODO: Remove allowMainThreadQueries
-    return Room.databaseBuilder(context, EhDatabase::class.java, "eh.db").allowMainThreadQueries()
-        .build()
+    return Room.databaseBuilder(context, EhDatabase::class.java, "eh.db").build()
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index c3f52c60e..0000e37aa 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -305,10 +305,15 @@ class ReaderActivity : EhActivity() {
             return
         }
 
-        mGalleryProvider!!.start()
-
-        lifecycleScope.launchUI {
-            if (mGalleryProvider!!.awaitReady()) setGallery()
+        mGalleryProvider.let {
+            if (it == null) {
+                finish()
+                return
+            }
+            lifecycleScope.launchIO {
+                it.start()
+                if (it.awaitReady()) withUIContext { setGallery() }
+            }
         }
 
         config = ReaderConfig()