From df21539311d5f3842fd7aadacdac34ff29aa3d83 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 6 Sep 2017 22:32:40 +0800 Subject: [PATCH] Some versioning fixes --- .../java/com/topjohnwu/magisk/asyncs/DownloadBusybox.java | 4 ++-- .../com/topjohnwu/magisk/database/RepoDatabaseHelper.java | 6 +++++- app/src/main/java/com/topjohnwu/magisk/utils/Utils.java | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/asyncs/DownloadBusybox.java b/app/src/main/java/com/topjohnwu/magisk/asyncs/DownloadBusybox.java index 979761438..dfacf6dec 100644 --- a/app/src/main/java/com/topjohnwu/magisk/asyncs/DownloadBusybox.java +++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/DownloadBusybox.java @@ -15,8 +15,8 @@ import java.io.InputStream; public class DownloadBusybox extends ParallelTask { - private static final String BUSYBOX_ARM = "https://github.com/topjohnwu/ndk-busybox/releases/download/1.27.1/busybox-arm"; - private static final String BUSYBOX_X86 = "https://github.com/topjohnwu/ndk-busybox/releases/download/1.27.1/busybox-x86"; + private static final String BUSYBOX_ARM = "https://github.com/topjohnwu/ndk-busybox/releases/download/1.27.2/busybox-arm"; + private static final String BUSYBOX_X86 = "https://github.com/topjohnwu/ndk-busybox/releases/download/1.27.2/busybox-x86"; private File busybox; 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 2fe001334..0eac2cfe1 100644 --- a/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java +++ b/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java @@ -5,8 +5,10 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; +import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.module.Repo; import com.topjohnwu.magisk.utils.Logger; +import com.topjohnwu.magisk.utils.Utils; import java.util.LinkedList; import java.util.List; @@ -18,10 +20,12 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper { private static final int MIN_TEMPLATE_VER = 3; private SQLiteDatabase mDb; + private MagiskManager mm; public RepoDatabaseHelper(Context context) { super(context, "repo.db", null, DATABASE_VER); mDb = getWritableDatabase(); + mm = Utils.getMagiskManager(context); } @Override @@ -70,7 +74,7 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper { } public Cursor getRepoCursor() { - return mDb.query(TABLE_NAME, null, "template>=?", new String[] { String.valueOf(MIN_TEMPLATE_VER) }, null, null, "name COLLATE NOCASE"); + return mDb.query(TABLE_NAME, null, "template>=? AND template<=?", new String[] { String.valueOf(MIN_TEMPLATE_VER), String.valueOf(mm.magiskVersionCode) }, null, null, "name COLLATE NOCASE"); } public List getRepoIDList() { diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java index 16ece3f54..77656ee49 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java +++ b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java @@ -350,7 +350,7 @@ public class Utils { DownloadReceiver receiver = null; switch (idx) { case 1: - if (mm.remoteMagiskVersionCode < 1370) { + if (mm.remoteMagiskVersionCode < 1400) { mm.toast(R.string.no_boot_file_patch_support, Toast.LENGTH_LONG); return; }