From a942a487a011446972f0edc5273c9d6e08ee95ea Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 27 May 2023 22:53:24 +0800
Subject: [PATCH] Drop buildMainDB

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

diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
index 92941bec5..2411dd0cb 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
@@ -23,6 +23,7 @@ import androidx.collection.LruCache
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.room.Room
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.decode.ImageDecoderDecoder
@@ -35,7 +36,7 @@ import com.hippo.ehviewer.client.data.GalleryDetail
 import com.hippo.ehviewer.coil.MergeInterceptor
 import com.hippo.ehviewer.coil.diskCache
 import com.hippo.ehviewer.dailycheck.checkDawn
-import com.hippo.ehviewer.dao.buildMainDB
+import com.hippo.ehviewer.dao.EhDatabase
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.legacy.cleanObsoleteCache
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
@@ -200,7 +201,7 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor
 
         val readerPreferences by lazy { ReaderPreferences(AndroidPreferenceStore(application)) }
 
-        val ehDatabase by lazy { buildMainDB(application) }
+        val ehDatabase by lazy { Room.databaseBuilder(application, EhDatabase::class.java, "eh.db").allowMainThreadQueries().build() }
 
         val imageCache by lazy {
             diskCache {
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/Database.kt b/app/src/main/java/com/hippo/ehviewer/dao/Database.kt
index cfac69fb9..bd2d4834b 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/Database.kt
+++ b/app/src/main/java/com/hippo/ehviewer/dao/Database.kt
@@ -1,10 +1,8 @@
 package com.hippo.ehviewer.dao
 
-import android.content.Context
 import androidx.room.AutoMigration
 import androidx.room.Database
 import androidx.room.DeleteTable
-import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.migration.AutoMigrationSpec
 import androidx.sqlite.db.SupportSQLiteDatabase
@@ -78,11 +76,6 @@ abstract class CookiesDatabase : RoomDatabase() {
     abstract fun cookiesDao(): CookiesDao
 }
 
-fun buildMainDB(context: Context): EhDatabase {
-    // TODO: Remove allowMainThreadQueries
-    return Room.databaseBuilder(context, EhDatabase::class.java, "eh.db").allowMainThreadQueries().build()
-}
-
 @Database(
     entities = [Search::class],
     version = 2,