Update stub

hmmon · Oct 23, 2019 · d010cb7 · d010cb7
1 parent 71136d7
commit d010cb7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -21,10 +21,8 @@
 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
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">Magisk Manager</string>
+</resources>
diff --git a/stub/src/main/res/values/strings.xml b/stub/src/main/res/values/strings.xml
@@ -1,12 +1,9 @@
 <?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>
-
-
-</resources>
+    <string name="dling">Downloading</string>
+</resources>