From 5e6d24f01ec4928bc7becbe9462527f293262049 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 4 Aug 2022 06:49:37 +0800
Subject: [PATCH] Clean up

---
 app/src/main/java/com/hippo/ehviewer/EhDB.java         |  6 +++---
 app/src/main/java/com/hippo/ehviewer/dao/BasicDao.java |  4 ++--
 .../main/java/com/hippo/ehviewer/dao/BookmarksDao.java | 10 ++++++++--
 .../com/hippo/ehviewer/dao/DownloadDirnameDao.java     |  5 +----
 .../java/com/hippo/ehviewer/dao/DownloadLabelDao.java  |  6 ------
 .../main/java/com/hippo/ehviewer/dao/DownloadsDao.java |  6 ------
 .../main/java/com/hippo/ehviewer/dao/FilterDao.java    |  6 ------
 .../main/java/com/hippo/ehviewer/dao/HistoryDao.java   |  6 ------
 .../java/com/hippo/ehviewer/dao/LocalFavoritesDao.java |  6 ------
 .../java/com/hippo/ehviewer/dao/QuickSearchDao.java    |  6 ------
 10 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.java b/app/src/main/java/com/hippo/ehviewer/EhDB.java
index 119905174..7b0294a58 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhDB.java
+++ b/app/src/main/java/com/hippo/ehviewer/EhDB.java
@@ -602,9 +602,9 @@ public class EhDB {
     }
 
     private static <T> boolean copyDao(BasicDao<T> from, BasicDao<T> to) {
-        List<T> list = from.fakeList();
+        List<T> list = from.list();
         for (T item : list)
-            to.fakeInsert(item);
+            to.insert(item);
         return false;
     }
 
