Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-06-12 05:07:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Several refinements

Browse Source
This commit is contained in:
topjohnwu
2017-02-17 14:07:15 +08:00
parent 430f2cafc1
commit f615ed40cd
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/topjohnwu/magisk/InstallFragment.java
View File

@ -98,8 +98,8 @@ public class InstallFragment extends Fragment implements CallbackEvent.Listener<
} else {
uninstallButton.setOnClickListener(vi -> {
new AlertDialogBuilder(getActivity())
.setTitle("Uninstall Magisk")
.setMessage("This will remove all modules, MagiskSU, and potentially re-encrypt your device\nAre you sure to process?")
.setTitle(R.string.uninstall_magisk_title)
.setMessage(R.string.uninstall_magisk_msg)
.setPositiveButton(R.string.yes, (dialogInterface, i) -> {
try {
InputStream in = getActivity().getAssets().open(UNINSTALLER);

10
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
View File

@ -78,9 +78,7 @@ public class MainActivity extends Activity
drawer.addDrawerListener(toggle);
toggle.syncState();
if (savedInstanceState != null)
navigate(savedInstanceState.getInt(SECTION, R.id.status));
else
if (savedInstanceState == null)
navigate(getIntent().getStringExtra(SECTION));
navigationView.setNavigationItemSelectedListener(this);
@ -94,6 +92,12 @@ public class MainActivity extends Activity
checkHideSection();
}
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
navigate(savedInstanceState.getInt(SECTION, R.id.status));
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

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

@ -64,7 +64,7 @@ public class SplashActivity extends Activity{
}
}.exec();
new LoadApps(this).exec();
new CheckUpdates(this, !"install".equals(getIntent().getStringExtra(MainActivity.SECTION))){
new CheckUpdates(this, false){
@Override
protected void onPostExecute(Void v) {
super.onPostExecute(v);

2
app/src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
View File

@ -58,7 +58,7 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
Intent intent = new Intent(magiskManager, SplashActivity.class);
intent.putExtra(MainActivity.SECTION, "install");
TaskStackBuilder stackBuilder = TaskStackBuilder.create(magiskManager);
stackBuilder.addParentStack(MainActivity.class);
stackBuilder.addParentStack(SplashActivity.class);
stackBuilder.addNextIntent(intent);
PendingIntent pendingIntent = stackBuilder.getPendingIntent(NOTIFICATION_ID, PendingIntent.FLAG_UPDATE_CURRENT);
builder.setContentIntent(pendingIntent);