gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-01-14 05:47:07 -08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor shell (again)

Browse Source
This commit is contained in:
topjohnwu
2017-10-15 23:02:44 +08:00
parent 13bf1b27b4
commit 6f457c0c59
20 changed files with 198 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View File

@@ -195,28 +195,28 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
case "disable":
enabled = prefs.getBoolean("disable", false);
if (enabled) {
Utils.createFile(getShell(), MagiskManager.MAGISK_DISABLE_FILE);
Utils.createFile(MagiskManager.MAGISK_DISABLE_FILE);
} else {
Utils.removeItem(getShell(), MagiskManager.MAGISK_DISABLE_FILE);
Utils.removeItem(MagiskManager.MAGISK_DISABLE_FILE);
}
Toast.makeText(getActivity(), R.string.settings_reboot_toast, Toast.LENGTH_LONG).show();
break;
case "magiskhide":
enabled = prefs.getBoolean("magiskhide", false);
if (enabled) {
Utils.enableMagiskHide(getShell());
Utils.enableMagiskHide();
} else {
Utils.disableMagiskHide(getShell());
Utils.disableMagiskHide();
}
break;
case "hosts":
enabled = prefs.getBoolean("hosts", false);
if (enabled) {
getShell().su_raw(
Shell.su_raw(
"cp -af /system/etc/hosts " + MagiskManager.MAGISK_HOST_FILE,
"mount -o bind " + MagiskManager.MAGISK_HOST_FILE + " /system/etc/hosts");
} else {
getShell().su_raw(
Shell.su_raw(
"umount -l /system/etc/hosts",
"rm -f " + MagiskManager.MAGISK_HOST_FILE);
}
@@ -243,10 +243,6 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
setSummary();
}
private Shell getShell() {
return Shell.getShell(getActivity());
}
private void setSummary() {
updateChannel.setSummary(getResources()
.getStringArray(R.array.update_channel)[mm.updateChannel]);