From 7fc7809cfc67a96f3ae0707ee1f640202de077c1 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Thu, 24 Oct 2019 04:25:05 -0400 Subject: [PATCH] More precise channel targeting --- app/src/main/java/com/topjohnwu/magisk/Config.kt | 7 ++++++- .../main/java/com/topjohnwu/magisk/DownloadActivity.java | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/Config.kt b/app/src/main/java/com/topjohnwu/magisk/Config.kt index 9a317aa91..d065a86be 100644 --- a/app/src/main/java/com/topjohnwu/magisk/Config.kt +++ b/app/src/main/java/com/topjohnwu/magisk/Config.kt @@ -98,7 +98,12 @@ object Config : PreferenceModel, DBConfig { } private val defaultChannel = - if (Utils.isCanary) Value.CANARY_DEBUG_CHANNEL + if (Utils.isCanary) { + if (BuildConfig.DEBUG) + Value.CANARY_DEBUG_CHANNEL + else + Value.CANARY_CHANNEL + } else Value.DEFAULT_CHANNEL var downloadPath by preference(Key.DOWNLOAD_PATH, Environment.DIRECTORY_DOWNLOADS) diff --git a/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java b/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java index 12d22ffcd..dfad034d5 100644 --- a/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java +++ b/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java @@ -21,8 +21,10 @@ import static com.topjohnwu.magisk.DelegateApplication.MANAGER_APK; public class DownloadActivity extends Activity { static final String TAG = "MMStub"; - private static final String URL = BuildConfig.DEV_CHANNEL != null ? BuildConfig.DEV_CHANNEL : - "https://raw.githubusercontent.com/topjohnwu/magisk_files/master/stable.json"; + private static final String URL = + BuildConfig.DEV_CHANNEL != null ? BuildConfig.DEV_CHANNEL : + "https://raw.githubusercontent.com/topjohnwu/magisk_files/" + + (BuildConfig.DEBUG ? "canary/debug.json" : "master/stable.json"); private String apkLink; private ErrorHandler err = (conn, e) -> {