From 97bf3884716b985df01dd8b854eb4ed55dadab40 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 17 Nov 2017 23:34:38 +0800
Subject: [PATCH] Support new module specification

---
 .../magisk/container/BaseModule.java          | 13 ++++-----
 .../com/topjohnwu/magisk/container/Repo.java  |  3 ++-
 .../magisk/database/RepoDatabaseHelper.java   | 27 ++++++++++---------
 .../magisk/database/SuDatabaseHelper.java     |  9 ++++---
 .../com/topjohnwu/magisk/utils/Const.java     |  3 +--
 5 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java b/app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java
index c161a7d74..c22feafd6 100644
--- a/app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java
+++ b/app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java
@@ -10,7 +10,7 @@ import java.util.List;
 public abstract class BaseModule implements Comparable<BaseModule> {
 
     private String mId = null, mName, mVersion, mAuthor, mDescription;
-    private int mVersionCode = -1, templateVersion = -1;
+    private int mVersionCode = -1, minMagiskVersion = -1;
 
     protected BaseModule() {}
 
@@ -21,7 +21,7 @@ public abstract class BaseModule implements Comparable<BaseModule> {
         mVersionCode = c.getInt(c.getColumnIndex("versionCode"));
         mAuthor = c.getString(c.getColumnIndex("author"));
         mDescription = c.getString(c.getColumnIndex("description"));
-        templateVersion = c.getInt(c.getColumnIndex("template"));
+        minMagiskVersion = c.getInt(c.getColumnIndex("minMagisk"));
     }
 
     public ContentValues getContentValues() {
@@ -32,7 +32,7 @@ public abstract class BaseModule implements Comparable<BaseModule> {
         values.put("versionCode", mVersionCode);
         values.put("author", mAuthor);
         values.put("description", mDescription);
-        values.put("template", templateVersion);
+        values.put("minMagisk", minMagiskVersion);
         return values;
     }
 
@@ -67,8 +67,9 @@ public abstract class BaseModule implements Comparable<BaseModule> {
                 case "description":
                     mDescription = prop[1];
                     break;
+                case "minMagisk":
                 case "template":
-                    templateVersion = Integer.parseInt(prop[1]);
+                    minMagiskVersion = Integer.parseInt(prop[1]);
                     break;
                 default:
                     break;
@@ -108,8 +109,8 @@ public abstract class BaseModule implements Comparable<BaseModule> {
         return mVersionCode;
     }
 
-    public int getTemplateVersion() {
-        return templateVersion;
+    public int getMinMagiskVersion() {
+        return minMagiskVersion;
     }
 
     @Override
diff --git a/app/src/main/java/com/topjohnwu/magisk/container/Repo.java b/app/src/main/java/com/topjohnwu/magisk/container/Repo.java
index 25a18fe02..7a57e75f7 100644
--- a/app/src/main/java/com/topjohnwu/magisk/container/Repo.java
+++ b/app/src/main/java/com/topjohnwu/magisk/container/Repo.java
@@ -40,7 +40,7 @@ public class Repo extends BaseModule {
         if (getVersionCode() < 0) {
             throw new IllegalRepoException("Repo [" + repoName + "] does not contain versionCode");
         }
-        if (getTemplateVersion() < Const.Value.MIN_TEMPLATE_VER) {
+        if (getMinMagiskVersion() < Const.Value.MIN_MODULE_VER) {
             throw new IllegalRepoException("Repo [" + repoName + "] is outdated");
         }
     }
@@ -54,6 +54,7 @@ public class Repo extends BaseModule {
         return false;
     }
 
+    @Override
     public ContentValues getContentValues() {
         ContentValues values = super.getContentValues();
         values.put("repo_name", repoName);
diff --git a/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java b/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
index a28f598ff..e342a6994 100644
--- a/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
+++ b/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
@@ -15,7 +15,7 @@ import java.util.List;
 
 public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VER = 2;
+    private static final int DATABASE_VER = 3;
     private static final String TABLE_NAME = "repos";
 
     private SQLiteDatabase mDb;
@@ -23,12 +23,12 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
     public RepoDatabaseHelper(Context context) {
         super(context, "repo.db", null, DATABASE_VER);
-        mDb = getWritableDatabase();
         mm = Utils.getMagiskManager(context);
+        mDb = getWritableDatabase();
 
         // Clear bad repos
-        mDb.delete(TABLE_NAME, "template<?",
-                new String[] { String.valueOf(Const.Value.MIN_TEMPLATE_VER) });
+        mDb.delete(TABLE_NAME, "minMagisk<?",
+                new String[] { String.valueOf(Const.Value.MIN_MODULE_VER) });
     }
 
     @Override
@@ -38,20 +38,23 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        if (oldVersion == 0) {
+        if (oldVersion < 3) {
+            db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
             db.execSQL(
                     "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
-                    "(id TEXT, name TEXT, version TEXT, versionCode INT, " +
+                    "(id TEXT, name TEXT, version TEXT, versionCode INT, minMagisk INT, " +
                     "author TEXT, description TEXT, repo_name TEXT, last_update INT, " +
                     "PRIMARY KEY(id))");
-            oldVersion++;
-        }
-        if (oldVersion == 1) {
-            db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD template INT");
-            oldVersion++;
+            mm.prefs.edit().remove(Const.Key.ETAG_KEY).apply();
+            oldVersion = 3;
         }
     }
 
+    @Override
+    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        onUpgrade(db, 0, DATABASE_VER);
+    }
+
     public void clearRepo() {
         mDb.delete(TABLE_NAME, null, null);
     }
@@ -86,7 +89,7 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
     }
 
     public Cursor getRepoCursor() {
-        return mDb.query(TABLE_NAME, null, "template<=?",
+        return mDb.query(TABLE_NAME, null, "minMagisk<=?",
                 new String[] { String.valueOf(mm.magiskVersionCode) },
                 null, null, "name COLLATE NOCASE");
     }
diff --git a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
index 71acaf883..32a9ca91f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
+++ b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
@@ -163,10 +163,11 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
     @Override
     public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         // Remove everything, we do not support downgrade
-        db.delete(POLICY_TABLE, null, null);
-        db.delete(LOG_TABLE, null, null);
-        db.delete(SETTINGS_TABLE, null, null);
-        db.delete(STRINGS_TABLE, null, null);
+        db.execSQL("DROP TABLE IF EXISTS " + POLICY_TABLE);
+        db.execSQL("DROP TABLE IF EXISTS " + LOG_TABLE);
+        db.execSQL("DROP TABLE IF EXISTS " + SETTINGS_TABLE);
+        db.execSQL("DROP TABLE IF EXISTS " + STRINGS_TABLE);
+        onUpgrade(db, 0, DATABASE_VER);
     }
 
     public File getDbFile() {
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Const.java b/app/src/main/java/com/topjohnwu/magisk/utils/Const.java
index 1e4c8ea49..5d8eb6151 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Const.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Const.java
@@ -9,7 +9,6 @@ public class Const {
     public static final String ORIG_PKG_NAME = "com.topjohnwu.magisk";
     public static final String SNET_PKG = "com.topjohnwu.snet";
     public static final String MAGISKHIDE_PROP = "persist.magisk.hide";
-    public static final String DISABLE_INDICATION_PROP = "ro.magisk.disable";
 
     // APK content
     public static final String PUBLIC_KEY_NAME = "public.certificate.x509.pem";
@@ -142,6 +141,6 @@ public class Const {
         public static final int[] timeoutList = {0, -1, 10, 20, 30, 60};
         public static final int UPDATE_SERVICE_VER = 1;
         public static final int SNET_VER = 3;
-        public static final int MIN_TEMPLATE_VER = 4;
+        public static final int MIN_MODULE_VER = 1400;
     }
 }