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

Update stub

Browse Source
This commit is contained in:
topjohnwu 2019-10-23 05:19:54 -04:00
parent 71136d7347
commit d010cb7e42
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stub/build.gradle
View File

@ -4,7 +4,7 @@ android {
defaultConfig { defaultConfig {
applicationId 'com.topjohnwu.magisk' applicationId 'com.topjohnwu.magisk'
versionCode 1 versionCode 1
versionName props['appVersion'] versionName "1.0"
buildConfigField 'String', 'DEV_CHANNEL', props['DEV_CHANNEL'] ?: 'null' buildConfigField 'String', 'DEV_CHANNEL', props['DEV_CHANNEL'] ?: 'null'
} }

9
stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java
View File

@ -21,10 +21,8 @@ import static com.topjohnwu.magisk.DelegateApplication.MANAGER_APK;
public class DownloadActivity extends Activity { public class DownloadActivity extends Activity {
static final String TAG = "MMStub"; 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 : private static final String URL = BuildConfig.DEV_CHANNEL != null ? BuildConfig.DEV_CHANNEL :
"https://raw.githubusercontent.com/topjohnwu/magisk_files/" + "https://raw.githubusercontent.com/topjohnwu/magisk_files/master/stable.json";
(IS_CANARY ? "canary/release.json" : "master/stable.json");
private String apkLink; private String apkLink;
private ErrorHandler err = (conn, e) -> { private ErrorHandler err = (conn, e) -> {
@ -34,8 +32,9 @@ public class DownloadActivity extends Activity {
private void showDialog() { private void showDialog() {
ProgressDialog.show(this, ProgressDialog.show(this,
"Downloading...", getString(R.string.dling),
"Downloading Magisk Manager", true); getString(R.string.dling) + " " + getString(R.string.app_name),
true);
} }
private void dlAPK() { private void dlAPK() {

4
stub/src/main/res/values/misc.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Magisk Manager</string>
</resources>

5
stub/src/main/res/values/strings.xml
View File

@ -1,12 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name" translatable="false">Magisk Manager</string>
<string name="no_thanks">No thanks</string> <string name="no_thanks">No thanks</string>
<string name="yes">Yes</string> <string name="yes">Yes</string>
<string name="ok">OK</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="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="no_internet_msg">Please connect to the Internet! Upgrading to full Magisk Manager is required.</string>
<string name="dling">Downloading</string>
</resources> </resources>