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

Small minor updates

Browse Source
This commit is contained in:
topjohnwu 2017-07-20 02:54:34 +08:00
parent 668d85d14e
commit 5ac6a8cb4a
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java
View File

@ -372,7 +372,11 @@ public class MagiskFragment extends Fragment
if (!Shell.rootAccess()) { if (!Shell.rootAccess()) {
installText.setText(R.string.download); installText.setText(R.string.download);
} else { } else {
installText.setText(R.string.download_install); if (magiskManager.remoteMagiskVersionCode > magiskManager.magiskVersionCode) {
installText.setText(R.string.update);
} else {
installText.setText(R.string.reinstall);
}
List<String> items = new ArrayList<>(); List<String> items = new ArrayList<>();
if (magiskManager.bootBlock != null) { if (magiskManager.bootBlock != null) {

12
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
View File

@ -33,11 +33,8 @@ public class SplashActivity extends Activity{
magiskManager.remoteMagiskVersionString = getIntent().getStringExtra(MagiskManager.INTENT_VERSION); magiskManager.remoteMagiskVersionString = getIntent().getStringExtra(MagiskManager.INTENT_VERSION);
magiskManager.magiskLink = getIntent().getStringExtra(MagiskManager.INTENT_LINK); magiskManager.magiskLink = getIntent().getStringExtra(MagiskManager.INTENT_LINK);
// Now fire all async tasks
new LoadModules(this) LoadModules loadModuleTask = new LoadModules(this);
.setCallBack(() -> new LoadRepos(this).exec())
.exec();
new LoadApps(this).exec();
if (Utils.checkNetworkStatus(this)) { if (Utils.checkNetworkStatus(this)) {
// Initialize the update check service, notify every 8 hours // Initialize the update check service, notify every 8 hours
@ -51,8 +48,13 @@ public class SplashActivity extends Activity{
JobScheduler scheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE); JobScheduler scheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
scheduler.schedule(jobInfo); scheduler.schedule(jobInfo);
} }
loadModuleTask.setCallBack(() -> new LoadRepos(this).exec());
} }
// Now fire all async tasks
loadModuleTask.exec();
new LoadApps(this).exec();
Intent intent = new Intent(this, MainActivity.class); Intent intent = new Intent(this, MainActivity.class);
String section = getIntent().getStringExtra(MagiskManager.INTENT_SECTION); String section = getIntent().getStringExtra(MagiskManager.INTENT_SECTION);
if (section != null) { if (section != null) {

3
app/src/main/res/values-zh-rTW/strings.xml
View File

@ -216,5 +216,8 @@
<string name="settings_ns_global">全域 Namespace</string> <string name="settings_ns_global">全域 Namespace</string>
<string name="settings_ns_isolate">獨立 Namespace</string> <string name="settings_ns_isolate">獨立 Namespace</string>
<string name="settings_ns_requester">繼承 Namespace</string> <string name="settings_ns_requester">繼承 Namespace</string>
<string name="reinstall">重新安裝</string>
<string name="update">更新</string>
<string name="magisk_updates">Magisk 更新</string>
</resources> </resources>

2
app/src/main/res/values/strings.xml
View File

@ -55,6 +55,8 @@
<string name="uninstall_magisk_title">Uninstall Magisk</string> <string name="uninstall_magisk_title">Uninstall Magisk</string>
<string name="uninstall_magisk_msg">This will remove all modules, MagiskSU, and potentially encrypt your data if not encrypted\nAre you sure to continue?</string> <string name="uninstall_magisk_msg">This will remove all modules, MagiskSU, and potentially encrypt your data if not encrypted\nAre you sure to continue?</string>
<string name="version_none">(None)</string> <string name="version_none">(None)</string>
<string name="reinstall">Re-Install</string>
<string name="update">Update</string>
<!--Module Fragment--> <!--Module Fragment-->
<string name="no_info_provided">(No info provided)</string> <string name="no_info_provided">(No info provided)</string>