From f1c1f2dbe8a6fec5f9c376ad6d8e32b5b42692c6 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 23 Mar 2023 16:14:26 +0800
Subject: [PATCH] Let room generate kotlin

---
 app/build.gradle.kts                               |  5 +++--
 app/src/main/java/com/hippo/ehviewer/EhDB.kt       |  4 +++-
 .../java/com/hippo/ehviewer/dao/HistoryInfo.kt     | 14 ++------------
 .../java/com/hippo/ehviewer/dao/QuickSearchDao.kt  |  2 +-
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3eb8a3917..949f7aec8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -188,7 +188,7 @@ dependencies {
     implementation("androidx.recyclerview:recyclerview:1.3.0")
 
     // https://developer.android.com/jetpack/androidx/releases/room
-    val room_version = "2.5.1"
+    val room_version = "2.6.0-alpha01"
     ksp("androidx.room:room-compiler:$room_version")
     implementation("androidx.room:room-paging:$room_version")
 
@@ -233,5 +233,6 @@ configurations.all {
 }
 
 ksp {
-    arg("room.schemaLocation", projectDir.resolve("schemas").path)
+    arg("room.schemaLocation", "$projectDir/schemas")
+    arg("room.generateKotlin", "true")
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.kt b/app/src/main/java/com/hippo/ehviewer/EhDB.kt
index 2eafda973..f3603caa2 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhDB.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhDB.kt
@@ -243,7 +243,9 @@ object EhDB {
     @Synchronized
     fun deleteQuickSearch(quickSearch: QuickSearch?) {
         val dao = db.quickSearchDao()
-        dao.delete(quickSearch)
+        if (quickSearch != null) {
+            dao.delete(quickSearch)
+        }
     }
 
     @Synchronized
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.kt b/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.kt
index 801c61257..5c8df0418 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.kt
+++ b/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.kt
@@ -12,18 +12,8 @@ class HistoryInfo() : BaseGalleryInfo() {
     var time: Long = 0
 
     // Trick: Use MODE for favoriteSlot
-    // Shadow its accessors
     @ColumnInfo(name = "MODE")
-    private val mode: Int = 0
-
-    fun getMode(): Int {
-        return favoriteSlot + 2
-    }
-
-    fun setMode(mode: Int) {
-        favoriteSlot = mode - 2
-    }
-    // Trick end
+    override var favoriteSlot: Int = -2
 
     constructor(galleryInfo: GalleryInfo) : this() {
         gid = galleryInfo.gid
@@ -39,4 +29,4 @@ class HistoryInfo() : BaseGalleryInfo() {
         simpleLanguage = galleryInfo.simpleLanguage
         favoriteSlot = galleryInfo.favoriteSlot
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/QuickSearchDao.kt b/app/src/main/java/com/hippo/ehviewer/dao/QuickSearchDao.kt
index beeffaa45..df8901d8b 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/QuickSearchDao.kt
+++ b/app/src/main/java/com/hippo/ehviewer/dao/QuickSearchDao.kt
@@ -24,5 +24,5 @@ interface QuickSearchDao : BasicDao<QuickSearch> {
     override fun insert(t: QuickSearch): Long
 
     @Delete
-    fun delete(quickSearch: QuickSearch?)
+    fun delete(quickSearch: QuickSearch)
 }
\ No newline at end of file