diff --git a/stub/build.gradle b/stub/build.gradle index 932b547fc..c43fcc5a8 100644 --- a/stub/build.gradle +++ b/stub/build.gradle @@ -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' } diff --git a/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java b/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java index 62a2baa29..12d22ffcd 100644 --- a/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java +++ b/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java @@ -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() { diff --git a/stub/src/main/res/values/misc.xml b/stub/src/main/res/values/misc.xml new file mode 100644 index 000000000..f60a4b322 --- /dev/null +++ b/stub/src/main/res/values/misc.xml @@ -0,0 +1,4 @@ + + + Magisk Manager + diff --git a/stub/src/main/res/values/strings.xml b/stub/src/main/res/values/strings.xml index 81ad51174..75117a28c 100644 --- a/stub/src/main/res/values/strings.xml +++ b/stub/src/main/res/values/strings.xml @@ -1,12 +1,9 @@ - Magisk Manager - No thanks Yes OK Upgrade to full Magisk Manager to finish the setup. Download and install? Please connect to the Internet! Upgrading to full Magisk Manager is required. - - - \ No newline at end of file + Downloading +