From a69edd5c55742cfd0d49955bde64071b96722c94 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 27 May 2023 22:50:52 +0800
Subject: [PATCH] Move CookiesDatabase out of EhDatabase

---
 app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt       | 4 ----
 .../main/java/com/hippo/ehviewer/network/CookieDatabase.kt   | 5 +++--
 2 files changed, 3 insertions(+), 6 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 2dc28198f..cfac69fb9 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt
+++ b/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt
@@ -83,10 +83,6 @@ fun buildMainDB(context: Context): EhDatabase {
     return Room.databaseBuilder(context, EhDatabase::class.java, "eh.db").allowMainThreadQueries().build()
 }
 
-fun buildCookiesDB(context: Context): CookiesDatabase {
-    return Room.databaseBuilder(context, CookiesDatabase::class.java, "okhttp3-cookie.db").build()
-}
-
 @Database(
     entities = [Search::class],
     version = 2,
diff --git a/app/src/main/java/com/hippo/ehviewer/network/CookieDatabase.kt b/app/src/main/java/com/hippo/ehviewer/network/CookieDatabase.kt
index 8b93e00ff..c28eb27ef 100644
--- a/app/src/main/java/com/hippo/ehviewer/network/CookieDatabase.kt
+++ b/app/src/main/java/com/hippo/ehviewer/network/CookieDatabase.kt
@@ -16,8 +16,9 @@
 package com.hippo.ehviewer.network
 
 import android.content.Context
+import androidx.room.Room
 import com.hippo.ehviewer.dao.Cookie
-import com.hippo.ehviewer.dao.buildCookiesDB
+import com.hippo.ehviewer.dao.CookiesDatabase
 import okhttp3.Cookie as OkHttpCookie
 
 class CookieDatabase(context: Context) {
@@ -30,7 +31,7 @@ class CookieDatabase(context: Context) {
             }
         }.toMutableList()
     }
-    private val db = buildCookiesDB(context)
+    private val db = Room.databaseBuilder(context, CookiesDatabase::class.java, "okhttp3-cookie.db").build()
 
     val allCookies by lazy {
         hashMapOf<String, CookieSet>().also { map ->