From 060bcc76ef18d46d90d3fd3daeaa54c7c7fb566a Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 22 Feb 2023 19:11:57 +0800 Subject: [PATCH] Drop support for old db --- .../main/java/com/hippo/ehviewer/EhDB.java | 43 +------------------ app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 3 files changed, 3 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.java b/app/src/main/java/com/hippo/ehviewer/EhDB.java index b7a27aece..5d3685e58 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhDB.java +++ b/app/src/main/java/com/hippo/ehviewer/EhDB.java @@ -57,48 +57,8 @@ import java.util.List; public class EhDB { private static final int CUR_DB_VER = 4; - private static final EhDatabase db = EhApplication.getEhDatabase(); - private static void upgradeDB(SQLiteDatabase db, int oldVersion) { - switch (oldVersion) { - case 1: // 1 to 2, add FILTER - db.execSQL("CREATE TABLE IF NOT EXISTS \"FILTER\" (" + // - "\"_id\" INTEGER PRIMARY KEY ," + // 0: id - "\"MODE\" INTEGER NOT NULL ," + // 1: mode - "\"TEXT\" TEXT," + // 2: text - "\"ENABLE\" INTEGER);"); // 3: enable - case 2: // 2 to 3, add ENABLE column to table FILTER - db.execSQL("CREATE TABLE " + "\"FILTER2\" (" + - "\"_id\" INTEGER PRIMARY KEY ," + - "\"MODE\" INTEGER NOT NULL ," + - "\"TEXT\" TEXT," + - "\"ENABLE\" INTEGER);"); - db.execSQL("INSERT INTO \"FILTER2\" (" + - "_id, MODE, TEXT, ENABLE)" + - "SELECT _id, MODE, TEXT, 1 FROM FILTER;"); - db.execSQL("DROP TABLE FILTER"); - db.execSQL("ALTER TABLE FILTER2 RENAME TO FILTER"); - case 3: // 3 to 4, add PAGE_FROM and PAGE_TO column to QUICK_SEARCH - db.execSQL("CREATE TABLE " + "\"QUICK_SEARCH2\" (" + - "\"_id\" INTEGER PRIMARY KEY ," + - "\"NAME\" TEXT," + - "\"MODE\" INTEGER NOT NULL ," + - "\"CATEGORY\" INTEGER NOT NULL ," + - "\"KEYWORD\" TEXT," + - "\"ADVANCE_SEARCH\" INTEGER NOT NULL ," + - "\"MIN_RATING\" INTEGER NOT NULL ," + - "\"PAGE_FROM\" INTEGER NOT NULL ," + - "\"PAGE_TO\" INTEGER NOT NULL ," + - "\"TIME\" INTEGER NOT NULL );"); - db.execSQL("INSERT INTO \"QUICK_SEARCH2\" (" + - "_id, NAME, MODE, CATEGORY, KEYWORD, ADVANCE_SEARCH, MIN_RATING, PAGE_FROM, PAGE_TO, TIME)" + - "SELECT _id, NAME, MODE, CATEGORY, KEYWORD, ADVANCE_SEARCH, MIN_RATING, -1, -1, TIME FROM QUICK_SEARCH;"); - db.execSQL("DROP TABLE QUICK_SEARCH"); - db.execSQL("ALTER TABLE QUICK_SEARCH2 RENAME TO QUICK_SEARCH"); - } - } - public static synchronized List getAllDownloadInfo() { DownloadsDao dao = db.downloadsDao(); List list = dao.list(); @@ -488,8 +448,7 @@ public class EhDB { int newVersion = CUR_DB_VER; int oldVersion = oldDB.getVersion(); if (oldVersion < newVersion) { - upgradeDB(oldDB, oldVersion); - oldDB.setVersion(newVersion); + return context.getString(R.string.db_version_too_low); } else if (oldVersion > newVersion) { return context.getString(R.string.db_version_too_high); } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c1fe66934..1ee1d9e04 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -426,6 +426,7 @@ 端口 无效的端口 无法读取文件 + 数据库版本过低 数据库版本过高 系统语言(默认) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 434179c1f..075e68254 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -476,6 +476,7 @@ Port Invalid port Can\'t read the file + Database version too low Database version too high System Language (Default) Deutsch