From 4f5c656b0525fcf251c3b571c6b89ac24d5dd6b9 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 16 Sep 2017 03:53:13 +0800
Subject: [PATCH] Update uninstall method

---
 .../com/topjohnwu/magisk/utils/Utils.java     | 31 ++++++-------------
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
index 24ff0e096..a4e007b85 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.app.DownloadManager;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
-import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -16,7 +15,6 @@ import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
-import android.os.CountDownTimer;
 import android.os.Environment;
 import android.provider.OpenableColumns;
 import android.support.annotation.StringRes;
@@ -508,26 +506,15 @@ public class Utils {
                     }
                     in.close();
                     out.close();
-                    ProgressDialog progress = new ProgressDialog(fragment.getActivity());
-                    progress.setTitle(R.string.reboot);
-                    progress.show();
-                    new CountDownTimer(5000, 1000) {
-                        @Override
-                        public void onTick(long millisUntilFinished) {
-                            progress.setMessage(mm.getString(R.string.reboot_countdown,
-                                    millisUntilFinished / 1000));
-                        }
-
-                        @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();
+                    Shell.getShell(mm).su(
+                            "cat " + uninstaller + " > /cache/" + UNINSTALLER,
+                            "cat " + utils + " > /data/magisk/" + UTIL_FUNCTIONS
+                    );
+                    mm.toast(R.string.uninstall_toast, Toast.LENGTH_LONG);
+                    Shell.getShell(mm).su_raw(
+                            "sleep 5",
+                            "pm uninstall " + mm.getApplicationInfo().packageName
+                    );
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d3c87bed6..2a4e6c87f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -122,6 +122,7 @@
     <string name="restore_stock_boot">Restore Stock Boot</string>
     <string name="restore_done">Restoration done!</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 -->
     <string name="settings_general_category">General</string>