From 959aaee045f4c8d831a127d3443525ff08c8b528 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 31 Jul 2017 01:19:43 +0800
Subject: [PATCH] Fix FlashZip crash when fails

---
 .../java/com/topjohnwu/magisk/asyncs/FlashZip.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java b/app/src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java
index 3a68947db..2502a0e77 100644
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java
@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk.asyncs;
 
+import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
@@ -26,7 +27,7 @@ public class FlashZip extends ParallelTask<Void, String, Integer> {
     private String mFilename;
     private AdaptiveList<String> mList;
 
-    public FlashZip(Context context, Uri uri, AdaptiveList<String> list) {
+    public FlashZip(Activity context, Uri uri, AdaptiveList<String> list) {
         super(context);
         mUri = uri;
         mList = list;
@@ -100,22 +101,22 @@ public class FlashZip extends ParallelTask<Void, String, Integer> {
         MagiskManager magiskManager = getMagiskManager();
         if (magiskManager == null) return;
         magiskManager.shell.su_raw(
-                "rm -rf " + mCachedFile.getParent() + "/*",
+                "rm -rf " + mCachedFile.getParent(),
                 "rm -rf " + MagiskManager.TMP_FOLDER_PATH
         );
         switch (result) {
             case -1:
                 mList.add(magiskManager.getString(R.string.install_error));
                 Utils.showUriSnack(getActivity(), mUri);
-                return;
+                break;
             case 0:
                 mList.add(magiskManager.getString(R.string.invalid_zip));
-                return;
+                break;
             case 1:
                 // Success
+                new LoadModules(magiskManager).exec();
                 break;
         }
-        new LoadModules(magiskManager).exec();
         super.onPostExecute(result);
     }
 }