@@ -704,7 +704,7 @@ public class EhDB {
             manager.addDownloadLabel(downloadLabelList);
 
             // Download dirname
-            List<DownloadDirname> downloadDirnameList = oldRoomDatabase.downloadDirnameDao().fakeList();
+            List<DownloadDirname> downloadDirnameList = oldRoomDatabase.downloadDirnameDao().list();
             for (DownloadDirname dirname : downloadDirnameList) {
                 putDownloadDirname(dirname.getGid(), dirname.getDirname());
             }
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/BasicDao.java b/app/src/main/java/com/hippo/ehviewer/dao/BasicDao.java
index fc7940dbc..0e774bb5a 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/BasicDao.java
+++ b/app/src/main/java/com/hippo/ehviewer/dao/BasicDao.java
@@ -3,6 +3,6 @@ package com.hippo.ehviewer.dao;
 import java.util.List;
 
 public interface BasicDao<T> {
-    List<T> fakeList();
-    void fakeInsert(T t);
+    List<T> list();
+    long insert(T t);
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/BookmarksDao.java b/app/src/main/java/com/hippo/ehviewer/dao/BookmarksDao.java
index 5ab452b69..1b276247a 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/BookmarksDao.java
+++ b/app/src/main/java/com/hippo/ehviewer/dao/BookmarksDao.java
@@ -3,12 +3,18 @@ package com.hippo.ehviewer.dao;
 import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
+import androidx.room.Query;
+
+import java.util.List;
 
 @Dao
-public interface BookmarksDao {
+public interface BookmarksDao extends BasicDao<BookmarkInfo> {
     @Insert
-    void insert(BookmarkInfo bookmark);
+    long insert(BookmarkInfo bookmark);
 
     @Delete
     void delete(BookmarkInfo bookmark);
+
+    @Query("SELECT * FROM BOOKMARKS ORDER BY TIME DESC")
+    List<BookmarkInfo> list();
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/DownloadDirnameDao.java b/app/src/main/java/com/hippo/ehviewer/dao/DownloadDirnameDao.java
index f206bf725..0226ac31f 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/DownloadDirnameDao.java
+++ b/app/src/main/java/com/hippo/ehviewer/dao/DownloadDirnameDao.java
@@ -25,8 +25,5 @@ public interface DownloadDirnameDao extends BasicDao<DownloadDirname> {
     void deleteAll();
 
     @Query("SELECT * FROM DOWNLOAD_DIRNAME")
-    List<DownloadDirname> fakeList();
-
-    @Insert
-    void fakeInsert(DownloadDirname t);
+    List<DownloadDirname> list();
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabelDao.java b/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabelDao.java
index 946fe44c6..29f552c51 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabelDao.java
+++ b/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabelDao.java
@@ -27,10 +27,4 @@ public interface DownloadLabelDao extends BasicDao<DownloadLabel> {
 
     @Delete
     void delete(DownloadLabel downloadLabel);
-
-    @Query("SELECT * FROM DOWNLOAD_LABELS ORDER BY TIME ASC")
-    List<DownloadLabel> fakeList();
-
-    @Insert
-    void fakeInsert(DownloadLabel t);
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/DownloadsDao.java b/app/src/main/java/com/hippo/ehviewer/dao/DownloadsDao.java
index dc738cd78..8e6fc61e4 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/DownloadsDao.java
+++ b/app/src/main/java/com/hippo/ehviewer/dao/DownloadsDao.java
@@ -24,10 +24,4 @@ public interface DownloadsDao extends BasicDao<DownloadInfo> {
 
     @Delete
     void delete(DownloadInfo downloadInfo);
-
-    @Query("SELECT * FROM DOWNLOADS ORDER BY TIME DESC")
-    List<DownloadInfo> fakeList();
-
-    @Insert
-    void fakeInsert(DownloadInfo t);
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/FilterDao.java b/app/src/main/java/com/hippo/ehviewer/dao/FilterDao.java
index ad39a0f4e..d6048f394 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/FilterDao.java
+++ b/app/src/main/java/com/hippo/ehviewer/dao/FilterDao.java
@@ -21,10 +21,4 @@ public interface FilterDao extends BasicDao<Filter> {
 
     @Delete
     void delete(Filter filter);
-
-    @Query("SELECT * FROM FILTER")
-    List<Filter> fakeList();
-
-    @Insert
-    void fakeInsert(Filter t);
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/HistoryDao.java b/app/src/main/java/com/hippo/ehviewer/dao/HistoryDao.java
index d7e1101bb..fafef1844 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/HistoryDao.java
+++ b/app/src/main/java/com/hippo/ehviewer/dao/HistoryDao.java
@@ -33,10 +33,4 @@ public interface HistoryDao extends BasicDao<HistoryInfo> {
 
     @Query("DELETE FROM HISTORY")
     void deleteAll();
-
-    @Query("SELECT * FROM HISTORY ORDER BY TIME DESC")
-    List<HistoryInfo> fakeList();
-
-    @Insert
-    void fakeInsert(HistoryInfo t);
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/LocalFavoritesDao.java b/app/src/main/java/com/hippo/ehviewer/dao/LocalFavoritesDao.java
index 3a42d67d6..6cc0e8256 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/LocalFavoritesDao.java
+++ b/app/src/main/java/com/hippo/ehviewer/dao/LocalFavoritesDao.java
@@ -26,10 +26,4 @@ public interface LocalFavoritesDao extends BasicDao<LocalFavoriteInfo> {
 
     @Query("DELETE FROM LOCAL_FAVORITES WHERE GID = :gid")
     void deleteByKey(long gid);
-
-    @Query("SELECT * FROM LOCAL_FAVORITES ORDER BY TIME DESC")
-    List<LocalFavoriteInfo> fakeList();
-
-    @Insert
-    void fakeInsert(LocalFavoriteInfo t);
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/QuickSearchDao.java b/app/src/main/java/com/hippo/ehviewer/dao/QuickSearchDao.java
index ca6db8dd9..b349e92be 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/QuickSearchDao.java
+++ b/app/src/main/java/com/hippo/ehviewer/dao/QuickSearchDao.java
@@ -27,10 +27,4 @@ public interface QuickSearchDao extends BasicDao<QuickSearch> {
 
     @Delete
     void delete(QuickSearch quickSearch);
-
-    @Query("SELECT * FROM QUICK_SEARCH ORDER BY TIME ASC")
-    List<QuickSearch> fakeList();
-
-    @Insert
-    void fakeInsert(QuickSearch t);
 }