Bump version

Delele Translate "Magisk Modo Sólo Núcleo". (After several hours (Days :v ). I thought it was best left in its original form .Magisk Hide, should also be translated if it were the case, it was better to leave it that way so as not to confuse the users.)
Fix translation error
Translations Updates and added new line

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.topjohnwu.magisk"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 50
-        versionName "5.1.0"
+        versionCode 51
+        versionName "5.1.1"
         ndk {
             moduleName 'zipadjust'
             abiFilters 'x86', 'armeabi-v7a'

app/src/main/assets/magisk_uninstaller.sh

@@ -65,7 +65,22 @@ cd $MAGISKBIN
 
 ui_print_wrap "- Unpacking boot image"
 ./magiskboot --unpack "$BOOTIMAGE"
-[ $? -ne 0 ] && abort_wrap "! Unable to unpack boot image"
+CHROMEOS=false
+case $? in
+  1 )
+    abort_wrap "! Unable to unpack boot image"
+    ;;
+  2 )
+    CHROMEOS=true
+    ;;
+  3 )
+    ui_print_wrap "! Sony ELF32 format detected"
+    abort_wrap "! Please use BootBridge from @AdrianDC to flash Magisk"
+    ;;
+  4 )
+    ui_print_wrap "! Sony ELF64 format detected"
+    abort_wrap "! Stock kernel cannot be patched, please use a custom kernel"
+esac
 
 # Update our previous backup to new format if exists
 if [ -f /data/stock_boot.img ]; then
@@ -109,11 +124,11 @@ case $? in
 esac
 
 # Sign chromeos boot
-if [ -f chromeos ]; then
+if $CHROMEOS; then
   echo > empty
 
-  LD_LIBRARY_PATH=$SYSTEMLIB $CHROMEDIR/futility vbutil_kernel --pack stock_boot.img.signed \
-  --keyblock $CHROMEDIR/kernel.keyblock --signprivate $CHROMEDIR/kernel_data_key.vbprivk \
+  ./chromeos/futility vbutil_kernel --pack stock_boot.img.signed \
+  --keyblock ./chromeos/kernel.keyblock --signprivate ./chromeos/kernel_data_key.vbprivk \
   --version 1 --vmlinuz stock_boot.img --config empty --arch arm --bootloader empty --flags 0x1
 
   rm -f empty stock_boot.img
@@ -132,6 +147,7 @@ ui_print_wrap "- Removing Magisk files"
 rm -rf  /cache/magisk.log /cache/last_magisk.log /cache/magiskhide.log /cache/.disable_magisk \
         /cache/magisk /cache/magisk_merge /cache/magisk_mount  /cache/unblock /cache/magisk_uninstaller.sh \
         /data/Magisk.apk /data/magisk.apk /data/magisk.img /data/magisk_merge.img /data/magisk_debug.log \
-        /data/busybox /data/magisk /data/custom_ramdisk_patch.sh 2>/dev/null
+        /data/busybox /data/magisk /data/custom_ramdisk_patch.sh /data/property/*magisk* \
+        /data/app/com.topjohnwu.magisk* /data/user/*/com.topjohnwu.magisk 2>/dev/null
 
 $BOOTMODE && reboot

app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java

