Commit d010cb7e authored by topjohnwu's avatar topjohnwu

Update stub

parent 71136d73
......@@ -4,7 +4,7 @@ android {
defaultConfig {
applicationId 'com.topjohnwu.magisk'
versionCode 1
versionName props['appVersion']
versionName "1.0"
buildConfigField 'String', 'DEV_CHANNEL', props['DEV_CHANNEL'] ?: 'null'
}
......
......@@ -21,10 +21,8 @@ import static com.topjohnwu.magisk.DelegateApplication.MANAGER_APK;
public class DownloadActivity extends Activity {
static final String TAG = "MMStub";
private static final boolean IS_CANARY = BuildConfig.VERSION_NAME.contains("-");
private static final String URL = BuildConfig.DEV_CHANNEL != null ? BuildConfig.DEV_CHANNEL :
"https://raw.githubusercontent.com/topjohnwu/magisk_files/" +
(IS_CANARY ? "canary/release.json" : "master/stable.json");
"https://raw.githubusercontent.com/topjohnwu/magisk_files/master/stable.json";
private String apkLink;
private ErrorHandler err = (conn, e) -> {
......@@ -34,8 +32,9 @@ public class DownloadActivity extends Activity {
private void showDialog() {
ProgressDialog.show(this,
"Downloading...",
"Downloading Magisk Manager", true);
getString(R.string.dling),
getString(R.string.dling) + " " + getString(R.string.app_name),
true);
}
private void dlAPK() {
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Magisk Manager</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Magisk Manager</string>
<string name="no_thanks">No thanks</string>
<string name="yes">Yes</string>
<string name="ok">OK</string>
<string name="upgrade_msg">Upgrade to full Magisk Manager to finish the setup. Download and install?</string>
<string name="no_internet_msg">Please connect to the Internet! Upgrading to full Magisk Manager is required.</string>
<string name="dling">Downloading</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment