From c7fba0e2c85df47a70ce09e5eab81d4c5ba35637 Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Sat, 20 Mar 2021 21:12:26 +0800
Subject: [PATCH] Fix reorder of imported quick search

---
 app/src/main/java/com/hippo/ehviewer/EhDB.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.java b/app/src/main/java/com/hippo/ehviewer/EhDB.java
index c207265e2..d3091bcc8 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhDB.java
+++ b/app/src/main/java/com/hippo/ehviewer/EhDB.java
@@ -515,6 +515,13 @@ public class EhDB {
         quickSearch.id = dao.insert(quickSearch);
     }
 
+    public static synchronized void importQuickSearch(List<QuickSearch> quickSearchList) {
+        QuickSearchDao dao = sDaoSession.getQuickSearchDao();
+        for (QuickSearch quickSearch : quickSearchList) {
+            dao.insert(quickSearch);
+        }
+    }
+
     public static synchronized void updateQuickSearch(QuickSearch quickSearch) {
         QuickSearchDao dao = sDaoSession.getQuickSearchDao();
         dao.update(quickSearch);
@@ -747,6 +754,7 @@ public class EhDB {
             // QuickSearch
             List<QuickSearch> quickSearchList = session.getQuickSearchDao().queryBuilder().list();
             List<QuickSearch> currentQuickSearchList = sDaoSession.getQuickSearchDao().queryBuilder().list();
+            List<QuickSearch> importList = new ArrayList<>();
             for (QuickSearch quickSearch : quickSearchList) {
                 String name = quickSearch.name;
                 for (QuickSearch q : currentQuickSearchList) {
@@ -759,8 +767,9 @@ public class EhDB {
                 if (null == name) {
                     continue;
                 }
-                insertQuickSearch(quickSearch);
+                importList.add(quickSearch);
             }
+            importQuickSearch(importList);
 
             // LocalFavorites
             List<LocalFavoriteInfo> localFavoriteInfoList = session.getLocalFavoritesDao().queryBuilder().list();