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

.gitignore

@@ -3,6 +3,6 @@
 /local.properties
 .idea/
 /build
-app/app-release.apk
+app/release
 *.hprof
 app/.externalNativeBuild/

README.md

@@ -1,4 +1,6 @@
-# Magisk Manager
-The project should be built with Android Studio version 2.2.0+  
-I use Java 8 features, which requires Jack compiler and it's only available in 2.2.0+  
-Also, you need to install CMake and NDK to build the zipadjust library for zip preprocessing
+# Magisk Manager 
+You need to install CMake and NDK to build the zipadjust library for zip preprocessing
+
+## Pre-built Binaries
+Busybox (arm and x86) compiled by osm0sis (`libbusybox.so` under `app\src\main\jniLibs`)  
+Source and more info: [osm0sis' Odds and Ends](https://forum.xda-developers.com/showthread.php?t=2239421)

app/build.gradle

@@ -1,28 +1,25 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.0"
 
     defaultConfig {
         applicationId "com.topjohnwu.magisk"
         minSdkVersion 21
-        targetSdkVersion 25
-        versionCode 25
-        versionName "4.2.6"
-        jackOptions {
-            enabled true
-            jackInProcess true
-        }
+        targetSdkVersion 26
+        versionCode 51
+        versionName "5.1.1"
         ndk {
             moduleName 'zipadjust'
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+            abiFilters 'x86', 'armeabi-v7a'
         }
     }
 
     buildTypes {
         release {
             minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -31,34 +28,36 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     dexOptions {
-        preDexLibraries = true
+        preDexLibraries true
+        javaMaxHeapSize "2g"
     }
     externalNativeBuild {
         cmake {
             path 'src/main/jni/CMakeLists.txt'
         }
     }
+    lintOptions {
+        disable 'MissingTranslation'
+    }
 }
 repositories {
     jcenter()
     maven { url "https://jitpack.io" }
+    maven { url "https://maven.google.com" }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-
-    compile 'com.android.support:recyclerview-v7:25.2.0'
-    compile 'com.android.support:cardview-v7:25.2.0'
-    compile 'com.android.support:design:25.2.0'
-    compile 'com.android.support:support-v4:25.2.0'
-    compile 'com.jakewharton:butterknife:8.5.1'
-    compile 'com.github.clans:fab:1.6.4'
-    compile 'com.thoughtbot:expandablerecyclerview:1.4'
-    compile 'us.feras.mdv:markdownview:1.1.0'
-    compile 'com.madgag.spongycastle:core:1.54.0.0'
-    compile 'com.madgag.spongycastle:prov:1.54.0.0'
-    compile 'com.madgag.spongycastle:pkix:1.54.0.0'
-    compile 'com.madgag.spongycastle:pg:1.54.0.0'
-    compile 'com.google.android.gms:play-services-safetynet:9.0.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:recyclerview-v7:26.0.0-beta2'
+    implementation 'com.android.support:cardview-v7:26.0.0-beta2'
+    implementation 'com.android.support:design:26.0.0-beta2'
+    implementation 'com.android.support:support-v4:26.0.0-beta2'
+    implementation 'com.jakewharton:butterknife:8.7.0'
+    implementation 'com.thoughtbot:expandablerecyclerview:1.4'
+    implementation 'us.feras.mdv:markdownview:1.1.0'
+    implementation 'com.madgag.spongycastle:core:1.54.0.0'
+    implementation 'com.madgag.spongycastle:prov:1.54.0.0'
+    implementation 'com.madgag.spongycastle:pkix:1.54.0.0'
+    implementation 'com.google.android.gms:play-services-safetynet:9.0.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0'
 }

app/proguard-rules.pro

@@ -16,10 +16,10 @@
 #   public *;
 #}
 
--keep class android.support.v7.internal.** { *; }
--keep interface android.support.v7.internal.** { *; }
--keep class android.support.v7.** { *; }
--keep interface android.support.v7.** { *; }
-
 # SpongyCastle
--keep class org.spongycastle.** {*;}
+-keep class org.spongycastle.** { *; }
+-dontwarn javax.naming.**
+
+-dontwarn android.content.**
+-dontwarn android.animation.**
+

app/src/main/AndroidManifest.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.topjohnwu.magisk"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-
-          xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.topjohnwu.magisk">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
         android:name=".MagiskManager"
@@ -21,8 +21,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize"
-            android:exported="true"/>
-
+            android:exported="true" />
         <activity
             android:name=".SplashActivity"
             android:configChanges="orientation|screenSize"
@@ -30,16 +29,22 @@
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".AboutActivity"
-            android:theme="@style/AppTheme.Transparent"/>
+            android:theme="@style/AppTheme.Transparent" />
         <activity
             android:name=".SettingsActivity"
             android:theme="@style/AppTheme.Transparent" />
+        <activity
+            android:name=".FlashActivity"
+            android:screenOrientation="nosensor"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme.Transparent" />
+
         <activity
             android:name=".superuser.RequestActivity"
             android:excludeFromRecents="true"
@@ -52,21 +57,27 @@
             android:taskAffinity="internal.superuser"
             android:theme="@style/SuRequest" />
 
-        <receiver
-            android:name=".superuser.SuReceiver" />
-
+        <receiver android:name=".superuser.SuReceiver" />
         <receiver android:name=".receivers.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
+        <receiver android:name=".receivers.PackageReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
 
-        <service android:name=".services.BootupIntentService" />
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".receivers.ManagerUpdate" />
 
+        <service android:name=".services.OnBootIntentService" />
         <service
             android:name=".services.UpdateCheckService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="true" />
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <provider
             android:name="android.support.v4.content.FileProvider"
@@ -84,4 +95,4 @@
 
     </application>
 
-</manifest>
+</manifest>

app/src/main/assets/util_functions.sh

@@ -0,0 +1,192 @@
+##########################################################################################
+# 
+# Magisk General Utility Functions
+# by topjohnwu
+# 
+# Used in flash_script.sh, addon.d.sh, magisk module installers, and uninstaller
+# 
+##########################################################################################
+
+get_outfd() {
+  readlink /proc/$$/fd/$OUTFD 2>/dev/null | grep /tmp >/dev/null
+  if [ "$?" -eq "0" ]; then
+    OUTFD=0
+
+    for FD in `ls /proc/$$/fd`; do
+      readlink /proc/$$/fd/$FD 2>/dev/null | grep pipe >/dev/null
+      if [ "$?" -eq "0" ]; then
+        ps | grep " 3 $FD " | grep -v grep >/dev/null
+        if [ "$?" -eq "0" ]; then
+          OUTFD=$FD
+          break
+        fi
+      fi
+    done
+  fi
+}
+
+ui_print() {
+  if $BOOTMODE; then
+    echo "$1"
+  else 
+    echo -n -e "ui_print $1\n" >> /proc/self/fd/$OUTFD
+    echo -n -e "ui_print\n" >> /proc/self/fd/$OUTFD
+  fi
+}
+
+getvar() {
+  local VARNAME=$1
+  local VALUE=$(eval echo \$"$VARNAME");
+  for FILE in /dev/.magisk /data/.magisk /cache/.magisk /system/.magisk; do
+    if [ -z "$VALUE" ]; then
+      LINE=$(cat $FILE 2>/dev/null | grep "$VARNAME=")
+      if [ ! -z "$LINE" ]; then
+        VALUE=${LINE#*=}
+      fi
+    fi
+  done
+  eval $VARNAME=\$VALUE
+}
+
+find_boot_image() {
+  if [ -z "$BOOTIMAGE" ]; then
+    for BLOCK in boot_a BOOT_A kern-a KERN-A android_boot ANDROID_BOOT kernel KERNEL boot BOOT lnx LNX; do
+      BOOTIMAGE=`ls /dev/block/by-name/$BLOCK || ls /dev/block/platform/*/by-name/$BLOCK || ls /dev/block/platform/*/*/by-name/$BLOCK` 2>/dev/null
+      [ ! -z $BOOTIMAGE ] && break
+    done
+  fi
+  # Recovery fallback
+  if [ -z "$BOOTIMAGE" ]; then
+    for FSTAB in /etc/*fstab*; do
+      BOOTIMAGE=`grep -E '\b/boot\b' $FSTAB | grep -v "#" | grep -oE '/dev/[a-zA-Z0-9_./-]*'`
+      [ ! -z $BOOTIMAGE ] && break
+    done
+  fi
+  [ -L "$BOOTIMAGE" ] && BOOTIMAGE=`readlink $BOOTIMAGE`
+}
+
+is_mounted() {
+  if [ ! -z "$2" ]; then
+    cat /proc/mounts | grep $1 | grep $2, >/dev/null
+  else
+    cat /proc/mounts | grep $1 >/dev/null
+  fi
+  return $?
+}
+
+grep_prop() {
+  REGEX="s/^$1=//p"
+  shift
+  FILES=$@
+  if [ -z "$FILES" ]; then
+    FILES='/system/build.prop'
+  fi
+  cat $FILES 2>/dev/null | sed -n "$REGEX" | head -n 1
+}
+
+remove_system_su() {
+  if [ -f /system/bin/su -o -f /system/xbin/su ] && [ ! -f /su/bin/su ]; then
+    ui_print "! System installed root detected, mount rw :("
+    mount -o rw,remount /system
+    # SuperSU
+    if [ -e /system/bin/.ext/.su ]; then
+      mv -f /system/bin/app_process32_original /system/bin/app_process32 2>/dev/null
+      mv -f /system/bin/app_process64_original /system/bin/app_process64 2>/dev/null
+      mv -f /system/bin/install-recovery_original.sh /system/bin/install-recovery.sh 2>/dev/null
+      cd /system/bin
+      if [ -e app_process64 ]; then
+        ln -sf app_process64 app_process
+      else
+        ln -sf app_process32 app_process
+      fi
+    fi
+    rm -rf /system/.pin /system/bin/.ext /system/etc/.installed_su_daemon /system/etc/.has_su_daemon \
+    /system/xbin/daemonsu /system/xbin/su /system/xbin/sugote /system/xbin/sugote-mksh /system/xbin/supolicy \
+    /system/bin/app_process_init /system/bin/su /cache/su /system/lib/libsupol.so /system/lib64/libsupol.so \
+    /system/su.d /system/etc/install-recovery.sh /system/etc/init.d/99SuperSUDaemon /cache/install-recovery.sh \
+    /system/.supersu /cache/.supersu /data/.supersu \
+    /system/app/Superuser.apk /system/app/SuperSU /cache/Superuser.apk  2>/dev/null
+  fi
+}
+
+api_level_arch_detect() {
+  API=`grep_prop ro.build.version.sdk`
+  ABI=`grep_prop ro.product.cpu.abi | cut -c-3`
+  ABI2=`grep_prop ro.product.cpu.abi2 | cut -c-3`
+  ABILONG=`grep_prop ro.product.cpu.abi`
+
+  ARCH=arm
+  IS64BIT=false
+  if [ "$ABI" = "x86" ]; then ARCH=x86; fi;
+  if [ "$ABI2" = "x86" ]; then ARCH=x86; fi;
+  if [ "$ABILONG" = "arm64-v8a" ]; then ARCH=arm64; IS64BIT=true; fi;
+  if [ "$ABILONG" = "x86_64" ]; then ARCH=x64; IS64BIT=true; fi;
+}
+
+recovery_actions() {
+  # TWRP bug fix
+  mount -o bind /dev/urandom /dev/random
+  # Temporarily block out all custom recovery binaries/libs
+  mv /sbin /sbin_tmp
+  # Add all possible library paths
+  OLD_LD_PATH=$LD_LIBRARY_PATH
+  $IS64BIT && export LD_LIBRARY_PATH=/system/lib64:/system/vendor/lib64 || export LD_LIBRARY_PATH=/system/lib:/system/vendor/lib
+}
+
+recovery_cleanup() {
+  mv /sbin_tmp /sbin
+  # Clear LD_LIBRARY_PATH
+  export LD_LIBRARY_PATH=$OLD_LD_PATH
+  ui_print "- Unmounting partitions"
+  umount -l /system
+  umount -l /vendor 2>/dev/null
+  umount -l /dev/random
+}
+
+abort() {
+  ui_print "$1"
+  mv /sbin_tmp /sbin 2>/dev/null
+  exit 1
+}
+
+set_perm() {
+  chown $2:$3 $1 || exit 1
+  chmod $4 $1 || exit 1
+  if [ ! -z $5 ]; then
+    chcon $5 $1 2>/dev/null
+  else
+    chcon 'u:object_r:system_file:s0' $1 2>/dev/null
+  fi
+}
+
+set_perm_recursive() {
+  find $1 -type d 2>/dev/null | while read dir; do
+    set_perm $dir $2 $3 $4 $6
+  done
+  find $1 -type f 2>/dev/null | while read file; do
+    set_perm $file $2 $3 $5 $6
+  done
+}
+
+mktouch() {
+  mkdir -p ${1%/*}
+  if [ -z "$2" ]; then
+    touch $1
+  else
+    echo $2 > $1
+  fi
+  chmod 644 $1
+}
+
+request_size_check() {
+  reqSizeM=`du -s $1 | cut -f1`
+  reqSizeM=$((reqSizeM / 1024 + 1))
+}
+
+image_size_check() {
+  SIZE="`$MAGISKBIN/magisk --imgsize $IMG`"
+  curUsedM=`echo "$SIZE" | cut -d" " -f1`
+  curSizeM=`echo "$SIZE" | cut -d" " -f2`
+  curFreeM=$((curSizeM - curUsedM))
+}
+

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

@@ -3,7 +3,6 @@ package com.topjohnwu.magisk;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
@@ -13,13 +12,11 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.components.AboutCardRow;
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.components.AlertDialogBuilder;
-import com.topjohnwu.magisk.utils.Logger;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,7 +26,7 @@ import butterknife.ButterKnife;
 
 public class AboutActivity extends Activity {
 
-    private static final String DONATION_URL = "http://topjohnwu.github.io/donate";
+    private static final String DONATION_URL = "https://www.paypal.me/topjohnwu";
     private static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382";
     private static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/MagiskManager";
 
@@ -45,10 +42,8 @@ public class AboutActivity extends Activity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        String theme = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("theme", "");
-        Logger.dev("AboutActivity: Theme is " + theme);
         if (getApplicationContext().isDarkTheme) {
-            setTheme(R.style.AppTheme_Dark);
+            setTheme(R.style.AppTheme_Transparent_Dark);
         }
         setContentView(R.layout.activity_about);
         ButterKnife.bind(this);
@@ -135,18 +130,4 @@ public class AboutActivity extends Activity {
         setFloating();
     }
 
-    public void setFloating() {
-        boolean isTablet = getResources().getBoolean(R.bool.isTablet);
-        if (isTablet) {
-            WindowManager.LayoutParams params = getWindow().getAttributes();
-            params.height = getResources().getDimensionPixelSize(R.dimen.floating_height);
-            params.width = getResources().getDimensionPixelSize(R.dimen.floating_width);
-            params.alpha = 1.0f;
-            params.dimAmount = 0.6f;
-            params.flags |= 2;
-            getWindow().setAttributes(params);
-            setFinishOnTouchOutside(true);
-        }
-    }
-
 }

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

@@ -0,0 +1,98 @@
+package com.topjohnwu.magisk;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.topjohnwu.magisk.asyncs.FlashZip;
+import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.utils.AdaptiveList;
+import com.topjohnwu.magisk.utils.Shell;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class FlashActivity extends Activity {
+
+    @BindView(R.id.toolbar) Toolbar toolbar;
+    @BindView(R.id.flash_logs) RecyclerView flashLogs;
+    @BindView(R.id.button_panel) LinearLayout buttonPanel;
+
+    private AdaptiveList<String> rootShellOutput;
+
+    @OnClick(R.id.no_thanks)
+    public void dismiss() {
+        finish();
+    }
+
+    @OnClick(R.id.reboot)
+    public void reboot() {
+        Shell.getShell(this).su_raw("reboot");
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_flash);
+        ButterKnife.bind(this);
+        rootShellOutput = new AdaptiveList<>(flashLogs);
+        setSupportActionBar(toolbar);
+        ActionBar ab = getSupportActionBar();
+        if (ab != null) {
+            ab.setTitle(R.string.flashing);
+        }
+        setFloating();
+
+        flashLogs.setAdapter(new FlashLogAdapter());
+
+        // We must receive a Uri of the target zip
+        Uri uri = getIntent().getData();
+
+        new FlashZip(this, uri, rootShellOutput)
+                .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
+                .exec();
+    }
+
+    @Override
+    public void onBackPressed() {
+        // Prevent user accidentally press back button
+    }
+
+    private class FlashLogAdapter extends RecyclerView.Adapter<ViewHolder> {
+
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.list_item_flashlog, parent, false);
+            return new ViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(ViewHolder holder, int position) {
+            holder.text.setText(rootShellOutput.get(position));
+        }
+
+        @Override
+        public int getItemCount() {
+            return rootShellOutput.size();
+        }
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.textView) TextView text;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+        }
+    }
+}

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

@@ -1,224 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.CountDownTimer;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.CardView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.asyncs.ProcessMagiskZip;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
-import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.receivers.DownloadReceiver;
-import com.topjohnwu.magisk.utils.CallbackEvent;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-
-public class InstallFragment extends Fragment implements CallbackEvent.Listener<Void> {
-
-
-    private static final String UNINSTALLER = "magisk_uninstaller.sh";
-
-    @BindView(R.id.current_version_title) TextView currentVersionTitle;
-    @BindView(R.id.install_title) TextView installTitle;
-    @BindView(R.id.block_spinner) Spinner spinner;
-    @BindView(R.id.detect_bootimage) Button detectButton;
-    @BindView(R.id.install_button) CardView installButton;
-    @BindView(R.id.install_text) TextView installText;
-    @BindView(R.id.uninstall_button) CardView uninstallButton;
-    @BindView(R.id.keep_force_enc) CheckBox keepEncChkbox;
-    @BindView(R.id.keep_verity) CheckBox keepVerityChkbox;
-
-    @OnClick(R.id.detect_bootimage)
-    public void toAutoDetect() {
-        if (magiskManager.bootBlock != null) {
-            spinner.setSelection(0);
-        }
-    }
-
-    @OnClick(R.id.install_button)
-    public void install() {
-        String bootImage = null;
-        if (magiskManager.blockList != null) {
-            int idx = spinner.getSelectedItemPosition();
-            if (magiskManager.bootBlock != null) {
-                if (idx > 0) {
-                    bootImage = magiskManager.blockList.get(idx - 1);
-                }
-            } else {
-                if (idx > 0)  {
-                    bootImage = magiskManager.blockList.get(idx - 1);
-                } else {
-                    SnackbarMaker.make(getActivity(), R.string.manual_boot_image, Snackbar.LENGTH_LONG);
-                }
-            }
-        }
-        final String finalBootImage = bootImage;
-        String filename = "Magisk-v" + magiskManager.remoteMagiskVersion + ".zip";
-        new AlertDialogBuilder(getActivity())
-                .setTitle(getString(R.string.repo_install_title, getString(R.string.magisk)))
-                .setMessage(getString(R.string.repo_install_msg, filename))
-                .setCancelable(true)
-                .setPositiveButton(Shell.rootAccess() ? R.string.install : R.string.download,
-                    (dialogInterface, i) -> 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) {
-                                new ProcessMagiskZip(getActivity(), uri, boot, enc, verity).exec();
-                            }
-                        },
-                        magiskManager.magiskLink,
-                        Utils.getLegalFilename(filename)))
-                .setNeutralButton(R.string.release_notes, (dialog, which) -> {
-                    magiskManager.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(magiskManager.releaseNoteLink)));
-                })
-                .setNegativeButton(R.string.no_thanks, null)
-                .show();
-    }
-
-    @OnClick(R.id.uninstall_button)
-    public void uninstall() {
-        new AlertDialogBuilder(getActivity())
-                .setTitle(R.string.uninstall_magisk_title)
-                .setMessage(R.string.uninstall_magisk_msg)
-                .setPositiveButton(R.string.yes, (dialogInterface, i) -> {
-                    try {
-                        InputStream in = magiskManager.getAssets().open(UNINSTALLER);
-                        File uninstaller = new File(magiskManager.getCacheDir(), UNINSTALLER);
-                        FileOutputStream out = new FileOutputStream(uninstaller);
-                        byte[] bytes = new byte[1024];
-                        int read;
-                        while ((read = in.read(bytes)) != -1) {
-                            out.write(bytes, 0, read);
-                        }
-                        in.close();
-                        out.close();
-                        ProgressDialog progress = new ProgressDialog(getActivity());
-                        progress.setTitle(R.string.reboot);
-                        progress.show();
-                        new CountDownTimer(5000, 1000) {
-                            @Override
-                            public void onTick(long millisUntilFinished) {
-                                progress.setMessage(getString(R.string.reboot_countdown, millisUntilFinished / 1000));
-                            }
-
-                            @Override
-                            public void onFinish() {
-                                progress.setMessage(getString(R.string.reboot_countdown, 0));
-                                Shell.su(true, "mv -f " + uninstaller + " /cache/" + UNINSTALLER,
-                                        "reboot");
-                            }
-                        }.start();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                })
-                .setNegativeButton(R.string.no_thanks, null)
-                .show();
-    }
-
-    private Unbinder unbinder;
-    private MagiskManager magiskManager;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.fragment_install, container, false);
-        unbinder = ButterKnife.bind(this, v);
-        magiskManager = getApplication();
-        if (magiskManager.magiskVersion < 0) {
-            currentVersionTitle.setText(getString(R.string.current_magisk_title, getString(R.string.version_none)));
-        } else {
-            currentVersionTitle.setText(getString(R.string.current_magisk_title, "v" + magiskManager.magiskVersionString));
-        }
-        installTitle.setText(getString(R.string.install_magisk_title, "v" + String.format(Locale.US, "%.1f", magiskManager.remoteMagiskVersion)));
-
-        updateUI();
-        return v;
-    }
-
-    @Override
-    public void onTrigger(CallbackEvent<Void> event) {
-        updateUI();
-    }
-
-    private void updateUI() {
-        if (magiskManager.blockList == null || !Shell.rootAccess()) {
-            uninstallButton.setVisibility(View.GONE);
-            installText.setText(R.string.download);
-            detectButton.setEnabled(false);
-            keepEncChkbox.setEnabled(false);
-            keepVerityChkbox.setEnabled(false);
-            spinner.setEnabled(false);
-        } else {
-            uninstallButton.setVisibility(magiskManager.magiskVersion > 10.3 ? View.VISIBLE : View.GONE);
-            installText.setText(R.string.download_install);
-            detectButton.setEnabled(true);
-            keepEncChkbox.setEnabled(true);
-            keepVerityChkbox.setEnabled(true);
-            spinner.setEnabled(true);
-
-            List<String> items = new ArrayList<>();
-            if (magiskManager.bootBlock != null) {
-                items.add(getString(R.string.auto_detect, magiskManager.bootBlock));
-            } else {
-                items.add(getString(R.string.cannot_auto_detect));
-            }
-            items.addAll(magiskManager.blockList);
-            ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
-                    android.R.layout.simple_spinner_item, items);
-            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-            spinner.setAdapter(adapter);
-            toAutoDetect();
-        }
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        getActivity().setTitle(R.string.install);
-        magiskManager.blockDetectionDone.register(this);
-    }
-
-    @Override
-    public void onStop() {
-        magiskManager.blockDetectionDone.unRegister(this);
-        super.onStop();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-}

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

@@ -31,14 +31,14 @@ public class LogFragment extends Fragment {
 
         TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());
 
-        adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
-
         if (getApplication().isSuClient) {
             adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
             tab.setupWithViewPager(viewPager);
             tab.setVisibility(View.VISIBLE);
         }
 
+        adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
+
         viewPager.setAdapter(adapter);
 
         return v;

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

@@ -1,16 +1,13 @@
 package com.topjohnwu.magisk;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
 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;
@@ -24,17 +21,15 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.topjohnwu.magisk.asyncs.SerialTask;
+import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.components.Fragment;
 import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
 
 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;
@@ -127,45 +122,28 @@ public class MagiskLogFragment extends Fragment {
         }
     }
 
-    public class LogManager extends SerialTask<Object, Void, Object> {
+    private class LogManager extends ParallelTask<Object, Void, Object> {
 
-        int mode;
-        File targetFile;
+        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(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:
-                    Shell.su("echo > " + MAGISK_LOG);
+                    magiskManager.shell.su_raw("echo > " + MAGISK_LOG);
                     SnackbarMaker.make(txtLog, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
                     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",
@@ -180,19 +158,14 @@ public class MagiskLogFragment extends Fragment {
                         return false;
                     }
 
-                    List<String> in = Utils.readFile(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;
         }
@@ -200,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);
@@ -215,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/MainActivity.java

@@ -22,6 +22,7 @@ import android.view.View;
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.utils.CallbackEvent;
 import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -90,18 +91,6 @@ public class MainActivity extends Activity
         checkHideSection();
     }
 
-    @Override
-    protected void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        navigate(savedInstanceState.getInt(MagiskManager.INTENT_SECTION, R.id.status));
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(MagiskManager.INTENT_SECTION, mDrawerItem);
-    }
-
     @Override
     protected void onDestroy() {
         getApplicationContext().reloadMainActivity.unRegister(this);
@@ -110,10 +99,13 @@ public class MainActivity extends Activity
 
     @Override
     public void onBackPressed() {
-        if (drawer.isDrawerOpen(navigationView))
+        if (drawer.isDrawerOpen(navigationView)) {
             drawer.closeDrawer(navigationView);
-        else
+        } else if (mDrawerItem != R.id.magisk) {
+            navigate(R.id.magisk);
+        } else {
             finish();
+        }
     }
 
     @Override
@@ -129,30 +121,29 @@ public class MainActivity extends Activity
         recreate();
     }
 
-    private void checkHideSection() {
+    public void checkHideSection() {
         Menu menu = navigationView.getMenu();
         menu.findItem(R.id.magiskhide).setVisible(
-                Shell.rootAccess() && getApplicationContext().magiskVersion >= 8
+                Shell.rootAccess() && getApplicationContext().magiskVersionCode >= 1300
                         && prefs.getBoolean("magiskhide", false));
         menu.findItem(R.id.modules).setVisible(
-                Shell.rootAccess() && getApplicationContext().magiskVersion >= 4);
-        menu.findItem(R.id.downloads).setVisible(
-                Shell.rootAccess() && getApplicationContext().magiskVersion >= 4);
+                Shell.rootAccess() && getApplicationContext().magiskVersionCode >= 0);
+        menu.findItem(R.id.downloads).setVisible(Utils.checkNetworkStatus(this) &&
+                Shell.rootAccess() && getApplicationContext().magiskVersionCode >= 0);
         menu.findItem(R.id.log).setVisible(Shell.rootAccess());
         menu.findItem(R.id.superuser).setVisible(
                 Shell.rootAccess() && getApplicationContext().isSuClient);
-        menu.findItem(R.id.install).setVisible(getApplicationContext().remoteMagiskVersion > 0);
     }
 
     public void navigate(String item) {
-        int itemId = R.id.status;
+        int itemId = R.id.magisk;
         if (item != null) {
             switch (item) {
-                case "status":
-                    itemId = R.id.status;
+                case "magisk":
+                    itemId = R.id.magisk;
                     break;
                 case "install":
-                    itemId = R.id.install;
+                    itemId = -1;
                     break;
                 case "superuser":
                     itemId = R.id.superuser;
@@ -185,11 +176,15 @@ public class MainActivity extends Activity
         mDrawerItem = itemId;
         navigationView.setCheckedItem(itemId);
         switch (itemId) {
-            case R.id.status:
-                displayFragment(new StatusFragment(), "status", true);
+            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.install:
-                displayFragment(new InstallFragment(), "install", true);
+            case R.id.magisk:
+                displayFragment(new MagiskFragment(), "magisk", true);
                 break;
             case R.id.superuser:
                 displayFragment(new SuperuserFragment(), "superuser", true);

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

@@ -2,9 +2,9 @@ package com.topjohnwu.magisk;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -12,9 +12,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.github.clans.fab.FloatingActionButton;
 import com.topjohnwu.magisk.adapters.ModulesAdapter;
-import com.topjohnwu.magisk.asyncs.FlashZip;
 import com.topjohnwu.magisk.asyncs.LoadModules;
 import com.topjohnwu.magisk.components.Fragment;
 import com.topjohnwu.magisk.module.Module;
@@ -86,8 +84,9 @@ public class ModulesFragment extends Fragment implements CallbackEvent.Listener<
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == FETCH_ZIP_CODE && resultCode == Activity.RESULT_OK && data != null) {
             // Get the URI of the selected file
-            final Uri uri = data.getData();
-            new FlashZip(getActivity(), uri).exec();
+            Intent intent = new Intent(getActivity(), FlashActivity.class);
+            intent.setData(data.getData()).putExtra("ACTION", "flash");
+            startActivity(intent);
         }
 
     }

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

@@ -2,7 +2,6 @@ package com.topjohnwu.magisk;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -14,18 +13,11 @@ import android.widget.SearchView;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.adapters.ReposAdapter;
-import com.topjohnwu.magisk.adapters.SimpleSectionedRecyclerViewAdapter;
 import com.topjohnwu.magisk.asyncs.LoadRepos;
-import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.module.Repo;
 import com.topjohnwu.magisk.utils.CallbackEvent;
 import com.topjohnwu.magisk.utils.Logger;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -37,16 +29,7 @@ public class ReposFragment extends Fragment implements CallbackEvent.Listener<Vo
     @BindView(R.id.empty_rv) TextView emptyRv;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
 
-    private List<Repo> mUpdateRepos = new ArrayList<>();
-    private List<Repo> mInstalledRepos = new ArrayList<>();
-    private List<Repo> mOthersRepos = new ArrayList<>();
-    private List<Repo> fUpdateRepos = new ArrayList<>();
-    private List<Repo> fInstalledRepos = new ArrayList<>();
-    private List<Repo> fOthersRepos = new ArrayList<>();
-
-    private SimpleSectionedRecyclerViewAdapter mSectionedAdapter;
-
-    private SearchView.OnQueryTextListener searchListener;
+    private ReposAdapter adapter;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -60,10 +43,9 @@ public class ReposFragment extends Fragment implements CallbackEvent.Listener<Vo
         View view = inflater.inflate(R.layout.fragment_repos, container, false);
         unbinder = ButterKnife.bind(this, view);
 
-        mSectionedAdapter = new SimpleSectionedRecyclerViewAdapter(R.layout.section,
-                R.id.section_text, new ReposAdapter(fUpdateRepos, fInstalledRepos, fOthersRepos));
+        adapter = new ReposAdapter(getApplication().repoMap);
 
-        recyclerView.setAdapter(mSectionedAdapter);
+        recyclerView.setAdapter(adapter);
 
         mSwipeRefreshLayout.setRefreshing(true);
 
@@ -73,38 +55,42 @@ public class ReposFragment extends Fragment implements CallbackEvent.Listener<Vo
         });
 
         if (getApplication().repoLoadDone.isTriggered) {
-            reloadRepos();
-            updateUI();
+            onTrigger(null);
         }
 
-        searchListener = new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                new FilterApps().exec(newText);
-                return false;
-            }
-        };
-
         return view;
     }
 
     @Override
     public void onTrigger(CallbackEvent<Void> event) {
         Logger.dev("ReposFragment: UI refresh triggered");
-        reloadRepos();
-        updateUI();
+        if (getApplication().repoMap.isEmpty()) {
+            recyclerView.setVisibility(View.GONE);
+            emptyRv.setVisibility(View.VISIBLE);
+        } else {
+            adapter.filter(getApplication().moduleMap, "");
+            recyclerView.setVisibility(View.VISIBLE);
+            emptyRv.setVisibility(View.GONE);
+            mSwipeRefreshLayout.setRefreshing(false);
+        }
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_repo, menu);
-        SearchView search = (SearchView) MenuItemCompat.getActionView(menu.findItem(R.id.repo_search));
-        search.setOnQueryTextListener(searchListener);
+        SearchView search = (SearchView) menu.findItem(R.id.repo_search).getActionView();
+        search.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                adapter.filter(getApplication().moduleMap, newText);
+                return false;
+            }
+        });
     }
 
     @Override
@@ -125,92 +111,4 @@ public class ReposFragment extends Fragment implements CallbackEvent.Listener<Vo
         super.onDestroyView();
         unbinder.unbind();
     }
-
-    private void reloadRepos() {
-        mUpdateRepos.clear();
-        mInstalledRepos.clear();
-        mOthersRepos.clear();
-        for (Repo repo : getApplication().repoMap.values()) {
-            Module module = getApplication().moduleMap.get(repo.getId());
-            if (module != null) {
-                if (repo.getVersionCode() > module.getVersionCode()) {
-                    mUpdateRepos.add(repo);
-                } else {
-                    mInstalledRepos.add(repo);
-                }
-            } else {
-                mOthersRepos.add(repo);
-            }
-        }
-        fUpdateRepos.clear();
-        fInstalledRepos.clear();
-        fOthersRepos.clear();
-        fUpdateRepos.addAll(mUpdateRepos);
-        fInstalledRepos.addAll(mInstalledRepos);
-        fOthersRepos.addAll(mOthersRepos);
-    }
-
-    private void updateUI() {
-        if (fUpdateRepos.size() + fInstalledRepos.size() + fOthersRepos.size() == 0) {
-            emptyRv.setVisibility(View.VISIBLE);
-            recyclerView.setVisibility(View.GONE);
-        } else {
-            List<SimpleSectionedRecyclerViewAdapter.Section> sections = new ArrayList<>();
-            if (!fUpdateRepos.isEmpty()) {
-                sections.add(new SimpleSectionedRecyclerViewAdapter.Section(0, getString(R.string.update_available)));
-            }
-            if (!fInstalledRepos.isEmpty()) {
-                sections.add(new SimpleSectionedRecyclerViewAdapter.Section(fUpdateRepos.size(), getString(R.string.installed)));
-            }
-            if (!fOthersRepos.isEmpty()) {
-                sections.add(new SimpleSectionedRecyclerViewAdapter.Section(fUpdateRepos.size() + fInstalledRepos.size(), getString(R.string.not_installed)));
-            }
-            SimpleSectionedRecyclerViewAdapter.Section[] array = sections.toArray(new SimpleSectionedRecyclerViewAdapter.Section[sections.size()]);
-            mSectionedAdapter.setSections(array);
-            emptyRv.setVisibility(View.GONE);
-            recyclerView.setVisibility(View.VISIBLE);
-        }
-        mSwipeRefreshLayout.setRefreshing(false);
-    }
-
-    private class FilterApps extends ParallelTask<String, Void, Void> {
-        @Override
-        protected Void doInBackground(String... strings) {
-            String newText = strings[0];
-            fUpdateRepos.clear();
-            fInstalledRepos.clear();
-            fOthersRepos.clear();
-            for (Repo repo: mUpdateRepos) {
-                if (repo.getName().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getAuthor().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getDescription().toLowerCase().contains(newText.toLowerCase())
-                        ) {
-                    fUpdateRepos.add(repo);
-                }
-            }
-            for (Repo repo: mInstalledRepos) {
-                if (repo.getName().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getAuthor().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getDescription().toLowerCase().contains(newText.toLowerCase())
-                        ) {
-                    fInstalledRepos.add(repo);
-                }
-            }
-            for (Repo repo: mOthersRepos) {
-                if (repo.getName().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getAuthor().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getDescription().toLowerCase().contains(newText.toLowerCase())
-                        ) {
-                    fOthersRepos.add(repo);
-                }
-            }
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            updateUI();
-        }
-    }
-
 }

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

@@ -6,15 +6,14 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 
-import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.asyncs.GetBootBlocks;
 import com.topjohnwu.magisk.asyncs.LoadApps;
 import com.topjohnwu.magisk.asyncs.LoadModules;
 import com.topjohnwu.magisk.asyncs.LoadRepos;
-import com.topjohnwu.magisk.asyncs.MagiskHide;
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.services.UpdateCheckService;
+import com.topjohnwu.magisk.utils.Utils;
 
 public class SplashActivity extends Activity{
 
@@ -27,47 +26,41 @@ public class SplashActivity extends Activity{
 
         MagiskManager magiskManager = getApplicationContext();
 
-        // Init the info and configs and root shell
+        // Init the info and configs and root sh
         magiskManager.init();
 
-        // Initialize the update check service, notify every 3 hours
-        if (!"install".equals(getIntent().getStringExtra(MagiskManager.INTENT_SECTION))) {
-            ComponentName service = new ComponentName(magiskManager, UpdateCheckService.class);
-            JobInfo jobInfo = new JobInfo.Builder(UPDATE_SERVICE_ID, service)
-                    .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-                    .setPersisted(true)
-                    .setPeriodic(3 * 60 * 60 * 1000)
-                    .build();
-            JobScheduler scheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
-            scheduler.schedule(jobInfo);
+        // 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
+            if (!TextUtils.equals("install", getIntent().getStringExtra(MagiskManager.INTENT_SECTION))) {
+                ComponentName service = new ComponentName(this, UpdateCheckService.class);
+                JobInfo jobInfo = new JobInfo.Builder(UPDATE_SERVICE_ID, service)
+                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                        .setPersisted(true)
+                        .setPeriodic(8 * 60 * 60 * 1000)
+                        .build();
+                JobScheduler scheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
+                scheduler.schedule(jobInfo);
+            }
+            loadModuleTask.setCallBack(() -> new LoadRepos(this).exec());
         }
 
         // Now fire all async tasks
-        new GetBootBlocks(this).exec();
-        if (magiskManager.magiskHide && !magiskManager.disabled &&
-                magiskManager.magiskVersion > 11 && !magiskManager.magiskHideStarted) {
-            new MagiskHide().enable();
-        }
-        new LoadModules(this) {
-            @Override
-            protected void onPostExecute(Void v) {
-                super.onPostExecute(v);
-                new LoadRepos(activity).exec();
-            }
-        }.exec();
+        loadModuleTask.exec();
         new LoadApps(this).exec();
-        new CheckUpdates(this, false){
-            @Override
-            protected void onPostExecute(Void v) {
-                super.onPostExecute(v);
-                String section = getIntent().getStringExtra(MagiskManager.INTENT_SECTION);
-                Intent intent = new Intent(magiskManager, MainActivity.class);
-                if (section != null) {
-                    intent.putExtra(MagiskManager.INTENT_SECTION, section);
-                }
-                startActivity(intent);
-                finish();
-            }
-        }.exec();
+
+        Intent intent = new Intent(this, MainActivity.class);
+        String section = getIntent().getStringExtra(MagiskManager.INTENT_SECTION);
+        if (section != null) {
+            intent.putExtra(MagiskManager.INTENT_SECTION, section);
+        }
+        startActivity(intent);
+        finish();
     }
 }

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

@@ -13,7 +13,6 @@ import android.widget.TextView;
 
 import com.topjohnwu.magisk.adapters.SuLogAdapter;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.database.SuLogDatabaseHelper;
 import com.topjohnwu.magisk.superuser.SuLogEntry;
 
 import java.util.List;
@@ -28,7 +27,7 @@ public class SuLogFragment extends Fragment {
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
 
     private Unbinder unbinder;
-    private SuLogDatabaseHelper dbHelper;
+    private MagiskManager magiskManager;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -48,8 +47,7 @@ public class SuLogFragment extends Fragment {
         // Inflate the layout for this fragment
         View v = inflater.inflate(R.layout.fragment_su_log, container, false);
         unbinder = ButterKnife.bind(this, v);
-
-        dbHelper = new SuLogDatabaseHelper(getActivity());
+        magiskManager = getApplication();
 
         updateList();
 
@@ -57,7 +55,7 @@ public class SuLogFragment extends Fragment {
     }
 
     private void updateList() {
-        List<SuLogEntry> logs = dbHelper.getLogList();
+        List<SuLogEntry> logs = magiskManager.suDB.getLogList();
 
         if (logs.size() == 0) {
             emptyRv.setVisibility(View.VISIBLE);
@@ -76,7 +74,7 @@ public class SuLogFragment extends Fragment {
                 updateList();
                 return true;
             case R.id.menu_clear:
-                dbHelper.clearLogs();
+                magiskManager.suDB.clearLogs();
                 updateList();
                 return true;
             default:

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

@@ -11,7 +11,6 @@ import android.widget.TextView;
 
 import com.topjohnwu.magisk.adapters.PolicyAdapter;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.database.SuDatabaseHelper;
 import com.topjohnwu.magisk.superuser.Policy;
 
 import java.util.List;
@@ -33,15 +32,15 @@ public class SuperuserFragment extends Fragment {
         unbinder = ButterKnife.bind(this, view);
 
         PackageManager pm = getActivity().getPackageManager();
+        MagiskManager magiskManager = getApplication();
 
-        SuDatabaseHelper dbHelper = new SuDatabaseHelper(getActivity());
-        List<Policy> policyList = dbHelper.getPolicyList(pm);
+        List<Policy> policyList = magiskManager.suDB.getPolicyList(pm);
 
         if (policyList.size() == 0) {
             emptyRv.setVisibility(View.VISIBLE);
             recyclerView.setVisibility(View.GONE);
         } else {
-            recyclerView.setAdapter(new PolicyAdapter(policyList, dbHelper, pm));
+            recyclerView.setAdapter(new PolicyAdapter(policyList, magiskManager.suDB, pm));
             emptyRv.setVisibility(View.GONE);
             recyclerView.setVisibility(View.VISIBLE);
         }

app/src/main/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java

@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk.adapters;
 
+import android.app.Activity;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.support.design.widget.Snackbar;
@@ -86,10 +87,10 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
             holder.checkBox.setChecked(mHideList.contains(info.packageName));
             holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
                 if (isChecked) {
-                    new MagiskHide().add(info.packageName);
+                    new MagiskHide((Activity) holder.itemView.getContext()).add(info.packageName);
                     mHideList.add(info.packageName);
                 } else {
-                    new MagiskHide().rm(info.packageName);
+                    new MagiskHide((Activity) holder.itemView.getContext()).rm(info.packageName);
                     mHideList.remove(info.packageName);
                 }
             });

app/src/main/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java

@@ -12,7 +12,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.SerialTask;
 import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.module.Module;
 import com.topjohnwu.magisk.utils.Shell;
@@ -39,6 +38,7 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
     @Override
     public void onBindViewHolder(final ViewHolder holder, int position) {
         Context context = holder.itemView.getContext();
+        Shell rootShell = Shell.getShell(context);
         final Module module = mList.get(position);
 
         String version = module.getVersion();
@@ -53,44 +53,31 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
 
         holder.checkBox.setOnCheckedChangeListener(null);
         holder.checkBox.setChecked(module.isEnabled());
-        holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> new SerialTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... voids) {
-                if (isChecked) {
-                    module.removeDisableFile();
-                } else {
-                    module.createDisableFile();
-                }
-                return null;
+        holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
+            int snack;
+            if (isChecked) {
+                module.removeDisableFile(rootShell);
+                snack = R.string.disable_file_removed;
+            } else {
+                module.createDisableFile(rootShell);
+                snack = R.string.disable_file_created;
             }
+            SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
+        });
 
-            @Override
-            protected void onPostExecute(Void v) {
-                int snack = isChecked ? R.string.disable_file_removed : R.string.disable_file_created;
-                SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
+        holder.delete.setOnClickListener(v -> {
+            boolean removed = module.willBeRemoved();
+            int snack;
+            if (removed) {
+                module.deleteRemoveFile(rootShell);
+                snack = R.string.remove_file_deleted;
+            } else {
+                module.createRemoveFile(rootShell);
+                snack = R.string.remove_file_created;
             }
-        }.exec());
-
-        holder.delete.setOnClickListener(v -> new SerialTask<Void, Void, Void>() {
-            private final boolean removed = module.willBeRemoved();
-
-            @Override
-            protected Void doInBackground(Void... voids) {
-                if (removed) {
-                    module.deleteRemoveFile();
-                } else {
-                    module.createRemoveFile();
-                }
-                return null;
-            }
-
-            @Override
-            protected void onPostExecute(Void v) {
-                int snack = removed ? R.string.remove_file_deleted : R.string.remove_file_created;
-                SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
-                updateDeleteButton(holder, module);
-            }
-        }.exec());
+            SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
+            updateDeleteButton(holder, module);
+        });
 
         if (module.isUpdated()) {
             holder.notice.setVisibility(View.VISIBLE);

app/src/main/java/com/topjohnwu/magisk/adapters/SimpleSectionedRecyclerViewAdapter.java

@@ -1,178 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-import android.support.v7.widget.RecyclerView;
-import android.util.SparseArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-public class SimpleSectionedRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    private static final int SECTION_TYPE = 0;
-
-    private boolean mValid = true;
-    private int mSectionResourceId;
-    private int mTextResourceId;
-    private RecyclerView.Adapter mBaseAdapter;
-    private SparseArray<Section> mSections = new SparseArray<Section>();
-
-
-    public SimpleSectionedRecyclerViewAdapter(int sectionResourceId, int textResourceId,
-                                              RecyclerView.Adapter baseAdapter) {
-
-        mSectionResourceId = sectionResourceId;
-        mTextResourceId = textResourceId;
-        mBaseAdapter = baseAdapter;
-
-        mBaseAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
-            @Override
-            public void onChanged() {
-                mValid = mBaseAdapter.getItemCount()>0;
-                notifyDataSetChanged();
-            }
-
-            @Override
-            public void onItemRangeChanged(int positionStart, int itemCount) {
-                mValid = mBaseAdapter.getItemCount()>0;
-                notifyItemRangeChanged(positionStart, itemCount);
-            }
-
-            @Override
-            public void onItemRangeInserted(int positionStart, int itemCount) {
-                mValid = mBaseAdapter.getItemCount()>0;
-                notifyItemRangeInserted(positionStart, itemCount);
-            }
-
-            @Override
-            public void onItemRangeRemoved(int positionStart, int itemCount) {
-                mValid = mBaseAdapter.getItemCount()>0;
-                notifyItemRangeRemoved(positionStart, itemCount);
-            }
-        });
-    }
-
-
-    public static class SectionViewHolder extends RecyclerView.ViewHolder {
-
-        public TextView title;
-
-        public SectionViewHolder(View view, int mTextResourceid) {
-            super(view);
-            title = (TextView) view.findViewById(mTextResourceid);
-        }
-    }
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int typeView) {
-        if (typeView == SECTION_TYPE) {
-            View view = LayoutInflater.from(parent.getContext()).inflate(mSectionResourceId, parent, false);
-            return new SectionViewHolder(view,mTextResourceId);
-        }else{
-            return mBaseAdapter.onCreateViewHolder(parent, typeView -1);
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder sectionViewHolder, int position) {
-        if (isSectionHeaderPosition(position)) {
-            ((SectionViewHolder)sectionViewHolder).title.setText(mSections.get(position).title);
-        }else{
-            mBaseAdapter.onBindViewHolder(sectionViewHolder,sectionedPositionToPosition(position));
-        }
-
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return isSectionHeaderPosition(position)
-                ? SECTION_TYPE
-                : mBaseAdapter.getItemViewType(sectionedPositionToPosition(position)) +1 ;
-    }
-
-
-    public static class Section {
-        int firstPosition;
-        int sectionedPosition;
-        CharSequence title;
-
-        public Section(int firstPosition, CharSequence title) {
-            this.firstPosition = firstPosition;
-            this.title = title;
-        }
-
-        public CharSequence getTitle() {
-            return title;
-        }
-    }
-
-
-    public void setSections(Section[] sections) {
-        mSections.clear();
-
-        Arrays.sort(sections, new Comparator<Section>() {
-            @Override
-            public int compare(Section o, Section o1) {
-                return (o.firstPosition == o1.firstPosition)
-                        ? 0
-                        : ((o.firstPosition < o1.firstPosition) ? -1 : 1);
-            }
-        });
-
-        int offset = 0; // offset positions for the headers we're adding
-        for (Section section : sections) {
-            section.sectionedPosition = section.firstPosition + offset;
-            mSections.append(section.sectionedPosition, section);
-            ++offset;
-        }
-
-        notifyDataSetChanged();
-    }
-
-    public int positionToSectionedPosition(int position) {
-        int offset = 0;
-        for (int i = 0; i < mSections.size(); i++) {
-            if (mSections.valueAt(i).firstPosition > position) {
-                break;
-            }
-            ++offset;
-        }
-        return position + offset;
-    }
-
-    public int sectionedPositionToPosition(int sectionedPosition) {
-        if (isSectionHeaderPosition(sectionedPosition)) {
-            return RecyclerView.NO_POSITION;
-        }
-
-        int offset = 0;
-        for (int i = 0; i < mSections.size(); i++) {
-            if (mSections.valueAt(i).sectionedPosition > sectionedPosition) {
-                break;
-            }
-            --offset;
-        }
-        return sectionedPosition + offset;
-    }
-
-    public boolean isSectionHeaderPosition(int position) {
-        return mSections.get(position) != null;
-    }
-
-
-    @Override
-    public long getItemId(int position) {
-        return isSectionHeaderPosition(position)
-                ? Integer.MAX_VALUE - mSections.indexOfKey(position)
-                : mBaseAdapter.getItemId(sectionedPositionToPosition(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return (mValid ? mBaseAdapter.getItemCount() + mSections.size() : 0);
-    }
-
-}

app/src/main/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java

@@ -1,17 +1,13 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.animation.Animator;
-import android.animation.ValueAnimator;
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
 import android.view.animation.Animation;
 import android.view.animation.RotateAnimation;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.thoughtbot.expandablerecyclerview.ExpandableRecyclerViewAdapter;
@@ -19,6 +15,7 @@ import com.thoughtbot.expandablerecyclerview.models.ExpandableGroup;
 import com.thoughtbot.expandablerecyclerview.viewholders.ChildViewHolder;
 import com.thoughtbot.expandablerecyclerview.viewholders.GroupViewHolder;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.ExpandableViewHolder;
 import com.topjohnwu.magisk.superuser.SuLogEntry;
 
 import java.util.ArrayList;
@@ -90,7 +87,7 @@ public class SuLogAdapter {
             SuLogEntry logEntry = (SuLogEntry) group.getItems().get(childIndex);
             holder.setExpanded(expandList.contains(logEntry));
             holder.itemView.setOnClickListener(view -> {
-                if (holder.mExpanded) {
+                if (holder.getExpanded()) {
                     holder.collapse();
                     expandList.remove(logEntry);
                 } else {
@@ -150,92 +147,50 @@ public class SuLogAdapter {
         }
     }
 
+    // Wrapper class
     static class LogViewHolder extends ChildViewHolder {
 
+        private InternalViewHolder expandableViewHolder;
+
         @BindView(R.id.app_name) TextView appName;
         @BindView(R.id.action) TextView action;
         @BindView(R.id.time) TextView time;
         @BindView(R.id.fromPid) TextView fromPid;
         @BindView(R.id.toUid) TextView toUid;
         @BindView(R.id.command) TextView command;
-        @BindView(R.id.expand_layout) LinearLayout expandLayout;
 
-        private ValueAnimator mAnimator;
-        private boolean mExpanded = false;
-        private static int expandHeight = 0;
-
-        public LogViewHolder(View itemView) {
+        LogViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
-            expandLayout.getViewTreeObserver().addOnPreDrawListener(
-                    new ViewTreeObserver.OnPreDrawListener() {
+            expandableViewHolder = new InternalViewHolder(itemView);
+        }
 
-                        @Override
-                        public boolean onPreDraw() {
-                            if (expandHeight == 0) {
-                                final int widthSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
-                                final int heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
-                                expandLayout.measure(widthSpec, heightSpec);
-                                expandHeight = expandLayout.getMeasuredHeight();
-                            }
+        private class InternalViewHolder extends ExpandableViewHolder {
 
-                            expandLayout.getViewTreeObserver().removeOnPreDrawListener(this);
-                            expandLayout.setVisibility(View.GONE);
-                            mAnimator = slideAnimator(0, expandHeight);
-                            return true;
-                        }
+            InternalViewHolder(View itemView) {
+                super(itemView);
+            }
 
-                    });
+            @Override
+            public void setExpandLayout(View itemView) {
+                expandLayout = itemView.findViewById(R.id.expand_layout);
+            }
+        }
+
+        private boolean getExpanded() {
+            return expandableViewHolder.mExpanded;
         }
 
         private void setExpanded(boolean expanded) {
-            mExpanded = expanded;
-            ViewGroup.LayoutParams layoutParams = expandLayout.getLayoutParams();
-            layoutParams.height = expanded ? expandHeight : 0;
-            expandLayout.setLayoutParams(layoutParams);
-            expandLayout.setVisibility(expanded ? View.VISIBLE : View.GONE);
+            expandableViewHolder.setExpanded(expanded);
         }
 
         private void expand() {
-            expandLayout.setVisibility(View.VISIBLE);
-            mAnimator.start();
-            mExpanded = true;
+            expandableViewHolder.expand();
         }
 
         private void collapse() {
-            if (!mExpanded) return;
-            int finalHeight = expandLayout.getHeight();
-            ValueAnimator mAnimator = slideAnimator(finalHeight, 0);
-            mAnimator.addListener(new Animator.AnimatorListener() {
-                @Override
-                public void onAnimationEnd(Animator animator) {
-                    expandLayout.setVisibility(View.GONE);
-                }
-
-                @Override
-                public void onAnimationStart(Animator animator) {}
-
-                @Override
-                public void onAnimationCancel(Animator animator) {}
-
-                @Override
-                public void onAnimationRepeat(Animator animator) {}
-            });
-            mAnimator.start();
-            mExpanded = false;
-        }
-
-        private ValueAnimator slideAnimator(int start, int end) {
-
-            ValueAnimator animator = ValueAnimator.ofInt(start, end);
-
-            animator.addUpdateListener(valueAnimator -> {
-                int value = (Integer) valueAnimator.getAnimatedValue();
-                ViewGroup.LayoutParams layoutParams = expandLayout.getLayoutParams();
-                layoutParams.height = value;
-                expandLayout.setLayoutParams(layoutParams);
-            });
-            return animator;
+            expandableViewHolder.collapse();
         }
     }
 

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

@@ -1,15 +1,9 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.content.Context;
-import android.content.Intent;
-import android.support.v4.app.TaskStackBuilder;
-import android.support.v7.app.NotificationCompat;
 
+import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.SplashActivity;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.WebService;
 
@@ -18,55 +12,51 @@ import org.json.JSONObject;
 
 public class CheckUpdates extends ParallelTask<Void, Void, Void> {
 
-    private static final String UPDATE_JSON = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/updates/magisk_update.json";
-    private static final int NOTIFICATION_ID = 1;
+    private static final String UPDATE_JSON = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/magisk_update.json";
 
     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);
             JSONObject magisk = json.getJSONObject("magisk");
-            magiskManager.remoteMagiskVersion = magisk.getDouble("versionCode");
+            magiskManager.remoteMagiskVersionString = magisk.getString("version");
+            magiskManager.remoteMagiskVersionCode = magisk.getInt("versionCode");
             magiskManager.magiskLink = magisk.getString("link");
             magiskManager.releaseNoteLink = magisk.getString("note");
-        } catch (JSONException ignored) {
-        }
+            JSONObject manager = json.getJSONObject("app");
+            magiskManager.remoteManagerVersionString = manager.getString("version");
+            magiskManager.remoteManagerVersionCode = manager.getInt("versionCode");
+            magiskManager.managerLink = manager.getString("link");
+        } catch (JSONException ignored) {}
         return null;
     }
 
     @Override
     protected void onPostExecute(Void v) {
-        if (magiskManager.magiskVersion < magiskManager.remoteMagiskVersion
-                && showNotification && magiskManager.updateNotification) {
-            NotificationCompat.Builder builder = new NotificationCompat.Builder(magiskManager);
-            builder.setSmallIcon(R.drawable.ic_magisk)
-                    .setContentTitle(magiskManager.getString(R.string.magisk_update_title))
-                    .setContentText(magiskManager.getString(R.string.magisk_update_available, magiskManager.remoteMagiskVersion))
-                    .setVibrate(new long[]{0, 100, 100, 100})
-                    .setAutoCancel(true);
-            Intent intent = new Intent(magiskManager, SplashActivity.class);
-            intent.putExtra(MagiskManager.INTENT_SECTION, "install");
-            TaskStackBuilder stackBuilder = TaskStackBuilder.create(magiskManager);
-            stackBuilder.addParentStack(SplashActivity.class);
-            stackBuilder.addNextIntent(intent);
-            PendingIntent pendingIntent = stackBuilder.getPendingIntent(NOTIFICATION_ID, PendingIntent.FLAG_UPDATE_CURRENT);
-            builder.setContentIntent(pendingIntent);
-            NotificationManager notificationManager =
-                    (NotificationManager) magiskManager.getSystemService(Context.NOTIFICATION_SERVICE);
-            notificationManager.notify(NOTIFICATION_ID, builder.build());
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return;
+        if (showNotification && magiskManager.updateNotification) {
+            if (BuildConfig.VERSION_CODE < magiskManager.remoteManagerVersionCode) {
+                Utils.showManagerUpdate(magiskManager);
+            } else if (magiskManager.magiskVersionCode < magiskManager.remoteMagiskVersionCode) {
+                Utils.showMagiskUpdate(magiskManager);
+            }
         }
         magiskManager.updateCheckDone.trigger();
+        super.onPostExecute(v);
     }
 }

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

@@ -1,15 +1,12 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.app.Activity;
-import android.app.ProgressDialog;
+import android.content.Context;
 import android.net.Uri;
-import android.widget.Toast;
+import android.text.TextUtils;
 
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.AdaptiveList;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.ZipUtils;
 
@@ -21,134 +18,104 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
 
-public class FlashZip extends SerialTask<Void, String, Integer> {
+public class FlashZip extends ParallelTask<Void, String, Integer> {
 
     private Uri mUri;
     private File mCachedFile, mScriptFile, mCheckFile;
 
     private String mFilename;
-    private ProgressDialog progress;
+    private AdaptiveList<String> mList;
 
-    public FlashZip(Activity context, Uri uri) {
+    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);
+        mFilename = Utils.getNameFromUri(context, mUri);
     }
 
-    private void copyToCache() throws Throwable {
-        publishProgress(magiskManager.getString(R.string.copying_msg));
-
-        if (mCachedFile.exists() && !mCachedFile.delete()) {
-            Logger.error("FlashZip: Error while deleting already existing file");
-            throw new IOException();
-        }
-        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);
-
-            Logger.dev("FlashZip: File created successfully - " + mCachedFile.getPath());
-        } catch (FileNotFoundException e) {
-            Logger.error("FlashZip: Invalid Uri");
-            throw e;
-        } catch (IOException e) {
-            Logger.error("FlashZip: Error in creating file");
-            throw e;
-        }
-    }
-
-    protected boolean unzipAndCheck() throws Exception {
+    private boolean unzipAndCheck() throws Exception {
         ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android");
-        List<String> ret;
-        ret = Utils.readFile(mCheckFile.getPath());
+        List<String> ret = Utils.readFile(getShell(), mCheckFile.getPath());
         return Utils.isValidShellResponse(ret) && ret.get(0).contains("#MAGISK");
     }
 
-    private int cleanup(int ret) {
-        Shell.su(
-                "rm -rf " + mCachedFile.getParent() + "/*",
-                "rm -rf " + MagiskManager.TMP_FOLDER_PATH
-        );
-        return ret;
-    }
-
     @Override
     protected void onPreExecute() {
-        progress = new ProgressDialog(activity);
-        progress.setTitle(R.string.zip_install_progress_title);
-        progress.show();
+        // UI updates must run in the UI thread
+        mList.setCallback(this::publishProgress);
     }
 
     @Override
     protected void onProgressUpdate(String... values) {
-        progress.setMessage(values[0]);
+        mList.updateView();
     }
 
     @Override
     protected Integer doInBackground(Void... voids) {
-        Logger.dev("FlashZip Running... " + mFilename);
-        List<String> ret;
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return -1;
         try {
-            copyToCache();
-            if (!unzipAndCheck()) return cleanup(0);
-            publishProgress(magiskManager.getString(R.string.zip_install_progress_msg, mFilename));
-            ret = Shell.su(
-                    "BOOTMODE=true sh " + mScriptFile + " dummy 1 " + mCachedFile,
-                    "if [ $? -eq 0 ]; then echo true; else echo false; fi"
-            );
-            if (!Utils.isValidShellResponse(ret)) return -1;
-            Logger.dev("FlashZip: Console log:");
-            for (String line : ret) {
-                Logger.dev(line);
-            }
-            if (Boolean.parseBoolean(ret.get(ret.size() - 1)))
-                return cleanup(1);
+            mList.add(magiskManager.getString(R.string.copying_msg));
 
-        } catch (Throwable e) {
+            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,
+                    "BOOTMODE=true sh " + mScriptFile + " dummy 1 " + mCachedFile +
+                            " && echo 'Success!' || echo 'Failed!'"
+            );
+            if (TextUtils.equals(mList.get(mList.size() - 1), "Success!"))
+                return 1;
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        return cleanup(-1);
+        return -1;
     }
 
     // -1 = error, manual install; 0 = invalid zip; 1 = success
     @Override
     protected void onPostExecute(Integer result) {
-        super.onPostExecute(result);
-        progress.dismiss();
+        MagiskManager magiskManager = getMagiskManager();
+        if (magiskManager == null) return;
+        magiskManager.shell.su_raw(
+                "rm -rf " + mCachedFile.getParent() + "/*",
+                "rm -rf " + MagiskManager.TMP_FOLDER_PATH
+        );
         switch (result) {
             case -1:
-                Toast.makeText(magiskManager, magiskManager.getString(R.string.install_error), Toast.LENGTH_LONG).show();
-                Utils.showUriSnack(activity, mUri);
-                break;
+                mList.add(magiskManager.getString(R.string.install_error));
+                Utils.showUriSnack(getActivity(), mUri);
+                return;
             case 0:
-                Toast.makeText(magiskManager, magiskManager.getString(R.string.invalid_zip), Toast.LENGTH_LONG).show();
-                break;
+                mList.add(magiskManager.getString(R.string.invalid_zip));
+                return;
             case 1:
-                onSuccess();
+                // Success
                 break;
         }
-    }
-
-    protected void onSuccess() {
-        magiskManager.updateCheckDone.trigger();
-        new LoadModules(activity).exec();
-
-        new AlertDialogBuilder(activity)
-                .setTitle(R.string.reboot_title)
-                .setMessage(R.string.reboot_msg)
-                .setPositiveButton(R.string.reboot, (dialogInterface, i) -> Shell.su(true, "reboot"))
-                .setNegativeButton(R.string.no_thanks, null)
-                .show();
+        new LoadModules(magiskManager).exec();
+        super.onPostExecute(result);
     }
 }

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

@@ -1,27 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-
-public class GetBootBlocks extends SerialTask<Void, Void, Void> {
-
-    public GetBootBlocks(Activity context) {
-        super(context);
-    }
-
-    @Override
-    protected Void doInBackground(Void... params) {
-        magiskManager.blockList = Shell.su("ls /dev/block | grep mmc");
-        if (magiskManager.bootBlock == null) {
-            magiskManager.bootBlock = Utils.detectBootImage();
-        }
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void v) {
-        magiskManager.blockDetectionDone.trigger();
-    }
-}

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();
     }
 }