From 47e8f7329692a7c2e99c43cca43dd4110080d3c7 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Fri, 18 Mar 2016 19:40:22 +0800
Subject: [PATCH] Fix old history merge failed

---
 .../main/java/com/hippo/ehviewer/EhDB.java    | 21 ++++++++++++++++++-
 1 file changed, 20 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 65f1e8eac..3c0ad5fdd 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhDB.java
+++ b/app/src/main/java/com/hippo/ehviewer/EhDB.java
@@ -34,6 +34,8 @@ import com.hippo.ehviewer.dao.DownloadInfo;
 import com.hippo.ehviewer.dao.DownloadLabel;
 import com.hippo.ehviewer.dao.DownloadLabelDao;
 import com.hippo.ehviewer.dao.DownloadsDao;
+import com.hippo.ehviewer.dao.Filter;
+import com.hippo.ehviewer.dao.FilterDao;
 import com.hippo.ehviewer.dao.HistoryDao;
 import com.hippo.ehviewer.dao.HistoryInfo;
 import com.hippo.ehviewer.dao.LocalFavoriteInfo;
@@ -72,6 +74,10 @@ public class EhDB {
 
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            switch (oldVersion) {
+                case 1: // 1 to 2
+                    FilterDao.createTable(db, true);
+            }
         }
     }
 
@@ -277,7 +283,7 @@ public class EhDB {
                             continue;
                         }
 
-                        HistoryInfo info = new HistoryInfo();
+                        HistoryInfo info = new HistoryInfo(gi);
                         info.setMode(cursor.getInt(1));
                         info.setTime(cursor.getLong(2));
                         dao.insert(info);
@@ -528,4 +534,17 @@ public class EhDB {
             dao.deleteInTx(list);
         }
     }
+
+    public static synchronized List<Filter> getAllFilter() {
+        return sDaoSession.getFilterDao().queryBuilder().list();
+    }
+
+    public static synchronized void addFilter(Filter filter) {
+        long id = sDaoSession.getFilterDao().insert(filter);
+        filter.setId(id);
+    }
+
+    public static synchronized void deleteFilter(Filter filter) {
+        sDaoSession.getFilterDao().delete(filter);
+    }
 }