MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Default to canary channel if running canary build

Browse Source
This commit is contained in:
topjohnwu 2019-03-11 07:38:31 -04:00
parent a1827fd680
commit 7e3ff03109
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/topjohnwu/magisk/Config.java
View File

@ -315,7 +315,8 @@ public class Config {
defs.put(Key.SU_REQUEST_TIMEOUT, 10); defs.put(Key.SU_REQUEST_TIMEOUT, 10);
defs.put(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT); defs.put(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT);
defs.put(Key.SU_NOTIFICATION, Value.NOTIFICATION_TOAST); 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 // prefs bool
defs.put(Key.CHECK_UPDATES, true); defs.put(Key.CHECK_UPDATES, true);

2
app/src/main/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
View File

@ -112,7 +112,7 @@ public class SettingsFragment extends BasePreferenceFragment implements Topic.Su
/* We only show canary channels if user is already on canary channel /* We only show canary channels if user is already on canary channel
* or the user have already chosen 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) { (int) Config.get(Config.Key.UPDATE_CHANNEL) < Config.Value.CANARY_CHANNEL) {
// Remove the last 2 entries // Remove the last 2 entries
CharSequence[] entries = updateChannel.getEntries(); CharSequence[] entries = updateChannel.getEntries();

5
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View File

@ -12,6 +12,7 @@ import android.provider.OpenableColumns;
import android.widget.Toast; import android.widget.Toast;
import com.topjohnwu.magisk.App; import com.topjohnwu.magisk.App;
import com.topjohnwu.magisk.BuildConfig;
import com.topjohnwu.magisk.Config; import com.topjohnwu.magisk.Config;
import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Const;
import com.topjohnwu.magisk.container.Module; import com.topjohnwu.magisk.container.Module;
@ -118,4 +119,8 @@ public class Utils {
public static void reboot() { public static void reboot() {
Shell.su("/system/bin/reboot" + (Config.recovery ? " recovery" : "")).submit(); Shell.su("/system/bin/reboot" + (Config.recovery ? " recovery" : "")).submit();
} }
public static boolean isCanary() {
return BuildConfig.VERSION_NAME.contains("-");
}
} }