From 7e3ff03109b57ab71c35cd66341c2adfd2cf8526 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 11 Mar 2019 07:38:31 -0400
Subject: [PATCH] Default to canary channel if running canary build

---
 app/src/main/java/com/topjohnwu/magisk/Config.java           | 3 ++-
 .../com/topjohnwu/magisk/fragments/SettingsFragment.java     | 2 +-
 app/src/main/java/com/topjohnwu/magisk/utils/Utils.java      | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/Config.java b/app/src/main/java/com/topjohnwu/magisk/Config.java
index 95d2fcf3c..19225f185 100644
--- a/app/src/main/java/com/topjohnwu/magisk/Config.java
+++ b/app/src/main/java/com/topjohnwu/magisk/Config.java
@@ -315,7 +315,8 @@ public class Config {
         defs.put(Key.SU_REQUEST_TIMEOUT, 10);
         defs.put(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT);
         defs.put(Key.SU_NOTIFICATION, Value.NOTIFICATION_TOAST);
-        defs.put(Key.UPDATE_CHANNEL, Value.STABLE_CHANNEL);
+        defs.put(Key.UPDATE_CHANNEL, Utils.isCanary() ?
+                Value.CANARY_DEBUG_CHANNEL : Value.STABLE_CHANNEL);
 
         // prefs bool
         defs.put(Key.CHECK_UPDATES, true);
diff --git a/app/src/main/java/com/topjohnwu/magisk/fragments/SettingsFragment.java b/app/src/main/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
index 718b3b432..58a46658b 100644
--- a/app/src/main/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
@@ -112,7 +112,7 @@ public class SettingsFragment extends BasePreferenceFragment implements Topic.Su
 
         /* We only show canary channels if user is already on canary channel
          * or the user have already chosen canary channel */
-        if (!BuildConfig.VERSION_NAME.contains("-") &&
+        if (!Utils.isCanary() &&
                 (int) Config.get(Config.Key.UPDATE_CHANNEL) < Config.Value.CANARY_CHANNEL) {
             // Remove the last 2 entries
             CharSequence[] entries = updateChannel.getEntries();
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 1154839dd..098342478 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
@@ -12,6 +12,7 @@ import android.provider.OpenableColumns;
 import android.widget.Toast;
 
 import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.container.Module;
@@ -118,4 +119,8 @@ public class Utils {
     public static void reboot() {
         Shell.su("/system/bin/reboot" + (Config.recovery ? " recovery" : "")).submit();
     }
+
+    public static boolean isCanary() {
+        return BuildConfig.VERSION_NAME.contains("-");
+    }
 }