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

Update uninstall method

Browse Source
This commit is contained in:
topjohnwu 2017-09-16 03:53:13 +08:00
parent a31cddbe7b
commit 4f5c656b05
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View File

@ -5,7 +5,6 @@ import android.app.Activity;
import android.app.DownloadManager; import android.app.DownloadManager;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
@ -16,7 +15,6 @@ import android.database.Cursor;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.Uri; import android.net.Uri;
import android.os.CountDownTimer;
import android.os.Environment; import android.os.Environment;
import android.provider.OpenableColumns; import android.provider.OpenableColumns;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
@ -508,26 +506,15 @@ public class Utils {
} }
in.close(); in.close();
out.close(); out.close();
ProgressDialog progress = new ProgressDialog(fragment.getActivity()); Shell.getShell(mm).su(
progress.setTitle(R.string.reboot); "cat " + uninstaller + " > /cache/" + UNINSTALLER,
progress.show(); "cat " + utils + " > /data/magisk/" + UTIL_FUNCTIONS
new CountDownTimer(5000, 1000) { );
@Override mm.toast(R.string.uninstall_toast, Toast.LENGTH_LONG);
public void onTick(long millisUntilFinished) { Shell.getShell(mm).su_raw(
progress.setMessage(mm.getString(R.string.reboot_countdown, "sleep 5",
millisUntilFinished / 1000)); "pm uninstall " + mm.getApplicationInfo().packageName
} );
@Override
public void onFinish() {
progress.setMessage(mm.getString(R.string.reboot_countdown, 0));
Shell.getShell(mm).su_raw(
"mv -f " + uninstaller + " /cache/" + UNINSTALLER,
"mv -f " + utils + " /data/magisk/" + UTIL_FUNCTIONS,
"reboot"
);
}
}.start();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }

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

@ -122,6 +122,7 @@
<string name="restore_stock_boot">Restore Stock Boot</string> <string name="restore_stock_boot">Restore Stock Boot</string>
<string name="restore_done">Restoration done!</string> <string name="restore_done">Restoration done!</string>
<string name="restore_fail">Stock backup does not exist!</string> <string name="restore_fail">Stock backup does not exist!</string>
<string name="uninstall_toast">Uninstalling Magisk Manager in 5 seconds, please manually reboot afterwards</string>
<!--Settings Activity --> <!--Settings Activity -->
<string name="settings_general_category">General</string> <string name="settings_general_category">General</string>