@@ -2,7 +2,9 @@ package com.topjohnwu.magisk;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
+import android.app.NotificationManager;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -49,7 +51,8 @@ import butterknife.Unbinder;
 public class MagiskFragment extends Fragment
         implements CallbackEvent.Listener<Void>, SwipeRefreshLayout.OnRefreshListener {
 
-    private static boolean noDialog = false;
+    public static final String SHOW_DIALOG = "dialog";
+
     private static int expandHeight = 0;
     private static boolean mExpanded = false;
 
@@ -126,31 +129,35 @@ public class MagiskFragment extends Fragment
                 .setMessage(getString(R.string.repo_install_msg, filename))
                 .setCancelable(true)
                 .setPositiveButton(Shell.rootAccess() ? R.string.install : R.string.download,
-                    (d, i) ->
-                    Utils.dlAndReceive(
-                        getActivity(),
-                        new DownloadReceiver() {
-                            private String boot = finalBootImage;
-                            private boolean enc = keepEncChkbox.isChecked();
-                            private boolean verity = keepVerityChkbox.isChecked();
+                    (d, i) -> {
+                        ((NotificationManager) getActivity()
+                                .getSystemService(Context.NOTIFICATION_SERVICE)).cancelAll();
+                        Utils.dlAndReceive(
+                            getActivity(),
+                            new DownloadReceiver() {
+                                private String boot = finalBootImage;
+                                private boolean enc = keepEncChkbox.isChecked();
+                                private boolean verity = keepVerityChkbox.isChecked();
 
-                            @Override
-                            public void onDownloadDone(Uri uri) {
-                                if (Shell.rootAccess()) {
-                                    magiskManager.shell.su_raw(
-                                            "rm -f /dev/.magisk",
-                                            "echo \"BOOTIMAGE=" + boot + "\" >> /dev/.magisk",
-                                            "echo \"KEEPFORCEENCRYPT=" + String.valueOf(enc) + "\" >> /dev/.magisk",
-                                            "echo \"KEEPVERITY=" + String.valueOf(verity) + "\" >> /dev/.magisk"
-                                    );
-                                    startActivity(new Intent(getActivity(), FlashActivity.class).setData(uri));
-                                } else {
-                                    Utils.showUriSnack(getActivity(), uri);
+                                @Override
+                                public void onDownloadDone(Uri uri) {
+                                    if (Shell.rootAccess()) {
+                                        magiskManager.shell.su_raw(
+                                                "rm -f /dev/.magisk",
+                                                "echo \"BOOTIMAGE=" + boot + "\" >> /dev/.magisk",
+                                                "echo \"KEEPFORCEENCRYPT=" + String.valueOf(enc) + "\" >> /dev/.magisk",
+                                                "echo \"KEEPVERITY=" + String.valueOf(verity) + "\" >> /dev/.magisk"
+                                        );
+                                        startActivity(new Intent(getActivity(), FlashActivity.class).setData(uri));
+                                    } else {
+                                        Utils.showUriSnack(getActivity(), uri);
+                                    }
                                 }
-                            }
-                        },
-                        magiskManager.magiskLink,
-                        Utils.getLegalFilename(filename)))
+                            },
+                            magiskManager.magiskLink,
+                            Utils.getLegalFilename(filename));
+                    }
+                )
                 .setNeutralButton(R.string.release_notes, (d, i) -> {
                     if (magiskManager.releaseNoteLink != null) {
                         Intent openReleaseNoteLink = new Intent(Intent.ACTION_VIEW, Uri.parse(magiskManager.releaseNoteLink));
@@ -241,19 +248,11 @@ public class MagiskFragment extends Fragment
 
         mSwipeRefreshLayout.setOnRefreshListener(this);
 
-        if (magiskManager.magiskVersionCode < 0 && Shell.rootAccess() && !noDialog) {
-            noDialog = true;
-            new AlertDialogBuilder(getActivity())
-                    .setTitle(R.string.no_magisk_title)
-                    .setMessage(R.string.no_magisk_msg)
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.goto_install, (d, i) -> {})
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
-        }
-
         updateUI();
 
+        if (getArguments() != null && getArguments().getBoolean(SHOW_DIALOG))
+            install();
+
         return v;
     }
 
@@ -272,7 +271,6 @@ public class MagiskFragment extends Fragment
         magiskManager.remoteMagiskVersionString = null;
         magiskManager.remoteMagiskVersionCode = -1;
         collapse();
-        noDialog = false;
 
         // Trigger state check
         if (Utils.checkNetworkStatus(magiskManager)) {
@@ -374,7 +372,11 @@ public class MagiskFragment extends Fragment
         if (!Shell.rootAccess()) {
             installText.setText(R.string.download);
         } else {
-            installText.setText(R.string.download_install);
+            if (magiskManager.remoteMagiskVersionCode > magiskManager.magiskVersionCode) {
+                installText.setText(R.string.update);
+            } else {
+                installText.setText(R.string.reinstall);
+            }
 
             List<String> items = new ArrayList<>();
             if (magiskManager.bootBlock != null) {
@@ -410,6 +412,9 @@ public class MagiskFragment extends Fragment
 
         magiskUpdateProgress.setVisibility(View.GONE);
         mSwipeRefreshLayout.setRefreshing(false);
+
+        if (magiskManager.remoteMagiskVersionCode > magiskManager.magiskVersionCode)
+            install();
     }
 
     private void updateSafetyNetUI() {

app/src/main/java/com/topjohnwu/magisk/MagiskLogFragment.java

@@ -1,17 +1,13 @@
 package com.topjohnwu.magisk;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -28,13 +24,12 @@ import android.widget.Toast;
 import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.components.Fragment;
 import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.Shell;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Calendar;
-import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -67,7 +62,7 @@ public class MagiskLogFragment extends Fragment {
 
         txtLog.setTextIsSelectable(true);
 
-        new LogManager(getActivity()).read();
+        new LogManager().read();
 
         return view;
     }
@@ -81,7 +76,7 @@ public class MagiskLogFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
-        new LogManager(getActivity()).read();
+        new LogManager().read();
     }
 
     @Override
@@ -100,13 +95,13 @@ public class MagiskLogFragment extends Fragment {
         mClickedMenuItem = item;
         switch (item.getItemId()) {
             case R.id.menu_refresh:
-                new LogManager(getActivity()).read();
+                new LogManager().read();
                 return true;
             case R.id.menu_save:
-                new LogManager(getActivity()).save();
+                new LogManager().save();
                 return true;
             case R.id.menu_clear:
-                new LogManager(getActivity()).clear();
+                new LogManager().clear();
                 return true;
             default:
                 return true;
@@ -129,29 +124,19 @@ public class MagiskLogFragment extends Fragment {
 
     private class LogManager extends ParallelTask<Object, Void, Object> {
 
-        int mode;
-        File targetFile;
-
-        LogManager(Activity activity) {
-            super(activity);
-        }
+        private int mode;
+        private File targetFile;
 
         @SuppressLint("DefaultLocale")
         @Override
         protected Object doInBackground(Object... params) {
+            MagiskManager magiskManager = MagiskLogFragment.this.getApplication();
             mode = (int) params[0];
             switch (mode) {
                 case 0:
-                    List<String> logList = Utils.readFile(magiskManager.shell, MAGISK_LOG);
-
-                    if (Utils.isValidShellResponse(logList)) {
-                        StringBuilder llog = new StringBuilder(15 * 10 * 1024);
-                        for (String s : logList) {
-                            llog.append(s).append("\n");
-                        }
-                        return llog.toString();
-                    }
-                    return "";
+                    StringBuildingList logList = new StringBuildingList();
+                    magiskManager.shell.su(logList, "cat " + MAGISK_LOG);
+                    return logList.toString();
 
                 case 1:
                     magiskManager.shell.su_raw("echo > " + MAGISK_LOG);
@@ -159,17 +144,6 @@ public class MagiskLogFragment extends Fragment {
                     return "";
 
                 case 2:
-                    if (ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                            requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0);
-                        }
-                        return false;
-                    }
-
-                    if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-                        return false;
-                    }
-
                     Calendar now = Calendar.getInstance();
                     String filename = String.format(
                             "magisk_%s_%04d%02d%02d_%02d%02d%02d.log", "error",
@@ -184,19 +158,14 @@ public class MagiskLogFragment extends Fragment {
                         return false;
                     }
 
-                    List<String> in = Utils.readFile(magiskManager.shell, MAGISK_LOG);
-
-                    if (Utils.isValidShellResponse(in)) {
-                        try (FileWriter out = new FileWriter(targetFile)) {
-                            for (String line : in)
-                                out.write(line + "\n");
-                            return true;
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                            return false;
-                        }
+                    try (FileWriter out = new FileWriter(targetFile)) {
+                        FileWritingList fileWritingList = new FileWritingList(out);
+                        magiskManager.shell.su(fileWritingList, "cat " + MAGISK_LOG);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        return false;
                     }
-                    return false;
+                    return true;
             }
             return null;
         }
@@ -204,12 +173,10 @@ public class MagiskLogFragment extends Fragment {
         @Override
         protected void onPostExecute(Object o) {
             if (o == null) return;
-            boolean bool;
-            String llog;
             switch (mode) {
                 case 0:
                 case 1:
-                    llog = (String) o;
+                    String llog = (String) o;
                     progressBar.setVisibility(View.GONE);
                     if (TextUtils.isEmpty(llog))
                         txtLog.setText(R.string.log_is_empty);
@@ -219,27 +186,64 @@ public class MagiskLogFragment extends Fragment {
                     hsvLog.post(() -> hsvLog.scrollTo(0, 0));
                     break;
                 case 2:
-                    bool = (boolean) o;
+                    boolean bool = (boolean) o;
                     if (bool) {
-                        Toast.makeText(getActivity(), targetFile.toString(), Toast.LENGTH_LONG).show();
+                        MagiskLogFragment.this.getApplication().toast(targetFile.toString(), Toast.LENGTH_LONG);
                     } else {
-                        Toast.makeText(getActivity(), getString(R.string.logs_save_failed), Toast.LENGTH_LONG).show();
+                        MagiskLogFragment.this.getApplication().toast(R.string.logs_save_failed, Toast.LENGTH_LONG);
                     }
                     break;
             }
         }
 
-        public void read() {
+        void read() {
             exec(0);
         }
 
-        public void clear() {
+        void clear() {
             exec(1);
         }
 
-        public void save() {
+        void save() {
             exec(2);
         }
     }
 
+    private static class StringBuildingList extends Shell.AbstractList<String> {
+
+        StringBuilder builder;
+
+        StringBuildingList() {
+            builder = new StringBuilder();
+        }
+
+        @Override
+        public boolean add(String s) {
+            builder.append(s).append("\n");
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return builder.toString();
+        }
+    }
+
+    private static class FileWritingList extends Shell.AbstractList<String> {
+
+        private FileWriter writer;
+
+        FileWritingList(FileWriter out) {
+            writer = out;
+        }
+
+        @Override
+        public boolean add(String s) {
+            try {
+                writer.write(s + "\n");
+            } catch (IOException ignored) {}
+            return true;
+        }
+    }
+
 }

app/src/main/java/com/topjohnwu/magisk/MagiskManager.java

@@ -32,6 +32,8 @@ public class MagiskManager extends Application {
     public static final String UNINSTALLER = "magisk_uninstaller.sh";
     public static final String UTIL_FUNCTIONS= "util_functions.sh";
     public static final String INTENT_SECTION = "section";
+    public static final String INTENT_VERSION = "version";
+    public static final String INTENT_LINK = "link";
     public static final String BUSYBOX_VERSION = "1.26.2";
     public static final String MAGISKHIDE_PROP = "persist.magisk.hide";
     public static final String DISABLE_INDICATION_PROP = "ro.magisk.disable";
@@ -117,7 +119,6 @@ public class MagiskManager extends Application {
             shellLogging = false;
         }
         magiskHide = prefs.getBoolean("magiskhide", true);
-        updateNotification = prefs.getBoolean("notification", true);
         initSU();
         updateMagiskInfo();
         updateBlockInfo();
@@ -183,6 +184,7 @@ public class MagiskManager extends Application {
     }
 
     public void updateMagiskInfo() {
+        updateNotification = prefs.getBoolean("notification", true);
         List<String> ret;
         ret = shell.sh("magisk -v");
         if (!Utils.isValidShellResponse(ret)) {

app/src/main/java/com/topjohnwu/magisk/MainActivity.java

@@ -140,9 +140,11 @@ public class MainActivity extends Activity
         if (item != null) {
             switch (item) {
                 case "magisk":
-                case "install":
                     itemId = R.id.magisk;
                     break;
+                case "install":
+                    itemId = -1;
+                    break;
                 case "superuser":
                     itemId = R.id.superuser;
                     break;
@@ -174,6 +176,13 @@ public class MainActivity extends Activity
         mDrawerItem = itemId;
         navigationView.setCheckedItem(itemId);
         switch (itemId) {
+            case -1:
+                Bundle args = new Bundle();
+                args.putBoolean(MagiskFragment.SHOW_DIALOG, true);
+                Fragment frag = new MagiskFragment();
+                frag.setArguments(args);
+                displayFragment(frag, "magisk", true);
+                break;
             case R.id.magisk:
                 displayFragment(new MagiskFragment(), "magisk", true);
                 break;

app/src/main/java/com/topjohnwu/magisk/SplashActivity.java

@@ -24,14 +24,17 @@ public class SplashActivity extends Activity{
 
         super.onCreate(savedInstanceState);
 
-        // Init the info and configs and root sh
-        getApplicationContext().init();
+        MagiskManager magiskManager = getApplicationContext();
 
-        // Now fire all async tasks
-        new LoadModules(this)
-                .setCallBack(() -> new LoadRepos(this).exec())
-                .exec();
-        new LoadApps(this).exec();
+        // Init the info and configs and root sh
+        magiskManager.init();
+
+        // Get possible additional info from intent
+        magiskManager.remoteMagiskVersionString = getIntent().getStringExtra(MagiskManager.INTENT_VERSION);
+        magiskManager.magiskLink = getIntent().getStringExtra(MagiskManager.INTENT_LINK);
+
+
+        LoadModules loadModuleTask = new LoadModules(this);
 
         if (Utils.checkNetworkStatus(this)) {
             // Initialize the update check service, notify every 8 hours
@@ -45,8 +48,13 @@ public class SplashActivity extends Activity{
                 JobScheduler scheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
                 scheduler.schedule(jobInfo);
             }
+            loadModuleTask.setCallBack(() -> new LoadRepos(this).exec());
         }
 
+        // Now fire all async tasks
+        loadModuleTask.exec();
+        new LoadApps(this).exec();
+
         Intent intent = new Intent(this, MainActivity.class);
         String section = getIntent().getStringExtra(MagiskManager.INTENT_SECTION);
         if (section != null) {

app/src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java

@@ -3,6 +3,7 @@ package com.topjohnwu.magisk.asyncs;
 import android.content.Context;
 
 import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.WebService;
 
@@ -15,17 +16,19 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
 
     private boolean showNotification = false;
 
-    public CheckUpdates(Context context, boolean b) {
-        this(context);
-        showNotification = b;
+    public CheckUpdates(Context context) {
+        super(context);
     }
 
-    public CheckUpdates(Context context) {
-        magiskManager = Utils.getMagiskManager(context);
+    public CheckUpdates(Context context, boolean b) {
+        super(context);
+        showNotification = b;
     }
 
     @Override
     protected Void doInBackground(Void... voids) {
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return null;
         String jsonStr = WebService.request(UPDATE_JSON, WebService.GET);
         try {
             JSONObject json = new JSONObject(jsonStr);
@@ -44,6 +47,8 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
 
     @Override
     protected void onPostExecute(Void v) {
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return;
         if (showNotification && magiskManager.updateNotification) {
             if (BuildConfig.VERSION_CODE < magiskManager.remoteManagerVersionCode) {
                 Utils.showManagerUpdate(magiskManager);

app/src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java

@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.app.Activity;
+import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
 
@@ -26,44 +26,22 @@ public class FlashZip extends ParallelTask<Void, String, Integer> {
     private String mFilename;
     private AdaptiveList<String> mList;
 
-    public FlashZip(Activity context, Uri uri, AdaptiveList<String> list) {
+    public FlashZip(Context context, Uri uri, AdaptiveList<String> list) {
         super(context);
         mUri = uri;
         mList = list;
 
-        mCachedFile = new File(magiskManager.getCacheDir(), "install.zip");
-        mScriptFile = new File(magiskManager.getCacheDir(), "/META-INF/com/google/android/update-binary");
+        mCachedFile = new File(context.getCacheDir(), "install.zip");
+        mScriptFile = new File(context.getCacheDir(), "/META-INF/com/google/android/update-binary");
         mCheckFile = new File(mScriptFile.getParent(), "updater-script");
 
         // Try to get the filename ourselves
-        mFilename = Utils.getNameFromUri(magiskManager, mUri);
-    }
-
-    private void copyToCache() throws Exception {
-        mList.add(magiskManager.getString(R.string.copying_msg));
-
-        mCachedFile.delete();
-        try (
-            InputStream in = magiskManager.getContentResolver().openInputStream(mUri);
-            OutputStream outputStream = new FileOutputStream(mCachedFile)
-        ) {
-            byte buffer[] = new byte[1024];
-            int length;
-            if (in == null) throw new FileNotFoundException();
-            while ((length = in.read(buffer)) > 0)
-                outputStream.write(buffer, 0, length);
-        } catch (FileNotFoundException e) {
-            mList.add("! Invalid Uri");
-            throw e;
-        } catch (IOException e) {
-            mList.add("! Cannot copy to cache");
-            throw e;
-        }
+        mFilename = Utils.getNameFromUri(context, mUri);
     }
 
     private boolean unzipAndCheck() throws Exception {
         ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android");
-        List<String> ret = Utils.readFile(magiskManager.shell, mCheckFile.getPath());
+        List<String> ret = Utils.readFile(getShell(), mCheckFile.getPath());
         return Utils.isValidShellResponse(ret) && ret.get(0).contains("#MAGISK");
     }
 
@@ -80,8 +58,28 @@ public class FlashZip extends ParallelTask<Void, String, Integer> {
 
     @Override
     protected Integer doInBackground(Void... voids) {
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return -1;
         try {
-            copyToCache();
+            mList.add(magiskManager.getString(R.string.copying_msg));
+
+            mCachedFile.delete();
+            try (
+                InputStream in = magiskManager.getContentResolver().openInputStream(mUri);
+                OutputStream outputStream = new FileOutputStream(mCachedFile)
+            ) {
+                if (in == null) throw new FileNotFoundException();
+                byte buffer[] = new byte[1024];
+                int length;
+                while ((length = in.read(buffer)) > 0)
+                    outputStream.write(buffer, 0, length);
+            } catch (FileNotFoundException e) {
+                mList.add("! Invalid Uri");
+                throw e;
+            } catch (IOException e) {
+                mList.add("! Cannot copy to cache");
+                throw e;
+            }
             if (!unzipAndCheck()) return 0;
             mList.add(magiskManager.getString(R.string.zip_install_progress_msg, mFilename));
             magiskManager.shell.su(mList,
@@ -99,6 +97,8 @@ public class FlashZip extends ParallelTask<Void, String, Integer> {
     // -1 = error, manual install; 0 = invalid zip; 1 = success
     @Override
     protected void onPostExecute(Integer result) {
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return;
         magiskManager.shell.su_raw(
                 "rm -rf " + mCachedFile.getParent() + "/*",
                 "rm -rf " + MagiskManager.TMP_FOLDER_PATH
@@ -106,19 +106,16 @@ public class FlashZip extends ParallelTask<Void, String, Integer> {
         switch (result) {
             case -1:
                 mList.add(magiskManager.getString(R.string.install_error));
-                Utils.showUriSnack(activity, mUri);
-                break;
+                Utils.showUriSnack(getActivity(), mUri);
+                return;
             case 0:
                 mList.add(magiskManager.getString(R.string.invalid_zip));
-                break;
+                return;
             case 1:
-                onSuccess();
+                // Success
                 break;
         }
+        new LoadModules(magiskManager).exec();
         super.onPostExecute(result);
     }
-
-    protected void onSuccess() {
-        new LoadModules(activity).exec();
-    }
 }

app/src/main/java/com/topjohnwu/magisk/asyncs/LoadApps.java

@@ -1,9 +1,10 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.app.Activity;
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.adapters.ApplicationAdapter;
 
 import java.util.Collections;
@@ -12,12 +13,14 @@ import java.util.List;
 
 public class LoadApps extends ParallelTask<Void, Void, Void> {
 
-    public LoadApps(Activity context) {
+    public LoadApps(Context context) {
         super(context);
     }
 
     @Override
     protected Void doInBackground(Void... voids) {
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return null;
         PackageManager pm = magiskManager.getPackageManager();
         List<ApplicationInfo> list = pm.getInstalledApplications(0);
         for (Iterator<ApplicationInfo> i = list.iterator(); i.hasNext(); ) {
@@ -34,6 +37,8 @@ public class LoadApps extends ParallelTask<Void, Void, Void> {
 
     @Override
     protected void onPostExecute(Void v) {
-        new MagiskHide(activity).list();
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return;
+        new MagiskHide(magiskManager).list();
     }
 }

app/src/main/java/com/topjohnwu/magisk/asyncs/LoadModules.java

@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.app.Activity;
+import android.content.Context;
 
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.module.BaseModule;
@@ -11,12 +11,14 @@ import com.topjohnwu.magisk.utils.ValueSortedMap;
 
 public class LoadModules extends ParallelTask<Void, Void, Void> {
 
-    public LoadModules(Activity context) {
+    public LoadModules(Context context) {
         super(context);
     }
 
     @Override
     protected Void doInBackground(Void... voids) {
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return null;
         Logger.dev("LoadModules: Loading modules");
 
         magiskManager.moduleMap = new ValueSortedMap<>();
@@ -35,6 +37,8 @@ public class LoadModules extends ParallelTask<Void, Void, Void> {
 
     @Override
     protected void onPostExecute(Void v) {
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return;
         magiskManager.moduleLoadDone.trigger();
         super.onPostExecute(v);
     }

app/src/main/java/com/topjohnwu/magisk/asyncs/LoadRepos.java

@@ -1,9 +1,10 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.app.Activity;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.text.TextUtils;
 
+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
 import com.topjohnwu.magisk.module.BaseModule;
 import com.topjohnwu.magisk.module.Repo;
@@ -41,11 +42,11 @@ public class LoadRepos extends ParallelTask<Void, Void, Void> {
     private RepoDatabaseHelper repoDB;
     private SharedPreferences prefs;
 
-    public LoadRepos(Activity context) {
+    public LoadRepos(Context context) {
         super(context);
-        prefs = magiskManager.prefs;
+        prefs = getMagiskManager().prefs;
         String prefsPath = context.getApplicationInfo().dataDir + "/shared_prefs";
-        repoDB = new RepoDatabaseHelper(magiskManager);
+        repoDB = new RepoDatabaseHelper(context);
         // Legacy data cleanup
         File old = new File(prefsPath, "RepoMap.xml");
         if (old.exists() || !prefs.getString("repomap", "empty").equals("empty")) {
@@ -54,7 +55,7 @@ public class LoadRepos extends ParallelTask<Void, Void, Void> {
             repoDB.clearRepo();
         }
         etags = new ArrayList<>(
-                Arrays.asList(magiskManager.prefs.getString(ETAG_KEY, "").split(",")));
+                Arrays.asList(prefs.getString(ETAG_KEY, "").split(",")));
     }
 
     private void loadJSON(String jsonString) throws Exception {
@@ -154,6 +155,8 @@ public class LoadRepos extends ParallelTask<Void, Void, Void> {
 
     @Override
     protected Void doInBackground(Void... voids) {
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return null;
         Logger.dev("LoadRepos: Loading repos");
 
         cached = repoDB.getRepoMap(false);
@@ -183,6 +186,8 @@ public class LoadRepos extends ParallelTask<Void, Void, Void> {
 
     @Override
     protected void onPostExecute(Void v) {
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return;
         magiskManager.repoLoadDone.trigger();
         super.onPostExecute(v);
     }

app/src/main/java/com/topjohnwu/magisk/asyncs/MagiskHide.java

@@ -1,6 +1,8 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.app.Activity;
+import android.content.Context;
+
+import com.topjohnwu.magisk.MagiskManager;
 
 import java.util.List;
 
@@ -8,12 +10,14 @@ public class MagiskHide extends ParallelTask<Object, Void, Void> {
 
     private boolean isList = false;
 
-    public MagiskHide(Activity context) {
+    public MagiskHide(Context context) {
         super(context);
     }
 
     @Override
     protected Void doInBackground(Object... params) {
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return null;
         String command = (String) params[0];
         List<String> ret = magiskManager.shell.su("magiskhide --" + command);
         if (isList) {
@@ -24,6 +28,8 @@ public class MagiskHide extends ParallelTask<Object, Void, Void> {
 
     @Override
     protected void onPostExecute(Void v) {
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return;
         if (isList) {
             magiskManager.magiskHideDone.trigger();
         }
@@ -48,7 +54,7 @@ public class MagiskHide extends ParallelTask<Object, Void, Void> {
 
     public void list() {
         isList = true;
-        if (magiskManager == null) return;
+        if (getMagiskManager() == null) return;
         exec("ls");
     }
 

app/src/main/java/com/topjohnwu/magisk/asyncs/ParallelTask.java

@@ -1,23 +1,44 @@
 package com.topjohnwu.magisk.asyncs;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.AsyncTask;
 
 import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 
+import java.lang.ref.WeakReference;
+
 public abstract class ParallelTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
 
-    protected Activity activity;
-    protected MagiskManager magiskManager;
+    private WeakReference<Activity> weakActivity;
+    private WeakReference<MagiskManager> weakMagiskManager;
 
     private Runnable callback = null;
 
     public ParallelTask() {}
 
+    public ParallelTask(Context context) {
+        weakMagiskManager = new WeakReference<>(Utils.getMagiskManager(context));
+    }
+
     public ParallelTask(Activity context) {
-        activity = context;
-        magiskManager = Utils.getMagiskManager(context);
+        this((Context) context);
+        weakActivity = new WeakReference<>(context);
+    }
+
+    protected Activity getActivity() {
+        return weakActivity.get();
+    }
+
+    protected MagiskManager getMagiskManager() {
+        return weakMagiskManager.get();
+    }
+
+    protected Shell getShell() {
+        MagiskManager magiskManager = getMagiskManager();
+        return magiskManager == null ? null : getMagiskManager().shell;
     }
 
     @SuppressWarnings("unchecked")

app/src/main/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java

@@ -32,6 +32,8 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
 
     @Override
     protected void onPreExecute() {
+        Activity activity = getActivity();
+        if (activity == null) return;
         progressDialog = ProgressDialog.show(activity,
                 activity.getString(R.string.zip_process_title),
                 activity.getString(R.string.zip_process_msg));
@@ -39,12 +41,14 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
 
     @Override
     protected Boolean doInBackground(Void... params) {
+        Activity activity = getActivity();
+        if (activity == null) return null;
         try {
 
             // Create temp file
-            File temp1 = new File(magiskManager.getCacheDir(), "1.zip");
-            File temp2 = new File(magiskManager.getCacheDir(), "2.zip");
-            magiskManager.getCacheDir().mkdirs();
+            File temp1 = new File(activity.getCacheDir(), "1.zip");
+            File temp2 = new File(activity.getCacheDir(), "2.zip");
+            activity.getCacheDir().mkdirs();
             temp1.createNewFile();
             temp2.createNewFile();
 
@@ -84,15 +88,17 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
 
     @Override
     protected void onPostExecute(Boolean result) {
+        Activity activity = getActivity();
+        if (activity == null) return;
         progressDialog.dismiss();
         if (result) {
             if (Shell.rootAccess() && mInstall) {
-                magiskManager.startActivity(new Intent(magiskManager, FlashActivity.class).setData(mUri));
+                activity.startActivity(new Intent(activity, FlashActivity.class).setData(mUri));
             } else {
                 Utils.showUriSnack(activity, mUri);
             }
         } else {
-            magiskManager.toast(R.string.process_error, Toast.LENGTH_LONG);
+            Utils.getMagiskManager(activity).toast(R.string.process_error, Toast.LENGTH_LONG);
         }
     }
 }

app/src/main/java/com/topjohnwu/magisk/receivers/ManagerUpdate.java

@@ -7,6 +7,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.support.v4.content.FileProvider;
 
+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.utils.Utils;
 
 import java.io.File;
@@ -34,8 +35,8 @@ public class ManagerUpdate extends BroadcastReceiver {
                         }
                     }
                 },
-                intent.getStringExtra("link"),
+                intent.getStringExtra(MagiskManager.INTENT_LINK),
                 Utils.getLegalFilename("MagiskManager-v" +
-                        intent.getStringExtra("version") + ".apk"));
+                        intent.getStringExtra(MagiskManager.INTENT_VERSION) + ".apk"));
     }
 }

app/src/main/java/com/topjohnwu/magisk/services/UpdateCheckService.java

@@ -4,24 +4,15 @@ import android.app.job.JobParameters;
 import android.app.job.JobService;
 
 import com.topjohnwu.magisk.asyncs.CheckUpdates;
+import com.topjohnwu.magisk.utils.Utils;
 
 public class UpdateCheckService extends JobService {
+
     @Override
     public boolean onStartJob(JobParameters params) {
-        new CheckUpdates(this, true){
-            @Override
-            protected Void doInBackground(Void... voids) {
-                magiskManager.updateMagiskInfo();
-                magiskManager.updateNotification = magiskManager.prefs.getBoolean("notification", true);
-                return super.doInBackground(voids);
-            }
-
-            @Override
-            protected void onPostExecute(Void v) {
-                jobFinished(params, false);
-                super.onPostExecute(v);
-            }
-        }.exec();
+        Utils.getMagiskManager(this).updateMagiskInfo();
+        new CheckUpdates(this, true)
+                .setCallBack(() -> jobFinished(params, false)).exec();
         return true;
     }
 

app/src/main/java/com/topjohnwu/magisk/utils/Shell.java

@@ -8,6 +8,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -116,7 +117,7 @@ public class Shell {
         }
     }
 
-    public void sh(List<String> output, String... commands) {
+    public void sh(Collection<String> output, String... commands) {
         if (!isValid) return;
         try {
             shellProcess.exitValue();
@@ -144,8 +145,24 @@ public class Shell {
         sh_raw(commands);
     }
 
-    public void su(List<String> output, String... commands) {
+    public void su(Collection<String> output, String... commands) {
         if (!rootAccess()) return;
         sh(output, commands);
     }
+
+    public static abstract class AbstractList<E> extends java.util.AbstractList<E> {
+
+        @Override
+        public abstract boolean add(E e);
+
+        @Override
+        public E get(int i) {
+            return null;
+        }
+
+        @Override
+        public int size() {
+            return 0;
+        }
+    }
 }

app/src/main/java/com/topjohnwu/magisk/utils/StreamGobbler.java

@@ -6,7 +6,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.List;
+import java.util.Collection;
 
 /**
  * Modified by topjohnwu, based on Chainfire's libsuperuser
@@ -15,8 +15,7 @@ import java.util.List;
 public class StreamGobbler extends Thread {
 
     private BufferedReader reader = null;
-    private List<String> writer = null;
-    private boolean isRoot = false;
+    private Collection<String> writer = null;
 
     /**
      * <p>StreamGobbler constructor</p>
@@ -28,7 +27,7 @@ public class StreamGobbler extends Thread {
      * @param inputStream InputStream to read from
      * @param outputList  {@literal List<String>} to write to, or null
      */
-    public StreamGobbler(InputStream inputStream, List<String> outputList) {
+    public StreamGobbler(InputStream inputStream, Collection<String> outputList) {
         try {
             while (inputStream.available() != 0) {
                 inputStream.skip(inputStream.available());

app/src/main/java/com/topjohnwu/magisk/utils/Utils.java

@@ -61,12 +61,12 @@ public class Utils {
     }
 
     public static List<String> getModList(Shell shell, String path) {
-        String command = "find " + path + " -type d -maxdepth 1 ! -name \"*.core\" ! -name \"*lost+found\" ! -name \"*magisk\"";
+        String command = "ls -d " + path + "/* | grep -v lost+found";
         return shell.su(command);
     }
 
     public static List<String> readFile(Shell shell, String path) {
-        String command = "cat " + path;
+        String command = "cat " + path + " | sed '$a\\ ' | sed '$d'";
         return shell.su(command);
     }
 
@@ -108,23 +108,6 @@ public class Utils {
                 .replace("#", "").replace("@", "").replace("*", "");
     }
 
-    public static String detectBootImage(Shell shell) {
-        String[] commands = {
-                "for PARTITION in kern-a KERN-A android_boot ANDROID_BOOT kernel KERNEL boot BOOT lnx LNX; do",
-                "BOOTIMAGE=`readlink /dev/block/by-name/$PARTITION || " +
-                        "readlink /dev/block/platform/*/by-name/$PARTITION || " +
-                        "readlink /dev/block/platform/*/*/by-name/$PARTITION`",
-                "if [ ! -z \"$BOOTIMAGE\" ]; then break; fi",
-                "done",
-                "echo \"$BOOTIMAGE\""
-        };
-        List<String> ret = shell.su(commands);
-        if (isValidShellResponse(ret)) {
-            return ret.get(0);
-        }
-        return null;
-    }
-
     public static boolean lowercaseContains(CharSequence string, CharSequence nonNullLowercaseSearch) {
         return !TextUtils.isEmpty(string) && string.toString().toLowerCase().contains(nonNullLowercaseSearch);
     }
@@ -213,6 +196,8 @@ public class Utils {
                 .setAutoCancel(true);
         Intent intent = new Intent(magiskManager, SplashActivity.class);
         intent.putExtra(MagiskManager.INTENT_SECTION, "install");
+        intent.putExtra(MagiskManager.INTENT_VERSION, magiskManager.remoteMagiskVersionString);
+        intent.putExtra(MagiskManager.INTENT_LINK, magiskManager.magiskLink);
         TaskStackBuilder stackBuilder = TaskStackBuilder.create(magiskManager);
         stackBuilder.addParentStack(SplashActivity.class);
         stackBuilder.addNextIntent(intent);
@@ -233,8 +218,8 @@ public class Utils {
                 .setVibrate(new long[]{0, 100, 100, 100})
                 .setAutoCancel(true);
         Intent intent = new Intent(magiskManager, ManagerUpdate.class);
-        intent.putExtra("link", magiskManager.managerLink);
-        intent.putExtra("version", magiskManager.remoteManagerVersionString);
+        intent.putExtra(MagiskManager.INTENT_LINK, magiskManager.managerLink);
+        intent.putExtra(MagiskManager.INTENT_VERSION, magiskManager.remoteManagerVersionString);
         PendingIntent pendingIntent = PendingIntent.getBroadcast(magiskManager,
                 APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         builder.setContentIntent(pendingIntent);

app/src/main/res/values-es/strings.xml

@@ -117,6 +117,7 @@
     <string name="process_error">Error de proceso</string>
     <string name="internal_storage">El zip es almacenado en:\n[Internal Storage]%1$s</string>
     <string name="zip_process_title">Procesando</string>
+    <string name="flashing">Flasheando</string>
 
     <!--Settings Activity -->
     <string name="settings_general_category">General</string>
@@ -127,8 +128,7 @@
     <string name="settings_clear_cache_title">Limpiar caché del repositorio</string>
     <string name="settings_clear_cache_summary">Limpiar la información en caché para los repositorios en línea, fuerza a la aplicación a actualizar en línea</string>
 
-    <string name="settings_core_only_title">Magisk Modo Sólo Núcleo</string>
-    <string name="settings_core_only_summary">Habilitar sólo funciones principales, no se cargarán todos los módulos. MagiskSU, MagiskHide, y hosts fuera de la partición de sistema seguiran habilitados</string>
+    <string name="settings_core_only_summary">Habilitar sólo funciones principales, no se cargarán todos los módulos. MagiskSU, MagiskHide, y archivo hosts fuera de la partición de sistema seguirán habilitados</string>
     <string name="settings_magiskhide_summary">Ocultar Magisk de varias detecciones</string>
     <string name="settings_hosts_title">Habilitar archivo hosts fuera de la partición de sistema</string>
     <string name="settings_hosts_summary">Soporte para aplicaciones de bloqueo de publicidad fuera de la partición de sistema</string>
@@ -147,16 +147,16 @@
     <string name="superuser_notification">Notificación de superusuario</string>
     <string name="request_timeout_summary">%1$s segundos</string>
     <string name="settings_su_reauth_title">Re-autenticación</string>
-    <string name="settings_su_reauth_summary">Pedir permisos de superusuario nuevamente si una aplicación es actualizada</string>
+    <string name="settings_su_reauth_summary">Pedir permisos de superusuario nuevamente si una aplicación es actualizada o reinstalada</string>
 
     <string name="multiuser_mode">Modo MultiUsuario</string> 
-    <string name="settings_owner_only">Solo propietario del dispositivo</string>
-    <string name="settings_owner_manage">Administrador del dispositivo</string>
+    <string name="settings_owner_only">Sólo Administrador del Dispositivo</string>
+    <string name="settings_owner_manage">Administrador del Dispositivo</string>
     <string name="settings_user_independent">Usuario Independiente</string>
-    <string name="owner_only_summary">Sólo el propietario tiene acceso root</string>
-    <string name="owner_manage_summary">Sólo el administrador puede supervisar el acceso root y recibir solicitudes</string>
+    <string name="owner_only_summary">Sólo el administrador tiene acceso root</string>
+    <string name="owner_manage_summary">Sólo el administrador puede supervisar el acceso root y recibir solicitudes de otros usuarios</string>
     <string name="user_indepenent_summary">Cada usuario tiene separadas sus propias reglas de root </string>
-    <string name="multiuser_hint_owner_request">Se ha enviado una solicitud al propietario del dispositivo. Por favor, cambie a la sesión del propietario y conceda el permiso</string>
+    <string name="multiuser_hint_owner_request">Se ha enviado una solicitud al administrador del dispositivo. Por favor, cambie a la cuenta del administrador y conceda el permiso</string>
     
     <string name="mount_namespace_mode">Montar Namespace </string>
     <string name="settings_ns_global">Global Namespace</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -216,5 +216,8 @@
     <string name="settings_ns_global">全域 Namespace</string>
     <string name="settings_ns_isolate">獨立 Namespace</string>
     <string name="settings_ns_requester">繼承 Namespace</string>
+    <string name="reinstall">重新安裝</string>
+    <string name="update">更新</string>
+    <string name="magisk_updates">Magisk 更新</string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -55,6 +55,8 @@
     <string name="uninstall_magisk_title">Uninstall Magisk</string>
     <string name="uninstall_magisk_msg">This will remove all modules, MagiskSU, and potentially encrypt your data if not encrypted\nAre you sure to continue?</string>
     <string name="version_none">(None)</string>
+    <string name="reinstall">Re-Install</string>
+    <string name="update">Update</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(No info provided)</string>