From 14ac37e8a589948ef79831d0c0d50a6b5b358e55 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 7 Dec 2018 21:42:53 -0500
Subject: [PATCH] Fix and optimize APK installations

---
 .../com/topjohnwu/magisk/asyncs/PatchAPK.java | 22 +++++++++----------
 .../magisk/utils/DlInstallManager.java        | 16 ++++++++++----
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/src/full/java/com/topjohnwu/magisk/asyncs/PatchAPK.java b/app/src/full/java/com/topjohnwu/magisk/asyncs/PatchAPK.java
index 7a9b77288..31feb5652 100644
--- a/app/src/full/java/com/topjohnwu/magisk/asyncs/PatchAPK.java
+++ b/app/src/full/java/com/topjohnwu/magisk/asyncs/PatchAPK.java
@@ -12,11 +12,12 @@ import com.topjohnwu.magisk.components.Notifications;
 import com.topjohnwu.magisk.utils.RootUtils;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.io.SuFile;
-import com.topjohnwu.superuser.io.SuFileOutputStream;
 import com.topjohnwu.utils.JarMap;
 import com.topjohnwu.utils.SignAPK;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.CharBuffer;
@@ -97,23 +98,22 @@ public class PatchAPK {
         MagiskManager mm = Data.MM();
 
         // Generate a new app with random package name
-        SuFile repack = new SuFile("/data/local/tmp/repack.apk");
+        File repack = new File(mm.getFilesDir(), "patched.apk");
         String pkg = genPackageName("com.", BuildConfig.APPLICATION_ID.length());
 
         try {
             JarMap apk = new JarMap(mm.getPackageCodePath());
-            if (!patchPackageID(apk, BuildConfig.APPLICATION_ID, pkg))
+            if (!patch(apk, pkg))
                 return false;
-            SignAPK.sign(apk, new SuFileOutputStream(repack));
+            SignAPK.sign(apk, new BufferedOutputStream(new FileOutputStream(repack)));
         } catch (Exception e) {
             return false;
         }
 
         // Install the application
+        repack.setReadable(true, false);
         if (!ShellUtils.fastCmdResult("pm install " + repack))
-            return false;
-
-        repack.delete();
+            return false;;
 
         mm.mDB.setStrings(Const.Key.SU_MANAGER, pkg);
         Data.exportPrefs();
@@ -122,13 +122,13 @@ public class PatchAPK {
         return true;
     }
 
-    public static boolean patchPackageID(JarMap apk, String from, String to) {
+    public static boolean patch(JarMap apk, String pkg) {
         try {
             JarEntry je = apk.getJarEntry(Const.ANDROID_MANIFEST);
             byte xml[] = apk.getRawData(je);
 
-            if (!findAndPatch(xml, from, to) ||
-                    !findAndPatch(xml, from + ".provider", to + ".provider") ||
+            if (!findAndPatch(xml, BuildConfig.APPLICATION_ID, pkg) ||
+                    !findAndPatch(xml, BuildConfig.APPLICATION_ID + ".provider", pkg + ".provider") ||
                     !findAndPatch(xml, R.string.app_name, R.string.re_app_name))
                 return false;
 
diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/DlInstallManager.java b/app/src/full/java/com/topjohnwu/magisk/utils/DlInstallManager.java
index d4f1d4158..32fe43e48 100644
--- a/app/src/full/java/com/topjohnwu/magisk/utils/DlInstallManager.java
+++ b/app/src/full/java/com/topjohnwu/magisk/utils/DlInstallManager.java
@@ -81,14 +81,14 @@ public class DlInstallManager {
                 patched = new File(apk.getParent(), "patched.apk");
                 try {
                     JarMap jarMap = new JarMap(apk);
-                    PatchAPK.patchPackageID(jarMap, BuildConfig.APPLICATION_ID, mm.getPackageName());
+                    PatchAPK.patch(jarMap, mm.getPackageName());
                     SignAPK.sign(jarMap, new BufferedOutputStream(new FileOutputStream(patched)));
                 } catch (Exception e) {
                     return;
                 }
             }
-            progress.dismiss();
             APKInstall.install(mm, patched);
+            progress.dismiss();
         }
     }
 
@@ -96,10 +96,18 @@ public class DlInstallManager {
 
         @Override
         public void onDownloadComplete(File apk, ProgressNotification progress) {
-            progress.dismiss();
+            MagiskManager mm = Data.MM();
+            progress.getNotification()
+                    .setProgress(0, 0, true)
+                    .setContentTitle(mm.getString(R.string.restore_img_msg))
+                    .setContentText("");
+            progress.update();
             Data.exportPrefs();
+            // Make it world readable
+            apk.setReadable(true, false);
             if (ShellUtils.fastCmdResult("pm install " + apk))
-                RootUtils.rmAndLaunch(Data.MM().getPackageName(), BuildConfig.APPLICATION_ID);
+                RootUtils.rmAndLaunch(mm.getPackageName(), BuildConfig.APPLICATION_ID);
+            progress.dismiss();
         }
     }
 }