From 60b77145a9c63f0847aa1c5e25792989c0d8fef9 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Wed, 12 Jul 2023 08:37:46 +0800
Subject: [PATCH] Prepare to drop allowMainThreadQueries

---
 app/src/main/java/com/hippo/ehviewer/EhApplication.kt | 6 +-----
 app/src/main/java/com/hippo/ehviewer/EhDB.kt          | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
index 1b649bcb5..7affe9519 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
@@ -30,7 +30,6 @@ import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.client.data.GalleryDetail
 import com.hippo.ehviewer.coil.MergeInterceptor
 import com.hippo.ehviewer.dailycheck.checkDawn
-import com.hippo.ehviewer.dao.EhDatabase
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.ktbuilder.cache
 import com.hippo.ehviewer.ktbuilder.chunker
@@ -57,7 +56,6 @@ import kotlinx.coroutines.launch
 import okhttp3.AsyncDns
 import okhttp3.android.AndroidAsyncDns
 import okio.Path.Companion.toOkioPath
-import splitties.arch.room.roomDb
 import splitties.init.appCtx
 
 private val lifecycle = ProcessLifecycleOwner.get().lifecycle
@@ -94,7 +92,7 @@ class EhApplication : Application(), ImageLoaderFactory {
                 EhTagDatabase.update()
             }
             launchIO {
-                ehDatabase
+                EhDB
             }
             launchIO {
                 DownloadManager.isIdle
@@ -192,8 +190,6 @@ class EhApplication : Application(), ImageLoaderFactory {
             }
         }
 
-        val ehDatabase by lazy { roomDb<EhDatabase>("eh.db") { allowMainThreadQueries() } }
-
         val imageCache by lazy {
             diskCache {
                 directory(appCtx.cacheDir.toOkioPath() / "image_cache")
diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.kt b/app/src/main/java/com/hippo/ehviewer/EhDB.kt
index 9e2a7f256..79254a824 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhDB.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhDB.kt
@@ -22,7 +22,6 @@ import android.os.ParcelFileDescriptor.MODE_READ_ONLY
 import androidx.paging.PagingSource
 import arrow.fx.coroutines.release
 import arrow.fx.coroutines.resource
-import com.hippo.ehviewer.EhApplication.Companion.ehDatabase
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.dao.BasicDao
 import com.hippo.ehviewer.dao.DownloadDirname
@@ -38,7 +37,7 @@ import com.hippo.ehviewer.util.sendTo
 import splitties.arch.room.roomDb
 
 object EhDB {
-    private val db = ehDatabase
+    private val db = roomDb<EhDatabase>("eh.db") { allowMainThreadQueries() }
 
     // Fix state
     @get:Synchronized