Initialize database earlier, #629

app/src/main/java/com/hippo/ehviewer/EhApplication.kt

@@ -44,6 +44,7 @@ import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhX509TrustManager
 import com.hippo.ehviewer.client.data.GalleryDetail
 import com.hippo.ehviewer.client.parser.EventPaneParser
+import com.hippo.ehviewer.dao.buildMainDB
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.spider.SpiderDen
 import com.hippo.ehviewer.ui.CommonOperations
@@ -107,11 +108,13 @@ class EhApplication : SceneApplication(), DefaultLifecycleObserver, ImageLoaderF
         ReadableTime.initialize(this)
         AppConfig.initialize(this)
         SpiderDen.initialize(this)
-        EhDB.initialize(this)
         BitmapUtils.initialize(this)
         EhTagDatabase.update()
         AppCompatDelegate.setDefaultNightMode(Settings.getTheme())
         launchIO {
+            launchIO {
+                ehDatabase
+            }
             launchIO {
                 downloadManager
             }
@@ -342,5 +345,8 @@ class EhApplication : SceneApplication(), DefaultLifecycleObserver, ImageLoaderF
 
         @JvmStatic
         val readerPreferences by lazy { ReaderPreferences(AndroidPreferenceStore(application)) }
+
+        @JvmStatic
+        val ehDatabase by lazy { buildMainDB(application) }
     }
 }

app/src/main/java/com/hippo/ehviewer/EhDB.java

@@ -58,7 +58,7 @@ import java.util.List;
 public class EhDB {
     private static final int CUR_DB_VER = 4;
 
-    private static EhDatabase db;
+    private static final EhDatabase db = EhApplication.getEhDatabase();
 
     private static void upgradeDB(SQLiteDatabase db, int oldVersion) {
         switch (oldVersion) {
@@ -99,10 +99,6 @@ public class EhDB {
         }
     }
 
-    public static void initialize(Context context) {
-        db = Room.databaseBuilder(context, EhDatabase.class, "eh.db").allowMainThreadQueries().build();
-    }
-
     public static synchronized List<DownloadInfo> getAllDownloadInfo() {
         DownloadsDao dao = db.downloadsDao();
         List<DownloadInfo> list = dao.list();

app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt

@@ -1,6 +1,8 @@
 package com.hippo.ehviewer.dao
 
+import android.content.Context
 import androidx.room.Database
+import androidx.room.Room
 import androidx.room.RoomDatabase
 
 @Database(
@@ -18,3 +20,9 @@ abstract class EhDatabase : RoomDatabase() {
     abstract fun localFavoritesDao(): LocalFavoritesDao
     abstract fun quickSearchDao(): QuickSearchDao
 }
+
+fun buildMainDB(context: Context): EhDatabase {
+    // TODO: Remove allowMainThreadQueries
+    return Room.databaseBuilder(context, EhDatabase::class.java, "eh.db").allowMainThreadQueries()
+        .build()
+}