Update strings.xml

Added new lines from original

.gitignore

@@ -6,3 +6,7 @@
 app/release
 *.hprof
 app/.externalNativeBuild/
+*.sh
+public.certificate.x509.pem
+private.key.pk8
+*.apk

README.md

@@ -1,6 +1,7 @@
-# Magisk Manager 
-You need to install CMake and NDK to build the zipadjust library for zip preprocessing
+# Magisk Manager
+This is one of the submodules used in Magisk. The project is licensed under GPL v3 (or newer).
+More info are written in the [Magisk Main Repo](https://github.com/topjohnwu/Magisk)
 
-## 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)
+## Building Notes
+You need to install CMake and NDK to build the zipadjust library.
+There are several files required to let Magisk Manager work properly, and they can be copied by using the build script in the [Magisk Main Repo](https://github.com/topjohnwu/Magisk). These files are: `magisk_uninstaller.sh`, `util_functions.sh`, `public.certificate.x509.pem`, and `private.key.pk8` under the `app/src/main/assets` folder.

app/build.gradle

@@ -2,17 +2,22 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "26.0.2"
 
     defaultConfig {
         applicationId "com.topjohnwu.magisk"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 51
-        versionName "5.1.1"
+        versionCode 57
+        versionName "5.4.0"
         ndk {
             moduleName 'zipadjust'
-            abiFilters 'x86', 'armeabi-v7a'
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+        }
+        javaCompileOptions {
+            annotationProcessorOptions {
+                argument('butterknife.debuggable', 'false')
+            }
         }
     }
 
@@ -48,16 +53,14 @@ repositories {
 
 dependencies {
     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'
+    implementation project(':common')
+    implementation project(':jarsigner')
+    implementation 'com.android.support:recyclerview-v7:26.1.0'
+    implementation 'com.android.support:cardview-v7:26.1.0'
+    implementation 'com.android.support:design:26.1.0'
+    implementation 'com.android.support:support-v4:26.1.0'
+    implementation 'com.jakewharton:butterknife:8.8.1'
+    implementation 'com.atlassian.commonmark:commonmark:0.10.0'
+    implementation 'org.kamranzafar:jtar:2.3'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 }

app/proguard-rules.pro

@@ -16,10 +16,9 @@
 #   public *;
 #}
 
-# SpongyCastle
--keep class org.spongycastle.** { *; }
+# Keep all names, we are open source anyway :)
+-keepnames class ** { *; }
+
+# BouncyCastle
+-keep class org.bouncycastle.jcajce.provider.** { *; }
 -dontwarn javax.naming.**
-
--dontwarn android.content.**
--dontwarn android.animation.**
-

app/src/main/AndroidManifest.xml

@@ -17,7 +17,8 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
+        android:directBootAware="true"
+        tools:ignore="UnusedAttribute">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize"
@@ -89,9 +90,10 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
+        <!-- Hardcode GMS version -->
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
+            android:value="11400000" />
 
     </application>
 

app/src/main/assets/magisk_uninstaller.sh

@@ -1,153 +0,0 @@
-#!/system/bin/sh
-##########################################################################################
-#
-# Magisk Uninstaller
-# by topjohnwu
-# 
-# This script can be placed in /cache/magisk_uninstaller.sh
-# The Magisk main binary will pick up the script, and uninstall itself, following a reboot
-# This script can also be used in flashable zip with the uninstaller_loader.sh
-# 
-# This script will try to do restoration with the following:
-# 1-1. Find and restore the original stock boot image dump (OTA proof)
-# 1-2. If 1-1 fails, restore ramdisk from the internal backup
-#      (ramdisk fully restored, not OTA friendly)
-# 1-3. If 1-2 fails, it will remove added files in ramdisk, however modified files
-#      are remained modified, because we have no backups. By doing so, Magisk will 
-#      not be started at boot, but this isn't actually 100% cleaned up
-# 2. Remove all Magisk related files
-#    (The list is LARGE, most likely due to bad decision in early versions
-#    the latest versions has much less bloat to cleanup)
-#
-##########################################################################################
-
-# Call ui_print_wrap if exists, or else simply use echo
-# Useful when wrapped in flashable zip
-ui_print_wrap() {
-  type ui_print >/dev/null 2>&1 && ui_print "$1" || echo "$1"
-}
-
-# Call abort if exists, or else show error message and exit
-# Essential when wrapped in flashable zip
-abort_wrap() {
-  type abort >/dev/null 2>&1
-  if [ $? -ne 0 ]; then
-    ui_print_wrap "$1"
-    exit 1
-  else
-    abort "$1"
-  fi
-}
-
-if [ ! -d $MAGISKBIN -o ! -f $MAGISKBIN/magiskboot -o ! -f $MAGISKBIN/util_functions.sh ]; then
-  ui_print_wrap "! Cannot find $MAGISKBIN"
-  exit 1
-fi
-
-[ -z $BOOTMODE ] && BOOTMODE=false
-
-MAGISKBIN=/data/magisk
-CHROMEDIR=$MAGISKBIN/chromeos
-
-# Default permissions
-umask 022
-
-# Load utility functions
-. $MAGISKBIN/util_functions.sh
-
-# Find the boot image
-find_boot_image
-[ -z $BOOTIMAGE ] && abort "! Unable to detect boot image"
-
-ui_print_wrap "- Found Boot Image: $BOOTIMAGE"
-
-cd $MAGISKBIN
-
-ui_print_wrap "- Unpacking boot image"
-./magiskboot --unpack "$BOOTIMAGE"
-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
-  SHA1=`./magiskboot --sha1 /data/stock_boot.img | tail -n 1`
-  STOCKDUMP=/data/stock_boot_${SHA1}.img
-  mv /data/stock_boot.img $STOCKDUMP
-  ./magiskboot --compress $STOCKDUMP
-fi
-
-# Detect boot image state
-./magiskboot --cpio-test ramdisk.cpio
-case $? in
-  0 )  # Stock boot
-    ui_print_wrap "- Stock boot image detected!"
-    ui_print_wrap "! Magisk is not installed!"
-    exit
-    ;;
-  1 )  # Magisk patched
-    ui_print_wrap "- Magisk patched image detected!"
-    # Find SHA1 of stock boot image
-    if [ -z $SHA1 ]; then
-      ./magiskboot --cpio-extract ramdisk.cpio init.magisk.rc init.magisk.rc.old
-      SHA1=`grep_prop "# STOCKSHA1" init.magisk.rc.old`
-      rm -f init.magisk.rc.old
-    fi
-    [ ! -z $SHA1 ] && STOCKDUMP=/data/stock_boot_${SHA1}.img
-    if [ -f ${STOCKDUMP}.gz ]; then
-      ui_print_wrap "- Boot image backup found!"
-      ./magiskboot --decompress ${STOCKDUMP}.gz stock_boot.img
-    else
-      ui_print_wrap "! Boot image backup unavailable"
-      ui_print_wrap "- Restoring ramdisk with backup"
-      ./magiskboot --cpio-restore ramdisk.cpio
-      ./magiskboot --repack $BOOTIMAGE stock_boot.img
-    fi
-    ;;
-  2 ) # Other patched
-    ui_print_wrap "! Boot image patched by other programs!"
-    abort_wrap "! Cannot uninstall with this uninstaller"
-    ;;
-esac
-
-# Sign chromeos boot
-if $CHROMEOS; then
-  echo > empty
-
-  ./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
-  mv stock_boot.img.signed stock_boot.img
-fi
-
-ui_print_wrap "- Flashing stock/reverted image"
-if [ -L "$BOOTIMAGE" ]; then
-  dd if=stock_boot.img of="$BOOTIMAGE" bs=4096
-else
-  cat stock_boot.img /dev/zero | dd of="$BOOTIMAGE" bs=4096 >/dev/null 2>&1
-fi
-rm -f stock_boot.img
-
-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 /data/property/*magisk* \
-        /data/app/com.topjohnwu.magisk* /data/user/*/com.topjohnwu.magisk 2>/dev/null
-
-$BOOTMODE && reboot

app/src/main/assets/public.certificate.x509.pem

@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEqDCCA5CgAwIBAgIJAJNurL4H8gHfMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
-VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE
-AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
-Fw0wODAyMjkwMTMzNDZaFw0zNTA3MTcwMTMzNDZaMIGUMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G
-A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p
-ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI
-hvcNAQEBBQADggENADCCAQgCggEBANaTGQTexgskse3HYuDZ2CU+Ps1s6x3i/waM
-qOi8qM1r03hupwqnbOYOuw+ZNVn/2T53qUPn6D1LZLjk/qLT5lbx4meoG7+yMLV4
-wgRDvkxyGLhG9SEVhvA4oU6Jwr44f46+z4/Kw9oe4zDJ6pPQp8PcSvNQIg1QCAcy
-4ICXF+5qBTNZ5qaU7Cyz8oSgpGbIepTYOzEJOmc3Li9kEsBubULxWBjf/gOBzAzU
-RNps3cO4JFgZSAGzJWQTT7/emMkod0jb9WdqVA2BVMi7yge54kdVMxHEa5r3b97s
-zI5p58ii0I54JiCUP5lyfTwE/nKZHZnfm644oLIXf6MdW2r+6R8CAQOjgfwwgfkw
-HQYDVR0OBBYEFEhZAFY9JyxGrhGGBaR0GawJyowRMIHJBgNVHSMEgcEwgb6AFEhZ
-AFY9JyxGrhGGBaR0GawJyowRoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE
-CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH
-QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG
-CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJAJNurL4H8gHfMAwGA1Ud
-EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHqvlozrUMRBBVEY0NqrrwFbinZa
-J6cVosK0TyIUFf/azgMJWr+kLfcHCHJsIGnlw27drgQAvilFLAhLwn62oX6snb4Y
-LCBOsVMR9FXYJLZW2+TcIkCRLXWG/oiVHQGo/rWuWkJgU134NDEFJCJGjDbiLCpe
-+ZTWHdcwauTJ9pUbo8EvHRkU3cYfGmLaLfgn9gP+pWA7LFQNvXwBnDa6sppCccEX
-31I828XzgXpJ4O+mDL1/dBd+ek8ZPUP0IgdyZm5MTYPhvVqGCHzzTy3sIeJFymwr
-sBbmg2OAUNLEMO6nwmocSdN2ClirfxqCzJOLSDE4QyS9BAH6EhY6UFcOaE0=
------END CERTIFICATE-----

app/src/main/assets/util_functions.sh

@@ -1,192 +0,0 @@
-##########################################################################################
-# 
-# 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

@@ -20,6 +20,7 @@ import com.topjohnwu.magisk.components.AlertDialogBuilder;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -42,7 +43,7 @@ public class AboutActivity extends Activity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (getApplicationContext().isDarkTheme) {
+        if (getMagiskManager().isDarkTheme) {
             setTheme(R.style.AppTheme_Transparent_Dark);
         }
         setContentView(R.layout.activity_about);
@@ -57,7 +58,7 @@ public class AboutActivity extends Activity {
             ab.setDisplayHomeAsUpEnabled(true);
         }
 
-        appVersionInfo.setSummary(BuildConfig.VERSION_NAME);
+        appVersionInfo.setSummary(String.format(Locale.US, "%s (%d)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
 
         String changes = null;
         try (InputStream is = getAssets().open("changelog.html")) {

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

@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk;
 
+import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
@@ -8,25 +9,37 @@ import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.asyncs.FlashZip;
+import com.topjohnwu.magisk.asyncs.InstallMagisk;
 import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.AdaptiveList;
+import com.topjohnwu.magisk.container.AdaptiveList;
 import com.topjohnwu.magisk.utils.Shell;
 
+import java.util.List;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 public class FlashActivity extends Activity {
 
+    public static final String SET_ACTION = "action";
+    public static final String SET_BOOT = "boot";
+    public static final String SET_ENC = "enc";
+    public static final String SET_VERITY = "verity";
+
+    public static final String FLASH_ZIP = "flash";
+    public static final String PATCH_BOOT = "patch";
+    public static final String FLASH_MAGISK = "magisk";
+
     @BindView(R.id.toolbar) Toolbar toolbar;
     @BindView(R.id.flash_logs) RecyclerView flashLogs;
     @BindView(R.id.button_panel) LinearLayout buttonPanel;
-
-    private AdaptiveList<String> rootShellOutput;
+    @BindView(R.id.reboot) Button reboot;
 
     @OnClick(R.id.no_thanks)
     public void dismiss() {
@@ -35,7 +48,7 @@ public class FlashActivity extends Activity {
 
     @OnClick(R.id.reboot)
     public void reboot() {
-        Shell.getShell(this).su_raw("reboot");
+        getShell().su_raw("reboot");
     }
 
     @Override
@@ -43,22 +56,57 @@ public class FlashActivity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_flash);
         ButterKnife.bind(this);
-        rootShellOutput = new AdaptiveList<>(flashLogs);
+        AdaptiveList<String> rootShellOutput = new AdaptiveList<>(flashLogs);
         setSupportActionBar(toolbar);
         ActionBar ab = getSupportActionBar();
         if (ab != null) {
             ab.setTitle(R.string.flashing);
         }
         setFloating();
+        setFinishOnTouchOutside(false);
+        if (!Shell.rootAccess())
+            reboot.setVisibility(View.GONE);
 
-        flashLogs.setAdapter(new FlashLogAdapter());
+        flashLogs.setAdapter(new FlashLogAdapter(rootShellOutput));
 
         // We must receive a Uri of the target zip
-        Uri uri = getIntent().getData();
+        Intent intent = getIntent();
+        Uri uri = intent.getData();
 
-        new FlashZip(this, uri, rootShellOutput)
-                .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
-                .exec();
+        boolean keepEnc = intent.getBooleanExtra(SET_ENC, false);
+        boolean keepVerity = intent.getBooleanExtra(SET_VERITY, false);
+
+        switch (getIntent().getStringExtra(SET_ACTION)) {
+            case FLASH_ZIP:
+                new FlashZip(this, uri, rootShellOutput)
+                        .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
+                        .exec();
+                break;
+            case PATCH_BOOT:
+                new InstallMagisk(this, rootShellOutput, uri, keepEnc, keepVerity, (Uri) intent.getParcelableExtra(SET_BOOT))
+                        .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
+                        .exec();
+                break;
+            case FLASH_MAGISK:
+                String boot = intent.getStringExtra(SET_BOOT);
+                if (getMagiskManager().remoteMagiskVersionCode < 1370) {
+                    // Use legacy installation method
+                    getShell().su_raw(
+                            "echo \"BOOTIMAGE=" + boot + "\" > /dev/.magisk",
+                            "echo \"KEEPFORCEENCRYPT=" + keepEnc + "\" >> /dev/.magisk",
+                            "echo \"KEEPVERITY=" + keepVerity + "\" >> /dev/.magisk"
+                    );
+                    new FlashZip(this, uri, rootShellOutput)
+                            .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
+                            .exec();
+                } else {
+                    // Use new installation method
+                    new InstallMagisk(this, rootShellOutput, uri, keepEnc, keepVerity, boot)
+                            .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
+                            .exec();
+                }
+                break;
+        }
     }
 
     @Override
@@ -66,7 +114,13 @@ public class FlashActivity extends Activity {
         // Prevent user accidentally press back button
     }
 
-    private class FlashLogAdapter extends RecyclerView.Adapter<ViewHolder> {
+    private static class FlashLogAdapter extends RecyclerView.Adapter<ViewHolder> {
+
+        private List<String> mList;
+
+        FlashLogAdapter(List<String> list) {
+            mList = list;
+        }
 
         @Override
         public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
@@ -77,16 +131,16 @@ public class FlashActivity extends Activity {
 
         @Override
         public void onBindViewHolder(ViewHolder holder, int position) {
-            holder.text.setText(rootShellOutput.get(position));
+            holder.text.setText(mList.get(position));
         }
 
         @Override
         public int getItemCount() {
-            return rootShellOutput.size();
+            return mList.size();
         }
     }
 
-    public class ViewHolder extends RecyclerView.ViewHolder {
+    public static class ViewHolder extends RecyclerView.ViewHolder {
 
         @BindView(R.id.textView) TextView text;
 
@@ -95,4 +149,5 @@ public class FlashActivity extends Activity {
             ButterKnife.bind(this, itemView);
         }
     }
+
 }

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

@@ -29,6 +29,8 @@ public class LogFragment extends Fragment {
         View v = inflater.inflate(R.layout.fragment_log, container, false);
         unbinder = ButterKnife.bind(this, v);
 
+        ((MainActivity) getActivity()).toolbar.setElevation(0);
+
         TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());
 
         if (getApplication().isSuClient) {

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

@@ -1,22 +1,16 @@
 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;
-import android.os.CountDownTimer;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
 import android.support.design.widget.Snackbar;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.CardView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -26,19 +20,16 @@ import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.topjohnwu.magisk.asyncs.CheckSafetyNet;
 import com.topjohnwu.magisk.asyncs.CheckUpdates;
 import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.components.ExpandableView;
 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.Topic;
 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;
 
@@ -49,15 +40,20 @@ import butterknife.OnClick;
 import butterknife.Unbinder;
 
 public class MagiskFragment extends Fragment
-        implements CallbackEvent.Listener<Void>, SwipeRefreshLayout.OnRefreshListener {
+        implements Topic.Subscriber, SwipeRefreshLayout.OnRefreshListener, ExpandableView {
 
-    public static final String SHOW_DIALOG = "dialog";
+    public static final int CAUSE_SERVICE_DISCONNECTED = 0x00001;
+    public static final int CAUSE_NETWORK_LOST = 0x00010;
+    public static final int RESPONSE_ERR = 0x00100;
 
-    private static int expandHeight = 0;
-    private static boolean mExpanded = false;
+    public static final int BASIC_PASS = 0x01000;
+    public static final int CTS_PASS = 0x10000;
 
-    private MagiskManager magiskManager;
+    private Container expandableContainer = new Container();
+
+    private MagiskManager mm;
     private Unbinder unbinder;
+    private static boolean shownDialog = false;
 
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
 
@@ -98,127 +94,47 @@ public class MagiskFragment extends Fragment
     @BindColor(R.color.blue500) int colorInfo;
 
     @OnClick(R.id.safetyNet_title)
-    public void safetyNet() {
-        safetyNetProgress.setVisibility(View.VISIBLE);
-        safetyNetRefreshIcon.setVisibility(View.GONE);
-        safetyNetStatusText.setText(R.string.checking_safetyNet_status);
-        Utils.checkSafetyNet(getActivity());
-        collapse();
+    void safetyNet() {
+        Runnable task = () -> {
+            safetyNetProgress.setVisibility(View.VISIBLE);
+            safetyNetRefreshIcon.setVisibility(View.GONE);
+            safetyNetStatusText.setText(R.string.checking_safetyNet_status);
+            new CheckSafetyNet(getActivity()).exec();
+            collapse();
+        };
+        if (mm.snet_version < 0) {
+            // Show dialog
+            new AlertDialogBuilder(getActivity())
+                    .setTitle(R.string.proprietary_title)
+                    .setMessage(R.string.proprietary_notice)
+                    .setCancelable(true)
+                    .setPositiveButton(R.string.yes, (d, i) -> task.run())
+                    .setNegativeButton(R.string.no_thanks, null)
+                    .show();
+        } else {
+            task.run();
+        }
+
     }
 
     @OnClick(R.id.install_button)
-    public void install() {
-        String bootImage = null;
-        if (Shell.rootAccess()) {
-            if (magiskManager.bootBlock != null) {
-                bootImage = magiskManager.bootBlock;
-            } else {
-                int idx = spinner.getSelectedItemPosition();
-                if (idx > 0)  {
-                    bootImage = magiskManager.blockList.get(idx - 1);
-                } else {
-                    SnackbarMaker.make(getActivity(), R.string.manual_boot_image, Snackbar.LENGTH_LONG).show();
-                    return;
-                }
-            }
-        }
-        final String finalBootImage = bootImage;
-        String filename = "Magisk-v" + magiskManager.remoteMagiskVersionString + ".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,
-                    (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();
+    void install() {
+        shownDialog = true;
 
-                                @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));
-                    }
-                )
-                .setNeutralButton(R.string.release_notes, (d, i) -> {
-                    if (magiskManager.releaseNoteLink != null) {
-                        Intent openReleaseNoteLink = new Intent(Intent.ACTION_VIEW, Uri.parse(magiskManager.releaseNoteLink));
-                        openReleaseNoteLink.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        magiskManager.startActivity(openReleaseNoteLink);
-                    }
-                })
-                .setNegativeButton(R.string.no_thanks, null)
-                .show();
+        // Show Manager update first
+        if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
+            Utils.showManagerInstallDialog(getActivity());
+            return;
+        }
+
+        ((NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE)).cancelAll();
+        Utils.showMagiskInstallDialog(this,
+                keepEncChkbox.isChecked(), keepVerityChkbox.isChecked());
     }
 
     @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(MagiskManager.UNINSTALLER);
-                        File uninstaller = new File(magiskManager.getCacheDir(), MagiskManager.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();
-                        in = magiskManager.getAssets().open(MagiskManager.UTIL_FUNCTIONS);
-                        File utils = new File(magiskManager.getCacheDir(), MagiskManager.UTIL_FUNCTIONS);
-                        out = new FileOutputStream(utils);
-                        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));
-                                magiskManager.shell.su_raw(
-                                        "mv -f " + uninstaller + " /cache/" + MagiskManager.UNINSTALLER,
-                                        "mv -f " + utils + " /data/magisk/" + MagiskManager.UTIL_FUNCTIONS,
-                                        "reboot"
-                                );
-                            }
-                        }.start();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                })
-                .setNegativeButton(R.string.no_thanks, null)
-                .show();
+    void uninstall() {
+        Utils.showUninstallDialog(this);
     }
 
     @Nullable
@@ -226,38 +142,22 @@ public class MagiskFragment extends Fragment
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fragment_magisk, container, false);
         unbinder = ButterKnife.bind(this, v);
-        magiskManager = getApplication();
+        getActivity().setTitle(R.string.magisk);
 
-        expandLayout.getViewTreeObserver().addOnPreDrawListener(
-                new ViewTreeObserver.OnPreDrawListener() {
-                    @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();
-                        }
+        mm = getApplication();
 
-                        expandLayout.getViewTreeObserver().removeOnPreDrawListener(this);
-                        setExpanded();
-                        return true;
-                    }
-
-                });
+        expandableContainer.expandLayout = expandLayout;
+        setupExpandable();
 
         mSwipeRefreshLayout.setOnRefreshListener(this);
-
         updateUI();
 
-        if (getArguments() != null && getArguments().getBoolean(SHOW_DIALOG))
-            install();
-
         return v;
     }
 
     @Override
     public void onRefresh() {
+        mm.getMagiskInfo();
         updateUI();
 
         magiskUpdateText.setText(R.string.checking_for_updates);
@@ -266,14 +166,16 @@ public class MagiskFragment extends Fragment
 
         safetyNetStatusText.setText(R.string.safetyNet_check_text);
 
-        magiskManager.safetyNetDone.isTriggered = false;
-        magiskManager.updateCheckDone.isTriggered = false;
-        magiskManager.remoteMagiskVersionString = null;
-        magiskManager.remoteMagiskVersionCode = -1;
+        mm.safetyNetDone.hasPublished = false;
+        mm.updateCheckDone.hasPublished = false;
+        mm.remoteMagiskVersionString = null;
+        mm.remoteMagiskVersionCode = -1;
         collapse();
 
+        shownDialog = false;
+
         // Trigger state check
-        if (Utils.checkNetworkStatus(magiskManager)) {
+        if (Utils.checkNetworkStatus(mm)) {
             new CheckUpdates(getActivity()).exec();
         } else {
             mSwipeRefreshLayout.setRefreshing(false);
@@ -281,32 +183,17 @@ public class MagiskFragment extends Fragment
     }
 
     @Override
-    public void onTrigger(CallbackEvent<Void> event) {
-        if (event == magiskManager.updateCheckDone) {
+    public void onTopicPublished(Topic topic, Object result) {
+        if (topic == mm.updateCheckDone) {
             updateCheckUI();
-        } else if (event == magiskManager.safetyNetDone) {
-            updateSafetyNetUI();
+        } else if (topic == mm.safetyNetDone) {
+            updateSafetyNetUI((int) result);
         }
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-        // Manual trigger if already done
-        if (magiskManager.updateCheckDone.isTriggered)
-            updateCheckUI();
-        if (magiskManager.safetyNetDone.isTriggered)
-            updateSafetyNetUI();
-        magiskManager.updateCheckDone.register(this);
-        magiskManager.safetyNetDone.register(this);
-        getActivity().setTitle(R.string.magisk);
-    }
-
-    @Override
-    public void onStop() {
-        magiskManager.updateCheckDone.unRegister(this);
-        magiskManager.safetyNetDone.unRegister(this);
-        super.onStop();
+    public Topic[] getSubscription() {
+        return new Topic[] { mm.updateCheckDone, mm.safetyNetDone };
     }
 
     @Override
@@ -315,32 +202,53 @@ public class MagiskFragment extends Fragment
         unbinder.unbind();
     }
 
+    @Override
+    public Container getContainer() {
+        return expandableContainer;
+    }
+
+    public String getSelectedBootImage() {
+        if (Shell.rootAccess()) {
+            if (mm.bootBlock != null) {
+                return mm.bootBlock;
+            } else {
+                int idx = spinner.getSelectedItemPosition();
+                if (idx > 0)  {
+                    return mm.blockList.get(idx - 1);
+                } else {
+                    SnackbarMaker.make(getActivity(),
+                            R.string.manual_boot_image, Snackbar.LENGTH_LONG).show();
+                    return null;
+                }
+            }
+        } else {
+            return null;
+        }
+    }
+
     private void updateUI() {
         ((MainActivity) getActivity()).checkHideSection();
-        magiskManager.updateMagiskInfo();
 
-        final int ROOT = 0x1, NETWORK = 0x2, UPTODATE = 0x4;
-        int status = 0;
-        status |= Shell.rootAccess() ? ROOT : 0;
-        status |= Utils.checkNetworkStatus(magiskManager) ? NETWORK : 0;
-        status |= magiskManager.magiskVersionCode >= 130 ? UPTODATE : 0;
-        magiskUpdateCard.setVisibility(Utils.checkBits(status, NETWORK) ? View.VISIBLE : View.GONE);
-        safetyNetCard.setVisibility(Utils.checkBits(status, NETWORK) ? View.VISIBLE : View.GONE);
-        bootImageCard.setVisibility(Utils.checkBits(status, NETWORK, ROOT) ? View.VISIBLE : View.GONE);
-        installOptionCard.setVisibility(Utils.checkBits(status, NETWORK, ROOT) ? View.VISIBLE : View.GONE);
-        installButton.setVisibility(Utils.checkBits(status, NETWORK) ? View.VISIBLE : View.GONE);
-        uninstallButton.setVisibility(Utils.checkBits(status, UPTODATE, ROOT) ? View.VISIBLE : View.GONE);
+        boolean hasNetwork = Utils.checkNetworkStatus(getActivity());
+        boolean hasRoot = Shell.rootAccess();
+        boolean isUpToDate = mm.magiskVersionCode > 1300;
+
+        magiskUpdateCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
+        safetyNetCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
+        bootImageCard.setVisibility(hasNetwork && hasRoot ? View.VISIBLE : View.GONE);
+        installOptionCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
+        uninstallButton.setVisibility(isUpToDate && hasRoot ? View.VISIBLE : View.GONE);
 
         int image, color;
 
-        if (magiskManager.magiskVersionCode < 0) {
+        if (mm.magiskVersionCode < 0) {
             color = colorBad;
             image = R.drawable.ic_cancel;
             magiskVersionText.setText(R.string.magisk_version_error);
         } else {
             color = colorOK;
             image = R.drawable.ic_check_circle;
-            magiskVersionText.setText(getString(R.string.current_magisk_title, "v" + magiskManager.magiskVersionString));
+            magiskVersionText.setText(getString(R.string.current_magisk_title, "v" + mm.magiskVersionString));
         }
 
         magiskStatusIcon.setImageResource(image);
@@ -353,10 +261,10 @@ public class MagiskFragment extends Fragment
                 rootStatusText.setText(R.string.not_rooted);
                 break;
             case 1:
-                if (magiskManager.suVersion != null) {
+                if (mm.suVersion != null) {
                     color = colorOK;
                     image = R.drawable.ic_check_circle;
-                    rootStatusText.setText(magiskManager.suVersion);
+                    rootStatusText.setText(mm.suVersion);
                     break;
                 }
             case -1:
@@ -369,41 +277,46 @@ public class MagiskFragment extends Fragment
         rootStatusIcon.setImageResource(image);
         rootStatusIcon.setColorFilter(color);
 
-        if (!Shell.rootAccess()) {
-            installText.setText(R.string.download);
+        List<String> items = new ArrayList<>();
+        if (mm.bootBlock != null) {
+            items.add(getString(R.string.auto_detect, mm.bootBlock));
+            spinner.setEnabled(false);
         } else {
-            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) {
-                items.add(getString(R.string.auto_detect, magiskManager.bootBlock));
-                spinner.setEnabled(false);
-            } 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);
+            items.add(getString(R.string.cannot_auto_detect));
+            if (mm.blockList != null)
+                items.addAll(mm.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);
     }
 
     private void updateCheckUI() {
         int image, color;
 
-        if (magiskManager.remoteMagiskVersionCode < 0) {
+        if (mm.remoteMagiskVersionCode < 0) {
             color = colorNeutral;
             image = R.drawable.ic_help;
             magiskUpdateText.setText(R.string.cannot_check_updates);
         } else {
             color = colorOK;
             image = R.drawable.ic_check_circle;
-            magiskUpdateText.setText(getString(R.string.install_magisk_title, "v" + magiskManager.remoteMagiskVersionString));
+            magiskUpdateText.setText(getString(R.string.install_magisk_title, "v" + mm.remoteMagiskVersionString));
+        }
+
+        installButton.setVisibility(View.VISIBLE);
+        if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
+            installText.setText(getString(R.string.update, getString(R.string.app_name)));
+        } else if (mm.magiskVersionCode > 0 && mm.remoteMagiskVersionCode > mm.magiskVersionCode) {
+            installText.setText(getString(R.string.update, getString(R.string.magisk)));
+        } else {
+            installText.setText(R.string.install);
+        }
+
+        if (!shownDialog && (mm.remoteMagiskVersionCode > mm.magiskVersionCode
+                || mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE)) {
+                install();
         }
 
         magiskUpdateIcon.setImageResource(image);
@@ -412,94 +325,44 @@ public class MagiskFragment extends Fragment
 
         magiskUpdateProgress.setVisibility(View.GONE);
         mSwipeRefreshLayout.setRefreshing(false);
-
-        if (magiskManager.remoteMagiskVersionCode > magiskManager.magiskVersionCode)
-            install();
     }
 
-    private void updateSafetyNetUI() {
-        int image, color;
+    private void updateSafetyNetUI(int response) {
         safetyNetProgress.setVisibility(View.GONE);
         safetyNetRefreshIcon.setVisibility(View.VISIBLE);
-        if (magiskManager.SNCheckResult.failed) {
-            safetyNetStatusText.setText(magiskManager.SNCheckResult.errmsg);
-            collapse();
-        } else {
+        if (response < 0) {
+            safetyNetStatusText.setText(R.string.safetyNet_api_error);
+        } else if ((response & 0x111) == 0) {
             safetyNetStatusText.setText(R.string.safetyNet_check_success);
-            if (magiskManager.SNCheckResult.ctsProfile) {
-                color = colorOK;
-                image = R.drawable.ic_check_circle;
-            } else {
-                color = colorBad;
-                image = R.drawable.ic_cancel;
-            }
-            ctsStatusText.setText("ctsProfile: " + magiskManager.SNCheckResult.ctsProfile);
-            ctsStatusIcon.setImageResource(image);
-            ctsStatusIcon.setColorFilter(color);
 
-            if (magiskManager.SNCheckResult.basicIntegrity) {
-                color = colorOK;
-                image = R.drawable.ic_check_circle;
-            } else {
-                color = colorBad;
-                image = R.drawable.ic_cancel;
-            }
-            basicStatusText.setText("basicIntegrity: " + magiskManager.SNCheckResult.basicIntegrity);
-            basicStatusIcon.setImageResource(image);
-            basicStatusIcon.setColorFilter(color);
+            boolean b;
+            b = (response & CTS_PASS) != 0;
+            ctsStatusText.setText("ctsProfile: " + b);
+            ctsStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
+            ctsStatusIcon.setColorFilter(b ? colorOK : colorBad);
+
+            b = (response & BASIC_PASS) != 0;
+            basicStatusText.setText("basicIntegrity: " + b);
+            basicStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
+            basicStatusIcon.setColorFilter(b ? colorOK : colorBad);
+
             expand();
-        }
-    }
-
-    private void setExpanded() {
-        ViewGroup.LayoutParams layoutParams = expandLayout.getLayoutParams();
-        layoutParams.height = mExpanded ? expandHeight : 0;
-        expandLayout.setLayoutParams(layoutParams);
-        expandLayout.setVisibility(mExpanded ? View.VISIBLE : View.GONE);
-    }
-
-    private void expand() {
-        if (mExpanded) return;
-        expandLayout.setVisibility(View.VISIBLE);
-        ValueAnimator mAnimator = slideAnimator(0, expandHeight);
-        mAnimator.start();
-        mExpanded = true;
-    }
-
-    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);
+        } else {
+            @StringRes int resid;
+            switch (response) {
+                case CAUSE_SERVICE_DISCONNECTED:
+                    resid = R.string.safetyNet_network_loss;
+                    break;
+                case CAUSE_NETWORK_LOST:
+                    resid = R.string.safetyNet_service_disconnected;
+                    break;
+                case RESPONSE_ERR:
+                default:
+                    resid = R.string.safetyNet_res_invalid;
+                    break;
             }
-
-            @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;
+            safetyNetStatusText.setText(resid);
+        }
     }
 }
 

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

@@ -1,12 +1,9 @@
 package com.topjohnwu.magisk;
 
-import android.content.pm.PackageManager;
 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.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -15,16 +12,14 @@ import android.view.ViewGroup;
 import android.widget.SearchView;
 
 import com.topjohnwu.magisk.adapters.ApplicationAdapter;
-import com.topjohnwu.magisk.asyncs.MagiskHide;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.utils.CallbackEvent;
-import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.utils.Topic;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 
-public class MagiskHideFragment extends Fragment implements CallbackEvent.Listener<Void> {
+public class MagiskHideFragment extends Fragment implements Topic.Subscriber {
 
     private Unbinder unbinder;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
@@ -46,13 +41,12 @@ public class MagiskHideFragment extends Fragment implements CallbackEvent.Listen
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_magisk_hide, container, false);
         unbinder = ButterKnife.bind(this, view);
-
-        PackageManager packageManager = getActivity().getPackageManager();
+        lastFilter = "";
 
         mSwipeRefreshLayout.setRefreshing(true);
-        mSwipeRefreshLayout.setOnRefreshListener(() -> new MagiskHide(getActivity()).list());
+        mSwipeRefreshLayout.setOnRefreshListener(() -> appAdapter.refresh());
 
-        appAdapter = new ApplicationAdapter(packageManager);
+        appAdapter = new ApplicationAdapter(getActivity());
         recyclerView.setAdapter(appAdapter);
 
         searchListener = new SearchView.OnQueryTextListener() {
@@ -71,9 +65,7 @@ public class MagiskHideFragment extends Fragment implements CallbackEvent.Listen
             }
         };
 
-        if (getApplication().magiskHideDone.isTriggered) {
-            onTrigger(getApplication().magiskHideDone);
-        }
+        getActivity().setTitle(R.string.magiskhide);
 
         return view;
     }
@@ -81,23 +73,10 @@ public class MagiskHideFragment extends Fragment implements CallbackEvent.Listen
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_magiskhide, menu);
-        SearchView search = (SearchView) MenuItemCompat.getActionView(menu.findItem(R.id.app_search));
+        SearchView search = (SearchView) menu.findItem(R.id.app_search).getActionView();
         search.setOnQueryTextListener(searchListener);
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        getActivity().setTitle(R.string.magiskhide);
-        getApplication().magiskHideDone.register(this);
-    }
-
-    @Override
-    public void onStop() {
-        getApplication().magiskHideDone.unRegister(this);
-        super.onStop();
-    }
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -105,12 +84,13 @@ public class MagiskHideFragment extends Fragment implements CallbackEvent.Listen
     }
 
     @Override
-    public void onTrigger(CallbackEvent<Void> event) {
-        Logger.dev("MagiskHideFragment: UI refresh");
-        appAdapter.setLists(getApplication().appList, getApplication().magiskHideList);
+    public void onTopicPublished(Topic topic, Object result) {
         mSwipeRefreshLayout.setRefreshing(false);
-        if (!TextUtils.isEmpty(lastFilter)) {
-            appAdapter.filter(lastFilter);
-        }
+        appAdapter.filter(lastFilter);
+    }
+
+    @Override
+    public Topic[] getSubscription() {
+        return new Topic[] { getApplication().magiskHideDone };
     }
 }

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

@@ -1,11 +1,9 @@
 package com.topjohnwu.magisk;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
-import android.content.pm.PackageManager;
 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.text.TextUtils;
@@ -25,6 +23,7 @@ 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;
@@ -40,25 +39,18 @@ public class MagiskLogFragment extends Fragment {
     private static final String MAGISK_LOG = "/cache/magisk.log";
 
     private Unbinder unbinder;
+
     @BindView(R.id.txtLog) TextView txtLog;
     @BindView(R.id.svLog) ScrollView svLog;
     @BindView(R.id.hsvLog) HorizontalScrollView hsvLog;
-
     @BindView(R.id.progressBar) ProgressBar progressBar;
 
-    private MenuItem mClickedMenuItem;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_magisk_log, container, false);
         unbinder = ButterKnife.bind(this, view);
+        setHasOptionsMenu(true);
 
         txtLog.setTextIsSelectable(true);
 
@@ -92,13 +84,14 @@ public class MagiskLogFragment extends Fragment {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        mClickedMenuItem = item;
         switch (item.getItemId()) {
             case R.id.menu_refresh:
                 new LogManager().read();
                 return true;
             case R.id.menu_save:
-                new LogManager().save();
+                Utils.runWithPermission(getActivity(),
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        () -> new LogManager().save());
                 return true;
             case R.id.menu_clear:
                 new LogManager().clear();
@@ -108,38 +101,27 @@ public class MagiskLogFragment extends Fragment {
         }
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == 0) {
-            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                if (mClickedMenuItem != null) {
-                    new Handler().postDelayed(() -> onOptionsItemSelected(mClickedMenuItem), 500);
-                }
-            } else {
-                SnackbarMaker.make(txtLog, R.string.permissionNotGranted, Snackbar.LENGTH_LONG).show();
-            }
-        }
-    }
-
     private class LogManager extends ParallelTask<Object, Void, Object> {
 
         private int mode;
         private File targetFile;
 
+        LogManager() {
+            super(MagiskLogFragment.this.getActivity());
+        }
+
         @SuppressLint("DefaultLocale")
         @Override
         protected Object doInBackground(Object... params) {
-            MagiskManager magiskManager = MagiskLogFragment.this.getApplication();
             mode = (int) params[0];
             switch (mode) {
                 case 0:
                     StringBuildingList logList = new StringBuildingList();
-                    magiskManager.shell.su(logList, "cat " + MAGISK_LOG);
+                    getShell().su(logList, "cat " + MAGISK_LOG);
                     return logList.toString();
 
                 case 1:
-                    magiskManager.shell.su_raw("echo > " + MAGISK_LOG);
+                    getShell().su_raw("echo -n > " + MAGISK_LOG);
                     SnackbarMaker.make(txtLog, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
                     return "";
 
@@ -151,7 +133,7 @@ public class MagiskLogFragment extends Fragment {
                             now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
                             now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
 
-                    targetFile = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/MagiskManager/" + filename);
+                    targetFile = new File(Environment.getExternalStorageDirectory() + "/MagiskManager/" + filename);
 
                     if ((!targetFile.getParentFile().exists() && !targetFile.getParentFile().mkdirs())
                             || (targetFile.exists() && !targetFile.delete())) {
@@ -160,7 +142,7 @@ public class MagiskLogFragment extends Fragment {
 
                     try (FileWriter out = new FileWriter(targetFile)) {
                         FileWritingList fileWritingList = new FileWritingList(out);
-                        magiskManager.shell.su(fileWritingList, "cat " + MAGISK_LOG);
+                        getShell().su(fileWritingList, "cat " + MAGISK_LOG);
                     } catch (IOException e) {
                         e.printStackTrace();
                         return false;
@@ -188,9 +170,9 @@ public class MagiskLogFragment extends Fragment {
                 case 2:
                     boolean bool = (boolean) o;
                     if (bool) {
-                        MagiskLogFragment.this.getApplication().toast(targetFile.toString(), Toast.LENGTH_LONG);
+                        getMagiskManager().toast(targetFile.toString(), Toast.LENGTH_LONG);
                     } else {
-                        MagiskLogFragment.this.getApplication().toast(R.string.logs_save_failed, Toast.LENGTH_LONG);
+                        getMagiskManager().toast(R.string.logs_save_failed, Toast.LENGTH_LONG);
                     }
                     break;
             }

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

@@ -3,49 +3,63 @@ package com.topjohnwu.magisk;
 import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
+import android.app.job.JobInfo;
+import android.app.job.JobScheduler;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.text.TextUtils;
 import android.widget.Toast;
 
+import com.topjohnwu.magisk.asyncs.CheckUpdates;
+import com.topjohnwu.magisk.asyncs.DownloadBusybox;
+import com.topjohnwu.magisk.asyncs.LoadModules;
+import com.topjohnwu.magisk.asyncs.ParallelTask;
+import com.topjohnwu.magisk.asyncs.UpdateRepos;
+import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.database.RepoDatabaseHelper;
 import com.topjohnwu.magisk.database.SuDatabaseHelper;
-import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.module.Repo;
-import com.topjohnwu.magisk.utils.CallbackEvent;
-import com.topjohnwu.magisk.utils.SafetyNetHelper;
+import com.topjohnwu.magisk.services.UpdateCheckService;
+import com.topjohnwu.magisk.superuser.SuReceiver;
+import com.topjohnwu.magisk.superuser.SuRequestActivity;
 import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ValueSortedMap;
 
-import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
 
 public class MagiskManager extends Application {
 
     public static final String MAGISK_DISABLE_FILE = "/cache/.disable_magisk";
+    public static final String MAGISK_HOST_FILE = "/magisk/.core/hosts";
     public static final String TMP_FOLDER_PATH = "/dev/tmp";
     public static final String MAGISK_PATH = "/magisk";
-    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";
     public static final String NOTIFICATION_CHANNEL = "magisk_update_notice";
+    public static final String BUSYBOXPATH = "/dev/magisk/bin";
+    public static final int UPDATE_SERVICE_ID = 1;
 
-    // Events
-    public final CallbackEvent<Void> magiskHideDone = new CallbackEvent<>();
-    public final CallbackEvent<Void> reloadMainActivity = new CallbackEvent<>();
-    public final CallbackEvent<Void> moduleLoadDone = new CallbackEvent<>();
-    public final CallbackEvent<Void> repoLoadDone = new CallbackEvent<>();
-    public final CallbackEvent<Void> updateCheckDone = new CallbackEvent<>();
-    public final CallbackEvent<Void> safetyNetDone = new CallbackEvent<>();
+    // Topics
+    public final Topic magiskHideDone = new Topic();
+    public final Topic reloadActivity = new Topic();
+    public final Topic moduleLoadDone = new Topic();
+    public final Topic repoLoadDone = new Topic();
+    public final Topic updateCheckDone = new Topic();
+    public final Topic safetyNetDone = new Topic();
+    public final Topic localeDone = new Topic();
 
     // Info
     public String magiskVersionString;
@@ -57,22 +71,19 @@ public class MagiskManager extends Application {
     public String remoteManagerVersionString;
     public int remoteManagerVersionCode = -1;
     public String managerLink;
-    public SafetyNetHelper.Result SNCheckResult;
     public String bootBlock = null;
     public boolean isSuClient = false;
     public String suVersion = null;
     public boolean disabled;
 
     // Data
-    public ValueSortedMap<String, Repo> repoMap;
-    public ValueSortedMap<String, Module> moduleMap;
+    public Map<String, Module> moduleMap;
     public List<String> blockList;
-    public List<ApplicationInfo> appList;
-    public List<String> magiskHideList;
+    public List<Locale> locales;
 
     // Configurations
-    public static boolean shellLogging;
-    public static boolean devLogging;
+    public static Locale locale;
+    public static Locale defaultLocale;
 
     public boolean magiskHide;
     public boolean isDarkTheme;
@@ -85,20 +96,85 @@ public class MagiskManager extends Application {
     public int suResponseType;
     public int suNotificationType;
     public int suNamespaceMode;
+    public String localeConfig;
+    public int updateChannel;
+    public String bootFormat;
+    public int snet_version;
 
     // Global resources
     public SharedPreferences prefs;
     public SuDatabaseHelper suDB;
+    public RepoDatabaseHelper repoDB;
     public Shell shell;
 
     private static Handler mHandler = new Handler();
+    private boolean started = false;
+
+    private static class LoadLocale extends ParallelTask<Void, Void, Void> {
+
+        LoadLocale(Context context) {
+            super(context);
+        }
+
+        @Override
+        protected Void doInBackground(Void... voids) {
+            getMagiskManager().locales = Utils.getAvailableLocale(getMagiskManager());
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void aVoid) {
+            getMagiskManager().localeDone.publish();
+        }
+    }
 
     @Override
     public void onCreate() {
         super.onCreate();
-        new File(getApplicationInfo().dataDir).mkdirs();  /* Create the app data directory */
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        shell = Shell.getShell();
+
+        if (getDatabasePath(SuDatabaseHelper.DB_NAME).exists()) {
+            // Don't migrate yet, wait and check Magisk version
+            suDB = new SuDatabaseHelper(this);
+        } else {
+            suDB = new SuDatabaseHelper(Utils.getEncContext(this));
+        }
+
+        repoDB = new RepoDatabaseHelper(this);
+        defaultLocale = Locale.getDefault();
+        setLocale();
+        loadConfig();
+    }
+
+    public void setLocale() {
+        localeConfig = prefs.getString("locale", "");
+        if (localeConfig.isEmpty()) {
+            locale = defaultLocale;
+        } else {
+            locale = Locale.forLanguageTag(localeConfig);
+        }
+        Resources res = getBaseContext().getResources();
+        Configuration config = new Configuration(res.getConfiguration());
+        config.setLocale(locale);
+        res.updateConfiguration(config, res.getDisplayMetrics());
+    }
+
+    public void loadConfig() {
+        isDarkTheme = prefs.getBoolean("dark_theme", false);
+
+        // su
+        suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
+        suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", SuRequestActivity.PROMPT);
+        suNotificationType = Utils.getPrefsInt(prefs, "su_notification", SuReceiver.TOAST);
+        suReauth = prefs.getBoolean("su_reauth", false);
+        suAccessState = suDB.getSettings(SuDatabaseHelper.ROOT_ACCESS, SuDatabaseHelper.ROOT_ACCESS_APPS_AND_ADB);
+        multiuserMode = suDB.getSettings(SuDatabaseHelper.MULTIUSER_MODE, SuDatabaseHelper.MULTIUSER_MODE_OWNER_ONLY);
+        suNamespaceMode = suDB.getSettings(SuDatabaseHelper.MNT_NS, SuDatabaseHelper.NAMESPACE_MODE_REQUESTER);
+
+        updateNotification = prefs.getBoolean("notification", true);
+        updateChannel = Utils.getPrefsInt(prefs, "update_channel", CheckUpdates.STABLE_CHANNEL);
+        bootFormat = prefs.getString("boot_format", ".img");
+        snet_version = prefs.getInt("snet_version", -1);
     }
 
     public void toast(String msg, int duration) {
@@ -109,35 +185,66 @@ public class MagiskManager extends Application {
         mHandler.post(() -> Toast.makeText(this, resId, duration).show());
     }
 
-    public void init() {
-        isDarkTheme = prefs.getBoolean("dark_theme", false);
-        if (BuildConfig.DEBUG) {
-            devLogging = prefs.getBoolean("developer_logging", false);
-            shellLogging = prefs.getBoolean("shell_logging", false);
-        } else {
-            devLogging = false;
-            shellLogging = false;
+    public void startup() {
+        if (started)
+            return;
+        started = true;
+
+        boolean hasNetwork = Utils.checkNetworkStatus(this);
+
+        getMagiskInfo();
+
+        // Check if we need to migrate suDB
+        if (getDatabasePath(SuDatabaseHelper.DB_NAME).exists() && Utils.useFDE(this)) {
+            if (magiskVersionCode >= 1410) {
+                suDB.close();
+                Context de = createDeviceProtectedStorageContext();
+                de.moveDatabaseFrom(this, SuDatabaseHelper.DB_NAME);
+                suDB = new SuDatabaseHelper(de);
+            }
         }
-        magiskHide = prefs.getBoolean("magiskhide", true);
-        initSU();
-        updateMagiskInfo();
-        updateBlockInfo();
-        // Initialize busybox
-        File busybox = new File(getApplicationInfo().dataDir + "/busybox/busybox");
-        if (!busybox.exists() || !TextUtils.equals(prefs.getString("busybox_version", ""), BUSYBOX_VERSION)) {
-            busybox.getParentFile().mkdirs();
+
+        new LoadLocale(this).exec();
+
+        // Root actions
+        if (Shell.rootAccess()) {
+            if (hasNetwork && !Utils.itemExist(shell, BUSYBOXPATH + "/busybox")) {
+                try {
+                    // Force synchronous, make sure we have busybox to use
+                    new DownloadBusybox(this).exec().get();
+                } catch (InterruptedException | ExecutionException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            try (InputStream in  = getAssets().open(Utils.UTIL_FUNCTIONS)) {
+                shell.loadInputStream(in);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
             shell.su_raw(
-                    "cp -f " + new File(getApplicationInfo().nativeLibraryDir, "libbusybox.so") + " " + busybox,
-                    "chmod -R 755 " + busybox.getParent(),
-                    busybox + " --install -s " + busybox.getParent()
+                    "export PATH=" + BUSYBOXPATH + ":$PATH",
+                    "mount_partitions",
+                    "BOOTIMAGE=",
+                    "find_boot_image",
+                    "migrate_boot_backup"
             );
+
+            List<String> res = shell.su("echo \"$BOOTIMAGE\"");
+            if (Utils.isValidShellResponse(res)) {
+                bootBlock = res.get(0);
+            } else {
+                blockList = shell.su("find /dev/block -type b | grep -vE 'dm|ram|loop'");
+            }
         }
-        // Initialize prefs
+
+        // Write back default values
         prefs.edit()
                 .putBoolean("dark_theme", isDarkTheme)
                 .putBoolean("magiskhide", magiskHide)
                 .putBoolean("notification", updateNotification)
-                .putBoolean("hosts", new File("/magisk/.core/hosts").exists())
+                .putBoolean("hosts", Utils.itemExist(shell, MAGISK_HOST_FILE))
                 .putBoolean("disable", Utils.itemExist(shell, MAGISK_DISABLE_FILE))
                 .putBoolean("su_reauth", suReauth)
                 .putString("su_request_timeout", String.valueOf(suRequestTimeout))
@@ -146,46 +253,43 @@ public class MagiskManager extends Application {
                 .putString("su_access", String.valueOf(suAccessState))
                 .putString("multiuser_mode", String.valueOf(multiuserMode))
                 .putString("mnt_ns", String.valueOf(suNamespaceMode))
-                .putString("busybox_version", BUSYBOX_VERSION)
+                .putString("update_channel", String.valueOf(updateChannel))
+                .putString("locale", localeConfig)
+                .putString("boot_format", bootFormat)
                 .apply();
-        // Add busybox to PATH
-        shell.su_raw("PATH=$PATH:" + busybox.getParent());
 
         // Create notification channel on Android O
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL,
                     getString(R.string.magisk_updates), NotificationManager.IMPORTANCE_DEFAULT);
-            ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(channel);
+            getSystemService(NotificationManager.class).createNotificationChannel(channel);
         }
 
+        LoadModules loadModuleTask = new LoadModules(this);
+        // Start update check job
+        if (hasNetwork) {
+            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) getSystemService(Context.JOB_SCHEDULER_SERVICE)).schedule(jobInfo);
+            loadModuleTask.setCallBack(() -> new UpdateRepos(this, false).exec());
+        }
+        // Fire asynctasks
+        loadModuleTask.exec();
+
     }
 
-    public void initSUConfig() {
-        suDB = new SuDatabaseHelper(this);
-        suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
-        suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", 0);
-        suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
-        suReauth = prefs.getBoolean("su_reauth", false);
-    }
-
-    public void initSU() {
-        initSUConfig();
-
-        List<String> ret = shell.sh("su -v");
+    public void getMagiskInfo() {
+        List<String> ret;
+        Shell.getShell(this);
+        ret = shell.sh("su -v");
         if (Utils.isValidShellResponse(ret)) {
             suVersion = ret.get(0);
             isSuClient = suVersion.toUpperCase().contains("MAGISK");
         }
-        if (isSuClient) {
-            suAccessState = suDB.getSettings(SuDatabaseHelper.ROOT_ACCESS, 3);
-            multiuserMode = suDB.getSettings(SuDatabaseHelper.MULTIUSER_MODE, 0);
-            suNamespaceMode = suDB.getSettings(SuDatabaseHelper.MNT_NS, 1);
-        }
-    }
-
-    public void updateMagiskInfo() {
-        updateNotification = prefs.getBoolean("notification", true);
-        List<String> ret;
         ret = shell.sh("magisk -v");
         if (!Utils.isValidShellResponse(ret)) {
             ret = shell.sh("getprop magisk.version");
@@ -208,28 +312,15 @@ public class MagiskManager extends Application {
         } catch (NumberFormatException e) {
             disabled = false;
         }
-        ret = shell.sh("getprop " + MAGISKHIDE_PROP);
+        if (magiskVersionCode > 1435) {
+            ret = shell.su("resetprop -p " + MAGISKHIDE_PROP);
+        } else {
+            ret = shell.sh("getprop " + MAGISKHIDE_PROP);
+        }
         try {
             magiskHide = !Utils.isValidShellResponse(ret) || Integer.parseInt(ret.get(0)) != 0;
         } catch (NumberFormatException e) {
             magiskHide = true;
         }
     }
-
-    public void updateBlockInfo() {
-        List<String> res = shell.su(
-                "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",
-                "[ ! -z \"$BOOTIMAGE\" -a -L \"$BOOTIMAGE\" ] && BOOTIMAGE=`readlink $BOOTIMAGE`",
-                "echo \"$BOOTIMAGE\""
-        );
-        if (Utils.isValidShellResponse(res)) {
-            bootBlock = res.get(0);
-        } else {
-            blockList = shell.su("ls -d /dev/block/mmc* /dev/block/sd* 2>/dev/null");
-        }
-    }
-
 }

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

@@ -1,15 +1,11 @@
 package com.topjohnwu.magisk;
 
-import android.Manifest;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
-import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.widget.DrawerLayout;
@@ -20,15 +16,15 @@ import android.view.MenuItem;
 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.Topic;
 import com.topjohnwu.magisk.utils.Utils;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class MainActivity extends Activity
-        implements NavigationView.OnNavigationItemSelectedListener, CallbackEvent.Listener<Void> {
+        implements NavigationView.OnNavigationItemSelectedListener, Topic.Subscriber {
 
     private final Handler mDrawerHandler = new Handler();
     private SharedPreferences prefs;
@@ -42,24 +38,20 @@ public class MainActivity extends Activity
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
+        getMagiskManager().startup();
 
-        prefs = getApplicationContext().prefs;
+        prefs = getMagiskManager().prefs;
 
-        if (getApplicationContext().isDarkTheme) {
+        if (getMagiskManager().isDarkTheme) {
             setTheme(R.style.AppTheme_Dark);
         }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         ButterKnife.bind(this);
 
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0);
-        }
-
         setSupportActionBar(toolbar);
 
-        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close) {
+        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.magisk, R.string.magisk) {
             @Override
             public void onDrawerOpened(View drawerView) {
                 super.onDrawerOpened(drawerView);
@@ -81,7 +73,6 @@ public class MainActivity extends Activity
             navigate(getIntent().getStringExtra(MagiskManager.INTENT_SECTION));
 
         navigationView.setNavigationItemSelectedListener(this);
-        getApplicationContext().reloadMainActivity.register(this);
 
     }
 
@@ -91,12 +82,6 @@ public class MainActivity extends Activity
         checkHideSection();
     }
 
-    @Override
-    protected void onDestroy() {
-        getApplicationContext().reloadMainActivity.unRegister(this);
-        super.onDestroy();
-    }
-
     @Override
     public void onBackPressed() {
         if (drawer.isDrawerOpen(navigationView)) {
@@ -117,22 +102,27 @@ public class MainActivity extends Activity
     }
 
     @Override
-    public void onTrigger(CallbackEvent<Void> event) {
+    public void onTopicPublished(Topic topic, Object result) {
         recreate();
     }
 
+    @Override
+    public Topic[] getSubscription() {
+        return new Topic[] { getMagiskManager().reloadActivity };
+    }
+
     public void checkHideSection() {
         Menu menu = navigationView.getMenu();
         menu.findItem(R.id.magiskhide).setVisible(
-                Shell.rootAccess() && getApplicationContext().magiskVersionCode >= 1300
+                Shell.rootAccess() && getMagiskManager().magiskVersionCode >= 1300
                         && prefs.getBoolean("magiskhide", false));
         menu.findItem(R.id.modules).setVisible(
-                Shell.rootAccess() && getApplicationContext().magiskVersionCode >= 0);
+                Shell.rootAccess() && getMagiskManager().magiskVersionCode >= 0);
         menu.findItem(R.id.downloads).setVisible(Utils.checkNetworkStatus(this) &&
-                Shell.rootAccess() && getApplicationContext().magiskVersionCode >= 0);
+                Shell.rootAccess() && getMagiskManager().magiskVersionCode >= 0);
         menu.findItem(R.id.log).setVisible(Shell.rootAccess());
         menu.findItem(R.id.superuser).setVisible(
-                Shell.rootAccess() && getApplicationContext().isSuClient);
+                Shell.rootAccess() && getMagiskManager().isSuClient);
     }
 
     public void navigate(String item) {
@@ -142,9 +132,6 @@ public class MainActivity extends Activity
                 case "magisk":
                     itemId = R.id.magisk;
                     break;
-                case "install":
-                    itemId = -1;
-                    break;
                 case "superuser":
                     itemId = R.id.superuser;
                     break;
@@ -176,13 +163,6 @@ 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/ModulesFragment.java

@@ -1,10 +1,10 @@
 package com.topjohnwu.magisk;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 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;
@@ -15,18 +15,19 @@ import android.widget.TextView;
 import com.topjohnwu.magisk.adapters.ModulesAdapter;
 import com.topjohnwu.magisk.asyncs.LoadModules;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.utils.CallbackEvent;
-import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import butterknife.Unbinder;
 
-public class ModulesFragment extends Fragment implements CallbackEvent.Listener<Void> {
+public class ModulesFragment extends Fragment implements Topic.Subscriber {
 
     private static final int FETCH_ZIP_CODE = 2;
 
@@ -34,7 +35,14 @@ public class ModulesFragment extends Fragment implements CallbackEvent.Listener<
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
     @BindView(R.id.empty_rv) TextView emptyRv;
-    @BindView(R.id.fab) FloatingActionButton fabio;
+    @OnClick(R.id.fab)
+    public void selectFile() {
+        Utils.runWithPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE, () -> {
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.setType("application/zip");
+            startActivityForResult(intent, FETCH_ZIP_CODE);
+        });
+    }
 
     private List<Module> listModules = new ArrayList<>();
 
@@ -44,12 +52,6 @@ public class ModulesFragment extends Fragment implements CallbackEvent.Listener<
         View view = inflater.inflate(R.layout.fragment_modules, container, false);
         unbinder = ButterKnife.bind(this, view);
 
-        fabio.setOnClickListener(v -> {
-            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-            intent.setType("application/zip");
-            startActivityForResult(intent, FETCH_ZIP_CODE);
-        });
-
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
             recyclerView.setVisibility(View.GONE);
             new LoadModules(getActivity()).exec();
@@ -67,41 +69,29 @@ public class ModulesFragment extends Fragment implements CallbackEvent.Listener<
             }
         });
 
-        if (getApplication().moduleLoadDone.isTriggered) {
-            updateUI();
-        }
+        getActivity().setTitle(R.string.modules);
 
         return view;
     }
 
     @Override
-    public void onTrigger(CallbackEvent<Void> event) {
-        Logger.dev("ModulesFragment: UI refresh triggered");
+    public void onTopicPublished(Topic topic, Object result) {
         updateUI();
     }
 
+    @Override
+    public Topic[] getSubscription() {
+        return new Topic[] { getApplication().moduleLoadDone };
+    }
+
     @Override
     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
             Intent intent = new Intent(getActivity(), FlashActivity.class);
-            intent.setData(data.getData()).putExtra("ACTION", "flash");
+            intent.setData(data.getData()).putExtra(FlashActivity.SET_ACTION, FlashActivity.FLASH_ZIP);
             startActivity(intent);
         }
-
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        getApplication().moduleLoadDone.register(this);
-        getActivity().setTitle(R.string.modules);
-    }
-
-    @Override
-    public void onStop() {
-        getApplication().moduleLoadDone.unRegister(this);
-        super.onStop();
     }
 
     @Override

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

@@ -13,23 +13,22 @@ import android.widget.SearchView;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.adapters.ReposAdapter;
-import com.topjohnwu.magisk.asyncs.LoadRepos;
+import com.topjohnwu.magisk.asyncs.UpdateRepos;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.utils.CallbackEvent;
-import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.utils.Topic;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 
-public class ReposFragment extends Fragment implements CallbackEvent.Listener<Void> {
+public class ReposFragment extends Fragment implements Topic.Subscriber {
 
     private Unbinder unbinder;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
     @BindView(R.id.empty_rv) TextView emptyRv;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
 
-    private ReposAdapter adapter;
+    public static ReposAdapter adapter;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -43,36 +42,42 @@ public class ReposFragment extends Fragment implements CallbackEvent.Listener<Vo
         View view = inflater.inflate(R.layout.fragment_repos, container, false);
         unbinder = ButterKnife.bind(this, view);
 
-        adapter = new ReposAdapter(getApplication().repoMap);
-
-        recyclerView.setAdapter(adapter);
-
         mSwipeRefreshLayout.setRefreshing(true);
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
-            recyclerView.setVisibility(View.GONE);
-            new LoadRepos(getActivity()).exec();
+            recyclerView.setVisibility(View.VISIBLE);
+            emptyRv.setVisibility(View.GONE);
+            new UpdateRepos(getActivity(), true).exec();
         });
 
-        if (getApplication().repoLoadDone.isTriggered) {
-            onTrigger(null);
-        }
+        getActivity().setTitle(R.string.downloads);
 
         return view;
     }
 
     @Override
-    public void onTrigger(CallbackEvent<Void> event) {
-        Logger.dev("ReposFragment: UI refresh triggered");
-        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);
-        }
+    public void onResume() {
+        adapter = new ReposAdapter(getApplication().repoDB, getApplication().moduleMap);
+        recyclerView.setAdapter(adapter);
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        adapter = null;
+    }
+
+    @Override
+    public void onTopicPublished(Topic topic, Object result) {
+        mSwipeRefreshLayout.setRefreshing(false);
+        recyclerView.setVisibility(adapter.getItemCount() == 0 ? View.GONE : View.VISIBLE);
+        emptyRv.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
+    }
+
+    @Override
+    public Topic[] getSubscription() {
+        return new Topic[] { getApplication().repoLoadDone };
     }
 
     @Override
@@ -87,25 +92,12 @@ public class ReposFragment extends Fragment implements CallbackEvent.Listener<Vo
 
             @Override
             public boolean onQueryTextChange(String newText) {
-                adapter.filter(getApplication().moduleMap, newText);
+                adapter.filter(newText);
                 return false;
             }
         });
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        getApplication().repoLoadDone.register(this);
-        getActivity().setTitle(R.string.downloads);
-    }
-
-    @Override
-    public void onStop() {
-        getApplication().repoLoadDone.unRegister(this);
-        super.onStop();
-    }
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();

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

@@ -1,9 +1,11 @@
 package com.topjohnwu.magisk;
 
+import android.Manifest;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
+import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
@@ -13,25 +15,27 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.widget.Toast;
 
-import com.topjohnwu.magisk.asyncs.MagiskHide;
+import com.topjohnwu.magisk.asyncs.CheckUpdates;
+import com.topjohnwu.magisk.asyncs.HideManager;
 import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
 import com.topjohnwu.magisk.database.SuDatabaseHelper;
-import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
 
+import java.util.Locale;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class SettingsActivity extends Activity {
+public class SettingsActivity extends Activity implements Topic.Subscriber {
 
     @BindView(R.id.toolbar) Toolbar toolbar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (getApplicationContext().isDarkTheme) {
+        if (getMagiskManager().isDarkTheme) {
             setTheme(R.style.AppTheme_Transparent_Dark);
         }
 
@@ -56,14 +60,27 @@ public class SettingsActivity extends Activity {
 
     }
 
+    @Override
+    public void onTopicPublished(Topic topic, Object result) {
+        recreate();
+    }
+
+    @Override
+    public Topic[] getSubscription() {
+        return new Topic[] { getMagiskManager().reloadActivity };
+    }
+
     public static class SettingsFragment extends PreferenceFragment
-            implements SharedPreferences.OnSharedPreferenceChangeListener {
+            implements SharedPreferences.OnSharedPreferenceChangeListener,
+            Topic.Subscriber {
 
         private SharedPreferences prefs;
         private PreferenceScreen prefScreen;
 
-        private ListPreference suAccess, autoRes, suNotification, requestTimeout, multiuserMode, namespaceMode;
-        private MagiskManager magiskManager;
+        private ListPreference updateChannel, suAccess, autoRes, suNotification,
+                requestTimeout, multiuserMode, namespaceMode;
+        private MagiskManager mm;
+        private PreferenceCategory generalCatagory;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -71,12 +88,13 @@ public class SettingsActivity extends Activity {
             addPreferencesFromResource(R.xml.app_settings);
             prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
             prefScreen = getPreferenceScreen();
-            magiskManager = Utils.getMagiskManager(getActivity());
+            mm = Utils.getMagiskManager(getActivity());
 
+            generalCatagory = (PreferenceCategory) findPreference("general");
             PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
             PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
-            PreferenceCategory developer = (PreferenceCategory) findPreference("developer");
 
+            updateChannel = (ListPreference) findPreference("update_channel");
             suAccess = (ListPreference) findPreference("su_access");
             autoRes = (ListPreference) findPreference("su_auto_response");
             requestTimeout = (ListPreference) findPreference("su_request_timeout");
@@ -84,13 +102,14 @@ public class SettingsActivity extends Activity {
             multiuserMode = (ListPreference) findPreference("multiuser_mode");
             namespaceMode = (ListPreference) findPreference("mnt_ns");
             SwitchPreference reauth = (SwitchPreference) findPreference("su_reauth");
+            Preference hideManager = findPreference("hide");
 
             setSummary();
 
             // Disable dangerous settings in user mode if selected owner manage
             if (getActivity().getApplicationInfo().uid > 99999) {
-                prefScreen.removePreference(magiskCategory);
-                prefScreen.removePreference(suCategory);
+                suCategory.removePreference(multiuserMode);
+                generalCatagory.removePreference(hideManager);
             }
 
             // Remove re-authentication option on Android O, it will not work
@@ -103,131 +122,156 @@ public class SettingsActivity extends Activity {
                 return true;
             });
 
-            if (!BuildConfig.DEBUG) {
-                prefScreen.removePreference(developer);
-            }
+            hideManager.setOnPreferenceClickListener((pref) -> {
+                Utils.runWithPermission(getActivity(),
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        () -> new HideManager(getActivity()).exec());
+                return true;
+            });
 
             if (!Shell.rootAccess()) {
                 prefScreen.removePreference(magiskCategory);
                 prefScreen.removePreference(suCategory);
+                generalCatagory.removePreference(hideManager);
             } else {
-                if (!magiskManager.isSuClient) {
+                if (!mm.isSuClient) {
                     prefScreen.removePreference(suCategory);
                 }
-                if (magiskManager.magiskVersionCode < 1300) {
+                if (mm.magiskVersionCode < 1300) {
                     prefScreen.removePreference(magiskCategory);
                 }
             }
         }
 
+        private void setLocalePreference(ListPreference lp) {
+            boolean isNew = lp == null;
+            if (isNew) {
+                lp = new ListPreference(getActivity());
+            }
+            CharSequence[] entries = new CharSequence[mm.locales.size() + 1];
+            CharSequence[] entryValues = new CharSequence[mm.locales.size() + 1];
+            entries[0] = getString(R.string.system_default);
+            entryValues[0] = "";
+            int i = 1;
+            for (Locale locale : mm.locales) {
+                entries[i] = locale.getDisplayName(locale);
+                entryValues[i++] = locale.toLanguageTag();
+            }
+            lp.setEntries(entries);
+            lp.setEntryValues(entryValues);
+            lp.setTitle(R.string.language);
+            lp.setKey("locale");
+            lp.setSummary(MagiskManager.locale.getDisplayName(MagiskManager.locale));
+            if (isNew) {
+                generalCatagory.addPreference(lp);
+            }
+        }
+
         @Override
         public void onResume() {
             super.onResume();
             prefs.registerOnSharedPreferenceChangeListener(this);
+            subscribeTopics();
         }
 
         @Override
         public void onPause() {
-            super.onPause();
             prefs.unregisterOnSharedPreferenceChangeListener(this);
+            unsubscribeTopics();
+            super.onPause();
         }
 
         @Override
         public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
-            Logger.dev("Settings: Prefs change " + key);
             boolean enabled;
 
             switch (key) {
                 case "dark_theme":
                     enabled = prefs.getBoolean("dark_theme", false);
-                    if (magiskManager.isDarkTheme != enabled) {
-                        magiskManager.isDarkTheme = enabled;
-                        magiskManager.reloadMainActivity.trigger();
-                        getActivity().recreate();
+                    if (mm.isDarkTheme != enabled) {
+                        mm.reloadActivity.publish(false);
                     }
                     break;
                 case "disable":
                     enabled = prefs.getBoolean("disable", false);
                     if (enabled) {
-                        Utils.createFile(magiskManager.shell, MagiskManager.MAGISK_DISABLE_FILE);
+                        Utils.createFile(getShell(), MagiskManager.MAGISK_DISABLE_FILE);
                     } else {
-                        Utils.removeItem(magiskManager.shell, MagiskManager.MAGISK_DISABLE_FILE);
+                        Utils.removeItem(getShell(), MagiskManager.MAGISK_DISABLE_FILE);
                     }
                     Toast.makeText(getActivity(), R.string.settings_reboot_toast, Toast.LENGTH_LONG).show();
                     break;
                 case "magiskhide":
                     enabled = prefs.getBoolean("magiskhide", false);
                     if (enabled) {
-                        if (!magiskManager.isSuClient) {
-                            new AlertDialogBuilder(getActivity())
-                                    .setTitle(R.string.no_magisksu_title)
-                                    .setMessage(R.string.no_magisksu_msg)
-                                    .setPositiveButton(R.string.understand, (dialog, which) -> new MagiskHide(getActivity()).enable())
-                                    .setCancelable(false)
-                                    .show();
-                        } else {
-                            new MagiskHide(getActivity()).enable();
-                        }
+                        Utils.enableMagiskHide(getShell());
                     } else {
-                        new MagiskHide(getActivity()).disable();
+                        Utils.disableMagiskHide(getShell());
                     }
                     break;
                 case "hosts":
                     enabled = prefs.getBoolean("hosts", false);
                     if (enabled) {
-                        magiskManager.shell.su_raw(
-                                "cp -af /system/etc/hosts /magisk/.core/hosts",
-                                "mount -o bind /magisk/.core/hosts /system/etc/hosts");
+                        getShell().su_raw(
+                                "cp -af /system/etc/hosts " + MagiskManager.MAGISK_HOST_FILE,
+                                "mount -o bind " + MagiskManager.MAGISK_HOST_FILE + " /system/etc/hosts");
                     } else {
-                        magiskManager.shell.su_raw(
+                        getShell().su_raw(
                                 "umount -l /system/etc/hosts",
-                                "rm -f /magisk/.core/hosts");
+                                "rm -f " + MagiskManager.MAGISK_HOST_FILE);
                     }
                     break;
                 case "su_access":
-                    magiskManager.suAccessState = Utils.getPrefsInt(prefs, "su_access", 3);
-                    magiskManager.suDB.setSettings(SuDatabaseHelper.ROOT_ACCESS, magiskManager.suAccessState);
+                    mm.suDB.setSettings(SuDatabaseHelper.ROOT_ACCESS, Utils.getPrefsInt(prefs, "su_access"));
                     break;
                 case "multiuser_mode":
-                    magiskManager.multiuserMode = Utils.getPrefsInt(prefs, "multiuser_mode", 0);
-                    magiskManager.suDB.setSettings(SuDatabaseHelper.MULTIUSER_MODE, magiskManager.multiuserMode);
+                    mm.suDB.setSettings(SuDatabaseHelper.MULTIUSER_MODE, Utils.getPrefsInt(prefs, "multiuser_mode"));
                     break;
                 case "mnt_ns":
-                    magiskManager.suNamespaceMode = Utils.getPrefsInt(prefs, "mnt_ns", 1);
-                    magiskManager.suDB.setSettings(SuDatabaseHelper.MNT_NS, magiskManager.suNamespaceMode);
+                    mm.suDB.setSettings(SuDatabaseHelper.MNT_NS, Utils.getPrefsInt(prefs, "mnt_ns"));
                     break;
-                case "su_request_timeout":
-                    magiskManager.suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
+                case "locale":
+                    mm.setLocale();
+                    mm.reloadActivity.publish(false);
                     break;
-                case "su_auto_response":
-                    magiskManager.suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", 0);
-                    break;
-                case "su_notification":
-                    magiskManager.suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
-                    break;
-                case "developer_logging":
-                    MagiskManager.devLogging = prefs.getBoolean("developer_logging", false);
-                    break;
-                case "shell_logging":
-                    MagiskManager.shellLogging = prefs.getBoolean("shell_logging", false);
+                case "update_channel":
+                    mm.updateChannel = Utils.getPrefsInt(prefs, "update_channel");
+                    new CheckUpdates(mm, true).exec();
                     break;
             }
+            mm.loadConfig();
             setSummary();
         }
 
+        private Shell getShell() {
+            return Shell.getShell(getActivity());
+        }
+
         private void setSummary() {
+            updateChannel.setSummary(getResources()
+                    .getStringArray(R.array.update_channel)[mm.updateChannel]);
             suAccess.setSummary(getResources()
-                    .getStringArray(R.array.su_access)[magiskManager.suAccessState]);
+                    .getStringArray(R.array.su_access)[mm.suAccessState]);
             autoRes.setSummary(getResources()
-                    .getStringArray(R.array.auto_response)[magiskManager.suResponseType]);
+                    .getStringArray(R.array.auto_response)[mm.suResponseType]);
             suNotification.setSummary(getResources()
-                    .getStringArray(R.array.su_notification)[magiskManager.suNotificationType]);
+                    .getStringArray(R.array.su_notification)[mm.suNotificationType]);
             requestTimeout.setSummary(
                     getString(R.string.request_timeout_summary, prefs.getString("su_request_timeout", "10")));
             multiuserMode.setSummary(getResources()
-                    .getStringArray(R.array.multiuser_summary)[magiskManager.multiuserMode]);
+                    .getStringArray(R.array.multiuser_summary)[mm.multiuserMode]);
             namespaceMode.setSummary(getResources()
-                    .getStringArray(R.array.namespace_summary)[magiskManager.suNamespaceMode]);
+                    .getStringArray(R.array.namespace_summary)[mm.suNamespaceMode]);
+        }
+
+        @Override
+        public void onTopicPublished(Topic topic, Object result) {
+            setLocalePreference((ListPreference) findPreference("locale"));
+        }
+
+        @Override
+        public Topic[] getSubscription() {
+            return new Topic[] { mm.localeDone };
         }
     }
 

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

@@ -1,59 +1,17 @@
 package com.topjohnwu.magisk;
 
-import android.app.job.JobInfo;
-import android.app.job.JobScheduler;
-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.LoadApps;
-import com.topjohnwu.magisk.asyncs.LoadModules;
-import com.topjohnwu.magisk.asyncs.LoadRepos;
 import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.services.UpdateCheckService;
-import com.topjohnwu.magisk.utils.Utils;
 
-public class SplashActivity extends Activity{
-
-    private static final int UPDATE_SERVICE_ID = 1;
+public class SplashActivity extends Activity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
 
-        MagiskManager magiskManager = getApplicationContext();
-
-        // 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
-            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
-        loadModuleTask.exec();
-        new LoadApps(this).exec();
+        getMagiskManager().startup();
 
         Intent intent = new Intent(this, MainActivity.class);
         String section = getIntent().getStringExtra(MagiskManager.INTENT_SECTION);

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

@@ -13,9 +13,6 @@ import android.widget.TextView;
 
 import com.topjohnwu.magisk.adapters.SuLogAdapter;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.superuser.SuLogEntry;
-
-import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -27,7 +24,8 @@ public class SuLogFragment extends Fragment {
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
 
     private Unbinder unbinder;
-    private MagiskManager magiskManager;
+    private MagiskManager mm;
+    private SuLogAdapter adapter;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -47,7 +45,9 @@ 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);
-        magiskManager = getApplication();
+        mm = getApplication();
+        adapter = new SuLogAdapter(mm.suDB);
+        recyclerView.setAdapter(adapter);
 
         updateList();
 
@@ -55,13 +55,12 @@ public class SuLogFragment extends Fragment {
     }
 
     private void updateList() {
-        List<SuLogEntry> logs = magiskManager.suDB.getLogList();
+        adapter.notifyDBChanged();
 
-        if (logs.size() == 0) {
+        if (adapter.getSectionCount() == 0) {
             emptyRv.setVisibility(View.VISIBLE);
             recyclerView.setVisibility(View.GONE);
         } else {
-            recyclerView.setAdapter(new SuLogAdapter(logs).getAdapter());
             emptyRv.setVisibility(View.GONE);
             recyclerView.setVisibility(View.VISIBLE);
         }
@@ -74,7 +73,7 @@ public class SuLogFragment extends Fragment {
                 updateList();
                 return true;
             case R.id.menu_clear:
-                magiskManager.suDB.clearLogs();
+                mm.suDB.clearLogs();
                 updateList();
                 return true;
             default:

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

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

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

@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.app.Activity;
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.support.design.widget.Snackbar;
@@ -14,13 +14,16 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.MagiskHide;
+import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.components.SnackbarMaker;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 import butterknife.BindView;
@@ -41,20 +44,19 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
 
     private List<ApplicationInfo> mOriginalList, mList;
     private List<String> mHideList;
-    private PackageManager packageManager;
+    private PackageManager pm;
     private ApplicationFilter filter;
+    private Topic magiskHideDone;
+    private Shell shell;
 
-    public ApplicationAdapter(PackageManager packageManager) {
+    public ApplicationAdapter(Context context) {
         mOriginalList = mList = Collections.emptyList();
         mHideList = Collections.emptyList();
-        this.packageManager = packageManager;
         filter = new ApplicationFilter();
-    }
-
-    public void setLists(List<ApplicationInfo> listApps, List<String> hideList) {
-        mOriginalList = mList = listApps;
-        mHideList = hideList;
-        notifyDataSetChanged();
+        pm = context.getPackageManager();
+        magiskHideDone = Utils.getMagiskManager(context).magiskHideDone;
+        shell = Shell.getShell(context);
+        new LoadApps().exec();
     }
 
     @Override
@@ -67,8 +69,8 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
     public void onBindViewHolder(final ViewHolder holder, int position) {
         ApplicationInfo info = mList.get(position);
 
-        holder.appIcon.setImageDrawable(info.loadIcon(packageManager));
-        holder.appName.setText(info.loadLabel(packageManager));
+        holder.appIcon.setImageDrawable(info.loadIcon(pm));
+        holder.appName.setText(info.loadLabel(pm));
         holder.appPackage.setText(info.packageName);
 
         // Remove all listeners
@@ -87,10 +89,10 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
             holder.checkBox.setChecked(mHideList.contains(info.packageName));
             holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
                 if (isChecked) {
-                    new MagiskHide((Activity) holder.itemView.getContext()).add(info.packageName);
+                    Utils.addMagiskHide(shell, info.packageName);
                     mHideList.add(info.packageName);
                 } else {
-                    new MagiskHide((Activity) holder.itemView.getContext()).rm(info.packageName);
+                    Utils.rmMagiskHide(shell, info.packageName);
                     mHideList.remove(info.packageName);
                 }
             });
@@ -106,6 +108,10 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
         filter.filter(constraint);
     }
 
+    public void refresh() {
+        new LoadApps().exec();
+    }
+
     static class ViewHolder extends RecyclerView.ViewHolder {
 
         @BindView(R.id.app_icon) ImageView appIcon;
@@ -123,31 +129,47 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
 
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
-            List<ApplicationInfo> filteredApps;
             if (constraint == null || constraint.length() == 0) {
-                filteredApps = mOriginalList;
+                mList = mOriginalList;
             } else {
-                filteredApps = new ArrayList<>();
+                mList = new ArrayList<>();
                 String filter = constraint.toString().toLowerCase();
                 for (ApplicationInfo info : mOriginalList) {
-                    if (Utils.lowercaseContains(info.loadLabel(packageManager), filter)
+                    if (Utils.lowercaseContains(info.loadLabel(pm), filter)
                             || Utils.lowercaseContains(info.packageName, filter)) {
-                        filteredApps.add(info);
+                        mList.add(info);
                     }
                 }
             }
-
-            FilterResults results = new FilterResults();
-            results.values = filteredApps;
-            results.count = filteredApps.size();
-            return results;
+            return null;
         }
 
-        @SuppressWarnings("unchecked")
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
-            mList = (List<ApplicationInfo>) results.values;
             notifyDataSetChanged();
         }
     }
+
+    private class LoadApps extends ParallelTask<Void, Void, Void> {
+
+        @Override
+        protected Void doInBackground(Void... voids) {
+            mOriginalList = pm.getInstalledApplications(0);
+            for (Iterator<ApplicationInfo> i = mOriginalList.iterator(); i.hasNext(); ) {
+                ApplicationInfo info = i.next();
+                if (ApplicationAdapter.BLACKLIST.contains(info.packageName) || !info.enabled) {
+                    i.remove();
+                }
+            }
+            Collections.sort(mOriginalList, (a, b) -> a.loadLabel(pm).toString().toLowerCase()
+                    .compareTo(b.loadLabel(pm).toString().toLowerCase()));
+            mHideList = Utils.listMagiskHide(shell);
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void v) {
+            magiskHideDone.publish(false);
+        }
+    }
 }

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

@@ -13,7 +13,7 @@ import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.module.Module;
+import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.utils.Shell;
 
 import java.util.List;

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

@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk.adapters;
 
+import android.app.Activity;
 import android.content.pm.PackageManager;
 import android.support.design.widget.Snackbar;
 import android.support.v7.widget.RecyclerView;
@@ -12,10 +13,10 @@ import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.AlertDialogBuilder;
-import com.topjohnwu.magisk.components.ExpandableViewHolder;
+import com.topjohnwu.magisk.components.ExpandableView;
 import com.topjohnwu.magisk.components.SnackbarMaker;
+import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.database.SuDatabaseHelper;
-import com.topjohnwu.magisk.superuser.Policy;
 
 import java.util.HashSet;
 import java.util.List;
@@ -50,7 +51,7 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
         holder.setExpanded(expandList.contains(policy));
 
         holder.itemView.setOnClickListener(view -> {
-            if (holder.mExpanded) {
+            if (holder.isExpanded()) {
                 holder.collapse();
                 expandList.remove(policy);
             } else {
@@ -92,7 +93,7 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
                 dbHelper.updatePolicy(policy);
             }
         });
-        holder.delete.setOnClickListener(v -> new AlertDialogBuilder(v.getContext())
+        holder.delete.setOnClickListener(v -> new AlertDialogBuilder((Activity) v.getContext())
                 .setTitle(R.string.su_revoke_title)
                 .setMessage(v.getContext().getString(R.string.su_revoke_msg, policy.appName))
                 .setPositiveButton(R.string.yes, (dialog, which) -> {
@@ -119,7 +120,7 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
         return policyList.size();
     }
 
-    static class ViewHolder extends ExpandableViewHolder {
+    static class ViewHolder extends RecyclerView.ViewHolder implements ExpandableView {
 
         @BindView(R.id.app_name) TextView appName;
         @BindView(R.id.package_name) TextView packageName;
@@ -127,18 +128,23 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
         @BindView(R.id.master_switch) Switch masterSwitch;
         @BindView(R.id.notification_switch) Switch notificationSwitch;
         @BindView(R.id.logging_switch) Switch loggingSwitch;
+        @BindView(R.id.expand_layout) ViewGroup expandLayout;
 
         @BindView(R.id.delete) ImageView delete;
         @BindView(R.id.more_info) ImageView moreInfo;
 
+        private Container container = new Container();
+
         public ViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
+            container.expandLayout = expandLayout;
+            setupExpandable();
         }
 
         @Override
-        public void setExpandLayout(View itemView) {
-            expandLayout = itemView.findViewById(R.id.expand_layout);
+        public Container getContainer() {
+            return container;
         }
     }
 }

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

@@ -2,9 +2,10 @@ package com.topjohnwu.magisk.adapters;
 
 import android.app.Activity;
 import android.content.Context;
-import android.net.Uri;
+import android.database.Cursor;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,176 +14,154 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.asyncs.MarkDownWindow;
 import com.topjohnwu.magisk.asyncs.ProcessRepoZip;
 import com.topjohnwu.magisk.components.AlertDialogBuilder;
-import com.topjohnwu.magisk.components.MarkDownWindow;
-import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.module.Repo;
-import com.topjohnwu.magisk.receivers.DownloadReceiver;
+import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.container.Repo;
+import com.topjohnwu.magisk.database.RepoDatabaseHelper;
 import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ValueSortedMap;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class ReposAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, ReposAdapter.RepoHolder> {
 
-    private static final int SECTION_TYPE = 0;
-    private static final int REPO_TYPE = 1;
+    private static final int UPDATES = 0;
+    private static final int INSTALLED = 1;
+    private static final int OTHERS = 2;
 
-    private List<Repo> mUpdateRepos, mInstalledRepos, mOthersRepos;
-    private int[] sectionList;
-    private int size;
-    private ValueSortedMap<String, Repo> repoMap;
+    private Cursor repoCursor = null;
+    private Map<String, Module> moduleMap;
+    private RepoDatabaseHelper repoDB;
+    private List<Pair<Integer, List<Repo>>> repoPairs;
 
-    public ReposAdapter(ValueSortedMap<String, Repo> map) {
-        repoMap = map;
-        mUpdateRepos = new ArrayList<>();
-        mInstalledRepos = new ArrayList<>();
-        mOthersRepos = new ArrayList<>();
-        sectionList = new int[3];
-        size = 0;
+    public ReposAdapter(RepoDatabaseHelper db, Map<String, Module> map) {
+        repoDB = db;
+        moduleMap = map;
+        repoPairs = new ArrayList<>();
+        notifyDBChanged();
+    }
+
+
+    @Override
+    public int getSectionCount() {
+        return repoPairs.size();
     }
 
     @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        Context context = parent.getContext();
-        View v;
-        RecyclerView.ViewHolder holder = null;
-        switch (viewType) {
-            case SECTION_TYPE:
-                v = LayoutInflater.from(context).inflate(R.layout.section, parent, false);
-                holder = new SectionHolder(v);
+    public int getItemCount(int section) {
+        return repoPairs.get(section).second.size();
+    }
+
+    @Override
+    public SectionHolder onCreateSectionViewHolder(ViewGroup parent) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.section, parent, false);
+        return new SectionHolder(v);
+    }
+
+    @Override
+    public RepoHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_repo, parent, false);
+        return new RepoHolder(v);
+    }
+
+    @Override
+    public void onBindSectionViewHolder(SectionHolder holder, int section) {
+        switch (repoPairs.get(section).first) {
+            case UPDATES:
+                holder.sectionText.setText(R.string.update_available);
                 break;
-            case REPO_TYPE:
-                v = LayoutInflater.from(context).inflate(R.layout.list_item_repo, parent, false);
-                holder = new RepoHolder(v);
+            case INSTALLED:
+                holder.sectionText.setText(R.string.installed);
+                break;
+            case OTHERS:
+                holder.sectionText.setText(R.string.not_installed);
                 break;
         }
-        return holder;
     }
 
     @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+    public void onBindItemViewHolder(RepoHolder holder, int section, int position) {
+        Repo repo = repoPairs.get(section).second.get(position);
         Context context = holder.itemView.getContext();
-        switch (getItemViewType(position)) {
-            case SECTION_TYPE:
-                SectionHolder section = (SectionHolder) holder;
-                if (position == sectionList[0]) {
-                    section.sectionText.setText(context.getString(R.string.update_available));
-                } else if (position == sectionList[1]) {
-                    section.sectionText.setText(context.getString(R.string.installed));
-                } else {
-                    section.sectionText.setText(context.getString(R.string.not_installed));
-                }
-                break;
-            case REPO_TYPE:
-                RepoHolder repoHolder = (RepoHolder) holder;
-                Repo repo = getRepo(position);
-                repoHolder.title.setText(repo.getName());
-                repoHolder.versionName.setText(repo.getVersion());
-                String author = repo.getAuthor();
-                repoHolder.author.setText(TextUtils.isEmpty(author) ? null : context.getString(R.string.author, author));
-                repoHolder.description.setText(repo.getDescription());
 
-                repoHolder.infoLayout.setOnClickListener(v -> new MarkDownWindow(null, repo.getDetailUrl(), context));
+        holder.title.setText(repo.getName());
+        holder.versionName.setText(repo.getVersion());
+        String author = repo.getAuthor();
+        holder.author.setText(TextUtils.isEmpty(author) ? null : context.getString(R.string.author, author));
+        holder.description.setText(repo.getDescription());
 
-                repoHolder.downloadImage.setOnClickListener(v -> {
-                    String filename = repo.getName() + "-" + repo.getVersion() + ".zip";
-                    new AlertDialogBuilder(context)
-                            .setTitle(context.getString(R.string.repo_install_title, repo.getName()))
-                            .setMessage(context.getString(R.string.repo_install_msg, filename))
-                            .setCancelable(true)
-                            .setPositiveButton(R.string.install, (d, i) -> Utils.dlAndReceive(
-                                    context,
-                                    new DownloadReceiver() {
-                                        @Override
-                                        public void onDownloadDone(Uri uri) {
-                                            new ProcessRepoZip((Activity) context, uri, true).exec();
-                                        }
-                                    },
-                                    repo.getZipUrl(),
-                                    Utils.getLegalFilename(filename)))
-                            .setNeutralButton(R.string.download, (d, i) -> Utils.dlAndReceive(
-                                    context,
-                                    new DownloadReceiver() {
-                                        @Override
-                                        public void onDownloadDone(Uri uri) {
-                                            new ProcessRepoZip((Activity) context, uri, false).exec();
-                                        }
-                                    },
-                                    repo.getZipUrl(),
-                                    Utils.getLegalFilename(filename)))
-                            .setNegativeButton(R.string.no_thanks, null)
-                            .show();
-                });
-                break;
-        }
+        holder.infoLayout.setOnClickListener(v ->
+                new MarkDownWindow((Activity) context, null, repo.getDetailUrl()).exec());
+
+        holder.downloadImage.setOnClickListener(v -> {
+            String filename = repo.getName() + "-" + repo.getVersion() + ".zip";
+            new AlertDialogBuilder((Activity) context)
+                    .setTitle(context.getString(R.string.repo_install_title, repo.getName()))
+                    .setMessage(context.getString(R.string.repo_install_msg, filename))
+                    .setCancelable(true)
+                    .setPositiveButton(R.string.install, (d, i) ->
+                        new ProcessRepoZip((Activity) context, repo.getZipUrl(),
+                                Utils.getLegalFilename(filename), true).exec()
+                    )
+                    .setNeutralButton(R.string.download, (d, i) ->
+                        new ProcessRepoZip((Activity) context, repo.getZipUrl(),
+                                Utils.getLegalFilename(filename), false).exec())
+                    .setNegativeButton(R.string.no_thanks, null)
+                    .show();
+        });
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        for (int i : sectionList) {
-            if (position == i)
-                return SECTION_TYPE;
-        }
-        return REPO_TYPE;
+    public void notifyDBChanged() {
+        if (repoCursor != null)
+            repoCursor.close();
+        repoCursor = repoDB.getRepoCursor();
+        filter("");
     }
 
-    @Override
-    public int getItemCount() {
-        return size;
-    }
+    public void filter(String s) {
+        List<Repo> updates = new ArrayList<>();
+        List<Repo> installed = new ArrayList<>();
+        List<Repo> others = new ArrayList<>();
 
-    public void filter(ValueSortedMap<String, Module> moduleMap, String s) {
-        mUpdateRepos.clear();
-        mInstalledRepos.clear();
-        mOthersRepos.clear();
-        sectionList[0] = sectionList[1] = sectionList[2] = 0;
-        for (Repo repo : repoMap.values()) {
+        repoPairs.clear();
+        while (repoCursor.moveToNext()) {
+            Repo repo = new Repo(repoCursor);
             if (repo.getName().toLowerCase().contains(s.toLowerCase())
                     || repo.getAuthor().toLowerCase().contains(s.toLowerCase())
                     || repo.getDescription().toLowerCase().contains(s.toLowerCase())
                     ) {
-                // Passed the filter
+                // Passed the repoFilter
                 Module module = moduleMap.get(repo.getId());
                 if (module != null) {
                     if (repo.getVersionCode() > module.getVersionCode()) {
                         // Updates
-                        mUpdateRepos.add(repo);
+                        updates.add(repo);
                     } else {
-                        mInstalledRepos.add(repo);
+                        installed.add(repo);
                     }
                 } else {
-                    mOthersRepos.add(repo);
+                    others.add(repo);
                 }
             }
         }
+        repoCursor.moveToFirst();
 
-        sectionList[0] = mUpdateRepos.isEmpty() ? -1 : 0;
-        size = mUpdateRepos.isEmpty() ? 0 : mUpdateRepos.size() + 1;
-        sectionList[1] = mInstalledRepos.isEmpty() ? -1 : size;
-        size += mInstalledRepos.isEmpty() ? 0 : mInstalledRepos.size() + 1;
-        sectionList[2] = mOthersRepos.isEmpty() ? -1 : size;
-        size += mOthersRepos.isEmpty() ? 0 : mOthersRepos.size() + 1;
+        if (!updates.isEmpty())
+            repoPairs.add(new Pair<>(UPDATES, updates));
+        if (!installed.isEmpty())
+            repoPairs.add(new Pair<>(INSTALLED, installed));
+        if (!others.isEmpty())
+            repoPairs.add(new Pair<>(OTHERS, others));
 
         notifyDataSetChanged();
     }
 
-    private Repo getRepo(int position) {
-        if (!mUpdateRepos.isEmpty()) position -= 1;
-        if (position < mUpdateRepos.size()) return mUpdateRepos.get(position);
-        position -= mUpdateRepos.size();
-        if (!mInstalledRepos.isEmpty()) position -= 1;
-        if (position < mInstalledRepos.size()) return mInstalledRepos.get(position);
-        position -= mInstalledRepos.size();
-        if (!mOthersRepos.isEmpty()) position -= 1;
-        return mOthersRepos.get(position);
-    }
-
     static class SectionHolder extends RecyclerView.ViewHolder {
 
         @BindView(R.id.section_text) TextView sectionText;

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

@@ -0,0 +1,93 @@
+package com.topjohnwu.magisk.adapters;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.ViewGroup;
+
+public abstract class SectionedAdapter<S extends RecyclerView.ViewHolder, C extends RecyclerView.ViewHolder>
+        extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private static final int SECTION_TYPE = Integer.MIN_VALUE;
+
+    @Override
+    final public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        if (viewType == SECTION_TYPE)
+            return onCreateSectionViewHolder(parent);
+        return onCreateItemViewHolder(parent, viewType);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    final public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        PositionInfo info = getPositionInfo(position);
+        if (info.position == -1)
+            onBindSectionViewHolder((S) holder, info.section);
+        else
+            onBindItemViewHolder((C) holder, info.section, info.position);
+    }
+
+    @Override
+    final public int getItemCount() {
+        int size, sec;
+        size = sec = getSectionCount();
+        for (int i = 0; i < sec; ++i){
+            size += getItemCount(i);
+        }
+        return size;
+    }
+
+    @Override
+    final public int getItemViewType(int position) {
+        PositionInfo info = getPositionInfo(position);
+        if (info.position == -1)
+            return SECTION_TYPE;
+        else
+            return  getItemViewType(info.section, info.position);
+    }
+
+    public int getItemViewType(int section, int position) {
+        return 0;
+    }
+
+    protected int getSectionPosition(int section) {
+        return getItemPosition(section, -1);
+    }
+
+    protected int getItemPosition(int section, int position) {
+        int realPosition = 0;
+        // Previous sections
+        for (int i = 0; i < section; ++i) {
+            realPosition += getItemCount(i) + 1;
+        }
+        // Current section
+        realPosition += position + 1;
+        return realPosition;
+    }
+
+    private PositionInfo getPositionInfo(int position) {
+        int section = 0;
+        while (true) {
+            if (position == 0)
+                return new PositionInfo(section, -1);
+            position -= 1;
+            if (position < getItemCount(section))
+                return new PositionInfo(section, position);
+            position -= getItemCount(section++);
+        }
+    }
+
+    private static class PositionInfo {
+        int section;
+        int position;
+        PositionInfo(int section, int position) {
+            this.section = section;
+            this.position = position;
+        }
+    }
+
+    public abstract int getSectionCount();
+    public abstract int getItemCount(int section);
+    public abstract S onCreateSectionViewHolder(ViewGroup parent);
+    public abstract C onCreateItemViewHolder(ViewGroup parent, int viewType);
+    public abstract void onBindSectionViewHolder(S holder, int section);
+    public abstract void onBindItemViewHolder(C holder, int section, int position);
+}

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

@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.content.Context;
+import android.database.Cursor;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,147 +10,125 @@ import android.view.animation.RotateAnimation;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.thoughtbot.expandablerecyclerview.ExpandableRecyclerViewAdapter;
-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 com.topjohnwu.magisk.components.ExpandableView;
+import com.topjohnwu.magisk.container.SuLogEntry;
+import com.topjohnwu.magisk.database.SuDatabaseHelper;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class SuLogAdapter {
+public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, SuLogAdapter.LogViewHolder> {
 
-    private ExpandableAdapter adapter;
-    private Set<SuLogEntry> expandList = new HashSet<>();
+    private List<List<Integer>> logEntryList;
+    private Set<Integer> itemExpanded, sectionExpanded;
+    private SuDatabaseHelper suDB;
+    private Cursor suLogCursor = null;
 
-    public SuLogAdapter(List<SuLogEntry> list) {
+    public SuLogAdapter(SuDatabaseHelper db) {
+        suDB = db;
+        logEntryList = Collections.emptyList();
+        sectionExpanded = new HashSet<>();
+        itemExpanded = new HashSet<>();
+    }
 
-        // Separate the logs with date
-        Map<String, List<SuLogEntry>> logEntryMap = new LinkedHashMap<>();
-        List<SuLogEntry> group;
-        for (SuLogEntry log : list) {
-            String date = log.getDateString();
-            group = logEntryMap.get(date);
-            if (group == null) {
-                group = new ArrayList<>();
-                logEntryMap.put(date, group);
+    @Override
+    public int getSectionCount() {
+        return logEntryList.size();
+    }
+
+    @Override
+    public int getItemCount(int section) {
+        return sectionExpanded.contains(section) ? logEntryList.get(section).size() : 0;
+    }
+
+    @Override
+    public SectionHolder onCreateSectionViewHolder(ViewGroup parent) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_sulog_group, parent, false);
+        return new SectionHolder(v);
+    }
+
+    @Override
+    public LogViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_sulog, parent, false);
+        return new LogViewHolder(v);
+    }
+
+    @Override
+    public void onBindSectionViewHolder(SectionHolder holder, int section) {
+        suLogCursor.moveToPosition(logEntryList.get(section).get(0));
+        SuLogEntry entry = new SuLogEntry(suLogCursor);
+        holder.arrow.setRotation(sectionExpanded.contains(section) ? 180 : 0);
+        holder.itemView.setOnClickListener(v -> {
+            RotateAnimation rotate;
+            if (sectionExpanded.contains(section)) {
+                holder.arrow.setRotation(0);
+                rotate = new RotateAnimation(180, 0, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
+                sectionExpanded.remove(section);
+                notifyItemRangeRemoved(getItemPosition(section, 0), logEntryList.get(section).size());
+            } else {
+                rotate = new RotateAnimation(0, 180, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
+                sectionExpanded.add(section);
+                notifyItemRangeInserted(getItemPosition(section, 0), logEntryList.get(section).size());
             }
-            group.add(log);
-        }
-
-        // Then format them into expandable groups
-        List<LogGroup> logEntryGroups = new ArrayList<>();
-        for (Map.Entry<String, List<SuLogEntry>> entry : logEntryMap.entrySet()) {
-            logEntryGroups.add(new LogGroup(entry.getKey(), entry.getValue()));
-        }
-        adapter = new ExpandableAdapter(logEntryGroups);
-
+            rotate.setDuration(300);
+            rotate.setFillAfter(true);
+            holder.arrow.setAnimation(rotate);
+        });
+        holder.date.setText(entry.getDateString());
     }
 
-    public RecyclerView.Adapter getAdapter() {
-        return adapter;
-    }
-
-    private class ExpandableAdapter
-            extends ExpandableRecyclerViewAdapter<LogGroupViewHolder, LogViewHolder> {
-
-        ExpandableAdapter(List<? extends ExpandableGroup> groups) {
-            super(groups);
-            expandableList.expandedGroupIndexes[0] = true;
-        }
-
-        @Override
-        public LogGroupViewHolder onCreateGroupViewHolder(ViewGroup parent, int viewType) {
-            View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_sulog_group, parent, false);
-            return new LogGroupViewHolder(v);
-        }
-
-        @Override
-        public LogViewHolder onCreateChildViewHolder(ViewGroup parent, int viewType) {
-            View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_sulog, parent, false);
-            return new LogViewHolder(v);
-        }
-
-        @Override
-        public void onBindChildViewHolder(LogViewHolder holder, int flatPosition, ExpandableGroup group, int childIndex) {
-            Context context = holder.itemView.getContext();
-            SuLogEntry logEntry = (SuLogEntry) group.getItems().get(childIndex);
-            holder.setExpanded(expandList.contains(logEntry));
-            holder.itemView.setOnClickListener(view -> {
-                if (holder.getExpanded()) {
-                    holder.collapse();
-                    expandList.remove(logEntry);
-                } else {
-                    holder.expand();
-                    expandList.add(logEntry);
-                }
-            });
-            holder.appName.setText(logEntry.appName);
-            holder.action.setText(context.getString(logEntry.action ? R.string.grant : R.string.deny));
-            holder.command.setText(logEntry.command);
-            holder.fromPid.setText(String.valueOf(logEntry.fromPid));
-            holder.toUid.setText(String.valueOf(logEntry.toUid));
-            holder.time.setText(logEntry.getTimeString());
-        }
-
-        @Override
-        public void onBindGroupViewHolder(LogGroupViewHolder holder, int flatPosition, ExpandableGroup group) {
-            holder.date.setText(group.getTitle());
-            if (isGroupExpanded(flatPosition)) {
+    @Override
+    public void onBindItemViewHolder(LogViewHolder holder, int section, int position) {
+        int sqlPosition = logEntryList.get(section).get(position);
+        suLogCursor.moveToPosition(sqlPosition);
+        SuLogEntry entry = new SuLogEntry(suLogCursor);
+        holder.setExpanded(itemExpanded.contains(sqlPosition));
+        holder.itemView.setOnClickListener(view -> {
+            if (holder.isExpanded()) {
+                holder.collapse();
+                itemExpanded.remove(sqlPosition);
+            } else {
                 holder.expand();
+                itemExpanded.add(sqlPosition);
             }
-        }
+        });
+        holder.appName.setText(entry.appName);
+        holder.action.setText(entry.action ? R.string.grant : R.string.deny);
+        holder.command.setText(entry.command);
+        holder.fromPid.setText(String.valueOf(entry.fromPid));
+        holder.toUid.setText(String.valueOf(entry.toUid));
+        holder.time.setText(entry.getTimeString());
     }
 
-    private class LogGroup extends ExpandableGroup<SuLogEntry> {
-        LogGroup(String title, List<SuLogEntry> items) {
-            super(title, items);
-        }
+    public void notifyDBChanged() {
+        if (suLogCursor != null)
+            suLogCursor.close();
+        suLogCursor = suDB.getLogCursor();
+        logEntryList = suDB.getLogStructure();
+        itemExpanded.clear();
+        sectionExpanded.clear();
+        sectionExpanded.add(0);
+        notifyDataSetChanged();
     }
 
-    static class LogGroupViewHolder extends GroupViewHolder {
+    static class SectionHolder extends RecyclerView.ViewHolder {
 
         @BindView(R.id.date) TextView date;
         @BindView(R.id.arrow) ImageView arrow;
 
-        public LogGroupViewHolder(View itemView) {
+        SectionHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
         }
-
-        @Override
-        public void expand() {
-            RotateAnimation rotate =
-                    new RotateAnimation(360, 180, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
-            rotate.setDuration(300);
-            rotate.setFillAfter(true);
-            arrow.setAnimation(rotate);
-        }
-
-        @Override
-        public void collapse() {
-            RotateAnimation rotate =
-                    new RotateAnimation(180, 360, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
-            rotate.setDuration(300);
-            rotate.setFillAfter(true);
-            arrow.setAnimation(rotate);
-        }
     }
 
-    // Wrapper class
-    static class LogViewHolder extends ChildViewHolder {
-
-        private InternalViewHolder expandableViewHolder;
+    static class LogViewHolder extends RecyclerView.ViewHolder implements ExpandableView {
 
         @BindView(R.id.app_name) TextView appName;
         @BindView(R.id.action) TextView action;
@@ -158,40 +136,20 @@ public class SuLogAdapter {
         @BindView(R.id.fromPid) TextView fromPid;
         @BindView(R.id.toUid) TextView toUid;
         @BindView(R.id.command) TextView command;
+        @BindView(R.id.expand_layout) ViewGroup expandLayout;
+
+        private Container container = new Container();
 
         LogViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
-            expandableViewHolder = new InternalViewHolder(itemView);
+            container.expandLayout = expandLayout;
+            setupExpandable();
         }
 
-        private class InternalViewHolder extends ExpandableViewHolder {
-
-            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) {
-            expandableViewHolder.setExpanded(expanded);
-        }
-
-        private void expand() {
-            expandableViewHolder.expand();
-        }
-
-        private void collapse() {
-            expandableViewHolder.collapse();
+        @Override
+        public Container getContainer() {
+            return container;
         }
     }
-
 }

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

@@ -0,0 +1,84 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.support.v4.app.FragmentActivity;
+
+import com.topjohnwu.jarsigner.ByteArrayStream;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.WebService;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Proxy;
+import java.net.HttpURLConnection;
+
+import dalvik.system.DexClassLoader;
+
+public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
+
+    public static final int SNET_VER = 2;
+
+    private static final String SNET_URL = "https://github.com/topjohnwu/MagiskManager/releases/download/v5.4.0/snet.apk";
+    private static final String PKG = "com.topjohnwu.snet";
+
+    private File dexPath;
+    private DexClassLoader loader;
+
+    public CheckSafetyNet(FragmentActivity activity) {
+        super(activity);
+        dexPath = new File(activity.getCacheDir().getParent() + "/snet", "snet.apk");
+    }
+
+    @Override
+    protected void onPreExecute() {
+        MagiskManager mm = getMagiskManager();
+        if (mm.snet_version != CheckSafetyNet.SNET_VER) {
+            getShell().sh("rm -rf " + dexPath.getParent());
+        }
+        mm.snet_version = CheckSafetyNet.SNET_VER;
+        mm.prefs.edit().putInt("snet_version", CheckSafetyNet.SNET_VER).apply();
+    }
+
+    @Override
+    protected Exception doInBackground(Void... voids) {
+        try {
+            if (!dexPath.exists()) {
+                HttpURLConnection conn = WebService.request(SNET_URL, null);
+                ByteArrayStream bas = new ByteArrayStream();
+                bas.readFrom(conn.getInputStream());
+                conn.disconnect();
+                dexPath.getParentFile().mkdir();
+                try (OutputStream out = new BufferedOutputStream(new FileOutputStream(dexPath))) {
+                    bas.writeTo(out);
+                    out.flush();
+                }
+            }
+            loader = new DexClassLoader(dexPath.toString(), dexPath.getParent(),
+                    null, ClassLoader.getSystemClassLoader());
+        } catch (Exception e) {
+            return e;
+        }
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(Exception err) {
+        try {
+            if (err != null) throw err;
+            Class<?> helperClazz = loader.loadClass(PKG + ".SafetyNetHelper");
+            Class<?> callbackClazz = loader.loadClass(PKG + ".SafetyNetCallback");
+            Object helper = helperClazz.getConstructors()[0].newInstance(
+                    getActivity(), Proxy.newProxyInstance(
+                            loader, new Class[] { callbackClazz }, (proxy, method, args) -> {
+                                getMagiskManager().safetyNetDone.publish(false, args[0]);
+                                return null;
+                            }));
+            helperClazz.getMethod("attest").invoke(helper);
+        } catch (Exception e) {
+            e.printStackTrace();
+            getMagiskManager().safetyNetDone.publish(false, -1);
+        }
+        super.onPostExecute(err);
+    }
+}

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

@@ -12,7 +12,11 @@ import org.json.JSONObject;
 
 public class CheckUpdates extends ParallelTask<Void, Void, Void> {
 
-    private static final String UPDATE_JSON = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/magisk_update.json";
+    public static final int STABLE_CHANNEL = 0;
+    public static final int BETA_CHANNEL = 1;
+
+    private static final String STABLE_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/stable.json";
+    private static final String BETA_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/beta.json";
 
     private boolean showNotification = false;
 
@@ -27,36 +31,46 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
 
     @Override
     protected Void doInBackground(Void... voids) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return null;
-        String jsonStr = WebService.request(UPDATE_JSON, WebService.GET);
+        MagiskManager mm = getMagiskManager();
+        if (mm == null) return null;
+        String jsonStr;
+        switch (mm.updateChannel) {
+            case STABLE_CHANNEL:
+                jsonStr = WebService.getString(STABLE_URL);
+                break;
+            case BETA_CHANNEL:
+                jsonStr = WebService.getString(BETA_URL);
+                break;
+            default:
+                jsonStr = null;
+        }
         try {
             JSONObject json = new JSONObject(jsonStr);
             JSONObject magisk = json.getJSONObject("magisk");
-            magiskManager.remoteMagiskVersionString = magisk.getString("version");
-            magiskManager.remoteMagiskVersionCode = magisk.getInt("versionCode");
-            magiskManager.magiskLink = magisk.getString("link");
-            magiskManager.releaseNoteLink = magisk.getString("note");
+            mm.remoteMagiskVersionString = magisk.getString("version");
+            mm.remoteMagiskVersionCode = magisk.getInt("versionCode");
+            mm.magiskLink = magisk.getString("link");
+            mm.releaseNoteLink = magisk.getString("note");
             JSONObject manager = json.getJSONObject("app");
-            magiskManager.remoteManagerVersionString = manager.getString("version");
-            magiskManager.remoteManagerVersionCode = manager.getInt("versionCode");
-            magiskManager.managerLink = manager.getString("link");
+            mm.remoteManagerVersionString = manager.getString("version");
+            mm.remoteManagerVersionCode = manager.getInt("versionCode");
+            mm.managerLink = manager.getString("link");
         } catch (JSONException ignored) {}
         return null;
     }
 
     @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);
-            } else if (magiskManager.magiskVersionCode < magiskManager.remoteMagiskVersionCode) {
-                Utils.showMagiskUpdate(magiskManager);
+        MagiskManager mm = getMagiskManager();
+        if (mm == null) return;
+        if (showNotification && mm.updateNotification) {
+            if (BuildConfig.VERSION_CODE < mm.remoteManagerVersionCode) {
+                Utils.showManagerUpdateNotification(mm);
+            } else if (mm.magiskVersionCode < mm.remoteMagiskVersionCode) {
+                Utils.showMagiskUpdateNotification(mm);
             }
         }
-        magiskManager.updateCheckDone.trigger();
+        mm.updateCheckDone.publish();
         super.onPostExecute(v);
     }
 }

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

@@ -0,0 +1,64 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.content.Context;
+import android.os.Build;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.WebService;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+
+public class DownloadBusybox extends ParallelTask<Void, Void, Void> {
+
+    private static final String BUSYBOX_ARM = "https://github.com/topjohnwu/ndk-busybox/releases/download/1.27.2/busybox-arm";
+    private static final String BUSYBOX_X86 = "https://github.com/topjohnwu/ndk-busybox/releases/download/1.27.2/busybox-x86";
+
+    private File busybox;
+
+    public DownloadBusybox(Context context) {
+        super(context);
+        busybox = new File(context.getCacheDir(), "busybox");
+    }
+
+    @Override
+    protected Void doInBackground(Void... voids) {
+        Context context = getMagiskManager();
+        Utils.removeItem(getShell(), context.getApplicationInfo().dataDir + "/busybox");
+        try {
+            FileOutputStream out  = new FileOutputStream(busybox);
+            HttpURLConnection conn = WebService.request(
+                    Build.SUPPORTED_32_BIT_ABIS[0].contains("x86") ?
+                            BUSYBOX_X86 :
+                            BUSYBOX_ARM,
+                    null
+            );
+            if (conn == null) throw new IOException();
+            BufferedInputStream bis = new BufferedInputStream(conn.getInputStream());
+            byte[] buffer = new byte[4096];
+            int len;
+            while ((len = bis.read(buffer)) != -1) {
+                out.write(buffer, 0, len);
+            }
+            out.close();
+            conn.disconnect();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        if (busybox.exists()) {
+            getShell().su(
+                    "rm -rf " + MagiskManager.BUSYBOXPATH,
+                    "mkdir -p " + MagiskManager.BUSYBOXPATH,
+                    "cp " + busybox + " " + MagiskManager.BUSYBOXPATH,
+                    "chmod -R 755 " + MagiskManager.BUSYBOXPATH,
+                    MagiskManager.BUSYBOXPATH + "/busybox --install -s " + MagiskManager.BUSYBOXPATH
+            );
+            busybox.delete();
+        }
+        return null;
+    }
+}

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

@@ -1,15 +1,17 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.content.Context;
+import android.app.Activity;
 import android.net.Uri;
 import android.text.TextUtils;
 
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.AdaptiveList;
+import com.topjohnwu.magisk.container.AdaptiveList;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.ZipUtils;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -18,30 +20,22 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
 
-public class FlashZip extends ParallelTask<Void, String, Integer> {
+public class FlashZip extends ParallelTask<Void, Void, Integer> {
 
     private Uri mUri;
-    private File mCachedFile, mScriptFile, mCheckFile;
-
-    private String mFilename;
+    private File mCachedFile;
     private AdaptiveList<String> mList;
 
-    public FlashZip(Context context, Uri uri, AdaptiveList<String> list) {
+    public FlashZip(Activity context, Uri uri, AdaptiveList<String> list) {
         super(context);
         mUri = uri;
         mList = list;
-
         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(context, mUri);
     }
 
     private boolean unzipAndCheck() throws Exception {
-        ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android");
-        List<String> ret = Utils.readFile(getShell(), mCheckFile.getPath());
+        ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android", true);
+        List<String> ret = Utils.readFile(getShell(), new File(mCachedFile.getParentFile(), "updater-script").getPath());
         return Utils.isValidShellResponse(ret) && ret.get(0).contains("#MAGISK");
     }
 
@@ -52,27 +46,28 @@ public class FlashZip extends ParallelTask<Void, String, Integer> {
     }
 
     @Override
-    protected void onProgressUpdate(String... values) {
+    protected void onProgressUpdate(Void... values) {
         mList.updateView();
     }
 
     @Override
     protected Integer doInBackground(Void... voids) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return -1;
+        MagiskManager mm = getMagiskManager();
+        if (mm == null) return -1;
         try {
-            mList.add(magiskManager.getString(R.string.copying_msg));
+            mList.add("- Copying zip to temp directory");
 
             mCachedFile.delete();
             try (
-                InputStream in = magiskManager.getContentResolver().openInputStream(mUri);
-                OutputStream outputStream = new FileOutputStream(mCachedFile)
+                InputStream in = mm.getContentResolver().openInputStream(mUri);
+                OutputStream out = new BufferedOutputStream(new FileOutputStream(mCachedFile))
             ) {
                 if (in == null) throw new FileNotFoundException();
-                byte buffer[] = new byte[1024];
+                InputStream buf= new BufferedInputStream(in);
+                byte buffer[] = new byte[4096];
                 int length;
-                while ((length = in.read(buffer)) > 0)
-                    outputStream.write(buffer, 0, length);
+                while ((length = buf.read(buffer)) > 0)
+                    out.write(buffer, 0, length);
             } catch (FileNotFoundException e) {
                 mList.add("! Invalid Uri");
                 throw e;
@@ -81,9 +76,10 @@ public class FlashZip extends ParallelTask<Void, String, Integer> {
                 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 +
+            mList.add("- Installing " + Utils.getNameFromUri(mm, mUri));
+            getShell().su(mList,
+                    "cd " + mCachedFile.getParent(),
+                    "BOOTMODE=true sh update-binary dummy 1 " + mCachedFile +
                             " && echo 'Success!' || echo 'Failed!'"
             );
             if (TextUtils.equals(mList.get(mList.size() - 1), "Success!"))
@@ -97,25 +93,25 @@ 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() + "/*",
+        MagiskManager mm = getMagiskManager();
+        if (mm == null) return;
+        getShell().su_raw(
+                "rm -rf " + mCachedFile.getParent(),
                 "rm -rf " + MagiskManager.TMP_FOLDER_PATH
         );
         switch (result) {
             case -1:
-                mList.add(magiskManager.getString(R.string.install_error));
+                mList.add(mm.getString(R.string.install_error));
                 Utils.showUriSnack(getActivity(), mUri);
-                return;
+                break;
             case 0:
-                mList.add(magiskManager.getString(R.string.invalid_zip));
-                return;
+                mList.add(mm.getString(R.string.invalid_zip));
+                break;
             case 1:
                 // Success
+                new LoadModules(mm).exec();
                 break;
         }
-        new LoadModules(magiskManager).exec();
         super.onPostExecute(result);
     }
 }

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

@@ -0,0 +1,115 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Environment;
+import android.widget.Toast;
+
+import com.topjohnwu.jarsigner.JarMap;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.container.Policy;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.ZipUtils;
+
+import java.io.File;
+import java.util.List;
+import java.util.jar.JarEntry;
+
+public class HideManager extends ParallelTask<Void, Void, Boolean> {
+
+    private static final String UNHIDE_APK = "unhide.apk";
+    private static final String ANDROID_MANIFEST = "AndroidManifest.xml";
+    private static final byte[] UNHIDE_PKG_NAME = "com.topjohnwu.unhide\0".getBytes();
+
+    public HideManager(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void onPreExecute() {
+        getMagiskManager().toast(R.string.hide_manager_toast, Toast.LENGTH_SHORT);
+    }
+
+    @Override
+    protected Boolean doInBackground(Void... voids) {
+        MagiskManager mm = getMagiskManager();
+        if (mm == null)
+            return false;
+
+        // Generate a new unhide app with random package name
+        File unhideAPK = new File(Environment.getExternalStorageDirectory() + "/MagiskManager", "unhide.apk");
+        unhideAPK.getParentFile().mkdirs();
+        String pkg;
+
+        try {
+            JarMap asset = new JarMap(mm.getAssets().open(UNHIDE_APK));
+            JarEntry je = new JarEntry(ANDROID_MANIFEST);
+            byte xml[] = asset.getRawData(je);
+            int offset = -1;
+
+            // Linear search pattern offset
+            for (int i = 0; i < xml.length - UNHIDE_PKG_NAME.length; ++i) {
+                boolean match = true;
+                for (int j = 0; j < UNHIDE_PKG_NAME.length; ++j) {
+                    if (xml[i + j] != UNHIDE_PKG_NAME[j]) {
+                        match = false;
+                        break;
+                    }
+                }
+                if (match) {
+                    offset = i;
+                    break;
+                }
+            }
+            if (offset < 0)
+                return false;
+
+            // Patch binary XML with new package name
+            pkg = Utils.genPackageName("com.", UNHIDE_PKG_NAME.length - 1);
+            System.arraycopy(pkg.getBytes(), 0, xml, offset, pkg.length());
+            asset.getOutputStream(je).write(xml);
+
+            // Sign the APK
+            ZipUtils.signZip(mm, asset, unhideAPK, false);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        // Install the application
+        List<String> ret = getShell().su("pm install " + unhideAPK + ">/dev/null && echo true || echo false");
+        unhideAPK.delete();
+        if (!Utils.isValidShellResponse(ret) || !Boolean.parseBoolean(ret.get(0)))
+            return false;
+
+        try {
+            // Allow the application to gain root by default
+            PackageManager pm = mm.getPackageManager();
+            int uid = pm.getApplicationInfo(pkg, 0).uid;
+            Policy policy = new Policy(uid, pm);
+            policy.policy = Policy.ALLOW;
+            policy.notification = false;
+            policy.logging = false;
+            mm.suDB.addPolicy(policy);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        // Hide myself!
+        getShell().su_raw("pm hide " + mm.getPackageName());
+        return true;
+    }
+
+    @Override
+    protected void onPostExecute(Boolean b) {
+        MagiskManager mm = getMagiskManager();
+        if (mm == null)
+            return;
+        if (!b) {
+            mm.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
+        }
+        super.onPostExecute(b);
+    }
+}

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

@@ -0,0 +1,230 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.text.TextUtils;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.container.AdaptiveList;
+import com.topjohnwu.magisk.container.TarEntry;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.ZipUtils;
+
+import org.kamranzafar.jtar.TarInputStream;
+import org.kamranzafar.jtar.TarOutputStream;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.List;
+
+public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
+
+    private static final int PATCH_MODE = 0;
+    private static final int DIRECT_MODE = 1;
+
+    private Uri mBootImg, mZip;
+    private AdaptiveList<String> mList;
+    private String mBootLocation;
+    private boolean mKeepEnc, mKeepVerity;
+    private int mode;
+
+    private InstallMagisk(Activity context, AdaptiveList<String> list, Uri zip, boolean enc, boolean verity) {
+        super(context);
+        mList = list;
+        mZip = zip;
+        mKeepEnc = enc;
+        mKeepVerity = verity;
+    }
+
+    public InstallMagisk(Activity context, AdaptiveList<String> list, Uri zip, boolean enc, boolean verity, Uri boot) {
+        this(context, list, zip, enc, verity);
+        mBootImg = boot;
+        mode = PATCH_MODE;
+    }
+
+    public InstallMagisk(Activity context, AdaptiveList<String> list, Uri zip, boolean enc, boolean verity, String boot) {
+        this(context, list, zip, enc, verity);
+        mBootLocation = boot;
+        mode = DIRECT_MODE;
+    }
+
+    @Override
+    protected void onPreExecute() {
+        // UI updates must run in the UI thread
+        mList.setCallback(this::publishProgress);
+    }
+
+    @Override
+    protected void onProgressUpdate(Void... values) {
+        mList.updateView();
+    }
+
+    @Override
+    protected Boolean doInBackground(Void... voids) {
+        MagiskManager mm = getMagiskManager();
+        if (mm == null) return false;
+
+        File install = new File(Utils.getEncContext(mm).getFilesDir().getParent(), "install");
+        getShell().sh_raw("rm -rf " + install);
+
+        List<String> abis = Arrays.asList(Build.SUPPORTED_ABIS);
+        String arch;
+        if (abis.contains("x86_64")) arch = "x64";
+        else if (abis.contains("arm64-v8a")) arch = "arm64";
+        else if (abis.contains("x86")) arch = "x86";
+        else arch = "arm";
+        mList.add("- Device platform: " + arch);
+
+        try {
+            // Unzip files
+            mList.add("- Extracting files");
+            try (InputStream in = mm.getContentResolver().openInputStream(mZip)) {
+                if (in == null) throw new FileNotFoundException();
+                BufferedInputStream buf = new BufferedInputStream(in);
+                buf.mark(Integer.MAX_VALUE);
+                ZipUtils.unzip(buf, install, arch + "/", true);
+                buf.reset();
+                ZipUtils.unzip(buf, install, "common/", true);
+                buf.reset();
+                ZipUtils.unzip(buf, install, "chromeos/", false);
+                buf.reset();
+                ZipUtils.unzip(buf, install, "META-INF/com/google/android/update-binary", true);
+            } catch (FileNotFoundException e) {
+                mList.add("! Invalid Uri");
+                throw e;
+            } catch (Exception e) {
+                mList.add("! Cannot unzip zip");
+                throw e;
+            }
+
+            File boot;
+            switch (mode) {
+                case PATCH_MODE:
+                    boot = new File(install, "boot.img");
+                    // Copy boot image to local
+                    try (
+                        InputStream in = mm.getContentResolver().openInputStream(mBootImg);
+                        OutputStream out = new FileOutputStream(boot)
+                    ) {
+                        InputStream source;
+                        if (in == null) throw new FileNotFoundException();
+
+                        if (Utils.getNameFromUri(mm, mBootImg).endsWith(".tar")) {
+                            // Extract boot.img from tar
+                            TarInputStream tar = new TarInputStream(new BufferedInputStream(in));
+                            org.kamranzafar.jtar.TarEntry entry;
+                            while ((entry = tar.getNextEntry()) != null) {
+                                if (entry.getName().equals("boot.img"))
+                                    break;
+                            }
+                            source = tar;
+                        } else {
+                            // Direct copy raw image
+                            source = new BufferedInputStream(in);
+                        }
+                        byte buffer[] = new byte[1024];
+                        int length;
+                        while ((length = source.read(buffer)) > 0)
+                            out.write(buffer, 0, length);
+                    } catch (FileNotFoundException e) {
+                        mList.add("! Invalid Uri");
+                        throw e;
+                    } catch (IOException e) {
+                        mList.add("! Copy failed");
+                        throw e;
+                    }
+                    break;
+                case DIRECT_MODE:
+                    boot = new File(mBootLocation);
+                    break;
+                default:
+                    return false;
+            }
+
+            mList.add("- Use boot image: " + boot);
+
+            Shell shell;
+            if (mode == PATCH_MODE && Shell.rootAccess()) {
+                // Force non-root shell
+                shell = Shell.getShell("sh");
+             } else {
+                shell = getShell();
+            }
+
+            // Patch boot image
+            shell.sh(mList,
+                    "cd " + install,
+                    "KEEPFORCEENCRYPT=" + mKeepEnc + " KEEPVERITY=" + mKeepVerity + " sh " +
+                            "update-binary indep boot_patch.sh " + boot +
+                            " && echo 'Success!' || echo 'Failed!'"
+            );
+
+            if (!TextUtils.equals(mList.get(mList.size() - 1), "Success!"))
+                return false;
+
+            File patched_boot = new File(install, "new-boot.img");
+            mList.add("");
+            switch (mode) {
+                case PATCH_MODE:
+                    File dest = new File(Environment.getExternalStorageDirectory() + "/MagiskManager/patched_boot" + mm.bootFormat);
+                    dest.getParentFile().mkdirs();
+                    switch (mm.bootFormat) {
+                        case ".img":
+                            getShell().sh_raw("cp -f " + patched_boot + " " + dest);
+                            break;
+                        case ".img.tar":
+                            TarOutputStream tar = new TarOutputStream(new BufferedOutputStream(new FileOutputStream(dest)));
+                            tar.putNextEntry(new TarEntry(patched_boot, "boot.img"));
+                            byte buffer[] = new byte[4096];
+                            BufferedInputStream in = new BufferedInputStream(new FileInputStream(patched_boot));
+                            int len;
+                            while ((len = in.read(buffer)) != -1) {
+                                tar.write(buffer, 0, len);
+                            }
+                            tar.flush();
+                            tar.close();
+                            in.close();
+                            break;
+                    }
+                    mList.add("*********************************");
+                    mList.add(" Patched Boot Image is placed in ");
+                    mList.add(" " + dest + " ");
+                    mList.add("*********************************");
+                    break;
+                case DIRECT_MODE:
+                    // Direct flash boot image
+                    getShell().su(mList, "flash_boot_image " + patched_boot + " " + mBootLocation);
+                    break;
+                default:
+                    return false;
+            }
+
+            // Finals
+            getShell().sh_raw(
+                    "cd " + install,
+                    "mv bin/busybox busybox",
+                    "rm -rf bin *.img update-binary",
+                    "cd /");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    protected void onPostExecute(Boolean result) {
+        super.onPostExecute(result);
+    }
+}

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

@@ -1,44 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-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;
-import java.util.Iterator;
-import java.util.List;
-
-public class LoadApps extends ParallelTask<Void, Void, Void> {
-
-    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(); ) {
-            ApplicationInfo info = i.next();
-            if (ApplicationAdapter.BLACKLIST.contains(info.packageName) || !info.enabled) {
-                i.remove();
-            }
-        }
-        Collections.sort(list, (a, b) -> a.loadLabel(pm).toString().toLowerCase()
-                .compareTo(b.loadLabel(pm).toString().toLowerCase()));
-        magiskManager.appList = Collections.unmodifiableList(list);
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void v) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return;
-        new MagiskHide(magiskManager).list();
-    }
-}

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

@@ -3,11 +3,9 @@ package com.topjohnwu.magisk.asyncs;
 import android.content.Context;
 
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.module.BaseModule;
-import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.container.ValueSortedMap;
 import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ValueSortedMap;
 
 public class LoadModules extends ParallelTask<Void, Void, Void> {
 
@@ -17,29 +15,23 @@ public class LoadModules extends ParallelTask<Void, Void, Void> {
 
     @Override
     protected Void doInBackground(Void... voids) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return null;
-        Logger.dev("LoadModules: Loading modules");
+        MagiskManager mm = getMagiskManager();
+        if (mm == null) return null;
+        mm.moduleMap = new ValueSortedMap<>();
 
-        magiskManager.moduleMap = new ValueSortedMap<>();
-
-        for (String path : Utils.getModList(magiskManager.shell, MagiskManager.MAGISK_PATH)) {
-            Logger.dev("LoadModules: Adding modules from " + path);
-            try {
-                Module module = new Module(magiskManager.shell, path);
-                magiskManager.moduleMap.put(module.getId(), module);
-            } catch (BaseModule.CacheModException ignored) {}
+        for (String path : Utils.getModList(getShell(), MagiskManager.MAGISK_PATH)) {
+            Module module = new Module(getShell(), path);
+            mm.moduleMap.put(module.getId(), module);
         }
 
-        Logger.dev("LoadModules: Data load done");
         return null;
     }
 
     @Override
     protected void onPostExecute(Void v) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return;
-        magiskManager.moduleLoadDone.trigger();
+        MagiskManager mm = getMagiskManager();
+        if (mm == null) return;
+        mm.moduleLoadDone.publish();
         super.onPostExecute(v);
     }
 }

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

@@ -1,194 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-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;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.ValueSortedMap;
-import com.topjohnwu.magisk.utils.WebService;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-public class LoadRepos extends ParallelTask<Void, Void, Void> {
-
-    public static final String ETAG_KEY = "ETag";
-
-    private static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&page=%d";
-    private static final String IF_NONE_MATCH = "If-None-Match";
-    private static final String LINK_KEY = "Link";
-
-    private static final int CHECK_ETAG = 0;
-    private static final int LOAD_NEXT = 1;
-    private static final int LOAD_PREV = 2;
-
-    private List<String> etags;
-    private ValueSortedMap<String, Repo> cached, fetched;
-    private RepoDatabaseHelper repoDB;
-    private SharedPreferences prefs;
-
-    public LoadRepos(Context context) {
-        super(context);
-        prefs = getMagiskManager().prefs;
-        String prefsPath = context.getApplicationInfo().dataDir + "/shared_prefs";
-        repoDB = new RepoDatabaseHelper(context);
-        // Legacy data cleanup
-        File old = new File(prefsPath, "RepoMap.xml");
-        if (old.exists() || !prefs.getString("repomap", "empty").equals("empty")) {
-            old.delete();
-            prefs.edit().remove("version").remove("repomap").remove(ETAG_KEY).apply();
-            repoDB.clearRepo();
-        }
-        etags = new ArrayList<>(
-                Arrays.asList(prefs.getString(ETAG_KEY, "").split(",")));
-    }
-
-    private void loadJSON(String jsonString) throws Exception {
-        JSONArray jsonArray = new JSONArray(jsonString);
-
-        for (int i = 0; i < jsonArray.length(); i++) {
-            JSONObject jsonobject = jsonArray.getJSONObject(i);
-            String id = jsonobject.getString("description");
-            String name = jsonobject.getString("name");
-            String lastUpdate = jsonobject.getString("pushed_at");
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
-            Date updatedDate = format.parse(lastUpdate);
-            Repo repo = cached.get(id);
-            try {
-                if (repo == null) {
-                    Logger.dev("LoadRepos: Create new repo " + id);
-                    repo = new Repo(name, updatedDate);
-                } else {
-                    // Popout from cached
-                    cached.remove(id);
-                    repo.update(updatedDate);
-                }
-                if (repo.getId() != null) {
-                    fetched.put(id, repo);
-                }
-            } catch (BaseModule.CacheModException ignored) {}
-        }
-    }
-
-    private boolean loadPage(int page, String url, int mode) {
-        Logger.dev("LoadRepos: Loading page: " + (page + 1));
-        Map<String, String> header = new HashMap<>();
-        if (mode == CHECK_ETAG && page < etags.size() && !TextUtils.isEmpty(etags.get(page))) {
-            Logger.dev("ETAG: " + etags.get(page));
-            header.put(IF_NONE_MATCH, etags.get(page));
-        }
-        if (url == null) {
-            url = String.format(Locale.US, REPO_URL, page + 1);
-        }
-        String jsonString = WebService.request(url, WebService.GET, header, true);
-        if (TextUtils.isEmpty(jsonString)) {
-            // At least check the pages we know
-            return page + 1 < etags.size() && loadPage(page + 1, null, CHECK_ETAG);
-        }
-
-        // The request succeed, parse the new stuffs
-        try {
-            loadJSON(jsonString);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-
-        // Update the ETAG
-        String newEtag = header.get(ETAG_KEY);
-        newEtag = newEtag.substring(newEtag.indexOf('\"'), newEtag.lastIndexOf('\"') + 1);
-        Logger.dev("New ETAG: " + newEtag);
-        if (page < etags.size()) {
-            etags.set(page, newEtag);
-        } else {
-            etags.add(newEtag);
-        }
-
-        String links = header.get(LINK_KEY);
-        if (links != null) {
-            if (mode == CHECK_ETAG || mode == LOAD_NEXT) {
-                // Try to check next page URL
-                url = null;
-                for (String s : links.split(", ")) {
-                    if (s.contains("next")) {
-                        url = s.substring(s.indexOf("<") + 1, s.indexOf(">; "));
-                        break;
-                    }
-                }
-                if (url != null) {
-                    loadPage(page + 1, url, LOAD_NEXT);
-                }
-            }
-
-            if (mode == CHECK_ETAG || mode == LOAD_PREV) {
-                // Try to check prev page URL
-                url = null;
-                for (String s : links.split(", ")) {
-                    if (s.contains("prev")) {
-                        url = s.substring(s.indexOf("<") + 1, s.indexOf(">; "));
-                        break;
-                    }
-                }
-                if (url != null) {
-                    loadPage(page - 1, url, LOAD_PREV);
-                }
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    protected Void doInBackground(Void... voids) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return null;
-        Logger.dev("LoadRepos: Loading repos");
-
-        cached = repoDB.getRepoMap(false);
-        fetched = new ValueSortedMap<>();
-
-        if (!loadPage(0, null, CHECK_ETAG)) {
-            magiskManager.repoMap = repoDB.getRepoMap();
-            Logger.dev("LoadRepos: No updates, use DB");
-            return null;
-        }
-
-        repoDB.addRepoMap(fetched);
-        repoDB.removeRepo(cached);
-
-        // Update ETag
-        StringBuilder etagBuilder = new StringBuilder();
-        for (int i = 0; i < etags.size(); ++i) {
-            if (i != 0) etagBuilder.append(",");
-            etagBuilder.append(etags.get(i));
-        }
-        prefs.edit().putString(ETAG_KEY, etagBuilder.toString()).apply();
-
-        magiskManager.repoMap = repoDB.getRepoMap();
-        Logger.dev("LoadRepos: Done");
-        return null;
-    }
-
-    @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,61 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.content.Context;
-
-import com.topjohnwu.magisk.MagiskManager;
-
-import java.util.List;
-
-public class MagiskHide extends ParallelTask<Object, Void, Void> {
-
-    private boolean isList = false;
-
-    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) {
-            magiskManager.magiskHideList = ret;
-        }
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void v) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return;
-        if (isList) {
-            magiskManager.magiskHideDone.trigger();
-        }
-        super.onPostExecute(v);
-    }
-
-    public void add(CharSequence packageName) {
-        exec("add " + packageName);
-    }
-
-    public void rm(CharSequence packageName) {
-        exec("rm " + packageName);
-    }
-
-    public void enable() {
-        exec("enable");
-    }
-
-    public void disable() {
-        exec("disable");
-    }
-
-    public void list() {
-        isList = true;
-        if (getMagiskManager() == null) return;
-        exec("ls");
-    }
-
-}

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

@@ -0,0 +1,47 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.support.v7.app.AlertDialog;
+import android.webkit.WebView;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.WebService;
+
+import org.commonmark.node.Node;
+import org.commonmark.parser.Parser;
+import org.commonmark.renderer.html.HtmlRenderer;
+
+public class MarkDownWindow extends ParallelTask<Void, Void, String> {
+
+    private String mTitle, mUrl;
+
+    public MarkDownWindow(Activity context, String title, String url) {
+        super(context);
+        mTitle = title;
+        mUrl = url;
+    }
+
+    @Override
+    protected String doInBackground(Void... voids) {
+        String md = WebService.getString(mUrl);
+        Parser parser = Parser.builder().build();
+        HtmlRenderer renderer = HtmlRenderer.builder().build();
+        Node doc = parser.parse(md);
+        return String.format(
+                "<link rel='stylesheet' type='text/css' href='file:///android_asset/%s.css'/> %s",
+                getMagiskManager().isDarkTheme ? "dark" : "light", renderer.render(doc));
+    }
+
+    @Override
+    protected void onPostExecute(String html) {
+        AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
+        alert.setTitle(mTitle);
+
+        WebView wv = new WebView(getActivity());
+        wv.loadDataWithBaseURL("fake://", html, "text/html", "UTF-8", null);
+
+        alert.setView(wv);
+        alert.setNegativeButton(R.string.close, (dialog, id) -> dialog.dismiss());
+        alert.show();
+    }
+}

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

@@ -38,12 +38,13 @@ public abstract class ParallelTask<Params, Progress, Result> extends AsyncTask<P
 
     protected Shell getShell() {
         MagiskManager magiskManager = getMagiskManager();
-        return magiskManager == null ? null : getMagiskManager().shell;
+        return magiskManager == null ? null : Shell.getShell(magiskManager);
     }
 
     @SuppressWarnings("unchecked")
-    public void exec(Params... params) {
+    public ParallelTask<Params, Progress, Result> exec(Params... params) {
         executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, params);
+        return this;
     }
 
     @Override

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

@@ -1,42 +1,102 @@
 package com.topjohnwu.magisk.asyncs;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Environment;
+import android.support.annotation.NonNull;
 import android.widget.Toast;
 
 import com.topjohnwu.magisk.FlashActivity;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.container.InputStreamWrapper;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.WebService;
 import com.topjohnwu.magisk.utils.ZipUtils;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+import java.util.jar.JarOutputStream;
 
-public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
+public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
 
-    private Uri mUri;
     private ProgressDialog progressDialog;
     private boolean mInstall;
+    private String mLink;
+    private File mFile;
+    private int progress = 0, total = -1;
 
-    public ProcessRepoZip(Activity context, Uri uri, boolean install) {
+    private static final int UPDATE_DL_PROG = 0;
+    private static final int SHOW_PROCESSING = 1;
+
+    public ProcessRepoZip(Activity context, String link, String filename, boolean install) {
         super(context);
-        mUri = uri;
+        mLink = link;
+        mFile = new File(Environment.getExternalStorageDirectory() + "/MagiskManager", filename);
         mInstall = install;
     }
 
+    private void removeTopFolder(InputStream in, File output) throws IOException {
+        JarInputStream source = new JarInputStream(in);
+        JarOutputStream dest = new JarOutputStream(new BufferedOutputStream(new FileOutputStream(output)));
+        JarEntry entry;
+        String path;
+        int size;
+        byte buffer[] = new byte[4096];
+        while ((entry = source.getNextJarEntry()) != null) {
+            // Remove the top directory from the path
+            path = entry.getName().substring(entry.getName().indexOf("/") + 1);
+            // If it's the top folder, ignore it
+            if (path.isEmpty()) {
+                continue;
+            }
+            // Don't include placeholder
+            if (path.equals("system/placeholder")) {
+                continue;
+            }
+            dest.putNextEntry(new JarEntry(path));
+            while((size = source.read(buffer)) != -1) {
+                dest.write(buffer, 0, size);
+            }
+        }
+        source.close();
+        dest.close();
+        in.close();
+    }
+
     @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));
+        mFile.getParentFile().mkdirs();
+        progressDialog = ProgressDialog.show(activity, activity.getString(R.string.zip_download_title), activity.getString(R.string.zip_download_msg, 0));
+    }
+
+    @Override
+    protected void onProgressUpdate(Object... values) {
+        int mode = (int) values[0];
+        switch (mode) {
+            case UPDATE_DL_PROG:
+                int add = (int) values[1];
+                progress += add;
+                progressDialog.setMessage(getActivity().getString(R.string.zip_download_msg, 100 * progress / total));
+                break;
+            case SHOW_PROCESSING:
+                progressDialog.setTitle(R.string.zip_process_title);
+                progressDialog.setMessage(getActivity().getString(R.string.zip_process_msg));
+                break;
+        }
     }
 
     @Override
@@ -45,15 +105,30 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
         if (activity == null) return null;
         try {
 
-            // Create temp file
-            File temp1 = new File(activity.getCacheDir(), "1.zip");
-            File temp2 = new File(activity.getCacheDir(), "2.zip");
-            activity.getCacheDir().mkdirs();
-            temp1.createNewFile();
-            temp2.createNewFile();
+            // Request zip from Internet
+            HttpURLConnection conn;
+            do {
+                conn = WebService.request(mLink, null);
+                if (conn == null) return null;
+                total = conn.getContentLength();
+                if (total < 0)
+                    conn.disconnect();
+                else
+                    break;
+            } while (true);
 
-            // First remove top folder in Github source zip, Uri -> temp1
-            ZipUtils.removeTopFolder(activity.getContentResolver().openInputStream(mUri), temp1);
+            InputStream in = new BufferedInputStream(new ProgressInputStream(conn.getInputStream()));
+
+            // Temp files
+            File temp1 = new File(activity.getCacheDir(), "1.zip");
+            File temp2 = new File(temp1.getParentFile(), "2.zip");
+            temp1.getParentFile().mkdir();
+
+            // First remove top folder in Github source zip, Web -> temp1
+            removeTopFolder(in, temp1);
+
+            conn.disconnect();
+            publishProgress(SHOW_PROCESSING);
 
             // Then sign the zip for the first time, temp1 -> temp2
             ZipUtils.signZip(activity, temp1, temp2, false);
@@ -64,23 +139,22 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
             // Finally, sign the whole zip file again, temp1 -> temp2
             ZipUtils.signZip(activity, temp1, temp2, true);
 
-            // Write it back to the downloaded zip, temp2 -> Uri
-            FileInputStream in = new FileInputStream(temp2);
-            try (OutputStream target = activity.getContentResolver().openOutputStream(mUri)) {
+            // Write it to the target zip, temp2 -> file
+            try (OutputStream out = new BufferedOutputStream(new FileOutputStream(mFile));
+                 InputStream source = new BufferedInputStream(new FileInputStream(temp2))
+            ) {
                 byte[] buffer = new byte[4096];
                 int length;
-                if (target == null) throw new FileNotFoundException();
-                while ((length = in.read(buffer)) > 0)
-                    target.write(buffer, 0, length);
+                while ((length = source.read(buffer)) > 0)
+                    out.write(buffer, 0, length);
             }
 
-            // Delete the temp file
+            // Delete temp files
             temp1.delete();
             temp2.delete();
 
             return true;
         } catch (Exception e) {
-            Logger.error("ProcessRepoZip: Error!");
             e.printStackTrace();
             return false;
         }
@@ -91,14 +165,50 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
         Activity activity = getActivity();
         if (activity == null) return;
         progressDialog.dismiss();
+        Uri uri = Uri.fromFile(mFile);
         if (result) {
             if (Shell.rootAccess() && mInstall) {
-                activity.startActivity(new Intent(activity, FlashActivity.class).setData(mUri));
+                Intent intent = new Intent(getActivity(), FlashActivity.class);
+                intent.setData(uri).putExtra(FlashActivity.SET_ACTION, FlashActivity.FLASH_ZIP);
+                activity.startActivity(intent);
             } else {
-                Utils.showUriSnack(activity, mUri);
+                Utils.showUriSnack(activity, uri);
             }
         } else {
             Utils.getMagiskManager(activity).toast(R.string.process_error, Toast.LENGTH_LONG);
         }
+        super.onPostExecute(result);
+    }
+
+    @Override
+    public ParallelTask<Void, Object, Boolean> exec(Void... voids) {
+        Utils.runWithPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                () -> super.exec(voids));
+        return this;
+    }
+
+    private class ProgressInputStream extends InputStreamWrapper {
+
+        ProgressInputStream(InputStream in) {
+            super(in);
+        }
+
+        @Override
+        public synchronized int read() throws IOException {
+            publishProgress(UPDATE_DL_PROG, 1);
+            return super.read();
+        }
+
+        @Override
+        public int read(@NonNull byte[] b) throws IOException {
+            return read(b, 0, b.length);
+        }
+
+        @Override
+        public synchronized int read(@NonNull byte[] b, int off, int len) throws IOException {
+            int read = super.read(b, off, len);
+            publishProgress(UPDATE_DL_PROG, read);
+            return read;
+        }
     }
 }

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

@@ -0,0 +1,40 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.content.Context;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Utils;
+
+import java.util.List;
+
+public class RestoreStockBoot extends ParallelTask<Void, Void, Boolean> {
+
+    private String mBoot;
+
+    public RestoreStockBoot(Context context, String boot) {
+        super(context);
+        mBoot = boot;
+    }
+
+    @Override
+    protected Boolean doInBackground(Void... voids) {
+        List<String> ret = getShell().su("cat /init.magisk.rc | grep STOCKSHA1");
+        if (!Utils.isValidShellResponse(ret))
+            return false;
+        String stock_boot = "/data/stock_boot_" + ret.get(0).substring(ret.get(0).indexOf('=') + 1) + ".img.gz";
+        if (!Utils.itemExist(getShell(), stock_boot))
+            return false;
+        getShell().su_raw("flash_boot_image " + stock_boot + " " + mBoot);
+        return true;
+    }
+
+    @Override
+    protected void onPostExecute(Boolean result) {
+        if (result) {
+            getMagiskManager().toast(R.string.restore_done, Toast.LENGTH_SHORT);
+        } else {
+            getMagiskManager().toast(R.string.restore_fail, Toast.LENGTH_LONG);
+        }
+    }
+}

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

@@ -0,0 +1,219 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.AsyncTask;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.ReposFragment;
+import com.topjohnwu.magisk.container.Repo;
+import com.topjohnwu.magisk.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.utils.WebService;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.net.HttpURLConnection;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+public class UpdateRepos extends ParallelTask<Void, Void, Void> {
+
+    private static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&page=%d";
+
+    public static final String ETAG_KEY = "ETag";
+    private static final String IF_NONE_MATCH = "If-None-Match";
+    private static final String LINK_KEY = "Link";
+
+    private static final int CHECK_ETAG = 0;
+    private static final int LOAD_NEXT = 1;
+    private static final int LOAD_PREV = 2;
+
+    private List<String> cached, etags, newEtags = new ArrayList<>();
+    private RepoDatabaseHelper repoDB;
+    private SharedPreferences prefs;
+    private boolean forceUpdate;
+
+    private int tasks = 0;
+
+    public UpdateRepos(Context context, boolean force) {
+        super(context);
+        prefs = getMagiskManager().prefs;
+        repoDB = getMagiskManager().repoDB;
+        getMagiskManager().repoLoadDone.hasPublished = false;
+        // Legacy data cleanup
+        File old = new File(context.getApplicationInfo().dataDir + "/shared_prefs", "RepoMap.xml");
+        if (old.exists() || prefs.getString("repomap", null) != null) {
+            old.delete();
+            prefs.edit().remove("version").remove("repomap").remove(ETAG_KEY).apply();
+            repoDB.clearRepo();
+        }
+        forceUpdate = force;
+    }
+
+    private void loadJSON(String jsonString) throws Exception {
+        JSONArray jsonArray = new JSONArray(jsonString);
+
+        // Empty page, throw error
+        if (jsonArray.length() == 0) throw new Exception();
+
+        for (int i = 0; i < jsonArray.length(); i++) {
+            JSONObject jsonobject = jsonArray.getJSONObject(i);
+            String id = jsonobject.getString("description");
+            String name = jsonobject.getString("name");
+            String lastUpdate = jsonobject.getString("pushed_at");
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+            Date updatedDate = format.parse(lastUpdate);
+            ++tasks;
+            AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+                Repo repo = repoDB.getRepo(id);
+                Boolean updated;
+                try {
+                    if (repo == null) {
+                        repo = new Repo(name, updatedDate);
+                        updated = true;
+                    } else {
+                        // Popout from cached
+                        cached.remove(id);
+                        if (forceUpdate) {
+                            repo.update();
+                            updated = true;
+                        } else {
+                            updated = repo.update(updatedDate);
+                        }
+                    }
+                    if (updated) {
+                        repoDB.addRepo(repo);
+                        publishProgress();
+                    }
+                    if (!id.equals(repo.getId())) {
+                        Logger.error("Repo [" + name + "] id=[" + repo.getId() + "] has illegal repo id");
+                    }
+                } catch (Repo.IllegalRepoException e) {
+                    Logger.error(e.getMessage());
+                    repoDB.removeRepo(id);
+                }
+                --tasks;
+            });
+        }
+    }
+
+    private boolean loadPage(int page, int mode) {
+        Map<String, String> header = new HashMap<>();
+        String etag = "";
+        if (mode == CHECK_ETAG && page < etags.size()) {
+            etag = etags.get(page);
+        }
+        header.put(IF_NONE_MATCH, etag);
+        String url = String.format(Locale.US, REPO_URL, page + 1);
+        HttpURLConnection conn = WebService.request(url, header);
+
+        try {
+            if (conn == null) throw new Exception();
+            if (conn.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {
+                newEtags.add(etag);
+                return page + 1 < etags.size() && loadPage(page + 1, CHECK_ETAG);
+            }
+            loadJSON(WebService.getString(conn));
+        } catch (Exception e) {
+            e.printStackTrace();
+            // Don't continue
+            return true;
+        }
+
+        // Update ETAG
+        etag = header.get(ETAG_KEY);
+        etag = etag.substring(etag.indexOf('\"'), etag.lastIndexOf('\"') + 1);
+        newEtags.add(etag);
+
+        String links = header.get(LINK_KEY);
+        if (links != null) {
+            for (String s : links.split(", ")) {
+                if (mode != LOAD_PREV && s.contains("next")) {
+                    // Force load all next pages
+                    loadPage(page + 1, LOAD_NEXT);
+                } else if (mode != LOAD_NEXT && s.contains("prev")) {
+                    // Back propagation
+                    loadPage(page - 1, LOAD_PREV);
+                }
+            }
+        }
+        return true;
+    }
+
+    private Void waitTasks() {
+        while (tasks > 0) {
+            try {
+                Thread.sleep(5);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected void onProgressUpdate(Void... values) {
+        if (ReposFragment.adapter != null)
+            ReposFragment.adapter.notifyDBChanged();
+    }
+
+    @Override
+    protected Void doInBackground(Void... voids) {
+        etags = new ArrayList<>(Arrays.asList(prefs.getString(ETAG_KEY, "").split(",")));
+        cached = repoDB.getRepoIDList();
+
+        if (!loadPage(0, CHECK_ETAG)) {
+            // Nothing changed online
+            if (forceUpdate) {
+                for (String id : cached) {
+                    if (id == null) continue;
+                    ++tasks;
+                    AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+                        Repo repo = repoDB.getRepo(id);
+                        try {
+                            repo.update();
+                            repoDB.addRepo(repo);
+                        } catch (Repo.IllegalRepoException e) {
+                            Logger.error(e.getMessage());
+                            repoDB.removeRepo(repo);
+                        }
+                        --tasks;
+                    });
+                }
+            }
+            return waitTasks();
+        }
+
+        // Wait till all tasks are done
+        waitTasks();
+
+        // The leftover cached means they are removed from online repo
+        repoDB.removeRepo(cached);
+
+        // Update ETag
+        StringBuilder etagBuilder = new StringBuilder();
+        for (int i = 0; i < newEtags.size(); ++i) {
+            if (i != 0) etagBuilder.append(",");
+            etagBuilder.append(newEtags.get(i));
+        }
+        prefs.edit().putString(ETAG_KEY, etagBuilder.toString()).apply();
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(Void v) {
+        MagiskManager mm = getMagiskManager();
+        if (mm == null) return;
+        mm.repoLoadDone.publish();
+        super.onPostExecute(v);
+    }
+}

app/src/main/java/com/topjohnwu/magisk/components/Activity.java

@@ -1,18 +1,67 @@
 package com.topjohnwu.magisk.components;
 
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.WindowManager;
 
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Topic;
 
 public class Activity extends AppCompatActivity {
 
+    private Runnable permissionGrantCallback;
+
+    public Activity() {
+        super();
+        Configuration configuration = new Configuration();
+        configuration.setLocale(MagiskManager.locale);
+        applyOverrideConfiguration(configuration);
+    }
+
     @Override
-    public MagiskManager getApplicationContext() {
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (this instanceof Topic.Subscriber) {
+            ((Topic.Subscriber) this).subscribeTopics();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (this instanceof Topic.Subscriber) {
+            ((Topic.Subscriber) this).unsubscribeTopics();
+        }
+        super.onDestroy();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            if (permissionGrantCallback != null) {
+                permissionGrantCallback.run();
+            }
+        }
+        permissionGrantCallback = null;
+    }
+
+    public void setPermissionGrantCallback(Runnable callback) {
+        permissionGrantCallback = callback;
+    }
+
+    public MagiskManager getMagiskManager() {
         return (MagiskManager) super.getApplicationContext();
     }
 
+    public Shell getShell() {
+        return Shell.getShell(this);
+    }
+
     protected void setFloating() {
         boolean isTablet = getResources().getBoolean(R.bool.isTablet);
         if (isTablet) {

app/src/main/java/com/topjohnwu/magisk/components/AlertDialogBuilder.java

@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.components;
 
-import android.content.Context;
+import android.app.Activity;
 import android.content.DialogInterface;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -37,12 +37,12 @@ public class AlertDialogBuilder extends AlertDialog.Builder {
 
     private AlertDialog dialog;
 
-    public AlertDialogBuilder(@NonNull Context context) {
+    public AlertDialogBuilder(@NonNull Activity context) {
         super(context);
         setup();
     }
 
-    public AlertDialogBuilder(@NonNull Context context, @StyleRes int themeResId) {
+    public AlertDialogBuilder(@NonNull Activity context, @StyleRes int themeResId) {
         super(context, themeResId);
         setup();
     }

app/src/main/java/com/topjohnwu/magisk/components/ExpandableView.java

@@ -0,0 +1,84 @@
+package com.topjohnwu.magisk.components;
+
+import android.animation.ValueAnimator;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+
+public interface ExpandableView {
+
+    class Container {
+        public ViewGroup expandLayout;
+        ValueAnimator expandAnimator, collapseAnimator;
+        boolean mExpanded = false;
+        int expandHeight = 0;
+    }
+
+    // Provide state info
+    Container getContainer();
+
+    default void setupExpandable() {
+        Container container = getContainer();
+        container.expandLayout.getViewTreeObserver().addOnPreDrawListener(
+            new ViewTreeObserver.OnPreDrawListener() {
+
+                @Override
+                public boolean onPreDraw() {
+                    if (container.expandHeight == 0) {
+                        final int widthSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+                        final int heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+                        container.expandLayout.measure(widthSpec, heightSpec);
+                        container.expandHeight = container.expandLayout.getMeasuredHeight();
+                    }
+
+                    container.expandLayout.getViewTreeObserver().removeOnPreDrawListener(this);
+                    container.expandLayout.setVisibility(View.GONE);
+                    container.expandAnimator = slideAnimator(0, container.expandHeight);
+                    container.collapseAnimator = slideAnimator(container.expandHeight, 0);
+                    return true;
+                }
+
+            });
+    }
+
+    default boolean isExpanded() {
+        return getContainer().mExpanded;
+    }
+
+    default void setExpanded(boolean expanded) {
+        Container container = getContainer();
+        container.mExpanded = expanded;
+        ViewGroup.LayoutParams layoutParams = container.expandLayout.getLayoutParams();
+        layoutParams.height = expanded ? container.expandHeight : 0;
+        container.expandLayout.setLayoutParams(layoutParams);
+        container.expandLayout.setVisibility(expanded ? View.VISIBLE : View.GONE);
+    }
+
+    default void expand() {
+        Container container = getContainer();
+        if (container.mExpanded) return;
+        container.expandLayout.setVisibility(View.VISIBLE);
+        container.expandAnimator.start();
+        container.mExpanded = true;
+    }
+
+    default void collapse() {
+        Container container = getContainer();
+        if (!container.mExpanded) return;
+        container.collapseAnimator.start();
+        container.mExpanded = false;
+    }
+
+    default ValueAnimator slideAnimator(int start, int end) {
+        Container container = getContainer();
+        ValueAnimator animator = ValueAnimator.ofInt(start, end);
+
+        animator.addUpdateListener(valueAnimator -> {
+            int value = (Integer) valueAnimator.getAnimatedValue();
+            ViewGroup.LayoutParams layoutParams = container.expandLayout.getLayoutParams();
+            layoutParams.height = value;
+            container.expandLayout.setLayoutParams(layoutParams);
+        });
+        return animator;
+    }
+}

app/src/main/java/com/topjohnwu/magisk/components/ExpandableViewHolder.java

@@ -1,77 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.animation.ValueAnimator;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-
-public abstract class ExpandableViewHolder extends RecyclerView.ViewHolder {
-
-    protected ViewGroup expandLayout;
-    private ValueAnimator expandAnimator, collapseAnimator;
-    private static int expandHeight = 0;
-
-    public boolean mExpanded = false;
-
-    public ExpandableViewHolder(View itemView) {
-        super(itemView);
-        setExpandLayout(itemView);
-        expandLayout.getViewTreeObserver().addOnPreDrawListener(
-                new ViewTreeObserver.OnPreDrawListener() {
-
-                    @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();
-                        }
-
-                        expandLayout.getViewTreeObserver().removeOnPreDrawListener(this);
-                        expandLayout.setVisibility(View.GONE);
-                        expandAnimator = slideAnimator(0, expandHeight);
-                        collapseAnimator = slideAnimator(expandHeight, 0);
-                        return true;
-                    }
-
-                });
-    }
-
-    public 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);
-    }
-
-    public void expand() {
-        if (mExpanded) return;
-        expandLayout.setVisibility(View.VISIBLE);
-        expandAnimator.start();
-        mExpanded = true;
-    }
-
-    public void collapse() {
-        if (!mExpanded) return;
-        collapseAnimator.start();
-        mExpanded = false;
-    }
-
-    public abstract void setExpandLayout(View itemView);
-
-    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;
-    }
-}

app/src/main/java/com/topjohnwu/magisk/components/Fragment.java

@@ -1,12 +1,53 @@
 package com.topjohnwu.magisk.components;
 
+import android.content.Intent;
+
 import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
 
 public class Fragment extends android.support.v4.app.Fragment {
 
+    private ActivityResultListener activityResultListener;
+
     public MagiskManager getApplication() {
         return Utils.getMagiskManager(getActivity());
     }
 
+    public Shell getShell() {
+        return Shell.getShell(getActivity());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (this instanceof Topic.Subscriber) {
+            ((Topic.Subscriber) this).subscribeTopics();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (this instanceof Topic.Subscriber) {
+            ((Topic.Subscriber) this).unsubscribeTopics();
+        }
+        super.onPause();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (activityResultListener != null)
+            activityResultListener.onActivityResult(requestCode, resultCode, data);
+        activityResultListener = null;
+    }
+
+    public void startActivityForResult(Intent intent, int requestCode, ActivityResultListener listener) {
+        activityResultListener = listener;
+        super.startActivityForResult(intent, requestCode);
+    }
+
+    public interface ActivityResultListener {
+        void onActivityResult(int requestCode, int resultCode, Intent data);
+    }
 }

app/src/main/java/com/topjohnwu/magisk/components/MarkDownWindow.java

@@ -1,31 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.content.Context;
-import android.support.v7.app.AlertDialog;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Utils;
-
-import us.feras.mdv.MarkdownView;
-
-public class MarkDownWindow {
-
-    public MarkDownWindow(String title, String url, Context context) {
-        MagiskManager magiskManager = Utils.getMagiskManager(context);
-        AlertDialog.Builder alert = new AlertDialog.Builder(context);
-        alert.setTitle(title);
-    
-        Logger.dev("WebView: URL = " + url);
-
-        MarkdownView md = new MarkdownView(context);
-        md.loadMarkdownFile(url, "file:///android_asset/" +
-                (magiskManager.isDarkTheme ? "dark" : "light") + ".css");
-
-        alert.setView(md);
-        alert.setNegativeButton(R.string.close, (dialog, id) -> dialog.dismiss());
-        alert.show();
-    }
-
-}

app/src/main/java/com/topjohnwu/magisk/components/SnackbarMaker.java

@@ -6,8 +6,6 @@ import android.support.design.widget.Snackbar;
 import android.view.View;
 import android.widget.TextView;
 
-import butterknife.ButterKnife;
-
 public class SnackbarMaker {
 
     public static Snackbar make(Activity activity, CharSequence text, int duration) {
@@ -32,7 +30,7 @@ public class SnackbarMaker {
     }
 
     private static void setup(Snackbar snack) {
-        TextView text = ButterKnife.findById(snack.getView(), android.support.design.R.id.snackbar_text);
+        TextView text = snack.getView().findViewById(android.support.design.R.id.snackbar_text);
         text.setMaxLines(Integer.MAX_VALUE);
     }
 

app/src/main/java/com/topjohnwu/magisk/container/AdaptiveList.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.utils;
+package com.topjohnwu.magisk.container;
 
 import android.support.v7.widget.RecyclerView;
 

app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java

@@ -1,17 +1,16 @@
-package com.topjohnwu.magisk.module;
+package com.topjohnwu.magisk.container;
 
 
+import android.content.ContentValues;
 import android.database.Cursor;
 import android.support.annotation.NonNull;
 
-import com.topjohnwu.magisk.utils.Logger;
-
 import java.util.List;
 
 public abstract class BaseModule implements Comparable<BaseModule> {
 
-    private String mId, mName, mVersion, mAuthor, mDescription;
-    private int mVersionCode = 0, templateVersion = 0;
+    private String mId = null, mName, mVersion, mAuthor, mDescription;
+    private int mVersionCode = -1, templateVersion = -1;
 
     protected BaseModule() {}
 
@@ -25,9 +24,21 @@ public abstract class BaseModule implements Comparable<BaseModule> {
         templateVersion = c.getInt(c.getColumnIndex("template"));
     }
 
-    protected void parseProps(List<String> props) throws CacheModException { parseProps(props.toArray(new String[props.size()])); }
+    public ContentValues getContentValues() {
+        ContentValues values = new ContentValues();
+        values.put("id", mId);
+        values.put("name", mName);
+        values.put("version", mVersion);
+        values.put("versionCode", mVersionCode);
+        values.put("author", mAuthor);
+        values.put("description", mDescription);
+        values.put("template", templateVersion);
+        return values;
+    }
 
-    protected void parseProps(String[] props) throws CacheModException {
+    protected void parseProps(List<String> props) { parseProps(props.toArray(new String[0])); }
+
+    protected void parseProps(String[] props) throws NumberFormatException {
         for (String line : props) {
             String[] prop = line.split("=", 2);
             if (prop.length != 2)
@@ -48,9 +59,7 @@ public abstract class BaseModule implements Comparable<BaseModule> {
                     mVersion = prop[1];
                     break;
                 case "versionCode":
-                    try {
-                        mVersionCode = Integer.parseInt(prop[1]);
-                    } catch (NumberFormatException ignored) {}
+                    mVersionCode = Integer.parseInt(prop[1]);
                     break;
                 case "author":
                     mAuthor = prop[1];
@@ -59,12 +68,7 @@ public abstract class BaseModule implements Comparable<BaseModule> {
                     mDescription = prop[1];
                     break;
                 case "template":
-                    try {
-                        templateVersion = Integer.parseInt(prop[1]);
-                    } catch (NumberFormatException ignored) {}
-                case "cacheModule":
-                    if (Boolean.parseBoolean(prop[1]))
-                        throw new CacheModException(mId);
+                    templateVersion = Integer.parseInt(prop[1]);
                     break;
                 default:
                     break;
@@ -108,12 +112,6 @@ public abstract class BaseModule implements Comparable<BaseModule> {
         return templateVersion;
     }
 
-    public static class CacheModException extends Exception {
-        public CacheModException(String id) {
-            Logger.error("Cache mods are no longer supported! id: " + id);
-        }
-    }
-
     @Override
     public int compareTo(@NonNull BaseModule module) {
         return this.getName().toLowerCase().compareTo(module.getName().toLowerCase());

app/src/main/java/com/topjohnwu/magisk/container/InputStreamWrapper.java

@@ -0,0 +1,59 @@
+package com.topjohnwu.magisk.container;
+
+import android.support.annotation.NonNull;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class InputStreamWrapper extends InputStream {
+    private InputStream in;
+
+    public InputStreamWrapper(InputStream in) {
+        this.in = in;
+    }
+
+    @Override
+    public int available() throws IOException {
+        return in.available();
+    }
+
+    @Override
+    public void close() throws IOException {
+        in.close();
+    }
+
+    @Override
+    public synchronized void mark(int readlimit) {
+        in.mark(readlimit);
+    }
+
+    @Override
+    public boolean markSupported() {
+        return in.markSupported();
+    }
+
+    @Override
+    public synchronized int read() throws IOException {
+        return in.read();
+    }
+
+    @Override
+    public int read(@NonNull byte[] b) throws IOException {
+        return read(b, 0, b.length);
+    }
+
+    @Override
+    public synchronized int read(@NonNull byte[] b, int off, int len) throws IOException {
+        return in.read(b, off, len);
+    }
+
+    @Override
+    public synchronized void reset() throws IOException {
+        in.reset();
+    }
+
+    @Override
+    public long skip(long n) throws IOException {
+        return in.skip(n);
+    }
+}

app/src/main/java/com/topjohnwu/magisk/container/Module.java

@@ -1,6 +1,5 @@
-package com.topjohnwu.magisk.module;
+package com.topjohnwu.magisk.container;
 
-import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 
@@ -9,9 +8,11 @@ public class Module extends BaseModule {
     private String mRemoveFile, mDisableFile, mUpdateFile;
     private boolean mEnable, mRemove, mUpdated;
 
-    public Module(Shell shell, String path) throws CacheModException {
+    public Module(Shell shell, String path) {
 
-        parseProps(Utils.readFile(shell, path + "/module.prop"));
+        try {
+            parseProps(Utils.readFile(shell, path + "/module.prop"));
+        } catch (NumberFormatException ignored) {}
 
         mRemoveFile = path + "/remove";
         mDisableFile = path + "/disable";
@@ -26,8 +27,6 @@ public class Module extends BaseModule {
             setName(getId());
         }
 
-        Logger.dev("Creating Module, id: " + getId());
-
         mEnable = !Utils.itemExist(shell, mDisableFile);
         mRemove = Utils.itemExist(shell, mRemoveFile);
         mUpdated = Utils.itemExist(shell, mUpdateFile);

app/src/main/java/com/topjohnwu/magisk/container/Policy.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.superuser;
+package com.topjohnwu.magisk.container;
 
 import android.content.ContentValues;
 import android.content.pm.ApplicationInfo;

app/src/main/java/com/topjohnwu/magisk/container/Repo.java

@@ -1,22 +1,23 @@
-package com.topjohnwu.magisk.module;
+package com.topjohnwu.magisk.container;
 
 import android.content.ContentValues;
 import android.database.Cursor;
 
-import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.WebService;
 
 import java.util.Date;
 
 public class Repo extends BaseModule {
 
+    public static final int MIN_TEMPLATE_VER = 4;
+
     private static final String FILE_URL = "https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s";
     private static final String ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip";
 
     private String repoName;
     private Date mLastUpdate;
 
-    public Repo(String name, Date lastUpdate) throws CacheModException {
+    public Repo(String name, Date lastUpdate) throws IllegalRepoException {
         mLastUpdate = lastUpdate;
         repoName = name;
         update();
@@ -28,34 +29,46 @@ public class Repo extends BaseModule {
         mLastUpdate = new Date(c.getLong(c.getColumnIndex("last_update")));
     }
 
-    public void update() throws CacheModException {
-        String props = WebService.request(getManifestUrl(), WebService.GET);
+    public void update() throws IllegalRepoException {
+        String props = WebService.getString(getManifestUrl());
         String lines[] = props.split("\\n");
-        parseProps(lines);
-        Logger.dev("Repo: Fetching prop: " + getId());
-    }
+        try {
+            parseProps(lines);
+        } catch (NumberFormatException e) {
+            throw new IllegalRepoException("Repo [" + repoName + "] parse error: " + e.getMessage());
+        }
 
-    public void update(Date lastUpdate) throws CacheModException {
-        if (lastUpdate.after(mLastUpdate)) {
-            mLastUpdate = lastUpdate;
-            update();
+        if (getId() == null) {
+            throw new IllegalRepoException("Repo [" + repoName + "] does not contain id");
+        }
+        if (getVersionCode() < 0) {
+            throw new IllegalRepoException("Repo [" + repoName + "] does not contain versionCode");
+        }
+        if (getTemplateVersion() < MIN_TEMPLATE_VER) {
+            throw new IllegalRepoException("Repo [" + repoName + "] is outdated");
         }
     }
 
+    public boolean update(Date lastUpdate) throws IllegalRepoException {
+        if (lastUpdate.after(mLastUpdate)) {
+            mLastUpdate = lastUpdate;
+            update();
+            return true;
+        }
+        return false;
+    }
+
     public ContentValues getContentValues() {
-        ContentValues values = new ContentValues();
-        values.put("id", getId());
-        values.put("name", getName());
-        values.put("version", getVersion());
-        values.put("versionCode", getVersionCode());
-        values.put("author", getAuthor());
-        values.put("description", getDescription());
+        ContentValues values = super.getContentValues();
         values.put("repo_name", repoName);
         values.put("last_update", mLastUpdate.getTime());
-        values.put("template", getTemplateVersion());
         return values;
     }
 
+    public String getRepoName() {
+        return repoName;
+    }
+
     public String getZipUrl() {
         return String.format(ZIP_URL, repoName);
     }
@@ -71,4 +84,10 @@ public class Repo extends BaseModule {
     public Date getLastUpdate() {
         return mLastUpdate;
     }
+
+    public class IllegalRepoException extends Exception {
+        IllegalRepoException(String message) {
+            super(message);
+        }
+    }
 }

app/src/main/java/com/topjohnwu/magisk/container/SuLogEntry.java

@@ -0,0 +1,56 @@
+package com.topjohnwu.magisk.container;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+
+import com.topjohnwu.magisk.MagiskManager;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class SuLogEntry {
+
+    public int fromUid, toUid, fromPid;
+    public String packageName, appName, command;
+    public boolean action;
+    public Date date;
+
+    public SuLogEntry(Policy policy) {
+        fromUid = policy.uid;
+        packageName = policy.packageName;
+        appName = policy.appName;
+    }
+
+    public SuLogEntry(Cursor c) {
+        fromUid = c.getInt(c.getColumnIndex("from_uid"));
+        fromPid = c.getInt(c.getColumnIndex("from_pid"));
+        toUid = c.getInt(c.getColumnIndex("to_uid"));
+        packageName = c.getString(c.getColumnIndex("package_name"));
+        appName = c.getString(c.getColumnIndex("app_name"));
+        command = c.getString(c.getColumnIndex("command"));
+        action = c.getInt(c.getColumnIndex("action")) != 0;
+        date = new Date(c.getLong(c.getColumnIndex("time")));
+    }
+
+    public ContentValues getContentValues() {
+        ContentValues values = new ContentValues();
+        values.put("from_uid", fromUid);
+        values.put("package_name", packageName);
+        values.put("app_name", appName);
+        values.put("from_pid", fromPid);
+        values.put("command", command);
+        values.put("to_uid", toUid);
+        values.put("action", action ? 1 : 0);
+        values.put("time", date.getTime());
+        return values;
+    }
+
+    public String getDateString() {
+        return DateFormat.getDateInstance(DateFormat.MEDIUM, MagiskManager.locale).format(date);
+    }
+
+    public String getTimeString() {
+        return new SimpleDateFormat("h:mm a", MagiskManager.locale).format(date);
+    }
+}

app/src/main/java/com/topjohnwu/magisk/container/TarEntry.java

@@ -0,0 +1,64 @@
+package com.topjohnwu.magisk.container;
+
+import org.kamranzafar.jtar.TarHeader;
+
+import java.io.File;
+import java.util.Arrays;
+
+public class TarEntry extends org.kamranzafar.jtar.TarEntry {
+
+    public TarEntry(File file, String entryName) {
+        super(file, entryName);
+    }
+
+    /*
+    * Workaround missing java.nio.file.attribute.PosixFilePermission
+    * Simply just assign a default permission to the file
+    * */
+
+    @Override
+    public void extractTarHeader(String entryName) {
+        int permissions = file.isDirectory() ? 000755 : 000644;
+        header = TarHeader.createHeader(entryName, file.length(), file.lastModified() / 1000, file.isDirectory(), permissions);
+        header.userName = new StringBuffer("");
+        header.groupName = header.userName;
+    }
+
+    /*
+    * Rewrite the header to GNU format
+    * */
+
+    @Override
+    public void writeEntryHeader(byte[] outbuf) {
+        super.writeEntryHeader(outbuf);
+
+        System.arraycopy("ustar  \0".getBytes(), 0, outbuf, 257, TarHeader.USTAR_MAGICLEN);
+        getOctalBytes(header.mode, outbuf, 100, TarHeader.MODELEN);
+        getOctalBytes(header.userId, outbuf, 108, TarHeader.UIDLEN);
+        getOctalBytes(header.groupId, outbuf, 116, TarHeader.GIDLEN);
+        getOctalBytes(header.size, outbuf, 124, TarHeader.SIZELEN);
+        getOctalBytes(header.modTime, outbuf, 136, TarHeader.MODTIMELEN);
+        Arrays.fill(outbuf, 148, 148 + TarHeader.CHKSUMLEN, (byte) ' ');
+        Arrays.fill(outbuf, 329, 329 + TarHeader.USTAR_DEVLEN, (byte) '\0');
+        Arrays.fill(outbuf, 337, 337 + TarHeader.USTAR_DEVLEN, (byte) '\0');
+
+        // Recalculate checksum
+        getOctalBytes(computeCheckSum(outbuf), outbuf, 148, TarHeader.CHKSUMLEN);
+    }
+
+    /*
+    * Proper octal to ASCII conversion
+    * */
+
+    private void getOctalBytes(long value, byte[] buf, int offset, int length) {
+        int idx = length - 1;
+
+        buf[offset + idx] = 0;
+        --idx;
+
+        for (long val = value; idx >= 0; --idx) {
+            buf[offset + idx] = (byte) ((byte) '0' + (byte) (val & 7));
+            val = val >> 3;
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.utils;
+package com.topjohnwu.magisk.container;
 
 import android.support.annotation.NonNull;
 

app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java

@@ -5,20 +5,29 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import com.topjohnwu.magisk.module.Repo;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.ValueSortedMap;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.container.Repo;
+import com.topjohnwu.magisk.utils.Utils;
 
-import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
 
 public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
     private static final int DATABASE_VER = 2;
     private static final String TABLE_NAME = "repos";
-    private static final int MIN_TEMPLATE_VER = 3;
+
+    private SQLiteDatabase mDb;
+    private MagiskManager mm;
 
     public RepoDatabaseHelper(Context context) {
         super(context, "repo.db", null, DATABASE_VER);
+        mDb = getWritableDatabase();
+        mm = Utils.getMagiskManager(context);
+
+        // Clear bad repos
+        mDb.delete(TABLE_NAME, "template<?",
+                new String[] { String.valueOf(Repo.MIN_TEMPLATE_VER) });
     }
 
     @Override
@@ -42,52 +51,52 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
         }
     }
 
-    public void addRepoMap(ValueSortedMap<String, Repo> map) {
-        SQLiteDatabase db = getWritableDatabase();
-        Collection<Repo> list = map.values();
-        for (Repo repo : list) {
-            Logger.dev("Add to DB: " + repo.getId());
-            db.replace(TABLE_NAME, null, repo.getContentValues());
-        }
-        db.close();
-    }
-
     public void clearRepo() {
-        SQLiteDatabase db = getWritableDatabase();
-        db.delete(TABLE_NAME, null, null);
-        db.close();
+        mDb.delete(TABLE_NAME, null, null);
     }
 
-    public void removeRepo(ValueSortedMap<String, Repo> map) {
-        SQLiteDatabase db = getWritableDatabase();
-        Collection<Repo> list = map.values();
-        for (Repo repo : list) {
-            Logger.dev("Remove from DB: " + repo.getId());
-            db.delete(TABLE_NAME, "id=?", new String[] { repo.getId() });
+
+    public void removeRepo(String id) {
+        mDb.delete(TABLE_NAME, "id=?", new String[] { id });
+    }
+
+    public void removeRepo(Repo repo) {
+        mDb.delete(TABLE_NAME, "repo_name=?", new String[] { repo.getRepoName() });
+    }
+
+    public void removeRepo(List<String> list) {
+        for (String id : list) {
+            if (id == null) continue;
+            mDb.delete(TABLE_NAME, "id=?", new String[] { id });
         }
-        db.close();
     }
 
-    public ValueSortedMap<String, Repo> getRepoMap() {
-        return getRepoMap(true);
+    public void addRepo(Repo repo) {
+        mDb.replace(TABLE_NAME, null, repo.getContentValues());
     }
 
-    public ValueSortedMap<String, Repo> getRepoMap(boolean filtered) {
-        ValueSortedMap<String, Repo> ret = new ValueSortedMap<>();
-        SQLiteDatabase db = getReadableDatabase();
-        Repo repo;
-        try (Cursor c = db.query(TABLE_NAME, null, null, null, null, null, null)) {
-            while (c.moveToNext()) {
-                repo = new Repo(c);
-                if (repo.getTemplateVersion() < MIN_TEMPLATE_VER && filtered) {
-                    Logger.dev("Outdated repo: " + repo.getId());
-                } else {
-                    // Logger.dev("Load from DB: " + repo.getId());
-                    ret.put(repo.getId(), repo);
-                }
+    public Repo getRepo(String id) {
+        try (Cursor c = mDb.query(TABLE_NAME, null, "id=?", new String[] { id }, null, null, null)) {
+            if (c.moveToNext()) {
+                return new Repo(c);
+            }
+        }
+        return null;
+    }
+
+    public Cursor getRepoCursor() {
+        return mDb.query(TABLE_NAME, null, "template<=?",
+                new String[] { String.valueOf(mm.magiskVersionCode) },
+                null, null, "name COLLATE NOCASE");
+    }
+
+    public List<String> getRepoIDList() {
+        LinkedList<String> ret = new LinkedList<>();
+        try (Cursor c = mDb.query(TABLE_NAME, null, null, null, null, null, null)) {
+            while (c.moveToNext()) {
+                ret.add(c.getString(c.getColumnIndex("id")));
             }
         }
-        db.close();
         return ret;
     }
 }

app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java

@@ -4,37 +4,56 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
+import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.text.TextUtils;
 
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.superuser.Policy;
-import com.topjohnwu.magisk.superuser.SuLogEntry;
+import com.topjohnwu.magisk.container.Policy;
+import com.topjohnwu.magisk.container.SuLogEntry;
 import com.topjohnwu.magisk.utils.Utils;
 
 import java.io.File;
+import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 public class SuDatabaseHelper extends SQLiteOpenHelper {
 
     public static final String ROOT_ACCESS = "root_access";
-    public static final String MULTIUSER_MODE = "multiuser_mode";
-    public static final String MNT_NS = "mnt_ns";
+    public static final int ROOT_ACCESS_DISABLED = 0;
+    public static final int ROOT_ACCESS_APPS_ONLY = 1;
+    public static final int ROOT_ACCESS_ADB_ONLY = 2;
+    public static final int ROOT_ACCESS_APPS_AND_ADB = 3;
 
-    private static final int DATABASE_VER = 2;
+    public static final String MULTIUSER_MODE = "multiuser_mode";
+    public static final int MULTIUSER_MODE_OWNER_ONLY = 0;
+    public static final int MULTIUSER_MODE_OWNER_MANAGED = 1;
+    public static final int MULTIUSER_MODE_USER = 2;
+
+    public static final String MNT_NS = "mnt_ns";
+    public static final int NAMESPACE_MODE_GLOBAL = 0;
+    public static final int NAMESPACE_MODE_REQUESTER = 1;
+    public static final int NAMESPACE_MODE_ISOLATE = 2;
+
+    public static final String DB_NAME = "su.db";
+    private static final int DATABASE_VER = 3;
     private static final String POLICY_TABLE = "policies";
     private static final String LOG_TABLE = "logs";
     private static final String SETTINGS_TABLE = "settings";
 
-    private MagiskManager magiskManager;
+    private MagiskManager mm;
     private PackageManager pm;
+    private SQLiteDatabase mDb;
 
     public SuDatabaseHelper(Context context) {
-        super(context, "su.db", null, DATABASE_VER);
-        magiskManager = Utils.getMagiskManager(context);
+        super(context, DB_NAME, null, DATABASE_VER);
+        mm = Utils.getMagiskManager(context);
         pm = context.getPackageManager();
+        mDb = getWritableDatabase();
         cleanup();
     }
 
@@ -63,13 +82,17 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
                     "FROM " + POLICY_TABLE + "_old");
             db.execSQL("DROP TABLE " + POLICY_TABLE + "_old");
 
-            File oldDB = magiskManager.getDatabasePath("sulog.db");
+            File oldDB = mm.getDatabasePath("sulog.db");
             if (oldDB.exists()) {
                 migrateLegacyLogList(oldDB, db);
-                magiskManager.deleteDatabase("sulog.db");
+                mm.deleteDatabase("sulog.db");
             }
             ++oldVersion;
         }
+        if (oldVersion == 2) {
+            db.execSQL("UPDATE " + LOG_TABLE + " SET time=time*1000");
+            ++oldVersion;
+        }
     }
 
     private void createTables(SQLiteDatabase db) {
@@ -93,13 +116,12 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
     }
 
     private void cleanup() {
-        SQLiteDatabase db = getWritableDatabase();
         // Clear outdated policies
-        db.delete(POLICY_TABLE, "until > 0 AND until < ?",
+        mDb.delete(POLICY_TABLE, "until > 0 AND until < ?",
                 new String[] { String.valueOf(System.currentTimeMillis() / 1000) });
         // Clear outdated logs
-        db.delete(LOG_TABLE, "time < ?", new String[] { String.valueOf(
-                System.currentTimeMillis() / 1000 - magiskManager.suLogTimeout * 86400) });
+        mDb.delete(LOG_TABLE, "time < ?", new String[] { String.valueOf(
+                System.currentTimeMillis() - mm.suLogTimeout * 86400000) });
     }
 
     public void deletePolicy(Policy policy) {
@@ -107,25 +129,16 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
     }
 
     public void deletePolicy(String pkg) {
-        SQLiteDatabase db = getWritableDatabase();
-        db.delete(POLICY_TABLE, "package_name=?", new String[] { pkg });
-        db.close();
+        mDb.delete(POLICY_TABLE, "package_name=?", new String[] { pkg });
     }
 
     public void deletePolicy(int uid) {
-        SQLiteDatabase db = getWritableDatabase();
-        deletePolicy(db, uid);
-        db.close();
-    }
-
-    private void deletePolicy(SQLiteDatabase db, int uid) {
-        db.delete(POLICY_TABLE, "uid=?", new String[]{String.valueOf(uid)});
+        mDb.delete(POLICY_TABLE, "uid=?", new String[]{String.valueOf(uid)});
     }
 
     public Policy getPolicy(int uid) {
         Policy policy = null;
-        SQLiteDatabase db = getReadableDatabase();
-        try (Cursor c = db.query(POLICY_TABLE, null, "uid=?", new String[] { String.valueOf(uid) }, null, null, null)) {
+        try (Cursor c = mDb.query(POLICY_TABLE, null, "uid=?", new String[] { String.valueOf(uid) }, null, null, null)) {
             if (c.moveToNext()) {
                 policy = new Policy(c, pm);
             }
@@ -133,14 +146,12 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
             deletePolicy(uid);
             return null;
         }
-        db.close();
         return policy;
     }
 
     public Policy getPolicy(String pkg) {
         Policy policy = null;
-        SQLiteDatabase db = getReadableDatabase();
-        try (Cursor c = db.query(POLICY_TABLE, null, "package_name=?", new String[] { pkg }, null, null, null)) {
+        try (Cursor c = mDb.query(POLICY_TABLE, null, "package_name=?", new String[] { pkg }, null, null, null)) {
             if (c.moveToNext()) {
                 policy = new Policy(c, pm);
             }
@@ -148,116 +159,107 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
             deletePolicy(pkg);
             return null;
         }
-        db.close();
         return policy;
     }
 
     public void addPolicy(Policy policy) {
-        SQLiteDatabase db = getWritableDatabase();
-        db.replace(POLICY_TABLE, null, policy.getContentValues());
-        db.close();
+        mDb.replace(POLICY_TABLE, null, policy.getContentValues());
     }
 
     public void updatePolicy(Policy policy) {
-        SQLiteDatabase db = getWritableDatabase();
-        updatePolicy(db, policy);
-        db.close();
-    }
-
-    private void updatePolicy(SQLiteDatabase db, Policy policy) {
-        db.update(POLICY_TABLE, policy.getContentValues(), "package_name=?",
+        mDb.update(POLICY_TABLE, policy.getContentValues(), "package_name=?",
                 new String[] { policy.packageName });
     }
 
     public List<Policy> getPolicyList(PackageManager pm) {
-        List<Policy> ret = new ArrayList<>();
-        SQLiteDatabase db = getWritableDatabase();
-        Policy policy;
-        try (Cursor c = db.query(POLICY_TABLE, null, null, null, null, null, null)) {
+        try (Cursor c = mDb.query(POLICY_TABLE, null, null, null, null, null, null)) {
+            List<Policy> ret = new ArrayList<>(c.getCount());
             while (c.moveToNext()) {
                 try {
-                    policy = new Policy(c, pm);
+                    Policy policy = new Policy(c, pm);
                     // The application changed UID for some reason, check user config
                     if (policy.info.uid != policy.uid) {
-                        if (magiskManager.suReauth) {
+                        if (mm.suReauth) {
                             // Reauth required, remove from DB
-                            deletePolicy(db, policy.uid);
+                            deletePolicy(policy);
                             continue;
                         } else {
                             // No reauth, update to use the new UID
                             policy.uid = policy.info.uid;
-                            updatePolicy(db, policy);
+                            updatePolicy(policy);
                         }
                     }
                     ret.add(policy);
                 } catch (PackageManager.NameNotFoundException e) {
                     // The app no longer exist, remove from DB
-                    deletePolicy(db, c.getInt(c.getColumnIndex("uid")));
+                    deletePolicy(c.getInt(c.getColumnIndex("uid")));
                 }
             }
+            Collections.sort(ret);
+            return ret;
         }
-        db.close();
-        Collections.sort(ret);
-        return ret;
     }
 
-    private List<SuLogEntry> getLogList(SQLiteDatabase db, String selection) {
-        List<SuLogEntry> ret = new ArrayList<>();
-        try (Cursor c = db.query(LOG_TABLE, null, selection, null, null, null, "time DESC")) {
+    public List<List<Integer>> getLogStructure() {
+        try (Cursor c = mDb.query(LOG_TABLE, new String[] { "time" }, null, null, null, null, "time DESC")) {
+            List<List<Integer>> ret = new ArrayList<>();
+            List<Integer> list = null;
+            String dateString = null, newString;
             while (c.moveToNext()) {
-                ret.add(new SuLogEntry(c));
+                Date date = new Date(c.getLong(c.getColumnIndex("time")));
+                newString = DateFormat.getDateInstance(DateFormat.MEDIUM, MagiskManager.locale).format(date);
+                if (!TextUtils.equals(dateString, newString)) {
+                    dateString = newString;
+                    list = new ArrayList<>();
+                    ret.add(list);
+                }
+                list.add(c.getPosition());
             }
+            return ret;
         }
-        db.close();
-        return ret;
+    }
+
+    public Cursor getLogCursor() {
+        return getLogCursor(mDb);
+    }
+
+    public Cursor getLogCursor(SQLiteDatabase db) {
+        return db.query(LOG_TABLE, null, null, null, null, null, "time DESC");
     }
 
     private void migrateLegacyLogList(File oldDB, SQLiteDatabase newDB) {
-        SQLiteDatabase db = SQLiteDatabase.openDatabase(oldDB.getPath(), null, SQLiteDatabase.OPEN_READWRITE);
-        List<SuLogEntry> logs = getLogList(db, null);
-        for (SuLogEntry log : logs) {
-            newDB.insert(LOG_TABLE, null, log.getContentValues());
+        try (SQLiteDatabase oldDb = SQLiteDatabase.openDatabase(oldDB.getPath(), null, SQLiteDatabase.OPEN_READWRITE);
+             Cursor c = getLogCursor(oldDb)) {
+            while (c.moveToNext()) {
+                ContentValues values = new ContentValues();
+                DatabaseUtils.cursorRowToContentValues(c, values);
+                newDB.insert(LOG_TABLE, null, values);
+            }
         }
     }
 
-    public List<SuLogEntry> getLogList() {
-        return getLogList(null);
-    }
-
-    public List<SuLogEntry> getLogList(String selection) {
-        return getLogList(getReadableDatabase(), selection);
-    }
-
     public void addLog(SuLogEntry log) {
-        SQLiteDatabase db = getWritableDatabase();
-        db.insert(LOG_TABLE, null, log.getContentValues());
-        db.close();
+        mDb.insert(LOG_TABLE, null, log.getContentValues());
     }
 
     public void clearLogs() {
-        SQLiteDatabase db = getWritableDatabase();
-        db.delete(LOG_TABLE, null, null);
-        db.close();
+        mDb.delete(LOG_TABLE, null, null);
     }
 
     public void setSettings(String key, int value) {
         ContentValues data = new ContentValues();
         data.put("key", key);
         data.put("value", value);
-        SQLiteDatabase db = getWritableDatabase();
-        db.replace(SETTINGS_TABLE, null, data);
-        db.close();
+        mDb.replace(SETTINGS_TABLE, null, data);
     }
 
     public int getSettings(String key, int defaultValue) {
-        SQLiteDatabase db = getReadableDatabase();
         int value = defaultValue;
-        try (Cursor c = db.query(SETTINGS_TABLE, null, "key=?", new String[] { key }, null, null, null)) {
-            while (c.moveToNext()) {
+        try (Cursor c = mDb.query(SETTINGS_TABLE, null, "key=?",new String[] { key }, null, null, null)) {
+            if (c.moveToNext()) {
                 value = c.getInt(c.getColumnIndex("value"));
             }
         }
-        db.close();
         return value;
     }
 }

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

@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.os.Build;
 
 import com.topjohnwu.magisk.services.OnBootIntentService;
-import com.topjohnwu.magisk.utils.Utils;
 
 public class BootReceiver extends BroadcastReceiver {
 
@@ -21,7 +20,6 @@ public class BootReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
-            Utils.getMagiskManager(context).initSU();
             // There is currently no need to start an IntentService onBoot
             // startIntentService(context);
         }

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

@@ -34,7 +34,7 @@ public abstract class DownloadReceiver extends BroadcastReceiver {
                         onDownloadDone(uri);
                         break;
                     default:
-                        Toast.makeText(context, R.string.download_file_error, Toast.LENGTH_LONG).show();
+                        Utils.getMagiskManager(context).toast(R.string.download_file_error, Toast.LENGTH_LONG);
                         break;
                 }
                 context.unregisterReceiver(this);

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

@@ -5,14 +5,13 @@ import android.content.Context;
 import android.content.Intent;
 
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.superuser.Policy;
+import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.utils.Utils;
 
 public class PackageReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         MagiskManager magiskManager = Utils.getMagiskManager(context);
-        magiskManager.initSUConfig();
 
         String pkg = intent.getData().getEncodedSchemeSpecificPart();
         Policy policy = magiskManager.suDB.getPolicy(pkg);

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

@@ -10,7 +10,7 @@ public class UpdateCheckService extends JobService {
 
     @Override
     public boolean onStartJob(JobParameters params) {
-        Utils.getMagiskManager(this).updateMagiskInfo();
+        Utils.getMagiskManager(this).getMagiskInfo();
         new CheckUpdates(this, true)
                 .setCallBack(() -> jobFinished(params, false)).exec();
         return true;

app/src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java

@@ -17,7 +17,6 @@ public class RequestActivity extends Activity {
             return;
         }
 
-        getApplicationContext().initSUConfig();
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setClass(this, SuRequestActivity.class);
         startActivity(intent);
         finish();

app/src/main/java/com/topjohnwu/magisk/superuser/SuLogEntry.java

@@ -1,98 +0,0 @@
-package com.topjohnwu.magisk.superuser;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-public class SuLogEntry implements Parcelable {
-
-    public int fromUid, toUid, fromPid;
-    public String packageName, appName, command;
-    public boolean action;
-    public Date date;
-
-    public SuLogEntry(Policy policy) {
-        fromUid = policy.uid;
-        packageName = policy.packageName;
-        appName = policy.appName;
-    }
-
-    public SuLogEntry(Cursor c) {
-        fromUid = c.getInt(c.getColumnIndex("from_uid"));
-        fromPid = c.getInt(c.getColumnIndex("from_pid"));
-        toUid = c.getInt(c.getColumnIndex("to_uid"));
-        packageName = c.getString(c.getColumnIndex("package_name"));
-        appName = c.getString(c.getColumnIndex("app_name"));
-        command = c.getString(c.getColumnIndex("command"));
-        action = c.getInt(c.getColumnIndex("action")) != 0;
-        date = new Date(c.getLong(c.getColumnIndex("time")) * 1000);
-    }
-
-    public ContentValues getContentValues() {
-        ContentValues values = new ContentValues();
-        values.put("from_uid", fromUid);
-        values.put("package_name", packageName);
-        values.put("app_name", appName);
-        values.put("from_pid", fromPid);
-        values.put("command", command);
-        values.put("to_uid", toUid);
-        values.put("action", action ? 1 : 0);
-        values.put("time", date.getTime() / 1000);
-        return values;
-    }
-
-    public String getDateString() {
-        return DateFormat.getDateInstance(DateFormat.MEDIUM).format(date);
-    }
-
-    public String getTimeString() {
-        return new SimpleDateFormat("h:mm a", Locale.US).format(date);
-    }
-
-
-    public static final Creator<SuLogEntry> CREATOR = new Creator<SuLogEntry>() {
-        @Override
-        public SuLogEntry createFromParcel(Parcel in) {
-            return new SuLogEntry(in);
-        }
-
-        @Override
-        public SuLogEntry[] newArray(int size) {
-            return new SuLogEntry[size];
-        }
-    };
-
-    protected SuLogEntry(Parcel in) {
-        fromUid = in.readInt();
-        toUid = in.readInt();
-        fromPid = in.readInt();
-        packageName = in.readString();
-        appName = in.readString();
-        command = in.readString();
-        action = in.readByte() != 0;
-        date = new Date(in.readLong());
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(fromUid);
-        dest.writeInt(toUid);
-        dest.writeInt(fromPid);
-        dest.writeString(packageName);
-        dest.writeString(appName);
-        dest.writeString(command);
-        dest.writeByte((byte) (action ? 1 : 0));
-        dest.writeLong(date.getTime());
-    }
-}

app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java

@@ -9,13 +9,16 @@ import android.widget.Toast;
 
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.container.Policy;
+import com.topjohnwu.magisk.container.SuLogEntry;
 
 import java.util.Date;
 
 public class SuReceiver extends BroadcastReceiver {
 
-    private static final int NO_NOTIFICATION = 0;
-    private static final int TOAST = 1;
+    public static final int NO_NOTIFICATION = 0;
+    public static final int TOAST = 1;
+
     private static final int NOTIFY_NORMAL_LOG = 0;
     private static final int NOTIFY_USER_TOASTS = 1;
     private static final int NOTIFY_USER_TO_OWNER = 2;
@@ -27,7 +30,6 @@ public class SuReceiver extends BroadcastReceiver {
         Policy policy;
 
         MagiskManager magiskManager = (MagiskManager) context.getApplicationContext();
-        magiskManager.initSUConfig();
 
         if (intent == null) return;
 

app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java

@@ -21,6 +21,7 @@ import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.container.Policy;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -30,10 +31,11 @@ import butterknife.ButterKnife;
 
 public class SuRequestActivity extends Activity {
 
+    public static final int PROMPT = 0;
+    public static final int AUTO_DENY = 1;
+    public static final int AUTO_ALLOW = 2;
+
     private static final int[] timeoutList = {0, -1, 10, 20, 30, 60};
-    private static final int PROMPT = 0;
-    private static final int AUTO_DENY = 1;
-    private static final int AUTO_ALLOW = 2;
 
     @BindView(R.id.su_popup) LinearLayout suPopup;
     @BindView(R.id.timeout) Spinner timeout;
@@ -58,7 +60,7 @@ public class SuRequestActivity extends Activity {
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         pm = getPackageManager();
-        magiskManager = getApplicationContext();
+        magiskManager = getMagiskManager();
 
         Intent intent = getIntent();
         socketPath = intent.getStringExtra("socket");

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

@@ -1,18 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-public class ByteArrayInOutStream extends ByteArrayOutputStream {
-    public ByteArrayInputStream getInputStream() {
-        ByteArrayInputStream in = new ByteArrayInputStream(buf, 0, count);
-        count = 0;
-        buf = new byte[32];
-        return in;
-    }
-
-    public void setBuffer(byte[] buffer) {
-        buf = buffer;
-        count = buffer.length;
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class CallbackEvent<Result> {
-
-    public boolean isTriggered = false;
-    private Result result;
-    private Set<Listener<Result>> listeners;
-
-    public void register(Listener<Result> l) {
-        if (listeners == null) {
-            listeners = new HashSet<>();
-        }
-        listeners.add(l);
-    }
-
-    public void unRegister() {
-        listeners = null;
-    }
-
-    public void unRegister(Listener<Result> l) {
-        if (listeners != null) {
-            listeners.remove(l);
-        }
-    }
-
-    public void trigger() {
-        trigger(null);
-    }
-
-    public void trigger(Result r) {
-        result = r;
-        isTriggered = true;
-        if (listeners != null) {
-            for (Listener<Result> listener : listeners) {
-                listener.onTrigger(this);
-            }
-        }
-    }
-
-    public Result getResult() {
-        return result;
-    }
-
-    public interface Listener<R> {
-        void onTrigger(CallbackEvent<R> event);
-    }
-}

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

@@ -8,8 +8,8 @@ import java.util.Locale;
 
 public class Logger {
 
-    public static final String MAIN_TAG = "Magisk";
     public static final String DEBUG_TAG = "MagiskManager";
+    private static final boolean SHELL_LOGGING = false;
 
     public static void debug(String line) {
         Log.d(DEBUG_TAG, "DEBUG: " + line);
@@ -20,25 +20,15 @@ public class Logger {
     }
 
     public static void error(String line) {
-        Log.e(MAIN_TAG, "MANAGERERROR: " + line);
+        Log.e(DEBUG_TAG, "ERROR: " + line);
     }
 
     public static void error(String fmt, Object... args) {
         error(String.format(Locale.US, fmt, args));
     }
 
-    public static void dev(String line) {
-        if (MagiskManager.devLogging) {
-            Log.d(DEBUG_TAG, line);
-        }
-    }
-
-    public static void dev(String fmt, Object... args) {
-        dev(String.format(Locale.US, fmt, args));
-    }
-
     public static void shell(String line) {
-        if (MagiskManager.shellLogging) {
+        if (SHELL_LOGGING) {
             Log.d(DEBUG_TAG, "SHELL: " + line);
         }
     }

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

@@ -1,114 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.util.Base64;
-
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.common.api.Status;
-import com.google.android.gms.safetynet.SafetyNet;
-import com.topjohnwu.magisk.R;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.security.SecureRandom;
-
-public abstract class SafetyNetHelper
-        implements GoogleApiClient.OnConnectionFailedListener, GoogleApiClient.ConnectionCallbacks {
-
-    private static boolean isRunning = false;
-
-    private GoogleApiClient mGoogleApiClient;
-    private Result ret;
-    protected FragmentActivity mActivity;
-
-    public SafetyNetHelper(FragmentActivity activity) {
-        ret = new Result();
-        mActivity = activity;
-    }
-
-    // Entry point to start test
-    public void requestTest() {
-        if (isRunning)
-            return;
-        // Connect Google Service
-        mGoogleApiClient = new GoogleApiClient.Builder(mActivity)
-                .enableAutoManage(mActivity, this)
-                .addApi(SafetyNet.API)
-                .addConnectionCallbacks(this)
-                .build();
-        mGoogleApiClient.connect();
-        isRunning = true;
-    }
-
-    @Override
-    public void onConnectionFailed(@NonNull ConnectionResult result) {
-        Logger.dev("SN: Google API fail");
-        ret.errmsg = result.getErrorMessage();
-        handleResults(ret);
-    }
-
-    @Override
-    public void onConnectionSuspended(int i) {
-        Logger.dev("SN: Google API Suspended");
-        switch (i) {
-            case CAUSE_NETWORK_LOST:
-                ret.errmsg = mActivity.getString(R.string.safetyNet_network_loss);
-                break;
-            case CAUSE_SERVICE_DISCONNECTED:
-                ret.errmsg = mActivity.getString(R.string.safetyNet_service_disconnected);
-                break;
-        }
-        handleResults(ret);
-    }
-
-    @Override
-    public void onConnected(@Nullable Bundle bundle) {
-        Logger.dev("SN: Google API Connected");
-        // Create nonce
-        byte[] nonce = new byte[24];
-        new SecureRandom().nextBytes(nonce);
-
-        Logger.dev("SN: Check with nonce: " + Base64.encodeToString(nonce, Base64.DEFAULT));
-
-        // Call SafetyNet
-        SafetyNet.SafetyNetApi.attest(mGoogleApiClient, nonce)
-                .setResultCallback(result -> {
-                    Status status = result.getStatus();
-                    if (status.isSuccess()) {
-                        String json = new String(Base64.decode(result.getJwsResult().split("\\.")[1], Base64.DEFAULT));
-                        Logger.dev("SN: Response: " + json);
-                        try {
-                            JSONObject decoded = new JSONObject(json);
-                            ret.ctsProfile = decoded.getBoolean("ctsProfileMatch");
-                            ret.basicIntegrity = decoded.getBoolean("basicIntegrity");
-                            ret.failed = false;
-                        } catch (JSONException e) {
-                            ret.errmsg = mActivity.getString(R.string.safetyNet_res_invalid);
-                        }
-                    } else {
-                        Logger.dev("SN: No response");
-                        ret.errmsg = mActivity.getString(R.string.safetyNet_no_response);
-                    }
-                    // Disconnect
-                    mGoogleApiClient.stopAutoManage(mActivity);
-                    mGoogleApiClient.disconnect();
-                    isRunning = false;
-                    handleResults(ret);
-                });
-    }
-
-    // Callback function to save the results
-    public abstract void handleResults(Result result);
-
-    public static class Result {
-        public boolean failed = true;
-        public String errmsg;
-        public boolean ctsProfile = false;
-        public boolean basicIntegrity = false;
-    }
-}

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

@@ -1,11 +1,15 @@
 package com.topjohnwu.magisk.utils;
 
 import android.content.Context;
+import android.text.TextUtils;
+
+import com.topjohnwu.magisk.MagiskManager;
 
 import java.io.BufferedReader;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,6 +30,17 @@ public class Shell {
 
     private boolean isValid;
 
+    private void testRootShell(DataOutputStream in, DataInputStream out) throws IOException {
+        in.write(("id\n").getBytes("UTF-8"));
+        in.flush();
+        String s = new BufferedReader(new InputStreamReader(out)).readLine();
+        if (TextUtils.isEmpty(s) || !s.contains("uid=0")) {
+            in.close();
+            out.close();
+            throw new IOException();
+        }
+    }
+
     private Shell() {
         rootStatus = 1;
         Process process = null;
@@ -33,45 +48,36 @@ public class Shell {
         DataInputStream out = null;
 
         try {
-            process = Runtime.getRuntime().exec("su");
+            // Try getting global namespace
+            process = Runtime.getRuntime().exec("su --mount-master");
             in = new DataOutputStream(process.getOutputStream());
             out = new DataInputStream(process.getInputStream());
+            testRootShell(in, out);
         } catch (IOException e) {
-            rootStatus = 0;
+            // Feature not implemented, normal root shell
+            try {
+                process = Runtime.getRuntime().exec("su");
+                in = new DataOutputStream(process.getOutputStream());
+                out = new DataInputStream(process.getInputStream());
+                testRootShell(in, out);
+            } catch (IOException e1) {
+                rootStatus = 0;
+            }
         }
 
-        while (true) {
-            if (rootAccess()) {
-                try {
-                    in.write(("id\n").getBytes("UTF-8"));
-                    in.flush();
-                    String s = new BufferedReader(new InputStreamReader(out)).readLine();
-                    if (s.isEmpty() || !s.contains("uid=0")) {
-                        in.close();
-                        out.close();
-                        process.destroy();
-                        throw new IOException();
-                    }
-                } catch (IOException e) {
-                    rootStatus = -1;
-                    continue;
-                }
-                break;
-            } else {
-                // Try to gain non-root sh
-                try {
-                    process = Runtime.getRuntime().exec("sh");
-                    in = new DataOutputStream(process.getOutputStream());
-                    out = new DataInputStream(process.getInputStream());
-                } catch (IOException e) {
-                    // Nothing works....
-                    shellProcess = null;
-                    STDIN = null;
-                    STDOUT = null;
-                    isValid = false;
-                    return;
-                }
-                break;
+        if (!rootAccess()) {
+            // Try to gain non-root sh
+            try {
+                process = Runtime.getRuntime().exec("sh");
+                in = new DataOutputStream(process.getOutputStream());
+                out = new DataInputStream(process.getInputStream());
+            } catch (IOException e) {
+                // Nothing works....
+                shellProcess = null;
+                STDIN = null;
+                STDOUT = null;
+                isValid = false;
+                return;
             }
         }
 
@@ -82,18 +88,64 @@ public class Shell {
         sh_raw("umask 022");
     }
 
+    private Shell(String command) {
+        Process process;
+        DataOutputStream in;
+        DataInputStream out;
+
+        try {
+            process = Runtime.getRuntime().exec(command);
+            in = new DataOutputStream(process.getOutputStream());
+            out = new DataInputStream(process.getInputStream());
+        } catch (IOException e) {
+            // Nothing works....
+            shellProcess = null;
+            STDIN = null;
+            STDOUT = null;
+            isValid = false;
+            return;
+        }
+
+        isValid = true;
+        shellProcess = process;
+        STDIN = in;
+        STDOUT = out;
+    }
+
     public static Shell getShell() {
         return new Shell();
     }
 
+    public static Shell getShell(String command) {
+        return new Shell(command);
+    }
+
     public static Shell getShell(Context context) {
-        return Utils.getMagiskManager(context).shell;
+        MagiskManager magiskManager = Utils.getMagiskManager(context);
+        if (magiskManager.shell == null || !magiskManager.shell.isValid) {
+            // Get new shell if needed
+            magiskManager.shell = getShell();
+        }
+        return magiskManager.shell;
     }
 
     public static boolean rootAccess() {
         return rootStatus > 0;
     }
 
+    public void loadInputStream(InputStream in) {
+        try {
+            int read;
+            byte[] bytes = new byte[4096];
+            while ((read = in.read(bytes)) != -1) {
+                STDIN.write(bytes, 0, read);
+            }
+            STDIN.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     public List<String> sh(String... commands) {
         List<String> res = new ArrayList<>();
         if (!isValid) return res;
@@ -102,11 +154,16 @@ public class Shell {
     }
 
     public void sh_raw(String... commands) {
+        sh_raw(false, commands);
+    }
+
+    public void sh_raw(boolean stdout, String... commands) {
         if (!isValid) return;
         synchronized (shellProcess) {
             try {
                 for (String command : commands) {
-                    STDIN.write((command + "\n").getBytes("UTF-8"));
+                    Logger.shell(command);
+                    STDIN.write((command + (stdout ? "\n" : " >/dev/null\n")).getBytes("UTF-8"));
                     STDIN.flush();
                 }
             } catch (IOException e) {
@@ -127,10 +184,10 @@ public class Shell {
             // This should be the expected result
         }
         synchronized (shellProcess) {
-            StreamGobbler out = new StreamGobbler(this.STDOUT, output);
+            StreamGobbler out = new StreamGobbler(STDOUT, output);
             out.start();
-            sh_raw(commands);
-            sh_raw("echo \'-shell-done-\'");
+            sh_raw(true, commands);
+            sh_raw(true, "echo \'-shell-done-\'");
             try { out.join(); } catch (InterruptedException ignored) {}
         }
     }

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

@@ -0,0 +1,75 @@
+package com.topjohnwu.magisk.utils;
+
+import java.lang.ref.WeakReference;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+public class Topic {
+
+    public boolean hasPublished = false;
+    private List<WeakReference<Subscriber>> subscribers;
+
+    public void subscribe(Subscriber sub) {
+        if (subscribers == null) {
+            subscribers = new LinkedList<>();
+        }
+        subscribers.add(new WeakReference<>(sub));
+    }
+
+    public void unsubscribe() {
+        subscribers = null;
+    }
+
+    public void unsubscribe(Subscriber sub) {
+        for (Iterator<WeakReference<Subscriber>> i = subscribers.iterator(); i.hasNext();) {
+            WeakReference<Subscriber> subscriber = i.next();
+            if (subscriber.get() == null || subscriber.get() == sub) {
+                i.remove();
+            }
+        }
+    }
+
+    public void publish() {
+        publish(true, null);
+    }
+
+    public void publish(boolean record) {
+        publish(record, null);
+    }
+
+    public void publish(boolean record, Object result) {
+        hasPublished = record;
+        if (subscribers != null) {
+            for (WeakReference<Subscriber> subscriber : subscribers) {
+                if (subscriber.get() != null)
+                    subscriber.get().onTopicPublished(this, result);
+            }
+        }
+    }
+
+
+    public interface Subscriber {
+        default void subscribeTopics() {
+            for (Topic topic : getSubscription()) {
+                if (topic.hasPublished) {
+                    onTopicPublished(topic);
+                }
+                topic.subscribe(this);
+            }
+        }
+        default void unsubscribeTopics() {
+            for (Topic event : getSubscription()) {
+                event.unsubscribe(this);
+            }
+        }
+        default void onTopicPublished() {
+            onTopicPublished(null, null);
+        }
+        default void onTopicPublished(Topic topic) {
+            onTopicPublished(topic, null);
+        }
+        void onTopicPublished(Topic topic, Object result);
+        Topic[] getSubscription();
+    }
+}

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

@@ -5,39 +5,58 @@ import android.app.Activity;
 import android.app.DownloadManager;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Environment;
 import android.provider.OpenableColumns;
+import android.support.annotation.StringRes;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.widget.Toast;
 
+import com.topjohnwu.magisk.FlashActivity;
+import com.topjohnwu.magisk.MagiskFragment;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.SplashActivity;
-import com.topjohnwu.magisk.asyncs.LoadRepos;
+import com.topjohnwu.magisk.asyncs.RestoreStockBoot;
+import com.topjohnwu.magisk.asyncs.UpdateRepos;
+import com.topjohnwu.magisk.components.AlertDialogBuilder;
 import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
 import com.topjohnwu.magisk.receivers.DownloadReceiver;
 import com.topjohnwu.magisk.receivers.ManagerUpdate;
 
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 
 public class Utils {
 
+    public static final int SELECT_BOOT_IMG = 3;
+    public static final String UNINSTALLER = "magisk_uninstaller.sh";
+    public static final String UTIL_FUNCTIONS= "util_functions.sh";
     public static boolean isDownloading = false;
 
     private static final int MAGISK_UPDATE_NOTIFICATION_ID = 1;
@@ -74,32 +93,28 @@ public class Utils {
         if (isDownloading)
             return;
 
-        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                != PackageManager.PERMISSION_GRANTED) {
-            Toast.makeText(context, R.string.permissionNotGranted, Toast.LENGTH_LONG).show();
-            return;
-        }
+        runWithPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE, () -> {
+            File file = new File(Environment.getExternalStorageDirectory() + "/MagiskManager/" + filename);
 
-        File file = new File(Environment.getExternalStorageDirectory() + "/MagiskManager/" + filename);
+            if ((!file.getParentFile().exists() && !file.getParentFile().mkdirs())
+                    || (file.exists() && !file.delete())) {
+                Toast.makeText(context, R.string.permissionNotGranted, Toast.LENGTH_LONG).show();
+                return;
+            }
 
-        if ((!file.getParentFile().exists() && !file.getParentFile().mkdirs())
-                || (file.exists() && !file.delete())) {
-            Toast.makeText(context, R.string.permissionNotGranted, Toast.LENGTH_LONG).show();
-            return;
-        }
+            Toast.makeText(context, context.getString(R.string.downloading_toast, filename), Toast.LENGTH_LONG).show();
+            isDownloading = true;
 
-        Toast.makeText(context, context.getString(R.string.downloading_toast, filename), Toast.LENGTH_LONG).show();
-        isDownloading = true;
+            DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
 
-        DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-
-        if (link != null) {
-            DownloadManager.Request request = new DownloadManager.Request(Uri.parse(link));
-            request.setDestinationUri(Uri.fromFile(file));
-            receiver.setDownloadID(downloadManager.enqueue(request));
-        }
-        receiver.setFilename(filename);
-        context.getApplicationContext().registerReceiver(receiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+            if (link != null) {
+                DownloadManager.Request request = new DownloadManager.Request(Uri.parse(link));
+                request.setDestinationUri(Uri.fromFile(file));
+                receiver.setDownloadID(downloadManager.enqueue(request));
+            }
+            receiver.setFilename(filename);
+            context.getApplicationContext().registerReceiver(receiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+        });
     }
 
     public static String getLegalFilename(CharSequence filename) {
@@ -126,25 +141,19 @@ public class Utils {
         return Integer.parseInt(prefs.getString(key, String.valueOf(def)));
     }
 
+    public static int getPrefsInt(SharedPreferences prefs, String key) {
+        return getPrefsInt(prefs, key, 0);
+    }
+
     public static MagiskManager getMagiskManager(Context context) {
         return (MagiskManager) context.getApplicationContext();
     }
 
-    public static void checkSafetyNet(FragmentActivity activity) {
-        new SafetyNetHelper(activity) {
-            @Override
-            public void handleResults(Result result) {
-                getMagiskManager(mActivity).SNCheckResult = result;
-                getMagiskManager(mActivity).safetyNetDone.trigger();
-            }
-        }.requestTest();
-    }
-
-    public static void clearRepoCache(Activity activity) {
-        MagiskManager magiskManager = getMagiskManager(activity);
-        magiskManager.prefs.edit().remove(LoadRepos.ETAG_KEY).apply();
-        new RepoDatabaseHelper(activity).clearRepo();
-        Toast.makeText(activity, R.string.repo_cache_cleared, Toast.LENGTH_SHORT).show();
+    public static void clearRepoCache(Context context) {
+        MagiskManager mm = getMagiskManager(context);
+        mm.prefs.edit().remove(UpdateRepos.ETAG_KEY).apply();
+        mm.repoDB.clearRepo();
+        mm.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT);
     }
 
     public static String getNameFromUri(Context context, Uri uri) {
@@ -178,53 +187,348 @@ public class Utils {
         return networkInfo != null && networkInfo.isConnected();
     }
 
-    public static boolean checkBits(int bits, int... masks) {
-        for (int mask : masks) {
-            if ((bits & mask) == 0)
-                return false;
-        }
-        return true;
-    }
-
-    public static void showMagiskUpdate(MagiskManager magiskManager) {
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(magiskManager);
+    public static void showMagiskUpdateNotification(MagiskManager mm) {
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, MagiskManager.NOTIFICATION_CHANNEL);
         builder.setSmallIcon(R.drawable.ic_magisk)
-                .setContentTitle(magiskManager.getString(R.string.magisk_update_title))
-                .setContentText(magiskManager.getString(R.string.magisk_update_available, magiskManager.remoteMagiskVersionString))
-                .setChannelId(MagiskManager.NOTIFICATION_CHANNEL)
+                .setContentTitle(mm.getString(R.string.magisk_update_title))
+                .setContentText(mm.getString(R.string.magisk_update_available, mm.remoteMagiskVersionString))
                 .setVibrate(new long[]{0, 100, 100, 100})
                 .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);
+        Intent intent = new Intent(mm, SplashActivity.class);
+        intent.putExtra(MagiskManager.INTENT_SECTION, "magisk");
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mm);
         stackBuilder.addParentStack(SplashActivity.class);
         stackBuilder.addNextIntent(intent);
         PendingIntent pendingIntent = stackBuilder.getPendingIntent(MAGISK_UPDATE_NOTIFICATION_ID,
                 PendingIntent.FLAG_UPDATE_CURRENT);
         builder.setContentIntent(pendingIntent);
         NotificationManager notificationManager =
-                (NotificationManager) magiskManager.getSystemService(Context.NOTIFICATION_SERVICE);
+                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.notify(MAGISK_UPDATE_NOTIFICATION_ID, builder.build());
     }
 
-    public static void showManagerUpdate(MagiskManager magiskManager) {
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(magiskManager);
+    public static void showManagerUpdateNotification(MagiskManager mm) {
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, MagiskManager.NOTIFICATION_CHANNEL);
         builder.setSmallIcon(R.drawable.ic_magisk)
-                .setContentTitle(magiskManager.getString(R.string.manager_update_title))
-                .setContentText(magiskManager.getString(R.string.manager_download_install))
-                .setChannelId(MagiskManager.NOTIFICATION_CHANNEL)
+                .setContentTitle(mm.getString(R.string.manager_update_title))
+                .setContentText(mm.getString(R.string.manager_download_install))
                 .setVibrate(new long[]{0, 100, 100, 100})
                 .setAutoCancel(true);
-        Intent intent = new Intent(magiskManager, ManagerUpdate.class);
-        intent.putExtra(MagiskManager.INTENT_LINK, magiskManager.managerLink);
-        intent.putExtra(MagiskManager.INTENT_VERSION, magiskManager.remoteManagerVersionString);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(magiskManager,
+        Intent intent = new Intent(mm, ManagerUpdate.class);
+        intent.putExtra(MagiskManager.INTENT_LINK, mm.managerLink);
+        intent.putExtra(MagiskManager.INTENT_VERSION, mm.remoteManagerVersionString);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(mm,
                 APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         builder.setContentIntent(pendingIntent);
         NotificationManager notificationManager =
-                (NotificationManager) magiskManager.getSystemService(Context.NOTIFICATION_SERVICE);
+                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.notify(APK_UPDATE_NOTIFICATION_ID, builder.build());
     }
+
+    public static void enableMagiskHide(Shell shell) {
+        shell.su_raw("magiskhide --enable");
+    }
+
+    public static void disableMagiskHide(Shell shell) {
+        shell.su_raw("magiskhide --disable");
+    }
+
+    public static List<String> listMagiskHide(Shell shell) {
+        return shell.su("magiskhide --ls");
+    }
+
+    public static void addMagiskHide(Shell shell, String pkg) {
+        shell.su_raw("magiskhide --add " + pkg);
+    }
+
+    public static void rmMagiskHide(Shell shell, String pkg) {
+        shell.su_raw("magiskhide --rm " + pkg);
+    }
+
+    public static String getLocaleString(Context context, Locale locale, @StringRes int id) {
+        Configuration config = context.getResources().getConfiguration();
+        config.setLocale(locale);
+        Context localizedContext = context.createConfigurationContext(config);
+        return localizedContext.getString(id);
+    }
+
+    public static List<Locale> getAvailableLocale(Context context) {
+        List<Locale> locales = new ArrayList<>();
+        HashSet<String> set = new HashSet<>();
+        Locale locale;
+
+        int compareId = R.string.download_file_error;
+
+        // Add default locale
+        locales.add(Locale.ENGLISH);
+        set.add(getLocaleString(context, Locale.ENGLISH, compareId));
+
+        // Add some special locales
+        locales.add(Locale.TAIWAN);
+        set.add(getLocaleString(context, Locale.TAIWAN, compareId));
+        locale = new Locale("pt", "BR");
+        locales.add(locale);
+        set.add(getLocaleString(context, locale, compareId));
+
+        // Other locales
+        for (String s : context.getAssets().getLocales()) {
+            locale = Locale.forLanguageTag(s);
+            if (set.add(getLocaleString(context, locale, compareId))) {
+                locales.add(locale);
+            }
+        }
+
+        Collections.sort(locales, (l1, l2) -> l1.getDisplayName(l1).compareTo(l2.getDisplayName(l2)));
+
+        return locales;
+    }
+
+    public static String genPackageName(String prefix, int length) {
+        StringBuilder builder = new StringBuilder(length);
+        builder.append(prefix);
+        length -= prefix.length();
+        SecureRandom random = new SecureRandom();
+        String base = "abcdefghijklmnopqrstuvwxyz";
+        String alpha = base + base.toUpperCase();
+        String full = alpha + "0123456789..........";
+        char next, prev = '\0';
+        for (int i = 0; i < length; ++i) {
+            if (prev == '.' || i == length - 1 || i == 0) {
+                next = alpha.charAt(random.nextInt(alpha.length()));
+            } else {
+                next = full.charAt(random.nextInt(full.length()));
+            }
+            builder.append(next);
+            prev = next;
+        }
+        return builder.toString();
+    }
+
+    public static void runWithPermission(Context context, String permission, Runnable callback) {
+        if (ContextCompat.checkSelfPermission(context, permission) != PackageManager.PERMISSION_GRANTED) {
+            // Passed in context should be an activity if not granted, need to show dialog!
+            if (!(context instanceof com.topjohnwu.magisk.components.Activity))
+                return;
+            com.topjohnwu.magisk.components.Activity activity = (com.topjohnwu.magisk.components.Activity) context;
+            activity.setPermissionGrantCallback(callback);
+            ActivityCompat.requestPermissions(activity, new String[] { permission }, 0);
+        } else {
+            callback.run();
+        }
+    }
+
+    public static void showMagiskInstallDialog(MagiskFragment fragment, boolean enc, boolean verity) {
+        MagiskManager mm = getMagiskManager(fragment.getActivity());
+        String filename = getLegalFilename("Magisk-v" + mm.remoteMagiskVersionString + ".zip");
+        new AlertDialogBuilder(fragment.getActivity())
+            .setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.magisk)))
+            .setMessage(mm.getString(R.string.repo_install_msg, filename))
+            .setCancelable(true)
+            .setPositiveButton(R.string.install, (d, i) -> {
+                List<String> options = new ArrayList<>();
+                options.add(mm.getString(R.string.download_zip_only));
+                options.add(mm.getString(R.string.patch_boot_file));
+                if (Shell.rootAccess()) {
+                    options.add(mm.getString(R.string.direct_install));
+                }
+                List<String> res = Shell.getShell(mm).su("echo $SLOT");
+                if (isValidShellResponse(res)) {
+                    options.add(mm.getString(R.string.install_second_slot));
+                }
+                char[] slot = isValidShellResponse(res) ? res.get(0).toCharArray() : null;
+                new AlertDialog.Builder(fragment.getActivity())
+                    .setTitle(R.string.select_method)
+                    .setItems(
+                        options.toArray(new String [0]),
+                        (dialog, idx) -> {
+                            String boot;
+                            DownloadReceiver receiver = null;
+                            switch (idx) {
+                                case 1:
+                                    if (mm.remoteMagiskVersionCode < 1400) {
+                                        mm.toast(R.string.no_boot_file_patch_support, Toast.LENGTH_LONG);
+                                        return;
+                                    }
+                                    mm.toast(R.string.boot_file_patch_msg, Toast.LENGTH_LONG);
+                                    Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+                                    intent.setType("*/*");
+                                    fragment.startActivityForResult(intent, SELECT_BOOT_IMG,
+                                        (requestCode, resultCode, data) -> {
+                                            if (requestCode == SELECT_BOOT_IMG
+                                                    && resultCode == Activity.RESULT_OK && data != null) {
+                                                dlAndReceive(
+                                                    fragment.getActivity(),
+                                                    new DownloadReceiver() {
+                                                        @Override
+                                                        public void onDownloadDone(Uri uri) {
+                                                            Intent intent = new Intent(mm, FlashActivity.class);
+                                                            intent.setData(uri)
+                                                                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                                                .putExtra(FlashActivity.SET_BOOT, data.getData())
+                                                                .putExtra(FlashActivity.SET_ENC, enc)
+                                                                .putExtra(FlashActivity.SET_VERITY, verity)
+                                                                .putExtra(FlashActivity.SET_ACTION, FlashActivity.PATCH_BOOT);
+                                                            mm.startActivity(intent);
+                                                        }
+                                                    },
+                                                    mm.magiskLink,
+                                                    filename
+                                                );
+                                            }
+                                        });
+                                    return;
+                                case 0:
+                                    receiver = new DownloadReceiver() {
+                                        @Override
+                                        public void onDownloadDone(Uri uri) {
+                                            showUriSnack(fragment.getActivity(), uri);
+                                        }
+                                    };
+                                    break;
+                                case 2:
+                                    boot = fragment.getSelectedBootImage();
+                                    if (boot == null)
+                                        return;
+                                    receiver = new DownloadReceiver() {
+                                        @Override
+                                        public void onDownloadDone(Uri uri) {
+                                            Intent intent = new Intent(mm, FlashActivity.class);
+                                            intent.setData(uri)
+                                                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                                .putExtra(FlashActivity.SET_BOOT, boot)
+                                                .putExtra(FlashActivity.SET_ENC, enc)
+                                                .putExtra(FlashActivity.SET_VERITY, verity)
+                                                .putExtra(FlashActivity.SET_ACTION, FlashActivity.FLASH_MAGISK);
+                                            mm.startActivity(intent);
+                                        }
+                                    };
+                                    break;
+                                case 3:
+                                    assert (slot != null);
+                                    // Choose the other slot
+                                    if (slot[1] == 'a') slot[1] = 'b';
+                                    else slot[1] = 'a';
+                                    // Then find the boot image again
+                                    List<String> ret = Shell.getShell(mm).su(
+                                            "BOOTIMAGE=",
+                                            "SLOT=" + String.valueOf(slot),
+                                            "find_boot_image",
+                                            "echo \"$BOOTIMAGE\""
+                                    );
+                                    boot = isValidShellResponse(ret) ? ret.get(ret.size() - 1) : null;
+                                    Shell.getShell(mm).su_raw("mount_partitions");
+                                    if (boot == null)
+                                        return;
+                                    receiver = new DownloadReceiver() {
+                                        @Override
+                                        public void onDownloadDone(Uri uri) {
+                                            Intent intent = new Intent(mm, FlashActivity.class);
+                                            intent.setData(uri)
+                                                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                                    .putExtra(FlashActivity.SET_BOOT, boot)
+                                                    .putExtra(FlashActivity.SET_ENC, enc)
+                                                    .putExtra(FlashActivity.SET_VERITY, verity)
+                                                    .putExtra(FlashActivity.SET_ACTION, FlashActivity.FLASH_MAGISK);
+                                            mm.startActivity(intent);
+                                        }
+                                    };
+                                default:
+                            }
+                            Utils.dlAndReceive(
+                                    fragment.getActivity(),
+                                    receiver,
+                                    mm.magiskLink,
+                                    filename
+                            );
+                        }
+                    ).show();
+            })
+            .setNeutralButton(R.string.release_notes, (d, i) -> {
+                if (mm.releaseNoteLink != null) {
+                    Intent openLink = new Intent(Intent.ACTION_VIEW, Uri.parse(mm.releaseNoteLink));
+                    openLink.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    mm.startActivity(openLink);
+                }
+            })
+            .setNegativeButton(R.string.no_thanks, null)
+            .show();
+    }
+
+    public static void showManagerInstallDialog(Activity activity) {
+        MagiskManager mm = Utils.getMagiskManager(activity);
+        new AlertDialogBuilder(activity)
+                .setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.app_name)))
+                .setMessage(mm.getString(R.string.repo_install_msg,
+                        Utils.getLegalFilename("MagiskManager-v" +
+                                mm.remoteManagerVersionString + ".apk")))
+                .setCancelable(true)
+                .setPositiveButton(R.string.install, (d, i) -> {
+                    Intent intent = new Intent(mm, ManagerUpdate.class);
+                    intent.putExtra(MagiskManager.INTENT_LINK, mm.managerLink);
+                    intent.putExtra(MagiskManager.INTENT_VERSION, mm.remoteManagerVersionString);
+                    mm.sendBroadcast(intent);
+                })
+                .setNegativeButton(R.string.no_thanks, null)
+                .show();
+    }
+
+    public static void showUninstallDialog(MagiskFragment fragment) {
+        MagiskManager mm = Utils.getMagiskManager(fragment.getActivity());
+        new AlertDialogBuilder(fragment.getActivity())
+            .setTitle(R.string.uninstall_magisk_title)
+            .setMessage(R.string.uninstall_magisk_msg)
+            .setPositiveButton(R.string.complete_uninstall, (d, i) -> {
+                try {
+                    InputStream in = mm.getAssets().open(UNINSTALLER);
+                    File uninstaller = new File(mm.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();
+                    in = mm.getAssets().open(UTIL_FUNCTIONS);
+                    File utils = new File(mm.getCacheDir(), UTIL_FUNCTIONS);
+                    out = new FileOutputStream(utils);
+                    while ((read = in.read(bytes)) != -1) {
+                        out.write(bytes, 0, read);
+                    }
+                    in.close();
+                    out.close();
+                    Shell.getShell(mm).su(
+                            "cat " + uninstaller + " > /cache/" + UNINSTALLER,
+                            "cat " + utils + " > /data/magisk/" + UTIL_FUNCTIONS
+                    );
+                    mm.toast(R.string.uninstall_toast, Toast.LENGTH_LONG);
+                    Shell.getShell(mm).su_raw(
+                            "sleep 5",
+                            "pm uninstall " + mm.getApplicationInfo().packageName
+                    );
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            })
+            .setNeutralButton(R.string.restore_stock_boot, (d, i) -> {
+                String boot = fragment.getSelectedBootImage();
+                if (boot == null) return;
+                new RestoreStockBoot(mm, boot).exec();
+            })
+            .setNegativeButton(R.string.no_thanks, null)
+            .show();
+    }
+
+    public static boolean useFDE(Context context) {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
+                && context.getSystemService(DevicePolicyManager.class).getStorageEncryptionStatus()
+                == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER;
+    }
+
+    public static Context getEncContext(Context context) {
+        if (useFDE(context))
+            return context.createDeviceProtectedStorageContext();
+        else
+            return context;
+    }
 }

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

@@ -1,60 +1,51 @@
 package com.topjohnwu.magisk.utils;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
 
-import javax.net.ssl.HttpsURLConnection;
-
 public class WebService {
 
-    public final static int GET = 1;
-    public final static int POST = 2;
-
-    /**
-     * Making web service call
-     *
-     * @url - url to make request
-     * @requestmethod - http request method
-     */
-    public static String request(String url, int method) {
-        return request(url, method, null, true);
+    public static String getString(String url) {
+        return getString(url, null);
     }
 
-    public static String request(String url, int method, boolean newline) {
-        return request(url, method, null, newline);
+    public static String getString(String url, Map<String, String> header) {
+        HttpURLConnection conn = request(url, header);
+        if (conn == null) return "";
+        return getString(conn);
     }
 
-    /**
-     * Making service call
-     *
-     * @url - url to make request
-     * @requestmethod - http request method
-     * @params - http request params
-     * @header - http request header
-     * @newline - true to append a newline each line
-     */
-    public static String request(String urlAddress, int method,
-                                 Map<String, String> header, boolean newline) {
-        Logger.dev("WebService: Service call " + urlAddress);
-        URL url;
-        StringBuilder response = new StringBuilder();
+    public static String getString(HttpURLConnection conn) {
         try {
-            url = new URL(urlAddress);
+            StringBuilder builder = new StringBuilder();
+            if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+                int len;
+                char buf[] = new char[4096];
+                while ((len = br.read(buf)) != -1) {
+                    builder.append(buf, 0, len);
+                }
+            }
+            conn.disconnect();
+            return builder.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    public static HttpURLConnection request(String address, Map<String, String> header) {
+        try {
+            URL url = new URL(address);
 
             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
             conn.setReadTimeout(15000);
             conn.setConnectTimeout(15000);
-            conn.setDoInput(true);
-
-            if (method == POST) {
-                conn.setRequestMethod("POST");
-            } else if (method == GET) {
-                conn.setRequestMethod("GET");
-            }
 
             if (header != null) {
                 for (Map.Entry<String, String> entry : header.entrySet()) {
@@ -62,31 +53,20 @@ public class WebService {
                 }
             }
 
-            int responseCode = conn.getResponseCode();
+            conn.connect();
 
-            if (responseCode == HttpsURLConnection.HTTP_OK) {
-                String line;
-                BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-                while ((line = br.readLine()) != null) {
-                    if (newline) {
-                        response.append(line).append("\n");
-                    } else {
-                        response.append(line);
-                    }
-                }
-                if (header != null) {
-                    header.clear();
-                    for (Map.Entry<String, List<String>> entry : conn.getHeaderFields().entrySet()) {
-                        List<String> l = entry.getValue();
-                        header.put(entry.getKey(), l.get(l.size() - 1));
-                    }
+            if (header != null) {
+                header.clear();
+                for (Map.Entry<String, List<String>> entry : conn.getHeaderFields().entrySet()) {
+                    List<String> l = entry.getValue();
+                    header.put(entry.getKey(), l.get(l.size() - 1));
                 }
             }
+
+            return conn;
         } catch (Exception e) {
             e.printStackTrace();
+            return null;
         }
-
-        return response.toString();
     }
-
 }

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

@@ -1,148 +1,61 @@
 package com.topjohnwu.magisk.utils;
 
 import android.content.Context;
+import android.content.res.AssetManager;
 
-import org.spongycastle.asn1.ASN1InputStream;
-import org.spongycastle.asn1.ASN1ObjectIdentifier;
-import org.spongycastle.asn1.DEROutputStream;
-import org.spongycastle.asn1.cms.CMSObjectIdentifiers;
-import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
-import org.spongycastle.cert.jcajce.JcaCertStore;
-import org.spongycastle.cms.CMSException;
-import org.spongycastle.cms.CMSProcessableByteArray;
-import org.spongycastle.cms.CMSSignedData;
-import org.spongycastle.cms.CMSSignedDataGenerator;
-import org.spongycastle.cms.CMSTypedData;
-import org.spongycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
-import org.spongycastle.operator.ContentSigner;
-import org.spongycastle.operator.OperatorCreationException;
-import org.spongycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.spongycastle.util.encoders.Base64;
+import com.topjohnwu.jarsigner.JarMap;
+import com.topjohnwu.jarsigner.SignAPK;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.security.DigestOutputStream;
-import java.security.GeneralSecurityException;
-import java.security.KeyFactory;
-import java.security.MessageDigest;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.Security;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
 import java.util.jar.JarInputStream;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.regex.Pattern;
-
-/*
-* Modified from from AOSP(Marshmallow) SignAPK.java
-* */
 
 public class ZipUtils {
     // File name in assets
     private static final String PUBLIC_KEY_NAME = "public.certificate.x509.pem";
     private static final String PRIVATE_KEY_NAME = "private.key.pk8";
 
-    private static final String CERT_SF_NAME = "META-INF/CERT.SF";
-    private static final String CERT_SIG_NAME = "META-INF/CERT.%s";
-
-    private static Provider sBouncyCastleProvider;
-    // bitmasks for which hash algorithms we need the manifest to include.
-    private static final int USE_SHA1 = 1;
-    private static final int USE_SHA256 = 2;
-
     static {
-        sBouncyCastleProvider = new BouncyCastleProvider();
-        Security.insertProviderAt(sBouncyCastleProvider, 1);
         System.loadLibrary("zipadjust");
     }
 
     public native static void zipAdjust(String filenameIn, String filenameOut);
 
-    public static void removeTopFolder(InputStream in, File output) throws IOException {
-        try {
-            JarInputStream source = new JarInputStream(in);
-            JarOutputStream dest = new JarOutputStream(new FileOutputStream(output));
-            JarEntry entry;
-            String path;
-            int size;
-            byte buffer[] = new byte[4096];
-            while ((entry = source.getNextJarEntry()) != null) {
-                // Remove the top directory from the path
-                path = entry.getName().substring(entry.getName().indexOf("/") + 1);
-                // If it's the top folder, ignore it
-                if (path.isEmpty()) {
-                    continue;
-                }
-                // Don't include placeholder
-                if (path.contains("system/placeholder")) {
-                    continue;
-                }
-                dest.putNextEntry(new JarEntry(path));
-                while((size = source.read(buffer, 0, 2048)) != -1) {
-                    dest.write(buffer, 0, size);
-                }
-            }
-            source.close();
-            dest.close();
-            in.close();
-        } catch (IOException e) {
-            Logger.dev("ZipUtils: removeTopFolder IO error!");
-            throw e;
-        }
+    public static void unzip(File zip, File folder, String path, boolean junkPath) throws Exception {
+        InputStream in = new BufferedInputStream(new FileInputStream(zip));
+        unzip(in, folder, path, junkPath);
+        in.close();
     }
 
-    public static void unzip(File file, File folder, String path) throws Exception {
-        int count;
-        FileOutputStream out;
-        File dest;
-        InputStream is;
-        JarEntry entry;
+    public static void unzip(InputStream zip, File folder, String path, boolean junkPath) throws Exception {
         byte data[] = new byte[4096];
-        try (JarFile zipfile = new JarFile(file)) {
-            Enumeration<JarEntry> e = zipfile.entries();
-            while(e.hasMoreElements()) {
-                entry = e.nextElement();
-                if (!entry.getName().contains(path) || entry.isDirectory()){
+        try {
+            JarInputStream zipfile = new JarInputStream(zip);
+            JarEntry entry;
+            while ((entry = zipfile.getNextJarEntry()) != null) {
+                if (!entry.getName().startsWith(path) || entry.isDirectory()){
                     // Ignore directories, only create files
                     continue;
                 }
-                Logger.dev("ZipUtils: Extracting: " + entry);
-                is = zipfile.getInputStream(entry);
-                dest = new File(folder, entry.getName());
-                if (dest.getParentFile().mkdirs()) {
-                    dest.createNewFile();
+                String name;
+                if (junkPath) {
+                    name = entry.getName().substring(entry.getName().lastIndexOf('/') + 1);
+                } else {
+                    name = entry.getName();
                 }
-                out = new FileOutputStream(dest);
-                while ((count = is.read(data)) != -1) {
+                File dest = new File(folder, name);
+                dest.getParentFile().mkdirs();
+                FileOutputStream out = new FileOutputStream(dest);
+                int count;
+                while ((count = zipfile.read(data)) != -1) {
                     out.write(data, 0, count);
                 }
                 out.flush();
                 out.close();
-                is.close();
             }
         } catch(Exception e) {
             e.printStackTrace();
@@ -150,478 +63,18 @@ public class ZipUtils {
         }
     }
 
-    public static void signZip(Context context, File input, File output, boolean minSign) {
-        int alignment = 4;
-        JarFile inputJar = null;
-        FileOutputStream outputFile = null;
-        int hashes = 0;
-        try {
-            X509Certificate publicKey = readPublicKey(context.getAssets().open(PUBLIC_KEY_NAME));
-            hashes |= getDigestAlgorithm(publicKey);
-
-            // Set the ZIP file timestamp to the starting valid time
-            // of the 0th certificate plus one hour (to match what
-            // we've historically done).
-            long timestamp = publicKey.getNotBefore().getTime() + 3600L * 1000;
-            PrivateKey privateKey = readPrivateKey(context.getAssets().open(PRIVATE_KEY_NAME));
-
-            outputFile = new FileOutputStream(output);
-            if (minSign) {
-                ZipUtils.signWholeFile(input, publicKey, privateKey, outputFile);
-            } else {
-                inputJar = new JarFile(input, false);  // Don't verify.
-                JarOutputStream outputJar = new JarOutputStream(outputFile);
-                // For signing .apks, use the maximum compression to make
-                // them as small as possible (since they live forever on
-                // the system partition).  For OTA packages, use the
-                // default compression level, which is much much faster
-                // and produces output that is only a tiny bit larger
-                // (~0.1% on full OTA packages I tested).
-                outputJar.setLevel(9);
-                Manifest manifest = addDigestsToManifest(inputJar, hashes);
-                copyFiles(manifest, inputJar, outputJar, timestamp, alignment);
-                signFile(manifest, inputJar, publicKey, privateKey, outputJar);
-                outputJar.close();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (inputJar != null) inputJar.close();
-                if (outputFile != null) outputFile.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
+    public static void signZip(Context context, InputStream is, File output, boolean minSign) throws Exception {
+        signZip(context, new JarMap(is, false), output, minSign);
     }
 
-
-    /**
-     * Return one of USE_SHA1 or USE_SHA256 according to the signature
-     * algorithm specified in the cert.
-     */
-    private static int getDigestAlgorithm(X509Certificate cert) {
-        String sigAlg = cert.getSigAlgName().toUpperCase(Locale.US);
-        if ("SHA1WITHRSA".equals(sigAlg) ||
-                "MD5WITHRSA".equals(sigAlg)) {     // see "HISTORICAL NOTE" above.
-            return USE_SHA1;
-        } else if (sigAlg.startsWith("SHA256WITH")) {
-            return USE_SHA256;
-        } else {
-            throw new IllegalArgumentException("unsupported signature algorithm \"" + sigAlg +
-                    "\" in cert [" + cert.getSubjectDN());
-        }
-    }
-    /** Returns the expected signature algorithm for this key type. */
-    private static String getSignatureAlgorithm(X509Certificate cert) {
-        String sigAlg = cert.getSigAlgName().toUpperCase(Locale.US);
-        String keyType = cert.getPublicKey().getAlgorithm().toUpperCase(Locale.US);
-        if ("RSA".equalsIgnoreCase(keyType)) {
-            if (getDigestAlgorithm(cert) == USE_SHA256) {
-                return "SHA256withRSA";
-            } else {
-                return "SHA1withRSA";
-            }
-        } else if ("EC".equalsIgnoreCase(keyType)) {
-            return "SHA256withECDSA";
-        } else {
-            throw new IllegalArgumentException("unsupported key type: " + keyType);
-        }
-    }
-    // Files matching this pattern are not copied to the output.
-    private static Pattern stripPattern =
-            Pattern.compile("^(META-INF/((.*)[.](SF|RSA|DSA|EC)|com/android/otacert))|(" +
-                    Pattern.quote(JarFile.MANIFEST_NAME) + ")$");
-    private static X509Certificate readPublicKey(InputStream input)
-            throws IOException, GeneralSecurityException {
-        try {
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            return (X509Certificate) cf.generateCertificate(input);
-        } finally {
-            input.close();
-        }
+    public static void signZip(Context context, File input, File output, boolean minSign) throws Exception {
+        signZip(context, new JarMap(input, false), output, minSign);
     }
 
-    /** Read a PKCS#8 format private key. */
-    private static PrivateKey readPrivateKey(InputStream input)
-            throws IOException, GeneralSecurityException {
-        try {
-            byte[] buffer = new byte[4096];
-            int size = input.read(buffer);
-            byte[] bytes = Arrays.copyOf(buffer, size);
-            /* Check to see if this is in an EncryptedPrivateKeyInfo structure. */
-            PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(bytes);
-            /*
-             * Now it's in a PKCS#8 PrivateKeyInfo structure. Read its Algorithm
-             * OID and use that to construct a KeyFactory.
-             */
-            ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(spec.getEncoded()));
-            PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject());
-            String algOid = pki.getPrivateKeyAlgorithm().getAlgorithm().getId();
-            return KeyFactory.getInstance(algOid).generatePrivate(spec);
-        } finally {
-            input.close();
-        }
-    }
-    /**
-     * Add the hash(es) of every file to the manifest, creating it if
-     * necessary.
-     */
-    private static Manifest addDigestsToManifest(JarFile jar, int hashes)
-            throws IOException, GeneralSecurityException {
-        Manifest input = jar.getManifest();
-        Manifest output = new Manifest();
-        Attributes main = output.getMainAttributes();
-        if (input != null) {
-            main.putAll(input.getMainAttributes());
-        } else {
-            main.putValue("Manifest-Version", "1.0");
-            main.putValue("Created-By", "1.0 (Android SignApk)");
-        }
-        MessageDigest md_sha1 = null;
-        MessageDigest md_sha256 = null;
-        if ((hashes & USE_SHA1) != 0) {
-            md_sha1 = MessageDigest.getInstance("SHA1");
-        }
-        if ((hashes & USE_SHA256) != 0) {
-            md_sha256 = MessageDigest.getInstance("SHA256");
-        }
-        byte[] buffer = new byte[4096];
-        int num;
-        // We sort the input entries by name, and add them to the
-        // output manifest in sorted order.  We expect that the output
-        // map will be deterministic.
-        TreeMap<String, JarEntry> byName = new TreeMap<String, JarEntry>();
-        for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements(); ) {
-            JarEntry entry = e.nextElement();
-            byName.put(entry.getName(), entry);
-        }
-        for (JarEntry entry: byName.values()) {
-            String name = entry.getName();
-            if (!entry.isDirectory() &&
-                    (stripPattern == null || !stripPattern.matcher(name).matches())) {
-                InputStream data = jar.getInputStream(entry);
-                while ((num = data.read(buffer)) > 0) {
-                    if (md_sha1 != null) md_sha1.update(buffer, 0, num);
-                    if (md_sha256 != null) md_sha256.update(buffer, 0, num);
-                }
-                Attributes attr = null;
-                if (input != null) attr = input.getAttributes(name);
-                attr = attr != null ? new Attributes(attr) : new Attributes();
-                if (md_sha1 != null) {
-                    attr.putValue("SHA1-Digest",
-                            new String(Base64.encode(md_sha1.digest()), "ASCII"));
-                }
-                if (md_sha256 != null) {
-                    attr.putValue("SHA-256-Digest",
-                            new String(Base64.encode(md_sha256.digest()), "ASCII"));
-                }
-                output.getEntries().put(name, attr);
-            }
-        }
-        return output;
-    }
-
-    /** Write to another stream and track how many bytes have been
-     *  written.
-     */
-    private static class CountOutputStream extends FilterOutputStream {
-        private int mCount;
-        public CountOutputStream(OutputStream out) {
-            super(out);
-            mCount = 0;
-        }
-        @Override
-        public void write(int b) throws IOException {
-            super.write(b);
-            mCount++;
-        }
-        @Override
-        public void write(byte[] b, int off, int len) throws IOException {
-            super.write(b, off, len);
-            mCount += len;
-        }
-        public int size() {
-            return mCount;
-        }
-    }
-    /** Write a .SF file with a digest of the specified manifest. */
-    private static void writeSignatureFile(Manifest manifest, OutputStream out,
-                                           int hash)
-            throws IOException, GeneralSecurityException {
-        Manifest sf = new Manifest();
-        Attributes main = sf.getMainAttributes();
-        main.putValue("Signature-Version", "1.0");
-        main.putValue("Created-By", "1.0 (Android SignApk)");
-        MessageDigest md = MessageDigest.getInstance(
-                hash == USE_SHA256 ? "SHA256" : "SHA1");
-        PrintStream print = new PrintStream(
-                new DigestOutputStream(new ByteArrayOutputStream(), md),
-                true, "UTF-8");
-        // Digest of the entire manifest
-        manifest.write(print);
-        print.flush();
-        main.putValue(hash == USE_SHA256 ? "SHA-256-Digest-Manifest" : "SHA1-Digest-Manifest",
-                new String(Base64.encode(md.digest()), "ASCII"));
-        Map<String, Attributes> entries = manifest.getEntries();
-        for (Map.Entry<String, Attributes> entry : entries.entrySet()) {
-            // Digest of the manifest stanza for this entry.
-            print.print("Name: " + entry.getKey() + "\r\n");
-            for (Map.Entry<Object, Object> att : entry.getValue().entrySet()) {
-                print.print(att.getKey() + ": " + att.getValue() + "\r\n");
-            }
-            print.print("\r\n");
-            print.flush();
-            Attributes sfAttr = new Attributes();
-            sfAttr.putValue(hash == USE_SHA256 ? "SHA-256-Digest" : "SHA1-Digest-Manifest",
-                    new String(Base64.encode(md.digest()), "ASCII"));
-            sf.getEntries().put(entry.getKey(), sfAttr);
-        }
-        CountOutputStream cout = new CountOutputStream(out);
-        sf.write(cout);
-        // A bug in the java.util.jar implementation of Android platforms
-        // up to version 1.6 will cause a spurious IOException to be thrown
-        // if the length of the signature file is a multiple of 1024 bytes.
-        // As a workaround, add an extra CRLF in this case.
-        if ((cout.size() % 1024) == 0) {
-            cout.write('\r');
-            cout.write('\n');
-        }
-    }
-    /** Sign data and write the digital signature to 'out'. */
-    private static void writeSignatureBlock(
-            CMSTypedData data, X509Certificate publicKey, PrivateKey privateKey,
-            OutputStream out)
-            throws IOException,
-            CertificateEncodingException,
-            OperatorCreationException,
-            CMSException {
-        ArrayList<X509Certificate> certList = new ArrayList<>(1);
-        certList.add(publicKey);
-        JcaCertStore certs = new JcaCertStore(certList);
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-        ContentSigner signer = new JcaContentSignerBuilder(getSignatureAlgorithm(publicKey))
-                .setProvider(sBouncyCastleProvider)
-                .build(privateKey);
-        gen.addSignerInfoGenerator(
-                new JcaSignerInfoGeneratorBuilder(
-                        new JcaDigestCalculatorProviderBuilder()
-                                .setProvider(sBouncyCastleProvider)
-                                .build())
-                        .setDirectSignature(true)
-                        .build(signer, publicKey));
-        gen.addCertificates(certs);
-        CMSSignedData sigData = gen.generate(data, false);
-        ASN1InputStream asn1 = new ASN1InputStream(sigData.getEncoded());
-        DEROutputStream dos = new DEROutputStream(out);
-        dos.writeObject(asn1.readObject());
-    }
-    /**
-     * Copy all the files in a manifest from input to output.  We set
-     * the modification times in the output to a fixed time, so as to
-     * reduce variation in the output file and make incremental OTAs
-     * more efficient.
-     */
-    private static void copyFiles(Manifest manifest, JarFile in, JarOutputStream out,
-                                  long timestamp, int alignment) throws IOException {
-        byte[] buffer = new byte[4096];
-        int num;
-        Map<String, Attributes> entries = manifest.getEntries();
-        ArrayList<String> names = new ArrayList<String>(entries.keySet());
-        Collections.sort(names);
-        boolean firstEntry = true;
-        long offset = 0L;
-        // We do the copy in two passes -- first copying all the
-        // entries that are STORED, then copying all the entries that
-        // have any other compression flag (which in practice means
-        // DEFLATED).  This groups all the stored entries together at
-        // the start of the file and makes it easier to do alignment
-        // on them (since only stored entries are aligned).
-        for (String name : names) {
-            JarEntry inEntry = in.getJarEntry(name);
-            JarEntry outEntry = null;
-            if (inEntry.getMethod() != JarEntry.STORED) continue;
-            // Preserve the STORED method of the input entry.
-            outEntry = new JarEntry(inEntry);
-            outEntry.setTime(timestamp);
-            // 'offset' is the offset into the file at which we expect
-            // the file data to begin.  This is the value we need to
-            // make a multiple of 'alignement'.
-            offset += JarFile.LOCHDR + outEntry.getName().length();
-            if (firstEntry) {
-                // The first entry in a jar file has an extra field of
-                // four bytes that you can't get rid of; any extra
-                // data you specify in the JarEntry is appended to
-                // these forced four bytes.  This is JAR_MAGIC in
-                // JarOutputStream; the bytes are 0xfeca0000.
-                offset += 4;
-                firstEntry = false;
-            }
-            if (alignment > 0 && (offset % alignment != 0)) {
-                // Set the "extra data" of the entry to between 1 and
-                // alignment-1 bytes, to make the file data begin at
-                // an aligned offset.
-                int needed = alignment - (int)(offset % alignment);
-                outEntry.setExtra(new byte[needed]);
-                offset += needed;
-            }
-            out.putNextEntry(outEntry);
-            InputStream data = in.getInputStream(inEntry);
-            while ((num = data.read(buffer)) > 0) {
-                out.write(buffer, 0, num);
-                offset += num;
-            }
-            out.flush();
-        }
-        // Copy all the non-STORED entries.  We don't attempt to
-        // maintain the 'offset' variable past this point; we don't do
-        // alignment on these entries.
-        for (String name : names) {
-            JarEntry inEntry = in.getJarEntry(name);
-            JarEntry outEntry = null;
-            if (inEntry.getMethod() == JarEntry.STORED) continue;
-            // Create a new entry so that the compressed len is recomputed.
-            outEntry = new JarEntry(name);
-            outEntry.setTime(timestamp);
-            out.putNextEntry(outEntry);
-            InputStream data = in.getInputStream(inEntry);
-            while ((num = data.read(buffer)) > 0) {
-                out.write(buffer, 0, num);
-            }
-            out.flush();
-        }
-    }
-
-    // This class is to provide a file's content, but trimming out the last two bytes
-    // Used for signWholeFile
-    private static class CMSProcessableFile implements CMSTypedData {
-
-        private File file;
-        private ASN1ObjectIdentifier type;
-        private byte[] buffer;
-        int bufferSize = 0;
-
-        CMSProcessableFile(File file) {
-            this.file = file;
-            type = new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId());
-            buffer = new byte[4096];
-        }
-
-        @Override
-        public ASN1ObjectIdentifier getContentType() {
-            return type;
-        }
-
-        @Override
-        public void write(OutputStream out) throws IOException, CMSException {
-            FileInputStream input = new FileInputStream(file);
-            long len = file.length() - 2;
-            while ((bufferSize = input.read(buffer)) > 0) {
-                if (len <= bufferSize) {
-                    out.write(buffer, 0, (int) len);
-                    break;
-                } else {
-                    out.write(buffer, 0, bufferSize);
-                }
-                len -= bufferSize;
-            }
-        }
-
-        @Override
-        public Object getContent() {
-            return file;
-        }
-
-        byte[] getTail() {
-            return Arrays.copyOfRange(buffer, 0, bufferSize);
-        }
-    }
-
-    private static void signWholeFile(File input, X509Certificate publicKey,
-                                      PrivateKey privateKey, OutputStream outputStream)
-            throws Exception {
-        ByteArrayOutputStream temp = new ByteArrayOutputStream();
-        // put a readable message and a null char at the start of the
-        // archive comment, so that tools that display the comment
-        // (hopefully) show something sensible.
-        // TODO: anything more useful we can put in this message?
-        byte[] message = "signed by SignApk".getBytes("UTF-8");
-        temp.write(message);
-        temp.write(0);
-
-        CMSProcessableFile cmsFile = new CMSProcessableFile(input);
-        writeSignatureBlock(cmsFile, publicKey, privateKey, temp);
-
-        // For a zip with no archive comment, the
-        // end-of-central-directory record will be 22 bytes long, so
-        // we expect to find the EOCD marker 22 bytes from the end.
-        byte[] zipData = cmsFile.getTail();
-        if (zipData[zipData.length-22] != 0x50 ||
-                zipData[zipData.length-21] != 0x4b ||
-                zipData[zipData.length-20] != 0x05 ||
-                zipData[zipData.length-19] != 0x06) {
-            throw new IllegalArgumentException("zip data already has an archive comment");
-        }
-        int total_size = temp.size() + 6;
-        if (total_size > 0xffff) {
-            throw new IllegalArgumentException("signature is too big for ZIP file comment");
-        }
-        // signature starts this many bytes from the end of the file
-        int signature_start = total_size - message.length - 1;
-        temp.write(signature_start & 0xff);
-        temp.write((signature_start >> 8) & 0xff);
-        // Why the 0xff bytes?  In a zip file with no archive comment,
-        // bytes [-6:-2] of the file are the little-endian offset from
-        // the start of the file to the central directory.  So for the
-        // two high bytes to be 0xff 0xff, the archive would have to
-        // be nearly 4GB in size.  So it's unlikely that a real
-        // commentless archive would have 0xffs here, and lets us tell
-        // an old signed archive from a new one.
-        temp.write(0xff);
-        temp.write(0xff);
-        temp.write(total_size & 0xff);
-        temp.write((total_size >> 8) & 0xff);
-        temp.flush();
-        // Signature verification checks that the EOCD header is the
-        // last such sequence in the file (to avoid minzip finding a
-        // fake EOCD appended after the signature in its scan).  The
-        // odds of producing this sequence by chance are very low, but
-        // let's catch it here if it does.
-        byte[] b = temp.toByteArray();
-        for (int i = 0; i < b.length-3; ++i) {
-            if (b[i] == 0x50 && b[i+1] == 0x4b && b[i+2] == 0x05 && b[i+3] == 0x06) {
-                throw new IllegalArgumentException("found spurious EOCD header at " + i);
-            }
-        }
-        cmsFile.write(outputStream);
-        outputStream.write(total_size & 0xff);
-        outputStream.write((total_size >> 8) & 0xff);
-        temp.writeTo(outputStream);
-    }
-    private static void signFile(Manifest manifest, JarFile inputJar,
-                                 X509Certificate publicKey, PrivateKey privateKey,
-                                 JarOutputStream outputJar)
-            throws Exception {
-        // Assume the certificate is valid for at least an hour.
-        long timestamp = publicKey.getNotBefore().getTime() + 3600L * 1000;
-        // MANIFEST.MF
-        JarEntry je = new JarEntry(JarFile.MANIFEST_NAME);
-        je.setTime(timestamp);
-        outputJar.putNextEntry(je);
-        manifest.write(outputJar);
-        je = new JarEntry(CERT_SF_NAME);
-        je.setTime(timestamp);
-        outputJar.putNextEntry(je);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        writeSignatureFile(manifest, baos, getDigestAlgorithm(publicKey));
-        byte[] signedData = baos.toByteArray();
-        outputJar.write(signedData);
-        // CERT.{EC,RSA} / CERT#.{EC,RSA}
-        final String keyType = publicKey.getPublicKey().getAlgorithm();
-        je = new JarEntry(String.format(CERT_SIG_NAME, keyType));
-        je.setTime(timestamp);
-        outputJar.putNextEntry(je);
-        writeSignatureBlock(new CMSProcessableByteArray(signedData),
-                publicKey, privateKey, outputJar);
+    public static void signZip(Context context, JarMap input, File output, boolean minSign) throws Exception {
+        AssetManager assets = context.getAssets();
+        SignAPK.signZip(
+                assets.open(PUBLIC_KEY_NAME), assets.open(PRIVATE_KEY_NAME),
+                input, output, minSign);
     }
 }

app/src/main/res/drawable/ic_arrow.xml

@@ -9,5 +9,5 @@
         android:fillColor="#000000"
         android:pathData="M7.41 7.84L12 12.42l4.59-4.58L18 9.25l-6 6-6-6z" />
     <path
-        android:pathData="M0-.75h24v24H0z" />
+        android:pathData="M0-0.75h24v24H0z" />
 </vector>

app/src/main/res/layout/fragment_magisk.xml

@@ -383,6 +383,7 @@
                 android:layout_marginTop="4dp"
                 android:clickable="true"
                 android:foreground="?android:attr/selectableItemBackground"
+                android:visibility="gone"
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="@dimen/card_elevation">
 
@@ -399,7 +400,7 @@
                         android:id="@+id/imageView"
                         android:layout_width="50dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="20dp"
+                        android:layout_marginEnd="5dp"
                         android:layout_weight="0"
                         app:srcCompat="@mipmap/ic_launcher" />
 
@@ -411,6 +412,7 @@
                         android:ems="10"
                         android:fontFamily="sans-serif"
                         android:gravity="center"
+                        android:text="@string/install"
                         android:textAllCaps="false"
                         android:textSize="20sp"
                         android:textStyle="bold" />
@@ -418,7 +420,7 @@
                     <FrameLayout
                         android:layout_width="50dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="20dp"
+                        android:layout_marginStart="5dp"
                         android:layout_weight="0">
 
                     </FrameLayout>

app/src/main/res/layout/list_item_app.xml

@@ -56,9 +56,9 @@
                 android:ellipsize="marquee"
                 android:gravity="center_vertical"
                 android:marqueeRepeatLimit="marquee_forever"
-                android:maxLines="1"
                 android:paddingEnd="3dp"
-                android:paddingStart="3dp"/>
+                android:paddingStart="3dp"
+                android:singleLine="true"/>
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/list_item_sulog_group.xml

@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:orientation="horizontal"
     android:padding="5dp">
 
     <ImageView
+        android:id="@+id/arrow"
         android:layout_width="wrap_content"
         android:layout_height="25dp"
-        android:src="@drawable/ic_arrow"
-        android:id="@+id/arrow"
-        android:layout_marginEnd="10dp" />
+        android:layout_marginEnd="10dp"
+        android:src="@drawable/ic_arrow" />
 
     <TextView
-        android:text="2017/1/1"
+        android:id="@+id/date"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/date"
-        android:textColor="?android:attr/textColorPrimary"
+        android:gravity="center_vertical"
+        android:text="2017/1/1"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:gravity="center_vertical" />
+        android:textColor="?android:attr/textColorPrimary" />
 </LinearLayout>

app/src/main/res/menu/menu_magiskhide.xml

@@ -4,6 +4,7 @@
 
     <item
         android:id="@+id/app_search"
+        android:title=""
         app:actionViewClass="android.widget.SearchView"
         app:showAsAction="always"/>
 </menu>

app/src/main/res/menu/menu_repo.xml

@@ -4,6 +4,7 @@
 
     <item
         android:id="@+id/repo_search"
+        android:title=""
         app:actionViewClass="android.widget.SearchView"
         app:showAsAction="always"/>
 </menu>

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

@@ -2,40 +2,27 @@
     <!--Universal-->
 
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">فتح درج التنقل</string>
-    <string name="navigation_drawer_close">إغلاق درج التنقل</string>
     <string name="modules">الإضافات</string>
     <string name="downloads">التنزيلات</string>
     <string name="superuser">Superuser</string>
     <string name="log">السجل</string>
     <string name="settings">الإعدادات</string>
-    <string name="status">الحالة</string>
     <string name="install">التثبيت</string>
 
     <!--Status Fragment-->
-    <string name="magisk_version">المثبت Magisk v%1$s</string>
-    <string name="magisk_version_core_only">المثبت Magisk v%1$s (الوضع الأساسي فقط)</string>
     <string name="magisk_version_error">Magisk غير مثبت</string>
 
     <string name="checking_for_updates">البحث عن تحديثات…</string>
     <string name="magisk_update_available">Magisk v%1$s متاح!</string>
     <string name="cannot_check_updates">لا يمكن التحقق من التحديثات، لا يوجد إنترنت؟</string>
-    <string name="up_to_date">تم تثبيت أحدث إصدار من %1$s</string>
     <string name="root_error">مروت لكن لا يوجد إذن الروت، غير مسموح به؟</string>
     <string name="not_rooted">غير مروت</string>
-    <string name="proper_root">مروت فعلاً</string>
     <string name="safetyNet_check_text">انقر لبدء فحص SafetyNet</string>
     <string name="checking_safetyNet_status">التحقق من حالة SafetyNet…</string>
     <string name="safetyNet_check_success">نجح فحص SafetyNet</string>
-    <string name="safetyNet_connection_failed">لا يمكن الاتصال بـ Google API</string>
-    <string name="safetyNet_connection_suspended">تم تعليق الاتصال بـ Google API</string>
-    <string name="safetyNet_no_response">لا يمكن التحقق من SafetyNet، لا يوجد إنترنت؟</string>
-    <string name="safetyNet_fail">فشل SafetyNet: عدم تطابق التشكيل الجانبي CTS</string>
-    <string name="safetyNet_pass">SafetyNet تخطى</string>
     <string name="safetyNet_network_loss">فقدان الاتصال بالشبكة</string>
     <string name="safetyNet_service_disconnected">تم إنهاء الخدمة</string>
     <string name="safetyNet_res_invalid">الاستجابة غير صالحه</string>
-    <string name="root_info_warning">وظائف محدودة إلى حد كبير</string>
 
     <!--Install Fragment-->
     <string name="auto_detect">(تلقائي) %1$s</string>
@@ -48,10 +35,7 @@
     <string name="current_magisk_title">نسخة Magisk المثبته: %1$s</string>
     <string name="install_magisk_title">آخر نسخة Magisk: %1$s</string>
     <string name="uninstall">إلغاء التثبيت</string>
-    <string name="reboot_countdown">إعادة التشغيل في %1$d</string>
     <string name="uninstall_magisk_title">إلغاء تثبيت Magisk</string>
-    <string name="uninstall_magisk_msg">سيؤدي هذا إلى إزالة جميع الإضافات، MagiskSU، وربما تشفير البيانات الخاصة بك إذا لم يتم تشفيرها\nهل أنت متأكد من الاستمرار؟</string>
-    <string name="version_none">(بدون)</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(لم يتم توفير أي معلومات)</string>
@@ -62,7 +46,6 @@
     <string name="disable_file_created">سيتم تعطيل الإضافة في إعادة التشغيل التالي</string>
     <string name="disable_file_removed">سيتم تمكين الإضافة في إعادة التشغيل التالي</string>
     <string name="author">انشئ بواسطة %1$s</string>
-    <string name="fab_flash_zip">تثبيت الملف المضغوط للإضافة</string>
 
     <!--Repo Fragment-->
     <string name="update_available">يتوفر تحديث</string>
@@ -97,32 +80,18 @@
     <string name="close">إغلاق</string>
     <string name="repo_install_title">تثبيت %1$s</string>
     <string name="repo_install_msg">هل تريد تثبيت %1$s ?</string>
-    <string name="download_install">التنزيل &amp; التثبيت</string>
     <string name="download">التنزيل</string>
-    <string name="goto_install">انتقل إلى قسم \"التثبيت\"</string>
     <string name="download_file_error">خطأ تنزيل الملف</string>
     <string name="install_error">خطأ في التثبيت!</string>
     <string name="invalid_zip">الملف المضغوط ليس إضافة Magisk!!</string>
-    <string name="reboot_title">التثبيت نجح!</string>
-    <string name="reboot_msg">هل تريد إعادة التشغيل الآن؟</string>
     <string name="reboot">إعادة التشغيل</string>
-    <string name="copying_msg">نسخ الملف المضغوط إلى دليل مؤقت</string>
-    <string name="zip_install_progress_title">التثبيت</string>
-    <string name="zip_unzip_msg">فك الضغط عن الملف المضغوط …</string>
     <string name="zip_process_msg">معالجة الملف المضغوط …</string>
-    <string name="zip_install_progress_msg">تثبيت %1$s …</string>
-    <string name="no_magisk_title">لا يوجد Magisk مثبت!</string>
-    <string name="no_magisk_msg">هل ترغب في تنزيل وتثبيت Magisk؟</string>
     <string name="downloading_toast">جاري التنزيل %1$s</string>
     <string name="magisk_update_title">تحديث Magisk جديد متوفر!</string>
     <string name="settings_reboot_toast">إعادة التشغيل لتطبيق الإعدادات</string>
     <string name="release_notes">ملاحظات الإصدار</string>
     <string name="repo_cache_cleared">تم مسح الذاكرة المؤقته للمستودع</string>
     <string name="safetyNet_hide_notice">يستخدم هذا التطبيق SafetyNet, تم التعامل معها بالفعل من قبل MagiskHide بشكل افتراضي</string>
-    <string name="start_magiskhide">بدءا إخفاء Magisk …</string>
-    <string name="no_magisksu_title">لا تستخدم MagiskSU!</string>
-    <string name="no_magisksu_msg">غير مروت بأستخدام MagiskSU, إستخدام Magisk أخفاء لوحده قد لا يكون كافياً!\nانه غير معتمدة رسمياً, وأنت بحاجه إلى أدوات اضافيه (مثلاً suhide) لتخطي SafetyNet.</string>
-    <string name="understand">أنا أفهم</string>
     <string name="process_error">خطأ في العملية</string>
     <string name="internal_storage">يتم تخزين الملف المضغوط في:\n[التخزين الداخلي]%1$s</string>
     <string name="zip_process_title">معالجة</string>
@@ -140,8 +109,6 @@
     <string name="settings_core_only_title">Magisk الوضع الأساسي فقط</string>
     <string name="settings_core_only_summary">تمكين الميزات الأساسية فقط، لن يتم تحميل جميع الإضافات. MagiskSU، MagiskHide، systemless hosts، و لا يزال ممكنا</string>
     <string name="settings_magiskhide_summary">إخفاء Magisk من مختلف الاكتشافات</string>
-    <string name="settings_busybox_title">تفعيل BusyBox</string>
-    <string name="settings_busybox_summary">ربط تحميل Magisk\'s المدمج في busybox إلى xbin</string>
     <string name="settings_hosts_title">تمكين المضيفين(الهوست) لـ systemless</string>
     <string name="settings_hosts_summary">Systemless يدعم تطبيقات حجب الإعلانات</string>
 
@@ -168,12 +135,6 @@
     <string name="user_indepenent_summary">كل مستخدم لديه قواعد روت منفصلة خاصة به</string>
     <string name="multiuser_hint_owner_request">تم إرسال طلب إلى مالك الجهاز. يرجى التبديل إلى المالك ومنح الإذن</string>
 
-    <string name="settings_development_category">تطوير التطبيق</string>
-    <string name="settings_developer_logging_title">تمكين تصحيح السجلات المتقدمة</string>
-    <string name="settings_developer_logging_summary">حدد هذا الخيار لتمكين سجل مطول أكثر.</string>
-    <string name="settings_shell_logging_title">تمكين سجل تصحيح الأوامر الدفعية</string>
-    <string name="settings_shell_logging_summary">حدد هذا الخيار لتمكين سجل جميع الأوامر الدفعية والمخرجات</string>
-
     <!--Superuser-->
     <string name="su_request_title">Superuser طلبات</string>
     <string name="deny_with_str">رفض%1$s</string>

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

@@ -2,35 +2,23 @@
     <!--Universal-->
 
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">Otevřít postranní panel</string>
-    <string name="navigation_drawer_close">Zavřít postranní panel</string>
     <string name="modules">Moduly</string>
     <string name="downloads">Stahování</string>
     <string name="superuser">Superuser</string>
     <string name="log">Log</string>
     <string name="settings">Nastavení</string>
-    <string name="status">Stav</string>
     <string name="install">Instalovat</string>
 
     <!--Status Fragment-->
-    <string name="magisk_version">Nainstalován Magisk v%1$s</string>
     <string name="magisk_version_error">Magisk není nainstalován</string>
 
     <string name="checking_for_updates">Kontrola aktualizací…</string>
     <string name="magisk_update_available">Magisk v%1$s je dostupný!</string>
     <string name="cannot_check_updates">Nelze zkontrolovat aktualizace. Jste připojeni k Internetu?</string>
-    <string name="up_to_date">Poslední verze z %1$s nainstalovaných</string>
     <string name="root_error">Zařízení s rootem ale chybí root povolení, máte jej zpřístupněno?</string>
     <string name="not_rooted">Nemáte root</string>
-    <string name="proper_root">Správně provedený root</string>
     <string name="safetyNet_check_text">Kliknutím zahájíte SafetyNet kontrolu</string>
     <string name="checking_safetyNet_status">Kontrola stavu SafetyNet…</string>
-    <string name="safetyNet_connection_failed">Nelze se spojit s Google API</string>
-    <string name="safetyNet_connection_suspended">Spojení s Google API bylo přerušeno</string>
-    <string name="safetyNet_no_response">Nelze zkontrolovat SafetyNet. Jste připojeni k Internetu?</string>
-    <string name="safetyNet_fail">SafetyNet dopadl neúspěšně: CTS profile mismatch</string>
-    <string name="safetyNet_pass">SafetyNet Schváleno</string>
-    <string name="root_info_warning">Funkčnost omezena</string>
 
     <!--Install Fragment-->
     <string name="auto_detect">(Auto) %1$s</string>
@@ -43,10 +31,7 @@
     <string name="current_magisk_title">Nainstalovaná verze Magisk: %1$s</string>
     <string name="install_magisk_title">Poslední verze Magisk: %1$s</string>
     <string name="uninstall">Odinstalovat</string>
-    <string name="reboot_countdown">Restart za %1$d</string>
     <string name="uninstall_magisk_title">Odinstalovat Magisk</string>
-    <string name="uninstall_magisk_msg">Tímto odstraníte veškeré moduly, MagiskSU a potencionálně zašifrujete svá data pokud ještě nejsou\nOpravdu chcete pokračovat?</string>
-    <string name="version_none">(Žádná)</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(Žádné info)</string>
@@ -57,7 +42,6 @@
     <string name="disable_file_created">Modul bude zakázán během příštího restartu</string>
     <string name="disable_file_removed">Modul bude povolen během příštího restartu</string>
     <string name="author">Vytvořeno %1$s</string>
-    <string name="fab_flash_zip">Flash Zip Modulu</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Dostupná Aktualizace</string>
@@ -92,32 +76,18 @@
     <string name="close">Zavřít</string>
     <string name="repo_install_title">Instalovat %1$s</string>
     <string name="repo_install_msg">Chcete nainstalovat %1$s ?</string>
-    <string name="download_install">Stažení &amp; Instalace</string>
     <string name="download">Stáhnout</string>
-    <string name="goto_install">Jděte do sekce \"Instalovat\"</string>
     <string name="download_file_error">Chyba při Stahování souboru</string>
     <string name="install_error">Chyba při Instalaci!</string>
     <string name="invalid_zip">Soubor zip není Magisk Modul!!</string>
-    <string name="reboot_title">Instalace proběhla úspěšně!</string>
-    <string name="reboot_msg">Chcete nyní restartovat vaše zařízení?</string>
     <string name="reboot">Restart</string>
-    <string name="copying_msg">Kopírovat zip do temp adresáře</string>
-    <string name="zip_install_progress_title">Instalování</string>
-    <string name="zip_unzip_msg">Extrahování zip souboru …</string>
     <string name="zip_process_msg">Zpracování zip souboru …</string>
-    <string name="zip_install_progress_msg">Instalování %1$s …</string>
-    <string name="no_magisk_title">Magisk není Nainstalován!</string>
-    <string name="no_magisk_msg">Chcete stáhnout a nainstalovat Magisk?</string>
     <string name="downloading_toast">Stahování %1$s</string>
     <string name="magisk_update_title">K dispozici je aktualizace Magisk!</string>
     <string name="settings_reboot_toast">Restartovat pro použití nastavení</string>
     <string name="release_notes">Poznámky k vydání</string>
     <string name="repo_cache_cleared">Mezipaměť smazána</string>
     <string name="safetyNet_hide_notice">Tato aplikace využívá SafetyNet\nVe výchozím nastavení již ovládaný skrze MagiskHide</string>
-    <string name="start_magiskhide">Spouštění MagiskHide …</string>
-    <string name="no_magisksu_title">Nepoužíváte MagiskSU!</string>
-    <string name="no_magisksu_msg">Nemáte root s MagiskSU, používání MagiskHide samotného nebude stačit!\nNení to oficiálně podporováno a potřebovali byste další nástroje (např. suhide) k prolomení Safety Net.</string>
-    <string name="understand">Rozumím</string>
     <string name="process_error">Chyba při Zpracování</string>
     <string name="internal_storage">Zip je uchován v:\n[Interním Úložišti]%1$s</string>
     <string name="zip_process_title">Zpracování</string>
@@ -133,8 +103,6 @@
     <string name="settings_clear_cache_summary">Smaže informace online použití v Mezipaměti, donutí aplikaci obnovit informace online</string>
 
     <string name="settings_magiskhide_summary">Skryje root (MagiskSU) před různými aplikacemi</string>
-    <string name="settings_busybox_title">Povolit BusyBox</string>
-    <string name="settings_busybox_summary">Nasadí vestavěný Magisk busybox do xbin</string>
     <string name="settings_hosts_title">Nesystémová "hosts" data</string>
     <string name="settings_hosts_summary">Podpora nesystémových dat "hosts" pro Adblock aplikace</string>
 
@@ -152,12 +120,6 @@
     <string name="superuser_notification">Oznámení Superuser</string>
     <string name="request_timeout_summary">%1$s sekund</string>
 
-    <string name="settings_development_category">Vývoj aplikace</string>
-    <string name="settings_developer_logging_title">Povolit pokročilé ladění logování</string>
-    <string name="settings_developer_logging_summary">Zkuste zapnout toto pro rozsáhlejší logování</string>
-    <string name="settings_shell_logging_title">Povolit logování pro příkazy shellu</string>
-    <string name="settings_shell_logging_summary">Logování všech příkazů shellu a jejich výstup</string>
-
     <!--Superuser-->
     <string name="su_request_title">Požadavek Superuser</string>
     <string name="deny_with_str">Zamítnout%1$s</string>

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

@@ -4,41 +4,28 @@
 
 
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">Navigationsmenü öffnen</string>
-    <string name="navigation_drawer_close">Navigationsmenü schließen</string>
 
     <string name="modules">Module</string>
     <string name="downloads">Downloads</string>
     <string name="superuser">Superuser</string>
     <string name="log">Log</string>
     <string name="settings">Einstellungen</string>
-    <string name="status">Status</string>
     <string name="install">Installieren</string>
 
     <!--Status Fragment-->
-    <string name="magisk_version">Magisk %1$s ist installiert</string>
-    <string name="magisk_version_core_only">Magisk %1$s ist installiert (nur Kernfunktionen)</string>
     <string name="magisk_version_error">Magisk ist nicht installiert</string>
 
     <string name="checking_for_updates">Suche nach Updates…</string>
     <string name="magisk_update_available">Magisk %1$s ist verfügbar!</string>
     <string name="cannot_check_updates">Updatesuche fehlgeschlagen.\nIst eine Internetverbindung verfügbar?</string>
-    <string name="up_to_date">Die neueste Version von %1$s ist bereits installiert</string>
     <string name="root_error">Gerootet, aber keine root-Rechte. Wurde der root-Zugriff verweigert?</string>
     <string name="not_rooted">Nicht gerootet</string>
-    <string name="proper_root">Ordnungsgemäß gerootet</string>
     <string name="safetyNet_check_text">SafetyNet-Status abfragen</string>
     <string name="checking_safetyNet_status">Prüfe SafetyNet-Status…</string>
     <string name="safetyNet_check_success">SafetyNet-Test erfolgreich</string>
-    <string name="safetyNet_connection_failed">Verbindung zur Google-API fehlgeschlagen</string>
-    <string name="safetyNet_connection_suspended">Verbindung zur Google-API wurde ausgesetzt</string>	
-    <string name="safetyNet_no_response">SafetyNet-Status konnte nicht geprüft werden. Ist eine Internetverbindung verfügbar?</string>
-    <string name="safetyNet_fail">SafetyNet nicht bestanden: \"CTS profile mismatch\"</string>
-    <string name="safetyNet_pass">SafetyNet bestanden</string>
     <string name="safetyNet_network_loss">Netzwerkverbindung verloren</string>
     <string name="safetyNet_service_disconnected">Der Dienst wurde beendet</string>
     <string name="safetyNet_res_invalid">Die Antwort ist ungültig</string>
-    <string name="root_info_warning">Funktionalität stark eingeschränkt</string>
 
     <!--Install Fragment-->
     <string name="auto_detect">%1$s (autom.)</string>
@@ -51,10 +38,7 @@
     <string name="current_magisk_title">Installierte Magisk-Version: %1$s</string>
     <string name="install_magisk_title">Neueste Magisk-Version: %1$s</string>
     <string name="uninstall">Deinstallieren</string>
-    <string name="reboot_countdown">Neustart in %1$d</string>
     <string name="uninstall_magisk_title">Magisk deinstallieren</string>
-    <string name="uninstall_magisk_msg">Dies entfernt alle Module, MagiskSU und verschlüsselt unter Umständen deine Daten, falls nicht bereits verschlüsselt.\nMöchtest du wirklich fortfahren?</string>
-    <string name="version_none">(keine)</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(Nichts angegeben)</string>
@@ -65,7 +49,6 @@
     <string name="disable_file_created">Modul wird beim nächsten Neustart deaktiviert</string>
     <string name="disable_file_removed">Modul wird beim nächsten Neustart aktiviert</string>
     <string name="author">Erstellt von %1$s</string>
-    <string name="fab_flash_zip">Modul aus Zip-Datei flashen</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Update verfügbar</string>
@@ -85,7 +68,7 @@
     <string name="app_developers">Hauptentwickler</string>
     <string name="app_developers_"><![CDATA[App entwickelt von <a href="https://github.com/topjohnwu">topjohnwu</a> unter Mitwirkung von <a href="https://github.com/d8ahazard">Digitalhigh</a> und <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
     <string name="app_changelog">Änderungen</string>
-    <string name="translators">skalnet, c727</string>
+    <string name="translators">skalnet, c727, jenslody</string>
     <string name="app_version">Version</string>
     <string name="app_source_code">Quelltext</string>
     <string name="donation">Spende</string>
@@ -100,38 +83,35 @@
     <string name="close">Schließen</string>
     <string name="repo_install_title">Installiere %1$s</string>
     <string name="repo_install_msg">Möchtest du %1$s installieren?</string>
-    <string name="download_install">Herunterladen &amp; installieren</string>
     <string name="download">Herunterladen</string>
-    <string name="goto_install">Zu \"Installieren\" wechseln</string>
     <string name="download_file_error">Fehler beim Herunterladen der Datei</string>
     <string name="install_error">Fehler bei der Installation!</string>
     <string name="invalid_zip">Die Zip-Datei ist kein Magisk-Modul!</string>
-    <string name="reboot_title">Installation erfolgreich!</string>
-    <string name="reboot_msg">Möchtest du jetzt neustarten?</string>
     <string name="reboot">Neustart</string>
-    <string name="copying_msg">Kopiere Zip ins temp-Verzeichnis</string>
-    <string name="zip_install_progress_title">Installiere</string>
-    <string name="zip_unzip_msg">Entpacke Zip-Datei…</string>
-    <string name="zip_process_msg">Verarbeite Zip-Datei…</string>
-    <string name="zip_install_progress_msg">Installiere %1$s…</string>
-    <string name="no_magisk_title">Magisk ist nicht installiert!</string>
-    <string name="no_magisk_msg">Möchtest du Magisk herunterladen und installieren?</string>
     <string name="downloading_toast">Herunterladen von %1$s</string>
     <string name="magisk_update_title">Neues Magisk-Update verfügbar!</string>
     <string name="settings_reboot_toast">Neustarten, um die Änderungen anzuwenden</string>
     <string name="release_notes">Änderungen</string>
     <string name="repo_cache_cleared">Repo-Cache gelöscht</string>
     <string name="safetyNet_hide_notice">Diese App benutzt SafetyNet, welches standardmäßig von Magisk Hide gehandhabt</string>
-    <string name="start_magiskhide">Starte Magisk Hide…</string>
-    <string name="no_magisksu_title">Du benutzt nicht MagiskSU!</string>
-    <string name="no_magisksu_msg">Deine root-Lösung wird nicht offiziell unterstützt und Magisk Hide allein ist eventuell nicht ausreichend!\nEventuell benötigst du weitere Programme (z.B. \"suhide\"), um SafetyNet zu bestehen.</string>
-    <string name="understand">Ich verstehe</string>
     <string name="process_error">Prozessfehler</string>
     <string name="internal_storage">Die zip-Datei ist gespeichert unter:\n[Interner Speicher]%1$s</string>
+    <string name="zip_download_title">Herunterladen</string>
+    <string name="zip_download_msg">Lade Zip-Datei herunter (%1$d%%) …</string>
     <string name="zip_process_title">Verarbeite</string>
+    <string name="zip_process_msg">Verarbeite Zip-Datei…</string>
     <string name="manual_boot_image">Bitte Boot-Image auswählen!</string>
     <string name="manager_update_title">Update für Magisk Manager verfügbar!</string>
     <string name="manager_download_install">Herunterladen und installieren</string>
+    <string name="magisk_updates">Magisk Updates</string>
+    <string name="flashing">Flashing</string>
+    <string name="hide_manager_toast">Verberge Magisk Manager…</string>
+    <string name="hide_manager_fail_toast">Verbergen von Magisk Manager fehlgeschlagen…</string>
+    <string name="download_zip_only">Zip-Datei nur herunterladen</string>
+    <string name="patch_boot_file">Boot-Image-Datei patchen</string>
+    <string name="direct_install">Direkt installieren (empfohlen)</string>
+    <string name="select_method">Methode auswählen</string>
+    <string name="no_boot_file_patch_support">Magisk Zielversion unterstützt das Patchen des Boot-Images nicht</string>
 	
     <!--Settings Activity -->
     <string name="settings_general_category">Allgemein</string>
@@ -141,12 +121,20 @@
     <string name="settings_notification_summary">Benachrichtigung, wenn eine neue Version verfügbar ist</string>
     <string name="settings_clear_cache_title">Repo-Cache löschen</string>
     <string name="settings_clear_cache_summary">Löscht die zwischengespeicherten Informationen der Online-Repos. Erzwingt eine Aktualisierung</string>
+    <string name="settings_hide_manager_title">Magisk Manager verbergen</string>
+    <string name="settings_hide_manager_summary">Magisk Manager temporär verbergen.\nDies installiert eine neue App namens \"Unhide Magisk Manager\"</string>
+    <string name="language">Sprache</string>
+    <string name="system_default">(Systemstandard)</string>
+    <string name="settings_update">Update-Einstellungen</string>
+    <string name="settings_update_channel_title">Update-Kanal</string>
+    <string name="settings_update_stable">Stabil</string>
+    <string name="settings_update_beta">Beta</string>
+    <string name="settings_boot_format_title">Ausgabeformat des gepatchten Boot-Images</string>
+    <string name="settings_boot_format_summary">Wähle das Ausgabeformat des gepatchten Boot-Images.\nWähle .img, um mit \"fastboot/download mode\" zu flashen; wähle .img.tar zum Flashen mit ODIN.</string>
 
     <string name="settings_core_only_title">Nur Kernfunktionen</string>
     <string name="settings_core_only_summary">Aktiviert lediglich die Kernfunktionen, Module werden nicht geladen. MagiskSU, Magisk Hide und Systemless hosts bleiben weiterhin aktiv</string>
     <string name="settings_magiskhide_summary">Versteckt Magisk vor diversen Entdeckungsmethoden</string>
-    <string name="settings_busybox_title">BusyBox aktivieren</string>
-    <string name="settings_busybox_summary">Magisk\'s integriertes BusyBox nach xbin mounten</string>
     <string name="settings_hosts_title">Systemlose hosts-Datei</string>
     <string name="settings_hosts_summary">Systemlose Unterstützung für Werbeblocker</string>
 
@@ -182,12 +170,6 @@
     <string name="global_summary">Alle root-Sitzungen benutzen den global angelegten Namensraum</string>
     <string name="requester_summary">Root-Sitzungen erben den Namensraum des Abfragenden</string>
     <string name="isolate_summary">Jede root-Sitzung hat ihren isolierten Namensraum</string>
-	
-    <string name="settings_development_category">Entwickler</string>
-    <string name="settings_developer_logging_title">Erweiterte Fehlerprotokolle</string>
-    <string name="settings_developer_logging_summary">Für ausführliches Logging aktivieren</string>
-    <string name="settings_shell_logging_title">Fehlerprotokolle für Shell-Befehle</string>
-    <string name="settings_shell_logging_summary">Logging aller Shell-Befehle sowie deren Ausgabe</string>
 
     <!--Superuser-->
     <string name="su_request_title">Superuser-Anfrage</string>

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

@@ -1,39 +1,26 @@
 <resources>
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">Άνοιγμα συρταριού πλοήγησης</string>
-    <string name="navigation_drawer_close">Κλείσιμο συρταριού πλοήγησης</string>
     <string name="modules">Ενότητες</string>
     <string name="downloads">Λήψεις</string>
     <string name="superuser">Υπερχρήστης</string>
     <string name="log">Aρχείο Kαταγραφής</string>
     <string name="settings">Ρυθμίσεις</string>
-    <string name="status">Κατάσταση</string>
     <string name="install">Εγκατάσταση</string>
 
     <!--Status Fragment-->
-    <string name="magisk_version">Εγκατεστημένο Magisk v%1$s</string>
-    <string name="magisk_version_core_only">Εγκατεστημένο Magisk v%1$s (Λειτουργία Πυρήνα Μόνο)</string>
     <string name="magisk_version_error">Το Magisk δεν είναι εγκατεστημένο</string>
 
     <string name="checking_for_updates">Έλεγχος για ενημερώσεις…</string>
     <string name="magisk_update_available">Το Magisk v%1$s είναι διαθέσιμο!</string>
-    <string name="cannot_check_updates">Αδυναμία ελέγχου για ενημερώσεις, δεν έχει Internet;</string>
-    <string name="up_to_date">Τελευταία έκδοση του %1$s εγκατεστημένη</string>
+    <string name="cannot_check_updates">Αδυναμία ελέγχου για ενημερώσεις, δεν έχει internet;</string>
     <string name="root_error">Υπάρχει root αλλά όχι άδεια για root, δεν επιτρέπεται;</string>
     <string name="not_rooted">Δεν υπάρχει root</string>
-    <string name="proper_root">Rooted κανονικά</string>
     <string name="safetyNet_check_text">Πατήστε για έλεγχο του SafetyNet</string>
     <string name="checking_safetyNet_status">Έλεγχος κατάστασης SafetyNet…</string>
-    <string name="safetyNet_check_success">Επιτυχημένος έλεγχος SafetyNet</string>
-    <string name="safetyNet_connection_failed">Αδυναμία σύνδεσης στο Google API</string>
-    <string name="safetyNet_connection_suspended">Η σύνδεση στο Google API διακόπηκε</string>
-    <string name="safetyNet_no_response">Αδυναμία ελέγχου SafetyNet, δεν έχει Internet;</string>
-    <string name="safetyNet_fail">Αποτυχία SafetyNet: CTS profile mismatch</string>
-    <string name="safetyNet_pass">Το SafetyNet Πέρασε</string>
-    <string name="safetyNet_network_loss">Χάθηκε η σύνδεση στο δίκτυο</string>
+    <string name="safetyNet_check_success">Ο Έλεγχος του SafetyNet Ήταν Επιτυχής</string>
+    <string name="safetyNet_network_loss">Αδυναμία σύνδεσης στο δίκτυο</string>
     <string name="safetyNet_service_disconnected">Η υπηρεσία τερματίστηκε</string>
     <string name="safetyNet_res_invalid">Η απόκριση είναι άκυρη</string>
-    <string name="root_info_warning">Η λειτουργία είναι πολύ περιορισμένη</string>
 
     <!--Install Fragment-->
     <string name="auto_detect">(Αυτόματα) %1$s</string>
@@ -46,10 +33,8 @@
     <string name="current_magisk_title">Εγκατεστημένη έκδοση Magisk: %1$s</string>
     <string name="install_magisk_title">Τελευταία έκδοση Magisk: %1$s</string>
     <string name="uninstall">Απεγκατάσταση</string>
-    <string name="reboot_countdown">Επανεκκίνηση σε %1$d</string>
     <string name="uninstall_magisk_title">Απεγκατάσταση Magisk</string>
-    <string name="uninstall_magisk_msg">Αυτό θα αφαιρέσει όλες τις ενότητες, το MagiskSU και πιθανόν να κρυπτογραφύσει τα δεδομένα σας αν δεν είναι κρυπτογραφυμένα\nΕίστε σίγουρος/η ότι θέλετε να συνεχίσετε;</string>
-    <string name="version_none">(Καμία)</string>
+    <string name="update">Ενημέρωση %1$s</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(Δεν δόθηκαν πληροφορίες)</string>
@@ -60,7 +45,6 @@
     <string name="disable_file_created">Η ενότητα θα απενεργοποιηθεί στην επόμενη επανεκκίνηση</string>
     <string name="disable_file_removed">Η ενότητα θα ενεργοποιηθεί στην επόμενη επανεκκίνηση</string>
     <string name="author">Δημιουργήθηκε από τον/την %1$s</string>
-    <string name="fab_flash_zip">Flash Zip Ενότητας</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Διαθέσιμη Ενημέρωση</string>
@@ -94,40 +78,34 @@
     <string name="ok">OK</string>
     <string name="close">Κλείσιμο</string>
     <string name="repo_install_title">Εγκατάσταση %1$s</string>
-    <string name="repo_install_msg">Θέλετε να εγκαταστήσετε %1$s ;</string>
-    <string name="download_install">Κατέβασμα &amp; Εγκατάσταση</string>
-    <string name="download">Κατέβασμα</string>
-    <string name="goto_install">Μεταφορά στο τμήμα \"Εγκατάσταση\"</string>
-    <string name="download_file_error">Σφάλμα στο κατέβασμα του αρχείου</string>
+    <string name="repo_install_msg">Θέλετε να εγκαταστήσετε το %1$s τώρα;</string>
+    <string name="download">Λήψη</string>
+    <string name="download_file_error">Σφάλμα στη λήψη του αρχείου</string>
     <string name="install_error">Σφάλμα εγκατάστασης!</string>
     <string name="invalid_zip">Αυτό το zip δεν είναι Ενότητα Magisk!!</string>
-    <string name="reboot_title">Η εγκατάσταση πέτυχε!</string>
-    <string name="reboot_msg">Θέλετε να κάνετε επανεκκίνηση τώρα;</string>
     <string name="reboot">Επανεκκίνηση</string>
-    <string name="copying_msg">Αντιγραφή zip στον προσωρινό κατάλογο</string>
-    <string name="zip_install_progress_title">Εγκατάσταση</string>
-    <string name="zip_unzip_msg">Αποσυμπίεση αρχείου zip …</string>
     <string name="zip_process_msg">Επεξεργασία αρχείου zip …</string>
-    <string name="zip_install_progress_msg">Εγκατάσταση %1$s …</string>
-    <string name="no_magisk_title">Το Magisk δεν είναι εγκατεστημένο!</string>
-    <string name="no_magisk_msg">Θέλετε να κατεβάσετε και να εγκαταστήσετε το Magisk;</string>
     <string name="downloading_toast">Κατέβασμα %1$s</string>
     <string name="magisk_update_title">Νέα Ενημέρωση Magisk Διαθέσιμη!</string>
     <string name="settings_reboot_toast">Επανεκκίνηση για εφαρμογή ρυθμίσεων</string>
     <string name="release_notes">Σημειώσεις έκδοσης</string>
     <string name="repo_cache_cleared">Η Repo cache καθαρίστηκε</string>
     <string name="safetyNet_hide_notice">Αυτή η εφαρμογή χρησιμοποιεί SafetyNet\nΉδη διαχειρίζεται από το MagiskHide από προεπιλογή</string>
-    <string name="start_magiskhide">Εκκίνηση MagiskHide …</string>
-    <string name="no_magisksu_title">Δεν χρησιμοποιείται το MagiskSU!</string>
-    <string name="no_magisksu_msg">Δεν είστε rooted με το MagiskSU, η χρήση του MagiskHide μόνο μπορεί να μην είναι αρκετή!\nΔεν υποτηρίζεται επισήμως, και θα χρειαζόσασταν πρόσθετα εργαλεία (π.χ. suhide) για να περάσετε το Safety Net.</string>
-    <string name="understand">Καταλαβαίνω</string>
     <string name="process_error">Σφάλμα διαδικασίας</string>
     <string name="internal_storage">Το zip είναι αποθηκευμένο σε:\n[Εσωτερική μνήμη]%1$s</string>
     <string name="zip_process_title">Επεξεργασία</string>
     <string name="manual_boot_image">Παρακαλώ επιλέξτε χειροκίνητα μια εικόνα boot!</string>
     <string name="manager_update_title">Νέα Ενημέρωση Magisk Manager Διαθέσιμη!</string>
-    <string name="manager_download_install">Πιέστε για κατέβασμα και εγκατάσταση</string>
-
+    <string name="manager_download_install">Πιέστε για λήψη και εγκατάσταση</string>
+    <string name="magisk_updates">Ενημερώσεις Magisk</string>
+    <string name="flashing">Γίνεται Flash</string>
+    <string name="hide_manager_toast">Κρύβοντας το Magisk Manager…</string>
+    <string name="hide_manager_fail_toast">Το κρύψιμο Magisk Manager απέτυχε…</string>
+    <string name="download_zip_only">Λήψη Zip Μόνο</string>
+    <string name="patch_boot_file">Εφαρμογή Patch στο Αρχείο Εικόνας Boot</string>
+    <string name="direct_install">Απευθείας Εγκατάσταση (Προτείνεται)</string>
+    <string name="select_method">Επιλογή Μεθόδου</string>
+    
     <!--Settings Activity -->
     <string name="settings_general_category">Γενικά</string>
     <string name="settings_dark_theme_title">Σκούρο θέμα</string>
@@ -136,12 +114,20 @@
     <string name="settings_notification_summary">Εμφάνιση ειδοποιήσεων ενημέρωσης όταν είναι διαθέσιμη νέα έκδοση</string>
     <string name="settings_clear_cache_title">Εκκαθάριση προσωρινής μνήμης αποθετηρίων</string>
     <string name="settings_clear_cache_summary">Καθαρίζει τις κρυφές πληροφορίες για απευθείας συνδεδεμένα αποθετήρια, αναγκάζει την εφαρμογή να κάνει ανανέωση σε απευθείας σύνδεση</string>
+    <string name="settings_hide_manager_title">Κρύψιμο Magisk Manager</string>
+    <string name="settings_hide_manager_summary">Προσωρινό κρύψιμο του Magisk Manager.\nΑυτό θα εγκαταστήσει μια νέα εφαρμογή με το όνομα \"Unhide Magisk Manager\"</string>
+    <string name="language">Γλώσσα</string>
+    <string name="system_default">(Προεπιλογή Συστήματος)</string>
+    <string name="settings_update">Ρυθμίσεις Ενημερώσεων</string>
+    <string name="settings_update_channel_title">Κανάλι Ενημερώσεων</string>
+    <string name="settings_update_stable">Σταθερή</string>
+    <string name="settings_update_beta">Beta</string>
+    <string name="settings_boot_format_title">Μορφή Τροποποιημένης Εικόνας Boot</string>
+    <string name="settings_boot_format_summary">Επιλέξτε τη μορφή της εξαγόμενης εικόνας boot μετά το patch.\nΕπιλέξτε .img για flash μέσω λειτουργίας fastboot/download· επιλέξτε .img.tar για flash μέσω ODIN.</string>
 
     <string name="settings_core_only_title">Magisk Λειτουργία Πυρήνα Μόνο</string>
     <string name="settings_core_only_summary">Ενεργοποίηση μόνο των λειτουργιών πυρήνα, καμία από τις ενότητες δεν θα ενεργοποιηθεί. Τα MagiskSU, MagiskHide, και systemless hosts θα παραμείνουν ενεργά</string>
     <string name="settings_magiskhide_summary">Κρύβει το Magisk από διάφορες ανιχνεύσεις</string>
-    <string name="settings_busybox_title">Ενεργοποίηση BusyBox</string>
-    <string name="settings_busybox_summary">Υποχρεωτική προσάρτηση του ενσωματωμένου busybox του Magisk στο xbin</string>
     <string name="settings_hosts_title">Systemless hosts</string>
     <string name="settings_hosts_summary">Υποστήριξη Systemless hosts για εφαρμογές Adblock</string>
 
@@ -158,8 +144,8 @@
     <string name="request_timeout">Χρονικό όριο Αιτήματος</string>
     <string name="superuser_notification">Ειδοποίηση Υπερχρήστη</string>
     <string name="request_timeout_summary">%1$s δευτερόλεπτα</string>
-    <string name="settings_su_reauth_title">Επανα-πιστοποίηση μετά από αναβάθμιση</string>
-    <string name="settings_su_reauth_summary">Επανα-πιστοποίηση αδειών υπερχρήστη μετά την αναβάθμιση μίας εφαρμογής</string>
+    <string name="settings_su_reauth_title">Επαναπιστοποίηση μετά από αναβάθμιση</string>
+    <string name="settings_su_reauth_summary">Επαναπιστοποίηση αδειών υπερχρήστη μετά την αναβάθμιση μίας εφαρμογής</string>
 
     <string name="multiuser_mode">Λειτουργία Πολλών Χρηστών</string>
     <string name="settings_owner_only">Μόνο Ιδιοκτήτης Συσκευής</string>
@@ -178,12 +164,6 @@
     <string name="requester_summary">Οι συνεδρίες root θα κληρονομούν το χώρο ονομάτων του αιτούντα τους</string>
     <string name="isolate_summary">Κάθε συνεδρία root θα έχει το δικό της απομονωμένο χώρο ονομάτων</string>
 
-    <string name="settings_development_category">Ανάπτυξη Εφαρμογής</string>
-    <string name="settings_developer_logging_title">Ενεργοποίηση προηγμένης καταγραφής ελέγχου σφαλμάτων</string>
-    <string name="settings_developer_logging_summary">Επιλέξτε αυτό για να ενεργοποιήσετε τη verbose καταγραφή</string>
-    <string name="settings_shell_logging_title">Ενεργοποίηση καταγραφής ελέγχου σφαλμάτων εντολών κελύφους</string>
-    <string name="settings_shell_logging_summary">Επιλέξτε αυτό για να ενεργοποιήσετε την καταγραφή όλων των εντολών κελύφους και την έξοδο τους</string>
-
     <!--Superuser-->
     <string name="su_request_title">Αίτημα υπερχρήστη</string>
     <string name="deny_with_str">Άρνηση%1$s</string>
@@ -197,8 +177,8 @@
     <string name="twentymin">20 λεπτά</string>
     <string name="thirtymin">30 λεπτά</string>
     <string name="sixtymin">60 λεπτά</string>
-    <string name="su_allow_toast">Στο %1$s παραχορούνται δικαιώματα υπερχρήστη</string>
-    <string name="su_deny_toast">Στο %1$s απορρίπτονται τα δικαιώματα υπερχρήστη</string>
+    <string name="su_allow_toast">Παραχωρήθηκαν δικαιώματα υπερχρήστη στο %1$s</string>
+    <string name="su_deny_toast">Απορρίφθηκαν τα δικαιώματα υπερχρήστη του %1$s</string>
     <string name="no_apps_found">Δεν βρέθηκαν εφαρμογές</string>
     <string name="su_snack_grant">Παραχορούνται δικαιώματα υπερχρήστη στο %1$s</string>
     <string name="su_snack_deny">Δεν παραχορούνται δικαιώματα υπερχρήστη στο %1$s</string>

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

@@ -2,38 +2,32 @@
     <!--Universal-->
 
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">Abrir menú de navegación</string>
-    <string name="navigation_drawer_close">Cerrar menú de navegación</string>
     <string name="modules">Módulos</string>
     <string name="downloads">Descargas</string>
     <string name="superuser">Superusuario</string>
     <string name="log">Registro</string>
     <string name="settings">Ajustes</string>
-    <string name="status">Estado</string>
     <string name="install">Instalar</string>
 
     <!--Magisk Fragment-->
-    <string name="magisk_version">Instalado Magisk v%1$s</string>
     <string name="magisk_version_error">Magisk no está instalado</string>
 
     <string name="checking_for_updates">Comprobando actualizaciones…</string>
     <string name="magisk_update_available">¡Disponible Magisk v%1$s!</string>
     <string name="cannot_check_updates">No se pueden comprobar actualizaciones ¿No tiene internet?</string>
-    <string name="up_to_date">Última versión de %1$s instalada</string>
     <string name="root_error">Rooteado pero sin permiso root, ¿No lo permitiste?</string>
     <string name="not_rooted">No rooteado</string>
-    <string name="proper_root">Correctamente rooteado</string>
     <string name="safetyNet_check_text">Toque para empezar la comprobación de SafetyNet</string>
     <string name="checking_safetyNet_status">Comprobando estado de SafetyNet…</string>
-    <string name="safetyNet_connection_failed">No puede conectar con la API de Google</string>
-    <string name="safetyNet_connection_suspended">La conexión con la API de Google API fue suspendida</string>
-    <string name="safetyNet_no_response">No puede comprobar SafetyNet, ¿No tiene internet?</string>
-    <string name="safetyNet_fail">SafetyNet: Error, no coincide el perfil CTS</string>
-    <string name="safetyNet_pass">SafetyNet: Correcto</string>
-    <string name="root_info_warning">Funcionalidad enormemente limitada</string>
+    <string name="safetyNet_check_success">La comprobación de SafetyNet fue exitosa</string>
+    <string name="safetyNet_api_error">Error en la API de SafetyNet</string>
+    <string name="safetyNet_network_loss">Conexión de red perdida</string>
+    <string name="safetyNet_service_disconnected">Se ha detenido el servicio</string>
+    <string name="safetyNet_res_invalid">La respuesta no es válida</string>
 
     <!--Install Fragment-->
     <string name="auto_detect">(Auto) %1$s</string>
+    <string name="cannot_auto_detect">(No se puede detectar automáticamente)</string>
     <string name="boot_image_title">Ubicación de la imagen boot</string>
     <string name="detect_button">Detectar</string>
     <string name="advanced_settings_title">Ajustes avanzados</string>
@@ -42,8 +36,10 @@
     <string name="current_magisk_title">Versión de Magisk instalada: %1$s</string>
     <string name="install_magisk_title">Última versión de Magisk: %1$s</string>
     <string name="uninstall">Desinstalar</string>
-    <string name="reboot_countdown">Reiniciando en %1$d</string>
-
+    <string name="uninstall_magisk_msg">Todos los módulos serán desactivados / eliminados. El acceso Root se eliminará y, posiblemente, encriptará los datos si los datos no están cifrados actualmente.</string>
+    <string name="uninstall_magisk_title">Desinstalar Magisk</string>
+    <string name="update">Actualización %1$s</string>
+    
     <!--Module Fragment-->
     <string name="no_info_provided">(No hay información)</string>
     <string name="no_modules_found">No se han encontrado módulos</string>
@@ -53,7 +49,6 @@
     <string name="disable_file_created">El módulo se desactivará en el siguiente reinicio</string>
     <string name="disable_file_removed">El módulo se activará en el siguiente reinicio</string>
     <string name="author">Creado por %1$s</string>
-    <string name="fab_flash_zip">Flashear el zip del módulo</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Actualización disponible</string>
@@ -70,7 +65,7 @@
 
     <!--About Activity-->
     <string name="about">Acerca de</string>
-    <string name="app_developers">Desarroladores principales</string>
+    <string name="app_developers">Desarrolladores principales</string>
     <string name="app_developers_"><![CDATA[Aplicación creada por <a href="https://github.com/topjohnwu">topjohnwu</a> en colaboración con <a href="https://github.com/d8ahazard">Digitalhigh</a> y <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
     <string name="app_changelog">Registro de cambios de la aplicación</string>
     <string name="translators">Gawenda, netizen, Deiki, Nosi>, dark-basic</string>
@@ -87,47 +82,66 @@
     <string name="ok">Aceptar</string>
     <string name="close">Cerrar</string>
     <string name="repo_install_title">Instalar %1$s</string>
-    <string name="repo_install_msg">¿ Quieres instalar %1$s ?</string>
-    <string name="download_install">Descargar e instalar</string>
+    <string name="repo_install_msg">¿Quieres instalar %1$s ahora?</string>
     <string name="download">Descargar</string>
-    <string name="goto_install">Ir a la sección \"Instalar\"</string>
     <string name="download_file_error">Error descargando archivo</string>
     <string name="install_error">¡Error en la instalación!</string>
     <string name="invalid_zip">¡El zip no es un módulo Magisk!</string>
-    <string name="reboot_title">¡Instalación correcta!</string>
-    <string name="reboot_msg">¿Deseas reiniciar ahora?</string>
     <string name="reboot">Reiniciar</string>
-    <string name="copying_msg">Copiando zip a un directorio temporal</string>
-    <string name="zip_install_progress_title">Instalando</string>
-    <string name="zip_unzip_msg">Descomprimiendo archivo zip …</string>
     <string name="zip_process_msg">Procesando archivo zip …</string>
-    <string name="zip_install_progress_msg">Instalando %1$s …</string>
-    <string name="no_magisk_title">¡Magisk no instalado!</string>
-    <string name="no_magisk_msg">¿Deseas descargar e instalar Magisk?</string>
     <string name="downloading_toast">Descargando %1$s</string>
     <string name="magisk_update_title">¡Nueva actualización de Magisk disponible!</string>
     <string name="settings_reboot_toast">Reinicia para aplicar los ajustes</string>
     <string name="release_notes">Notas de lanzamiento</string>
     <string name="repo_cache_cleared">Caché del repositorio limpiada</string>
     <string name="safetyNet_hide_notice">Esta aplicación usa SafetyNet\nYa manejado por defecto por MagiskHide</string>
-    <string name="start_magiskhide">Iniciando MagiskHide …</string>
-    <string name="no_magisksu_title">¡No está usando MagiskSU!</string>
-    <string name="no_magisksu_msg">No estás rooteado con MagiskSU, ¡Usando MagiskHide por si mismo podría no ser suficiente!\nNo está oficialmente soportado, y necesitaria herramientas adiccionales (ej. suhide) para pasar Safety Net.</string>
-    <string name="understand">Entendido</string>
     <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_download_title">Descargando</string>
+    <string name="zip_download_msg">Descargando el archivo zip (%1$d%%) …</string>
     <string name="zip_process_title">Procesando</string>
+    <string name="manual_boot_image">¡Selecciona manualmente una imagen boot!</string>
+    <string name="manager_update_title">Nueva actualización de Magisk Manager disponible!</string>
+    <string name="manager_download_install">Pulse para descargar e instalar</string>
+    <string name="magisk_updates">Actualización de Magisk</string>
     <string name="flashing">Flasheando</string>
-
+    <string name="hide_manager_toast">Ocultando Magisk Manager...</string>
+    <string name="hide_manager_fail_toast">La Ocultación de Magisk Manager ha fallado…</string>
+    <string name="download_zip_only">Descargar sólo el archivo ZIP</string>
+    <string name="patch_boot_file">Parcheo de la imagen boot</string>
+    <string name="direct_install">Instalación Directa (Recomendado)</string>
+    <string name="install_second_slot">Instalación en el segundo espacio (Después de OTA)</string>
+    <string name="select_method">Seleccionar Método</string>
+    <string name="no_boot_file_patch_support">La versión de Magisk no admite el parcheo de la imagen boot</string>
+    <string name="boot_file_patch_msg">Seleccione el volcado de la imagen boot en formato .img o .img.tar</string>
+    <string name="complete_uninstall">Desinstalación completa</string>
+    <string name="restore_stock_boot">Restaurar imagen boot Stock</string>
+    <string name="restore_done">¡Restauración Terminada!</string>
+    <string name="restore_fail">¡El respaldo de la imagen boot Stock no existe!</string>
+    <string name="uninstall_toast">Desinstalación de Magisk Manager en 5 segundos, por favor después reinicie manualmente </string>
+    <string name="proprietary_title">Descargar Código Propietario</string>
+    <string name="proprietary_notice">Magisk Manager es un Software Libre por lo que no contiene el código API de SafetyNet (Código Propietario de Google).\n\n ¿Puede permitir que Magisk Manager descargue una extensión (contiene el GoogleApiClient) para los cheques de SafetyNet?</string>
+ 
+    
     <!--Settings Activity -->
     <string name="settings_general_category">General</string>
     <string name="settings_dark_theme_title">Tema oscuro</string>
-    <string name="settings_dark_theme_summary">Habilita el tema oscuro</string>
+    <string name="settings_dark_theme_summary">Habilitar el tema oscuro</string>
     <string name="settings_notification_title">Notificar Actualización</string>
     <string name="settings_notification_summary">Notificar cuando una nueva versión esté disponible</string>
     <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_hide_manager_title">Ocultar Magisk Manager</string>
+    <string name="settings_hide_manager_summary">Ocultar temporalmente Magisk Manager.\nEsto instalará una nueva aplicación llamada \"Unhide Magisk Manager\"</string>  
+    <string name="language">Idioma</string>
+    <string name="system_default">(Idioma del sistema)</string>
+    <string name="settings_update">Ajustes de Actualización</string>
+    <string name="settings_update_channel_title">Canal de Actualización</string>
+    <string name="settings_update_stable">Estable</string>
+    <string name="settings_update_beta">Beta</string>
+    <string name="settings_boot_format_title">Parchear imagen boot por tipo de formato</string>
+    <string name="settings_boot_format_summary">Seleccionar el formato de salida para parchear la imagen boot.\nEscoja .img para flashear mediante fastboot/download mode; escoja .img.tar para flashear con ODIN.</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>
@@ -164,13 +178,7 @@
     <string name="settings_ns_isolate">Aislar Namespace</string>
     <string name="global_summary">Todas las sesiones de root utilizan el soporte Global Namespace</string>
     <string name="requester_summary">Las sesiones de root heredarán las peticiones Namespace</string>
-    <string name="isolate_summary">Cada sesión root tendrá su propia Namespace</string>    
-        
-    <string name="settings_development_category">Desarrollo de la aplicación</string>
-    <string name="settings_developer_logging_title">Habilitar información avanzada de depuración en el registro</string>
-    <string name="settings_developer_logging_summary">Activar esto para grabar más información en el registro</string>
-    <string name="settings_shell_logging_title">Grabar comandos de terminal en el registro</string>
-    <string name="settings_shell_logging_summary">Activar esto para grabar en el log todos los comandos ejecutados y su resultado</string>
+    <string name="isolate_summary">Cada sesión root tendrá su propia Namespace</string>
 
     <!--Superuser-->
     <string name="su_request_title">Petición de superusuario</string>

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

@@ -1,38 +1,29 @@
 <resources>
     <!--Universal-->
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">Ouvrir le menu de navigation</string>
-    <string name="navigation_drawer_close">Fermer le menu de navigation</string>
     <string name="modules">Modules</string>
     <string name="downloads">Téléchargements</string>
     <string name="superuser">Superuser</string>
     <string name="log">Journal</string>
     <string name="settings">Paramètres</string>
-    <string name="status">État</string>
     <string name="install">Installer</string>
     <!--Status Fragment-->
-    <string name="magisk_version">Magisk v%1$s installée</string>
-    <string name="magisk_version_core_only">Magisk v%1$s installée (Mode Core uniquement)</string>
     <string name="magisk_version_error">Magisk non installé</string>
     <string name="checking_for_updates">Vérification de mises à jour…</string>
     <string name="magisk_update_available">Magisk v%1$s disponible !</string>
     <string name="cannot_check_updates">Impossible de vérifier les mises à jour, pas d\'Internet ?</string>
-    <string name="up_to_date">Dernière version %1$s installée</string>
-    <string name="root_error">Rooté mais aucune permission root, non acceptée ?</string>
+    <string name="root_error">Rooté mais aucune permission root, non autorisée ?</string>
     <string name="not_rooted">Non rooté</string>
-    <string name="proper_root">Correctement rooté</string>
     <string name="safetyNet_check_text">Appuyer pour lancer le contrôle SafetyNet</string>
     <string name="checking_safetyNet_status">Vérification de l\'état de SafetyNet…</string>
-    <string name="safetyNet_connection_failed">Impossible de se connecter à l\'API Google</string>
-    <string name="safetyNet_connection_suspended">La connexion à l\'API Google a été suspendue</string>
-    <string name="safetyNet_no_response">Impossible de contrôler SafetyNet, pas d\'Internet?</string>
-    <string name="safetyNet_fail">Échec SafetyNet: erreur de profil CTS</string>
-    <string name="safetyNet_pass">SafetyNet réussi</string>
-    <string name="root_info_warning">Fonctionnalités largement limitées</string>
+    <string name="safetyNet_check_success">Contrôle SafetyNet passé avec succès</string>
+	<string name="safetyNet_network_loss">Connexion réseau indisponible unavailable</string>
+	<string name="safetyNet_service_disconnected">Le service a été tué</string>
+	<string name="safetyNet_res_invalid">La réponse est invalide</string>
     <!--Install Fragment-->
     <string name="auto_detect">(Auto) %1$s</string>
     <string name="cannot_auto_detect">(Auto détection impossible)</string>
-    <string name="boot_image_title">Emplacement de l\'Image Boot</string>
+    <string name="boot_image_title">Emplacement de l\'image Boot</string>
     <string name="detect_button">Détection</string>
     <string name="advanced_settings_title">Paramètres avancés</string>
     <string name="keep_force_encryption">Garder le chiffrement forcé</string>
@@ -40,20 +31,18 @@
     <string name="current_magisk_title">Version Magisk Installée : %1$s</string>
     <string name="install_magisk_title">Dernière Version Magisk : %1$s</string>
     <string name="uninstall">Désinstaller</string>
-    <string name="reboot_countdown">Redémarrage dans %1$d</string>
     <string name="uninstall_magisk_title">Désinstaller Magisk</string>
-    <string name="uninstall_magisk_msg">Cela va supprimer tous les modules, MagiskSU et éventuellement chiffrer vos données si vous n\'êtes pas chiffré\nÊtes-vous sûr de vouloir continuer ?</string>
-    <string name="version_none">(Aucune)</string>
+	<string name="uninstall_magisk_msg">Tous les modules seront désactivés/effacés. Le root sera enlevé et vos données seront potentiellement chiffrées si ce n\'est actuellement pas le cas</string>
+	<string name="update">Mise à jour %1$s</string>
     <!--Module Fragment-->
     <string name="no_info_provided">(Aucune information transmise)</string>
     <string name="no_modules_found">Aucun module trouvé</string>
     <string name="update_file_created">Le module va être mis à jour au prochain redémarrage</string>
     <string name="remove_file_created">Le module va être supprimé au prochain redémarrage</string>
-    <string name="remove_file_deleted">Le modufle ne va pas être supprimé au prochain redémarrage</string>
+    <string name="remove_file_deleted">Le module ne va pas être supprimé au prochain redémarrage</string>
     <string name="disable_file_created">Le module va être désactivé au prochain redémarrage</string>
     <string name="disable_file_removed">Le module va être activé au prochain redémarrage</string>
     <string name="author">Créé par %1$s</string>
-    <string name="fab_flash_zip">Flasher un Module Zip</string>
     <!--Repo Fragment-->
     <string name="update_available">Mise à jour disponible</string>
     <string name="installed">Installé</string>
@@ -64,11 +53,11 @@
     <string name="menuClearLog">Effacer le journal maintenant</string>
     <string name="logs_cleared">Journal effacé avec succès</string>
     <string name="log_is_empty">Journal vide</string>
-    <string name="logs_save_failed">Impossible d\'écrire le journal sur la SD card:</string>
+    <string name="logs_save_failed">Impossible d\'écrire le journal sur la carte SD:</string>
     <!--About Activity-->
     <string name="about">À propos</string>
     <string name="app_developers">Principaux développeurs</string>
-    <string name="app_developers_"><![CDATA[App created by <a href="https://github.com/topjohnwu">topjohnwu</a> in collaboration with <a href="https://github.com/d8ahazard">Digitalhigh</a> and <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
+    <string name="app_developers_"><![CDATA[Appli créée par <a href="https://github.com/topjohnwu">topjohnwu</a> en collaboration avec <a href="https://github.com/d8ahazard">Digitalhigh</a> et <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
     <string name="app_changelog">Modifications de l\'application</string>
     <string name="translators" />
     <string name="app_version">Version de l\'application</string>
@@ -84,36 +73,39 @@
     <string name="close">Fermer</string>
     <string name="repo_install_title">Installer %1$s</string>
     <string name="repo_install_msg">Voulez-vous installer %1$s ?</string>
-    <string name="download_install">Télécharger &amp; Installer</string>
     <string name="download">Télécharger</string>
-    <string name="goto_install">Aller à la section \"Installer\"</string>
     <string name="download_file_error">Erreur de téléchargement du fichier</string>
     <string name="install_error">Échec de l\'installation !</string>
     <string name="invalid_zip">Ce zip n\'est pas un Module Magisk !!</string>
-    <string name="reboot_title">Installation réussie !</string>
-    <string name="reboot_msg">Voulez-vous redémarrer maintenant ?</string>
     <string name="reboot">Redémarrer</string>
-    <string name="copying_msg">Copie du zip dans le répertoire temp</string>
-    <string name="zip_install_progress_title">Installation</string>
-    <string name="zip_unzip_msg">Décompression du fichier zip…</string>
     <string name="zip_process_msg">Exécution du fichier zip…</string>
-    <string name="zip_install_progress_msg">Installation %1$s…</string>
-    <string name="no_magisk_title">Magisk non installé !</string>
-    <string name="no_magisk_msg">Voulez-vous télécharger et installer Magisk ?</string>
     <string name="downloading_toast">Téléchargement %1$s</string>
     <string name="magisk_update_title">Nouvelle mise à jour de Magisk disponible !</string>
     <string name="settings_reboot_toast">Redémarrer pour appliquer les changements</string>
     <string name="release_notes">Notes de version</string>
     <string name="repo_cache_cleared">Cache du dépôt effacé</string>
     <string name="safetyNet_hide_notice">Cette application utilise SafetyNet\nDéjà pris en charge par MagiskHide par défaut</string>
-    <string name="start_magiskhide">Lancement de MagiskHide …</string>
-    <string name="no_magisksu_title">MagiskSU non utilisé !</string>
-    <string name="no_magisksu_msg">Vous n\'êtes pas rooté avec MagiskSU, utiliser uniquement MagiskHide peut ne pas suffire !\nCeci n\'est officiellement pas supporté et vous devriez avoir besoin d\'autres outils (ex : suhide) pour passer SafetyNet.</string>
-    <string name="understand">Je comprends</string>
     <string name="process_error">Erreur d\'exécution</string>
     <string name="internal_storage">Le zip est stocké dans :\n[Internal Storage]%1$s</string>
     <string name="zip_process_title">Exécution</string>
     <string name="manual_boot_image">Veuillez sélectionner l\'image boot manuellement !</string>
+	<string name="zip_download_title">Téléchargement</string>
+	<string name="zip_download_msg">Téléchargement du fichier zip (%1$d%%) ...</string>
+	<string name="manager_update_title">Nouvelle mise à jour Magisk Manager disponible !</string>
+	<string name="manager_download_install">Appuyez pour télécharger et installer</string>
+	<string name="magisk_updates">Mises à jour Magisk</string>
+	<string name="flashing">Flash en-cours</string>
+	<string name="hide_manager_toast">Masquage de Magisk Manager…</string>
+	<string name="hide_manager_fail_toast">Échec du masquage de Magisk Manager...</string>
+	<string name="download_zip_only">Télécharger uniquement le zip</string>
+	<string name="patch_boot_file">Patcher le fichier image Boot</string>
+	<string name="direct_install">Installation directe (recommandée)</string>
+	<string name="select_method">Choisir une méthode</string>
+	<string name="no_boot_file_patch_support">La version cible de Magisk ne supporte pas la modification du fichier image Boot</string>
+	<string name="complete_uninstall">Désinstaller complètement</string>
+	<string name="restore_stock_boot">Restaurer le Boot stock</string>
+	<string name="restore_done">Restauration effectuée !</string>
+	<string name="restore_fail">Pas de sauvegarde stock disponible !</string>
     <!--Settings Activity -->
     <string name="settings_general_category">Général</string>
     <string name="settings_dark_theme_title">Thème sombre</string>
@@ -125,8 +117,6 @@
     <string name="settings_core_only_title">Mode Magisk Core uniquement</string>
     <string name="settings_core_only_summary">Activer uniquement les fonctionnalités de base, tous les modules ne seront pas chargés. MagiskSU, MagiskHide et les hosts systemless restent activés</string>
     <string name="settings_magiskhide_summary">Masquer Magisk de diverses détections</string>
-    <string name="settings_busybox_title">Activer BusyBox</string>
-    <string name="settings_busybox_summary">Monter le busybox de Magisk sur xbin</string>
     <string name="settings_hosts_title">Hosts systemless</string>
     <string name="settings_hosts_summary">Support hosts systemless pour les applications type Adblock</string>
     <string name="settings_su_app_adb">Applications et ADB</string>
@@ -142,11 +132,33 @@
     <string name="request_timeout">Délai de requête</string>
     <string name="superuser_notification">Notification Superuser</string>
     <string name="request_timeout_summary">%1$s secondes</string>
-    <string name="settings_development_category">Dévellopement de l\'application</string>
-    <string name="settings_developer_logging_title">Activer le journal de débogage avancé</string>
-    <string name="settings_developer_logging_summary">Cocher ceci pour activer la journalisation "verbose" (tout)</string>
-    <string name="settings_shell_logging_title">Activer la journalisation de débogage de commande shell</string>
-    <string name="settings_shell_logging_summary">Cocher ceci pour activer la journalisation de toutes les commandes shell et leurs données de sortie</string>
+    <string name="settings_hide_manager_title">Masquer Magisk Manager</string>
+	<string name="settings_hide_manager_summary">Masquer temporairement Magisk Manager.\nCeci installera une nouvelle appli appelée \"Unhide Magisk Manager\"</string>
+	<string name="language">Langue</string>
+	<string name="system_default">(Selon système)</string>
+	<string name="settings_update">Paramètres de mises à jour</string>
+	<string name="settings_update_channel_title">Canal de mise à jour</string>
+	<string name="settings_update_stable">Stable</string>
+	<string name="settings_update_beta">Beta</string>
+	<string name="settings_boot_format_title">Format de sortie du boot patché</string>
+	<string name="settings_boot_format_summary">Sélectionner le format de l\'image boot patchée finale.\nChoisir .img pour flasher via fastboot/mode download ; choisir .img.tar pour flasher via ODIN.</string>
+	<string name="settings_su_reauth_title">Ré-authentifier après mise à jour</string>
+	<string name="settings_su_reauth_summary">Ré-authentifier les permissions superuser après les mises à jour d\'une application</string>
+	<string name="multiuser_mode">Mode multi-utilisateurs</string>
+	<string name="settings_owner_only">Appareil du propriétaire uniquement</string>
+	<string name="settings_owner_manage">Appareil du propriétaire géré</string>
+	<string name="settings_user_independent">Utilisateur indépendant</string>
+	<string name="owner_only_summary">Seul le propriétaire a l\'accès root</string>
+	<string name="owner_manage_summary">Seul le propriétaire peut gérer les accès root et recevoir des demandes de permissions</string>
+	<string name="user_indepenent_summary">Chaque utilisateur dispose de ses propres règles root</string>
+	<string name="multiuser_hint_owner_request">Une requête a été envoyée au propriétaire de l\'appareil. Veuillez basculer sur le profil du propriétaire et accorder la permission</string>
+	<string name="mount_namespace_mode">Monter le mode espace de noms</string>
+	<string name="settings_ns_global">Espace de noms global</string>
+	<string name="settings_ns_requester">Hériter de l\'espace de noms</string>
+	<string name="settings_ns_isolate">Espace de noms isolé</string>
+	<string name="global_summary">Toutes les sessions root utilisent l\'espace de noms global monté</string>
+	<string name="requester_summary">Les sessions root hériteront des espaces de noms du demandeur</string>
+	<string name="isolate_summary">Chaque session root aura son propre espace de noms isolé</string>
     <!--Superuser-->
     <string name="su_request_title">Requête Superuser</string>
     <string name="deny_with_str">Refuser%1$s</string>

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

@@ -2,40 +2,27 @@
     <!--Universal-->
 
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">Apri drawer navigazione</string>
-    <string name="navigation_drawer_close">Chiudi drawer navigazione</string>
-   <string name="modules">Moduli</string>
+    <string name="modules">Moduli</string>
     <string name="downloads">Download</string>
     <string name="superuser">Superuser</string>
     <string name="log">Registro eventi</string>
     <string name="settings">Impostazioni</string>
-    <string name="status">Stato</string>
     <string name="install">Installa</string>
 
-     <!--Status Fragment-->
-    <string name="magisk_version">Versione Magisk: v%1$s</string>
-    <string name="magisk_version_core_only">Versione Magisk v%1$s (modo core)</string>
+    <!--Status Fragment-->
     <string name="magisk_version_error">Magisk non installato</string>
 
     <string name="checking_for_updates">Controllo aggiornamenti…</string>
     <string name="magisk_update_available">È disponibile Magisk v%1$s!</string>
     <string name="cannot_check_updates">Impossibile controllare aggiornamenti</string>
-    <string name="up_to_date">La versione di %1$s è aggiornata</string>
     <string name="root_error">Rootato ma senza permessi. Non sei autorizzato?</string>
     <string name="not_rooted">Non rootato</string>
-    <string name="proper_root">Rootato correttamente</string>
     <string name="safetyNet_check_text">Tocca per avviare controllo SafetyNet</string>
     <string name="checking_safetyNet_status">Controllo stato SafetyNet</string>
     <string name="safetyNet_check_success">Controllo SafetyNet OK</string>
-    <string name="safetyNet_connection_failed">Impossibile collegarsi alle API Google</string>
-    <string name="safetyNet_connection_suspended">Connessione alle API Google sospesa</string>
-    <string name="safetyNet_no_response">Impossibile controllare SafetyNet. Nessuna connessione internet?</string>
-    <string name="safetyNet_fail">Errore SafetyNet. Il profilo CTS non corrisponde</string>
-    <string name="safetyNet_pass">Controllo SafetyNet OK</string>
     <string name="safetyNet_network_loss">persa conenssioen di rete</string>
     <string name="safetyNet_service_disconnected">Ils ervizio è stato terminato</string>
     <string name="safetyNet_res_invalid">La risposta non è valida</string>
-    <string name="root_info_warning">Funzionalità molto limitata</string>
 
     <!--Install Fragment-->
     <string name="auto_detect">%1$s (auto)</string>
@@ -48,10 +35,8 @@
     <string name="current_magisk_title">Versione Magisk installata: %1$s</string>
     <string name="install_magisk_title">Versione Magisk aggiornata: %1$s</string>
     <string name="uninstall">Disinstalla</string>
-    <string name="reboot_countdown">Riavvio tra %1$d</string>
     <string name="uninstall_magisk_title">Disinstalla Magisk</string>
-    <string name="uninstall_magisk_msg">Questo rimuoverà tutti i moduli, MagiskSU, e potenzialmente crittograferà i dati, se non crittografati/nVuoi continuare?</string>
-    <string name="version_none">(nessuna)</string>
+    <string name="update">Aggiorna %1$s</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(nessuna informazione)</string>
@@ -62,7 +47,6 @@
     <string name="disable_file_created">Il modulo sarà disattivato al prossimo riavvio</string>
     <string name="disable_file_removed">Il modulo sarà abilitato al prossimo riavvio</string>
     <string name="author">Creato da: %1$s</string>
-    <string name="fab_flash_zip">Flasha modulo ZIP</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Aggiornamento disponibile</string>
@@ -97,36 +81,26 @@
     <string name="close">Chiudi</string>
     <string name="repo_install_title">Installazione %1$s</string>
     <string name="repo_install_msg">Vuoi installare %1$s ?</string>
-    <string name="download_install">Scarica e installa</string>
     <string name="download">Download</string>
-    <string name="goto_install">Vai alla sezione \"Installa\"</string>
     <string name="download_file_error">Errore nel download del file</string>
     <string name="install_error">Errore di installazione!</string>
     <string name="invalid_zip">Lo ZIP non è un modulo Magisk!!</string>
-    <string name="reboot_title">Installazione completata</string>
-    <string name="reboot_msg">Vuoi riavviare ora?</string>
     <string name="reboot">Riavvia</string>
-    <string name="copying_msg">Copia file ZIP in una cartella temporanea</string>
-    <string name="zip_install_progress_title">Installazione</string>
-    <string name="zip_unzip_msg">Decompressione file ZIP…</string>
     <string name="zip_process_msg">Elaborazione file ZIP…</string>
-    <string name="zip_install_progress_msg">Installazione di %1$s…</string>
-    <string name="no_magisk_title">Magisk non installato!</string>
-    <string name="no_magisk_msg">Vuoi scaricare ed installare Magisk?</string>
     <string name="downloading_toast">Download di %1$s</string>
     <string name="magisk_update_title">Disponibile nuovo aggiornamento Magisk!</string>
     <string name="settings_reboot_toast">Riavvia per applicare</string>
     <string name="release_notes">Note di rilascio</string>
     <string name="repo_cache_cleared">Cache reposititory azzerata</string>
     <string name="safetyNet_hide_notice">Quest\'app usa SafetyNet\ned è già gestita da MagiskHide</string>
-    <string name="start_magiskhide">Avvio MagiskHide…</string>
-    <string name="no_magisksu_title">MagiskSU non in uso!</string>
-    <string name="no_magisksu_msg">Non hai rootato con MagiskSU. L\'uso del solo MagiskHide potrebbe non essere suffciiente!\nNon è ufficialmente supportato, e potrebbe richiedere altri strumenti (es. suhide) per passare il test Safety Net.</string>
-    <string name="understand">Accetto</string>
     <string name="process_error">Errore di elaborazione</string>
     <string name="internal_storage">Lo ZIP si trova in:\n[memoria interna]%1$s</string>
     <string name="zip_process_title">Elaborazione</string>
     <string name="manual_boot_image">Seleziona manualmente l\'immagine di boot!</string>
+    <string name="manager_update_title">Nuovo aggiornamento di Magisk Manager disponibile!</string>
+    <string name="manager_download_install">Premere per scaricare e installare</string>
+    <string name="magisk_updates">Aggiornamenti Magisk</string>
+    <string name="flashing">Flashando</string>
 
     <!--Settings Activity -->
     <string name="settings_general_category">Generale</string>
@@ -140,8 +114,6 @@
     <string name="settings_core_only_title">Solo modo core Magisk</string>
     <string name="settings_core_only_summary">Abilita solo le funzioni principali. Non tutti i moduli verranno caricati. MagiskSU, MagiskHide, e host systemless rimarranno abilitati</string>
     <string name="settings_magiskhide_summary">Nasconde Magisk da numerose rilevazioni</string>
-    <string name="settings_busybox_title">Abilita BusyBox</string>
-    <string name="settings_busybox_summary">Collega il mount della busybox interna di Magisk a xbin</string>
     <string name="settings_hosts_title">Host systemless</string>
     <string name="settings_hosts_summary">Supporto host systemless per app blocco pubblicità</string>
 
@@ -158,7 +130,7 @@
     <string name="request_timeout">Timeout richiesta</string>
     <string name="superuser_notification">Notifica Superuser</string>
     <string name="request_timeout_summary">%1$s secondi</string>
-    <string name="settings_su_reauth_title">Ri-autentifica dopo aggironamento</string>
+    <string name="settings_su_reauth_title">Ri-autentifica dopo aggiornamento</string>
     <string name="settings_su_reauth_summary">Ri-autentifica permessi superuser dopo aggiornamento applicazione</string>
 
     <string name="multiuser_mode">Modo multiutente</string>
@@ -170,12 +142,6 @@
     <string name="user_indepenent_summary">Ogni utente ha le sue regole di root separate</string>
     <string name="multiuser_hint_owner_request">Una richiestà è stata inviata al propietario dipositivo. Accedi come propietario dispositivo e concedi i permessi.</string>
 
-    <string name="settings_development_category">Sviluppo app</string>
-    <string name="settings_developer_logging_title">Abilita registro eventi avanzato debug</string>
-    <string name="settings_developer_logging_summary">Spunta questo per abilitare il registro eventi dettagliato</string>
-    <string name="settings_shell_logging_title">Abilita registro eventi debug comandi shell</string>
-    <string name="settings_shell_logging_summary">Spunta questo per abilitare il registro eventi dettagliato dei comandi shell e dei relativi risultati</string>
-
     <!--Superuser-->
     <string name="su_request_title">Richiesta Superuser</string>
     <string name="deny_with_str">Nega %1$s</string>

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

@@ -2,36 +2,23 @@
     <!--Universal-->
 
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">ナビゲーションドロワーを開く</string>
-    <string name="navigation_drawer_close">ナビゲーションドロワーを閉じる</string>
     <string name="modules">モジュール</string>
     <string name="downloads">ダウンロード</string>
     <string name="superuser">スーパーユーザー</string>
     <string name="log">ログ</string>
     <string name="settings">設定</string>
-    <string name="status">ステータス</string>
     <string name="install">インストール</string>
 
     <!--Status Fragment-->
-    <string name="magisk_version">Magisk v%1$s がインストール済</string>
-    <string name="magisk_version_core_only">Magisk v%1$s がインストール済（コアモード）</string>
     <string name="magisk_version_error">Magisk がインストールされていません</string>
 
     <string name="checking_for_updates">更新を確認中...</string>
     <string name="magisk_update_available">Magisk v%1$s が利用可能です！</string>
     <string name="cannot_check_updates">更新を確認できませんでした。インターネットに接続されていますか？</string>
-    <string name="up_to_date">最新の %1$s がインストール済です</string>
     <string name="root_error">Root化はされていますが権限がありません。拒否していませんか？</string>
     <string name="not_rooted">Root化されていません</string>
-    <string name="proper_root">正常にroot化済</string>
     <string name="safetyNet_check_text">タップしてSafetyNetチェックを開始</string>
     <string name="checking_safetyNet_status">SafetyNet Statusをチェック中…</string>
-    <string name="safetyNet_connection_failed">Google APIに接続できませんでした</string>
-    <string name="safetyNet_connection_suspended">Google APIへの接続が中断されました</string>
-    <string name="safetyNet_no_response">SafetyNetをチェックできませんでした。インターネットに接続されていますか？</string>
-    <string name="safetyNet_fail">SafetyNet Failed: CTSプロファイルが不一致</string>
-    <string name="safetyNet_pass">SafetyNet Passed</string>
-    <string name="root_info_warning">機能が大幅に制限されています</string>
 
     <!--Install Fragment-->
     <string name="auto_detect">(自動) %1$s</string>
@@ -44,10 +31,7 @@
     <string name="current_magisk_title">インストール済のMagisk: %1$s</string>
     <string name="install_magisk_title">最新のMagisk: %1$s</string>
     <string name="uninstall">アンインストール</string>
-    <string name="reboot_countdown">%1$dで再起動します</string>
     <string name="uninstall_magisk_title">Magiskをアンインストールします</string>
-    <string name="uninstall_magisk_msg">これにより、すべてのモジュールとMagiskSUを削除します。暗号化されていないデータが暗号化される可能性があります。\ n続行しますか？</string>
-    <string name="version_none">(なし)</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(情報がありません)</string>
@@ -58,7 +42,6 @@
     <string name="disable_file_created">次の再起動時にモジュールを無効にする</string>
     <string name="disable_file_removed">次の再起動時にモジュールを有効にする</string>
     <string name="author">作者: %1$s</string>
-    <string name="fab_flash_zip">モジュールのzipを焼く</string>
 
     <!--Repo Fragment-->
     <string name="update_available">利用可能な更新</string>
@@ -93,32 +76,18 @@
     <string name="close">閉じる</string>
     <string name="repo_install_title">%1$s をインストール</string>
     <string name="repo_install_msg">%1$s をインストールしますか？</string>
-    <string name="download_install">ダウンロード &amp; インストール</string>
     <string name="download">ダウンロード</string>
-    <string name="goto_install">インストール画面に移動する</string>
     <string name="download_file_error">ダウンロード中にエラーが発生しました</string>
     <string name="install_error">インストールエラー！</string>
     <string name="invalid_zip">このzipはMagiskモジュールではありません</string>
-    <string name="reboot_title">インストールに成功しました！</string>
-    <string name="reboot_msg">今すぐ再起動しますか？</string>
     <string name="reboot">再起動</string>
-    <string name="copying_msg">一時ディレクトリへのzipをコピー中</string>
-    <string name="zip_install_progress_title">インストール中…</string>
-    <string name="zip_unzip_msg">zipファイルの解凍中…</string>
     <string name="zip_process_msg">zipファイルの処理中…</string>
-    <string name="zip_install_progress_msg">%1$s をインストール中…</string>
-    <string name="no_magisk_title">Magiskがインストールされていません！</string>
-    <string name="no_magisk_msg"> Magiskをダウンロードしてインストールしますか？</string>
     <string name="downloading_toast">%1$s をダウンロード中</string>
     <string name="magisk_update_title">新しいMagiskの更新が利用可能です！</string>
     <string name="settings_reboot_toast">再起動して設定を適用する</string>
     <string name="release_notes">リリースノート</string>
     <string name="repo_cache_cleared">リポジトリキャッシュを消去しました</string>
     <string name="safetyNet_hide_notice">このアプリはSafetyNetを使用しています。\n既定ではMagiskHideで既に処理されています</string>
-    <string name="start_magiskhide">MagiskHideを開始中…</string>
-    <string name="no_magisksu_title">MagiskSUを使用していません！</string>
-    <string name="no_magisksu_msg">あなたのデバイスはMagiskSUにrootされていません。MagiskHideを使用するだけでは十分ではありません。\nそれは正式にサポートされておらず、あなたはSafetyNetを通過するために追加ツール（例えばsuhide）が必要です。</string>
-    <string name="understand">了解</string>
     <string name="process_error">プロセスエラー</string>
     <string name="internal_storage">zipは:\n[Internal Storage]%1$sに保存されます</string>
     <string name="zip_process_title">処理</string>
@@ -136,8 +105,6 @@
     <string name="settings_core_only_title">Magisk コアモード</string>
     <string name="settings_core_only_summary">コア機能のみを有効にすると、すべてのモジュールがロードされなくなります。 MagiskSU、MagiskHide、systemless hostsは引き続き有効になります。</string>
     <string name="settings_magiskhide_summary">さまざまな検出からMagiskを隠す</string>
-    <string name="settings_busybox_title">BusyBoxを有効にする</string>
-    <string name="settings_busybox_summary">Magiskに搭載するBusyBoxをxbinにバインドする</string>
     <string name="settings_hosts_title">Systemless hosts</string>
     <string name="settings_hosts_summary">AdblockのためのSystemless hostsサポート</string>
 
@@ -155,12 +122,6 @@
     <string name="superuser_notification">スーパーユーザー通知</string>
     <string name="request_timeout_summary">%1$s秒</string>
 
-    <string name="settings_development_category">アプリケーション開発</string>
-    <string name="settings_developer_logging_title">高度なデバッグログを有効にする</string>
-    <string name="settings_developer_logging_summary">詳細なログを有効にするにはここをチェック</string>
-    <string name="settings_shell_logging_title">シェルコマンドのデバッグログを有効にする</string>
-    <string name="settings_shell_logging_summary">すべてのシェルコマンドとその出力をログに記録します</string>
-
     <!--Superuser-->
     <string name="su_request_title">スーパーユーザーリクエスト</string>
     <string name="deny_with_str">拒否 %1$s</string>

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

@@ -2,36 +2,23 @@
     <!--Universal-->
 
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">내비게이션 서랍 열기</string>
-    <string name="navigation_drawer_close">내비게이션 서랍 닫기</string>
     <string name="modules">모듈</string>
     <string name="downloads">다운로드</string>
     <string name="superuser">슈퍼유저</string>
     <string name="log">로그</string>
     <string name="settings">설정</string>
-    <string name="status">상태</string>
     <string name="install">설치</string>
 
     <!--Status Fragment-->
-    <string name="magisk_version">Magisk v%1$s 설치됨</string>
-    <string name="magisk_version_core_only">Magisk v%1$s 설치됨 (핵심 기능 모드)</string>
     <string name="magisk_version_error">Magisk가 설치되지 않음</string>
 
     <string name="checking_for_updates">업데이트 확인 중…</string>
     <string name="magisk_update_available">Magisk v%1$s 사용 가능!</string>
     <string name="cannot_check_updates">업데이트를 확인할 수 없음. 인터넷 연결을 확인하세요.</string>
-    <string name="up_to_date">최신 버전의 %1$s 설치됨</string>
     <string name="root_error">루팅은 되어 있으나 루트 권한을 얻을 수 없음. 루트 권한 허용 상태를 확인하세요.</string>
     <string name="not_rooted">루팅이 되어 있지 않음</string>
-    <string name="proper_root">정상적으로 루팅됨</string>
     <string name="safetyNet_check_text">SafetyNet 체크를 시작하려면 누르기</string>
     <string name="checking_safetyNet_status">SafetyNet 상태 확인 중…</string>
-    <string name="safetyNet_connection_failed">Google API에 연결할 수 없음</string>
-    <string name="safetyNet_connection_suspended">Google API에 대한 연결이 일시 중지됨</string>
-    <string name="safetyNet_no_response">SafetyNet 체크 실패. 인터넷 연결을 확인하세요.</string>
-    <string name="safetyNet_fail">SafetyNet 실패: CTS 프로필 불일치</string>
-    <string name="safetyNet_pass">SafetyNet 통과</string>
-    <string name="root_info_warning">기능이 크게 제한됨</string>
 
     <!--Install Fragment-->
     <string name="auto_detect">(자동) %1$s</string>
@@ -44,10 +31,7 @@
     <string name="current_magisk_title">설치된 Magisk 버전: %1$s</string>
     <string name="install_magisk_title">최신 Magisk 버전: %1$s</string>
     <string name="uninstall">제거</string>
-    <string name="reboot_countdown">%1$d초 안에 다시 시작됨</string>
     <string name="uninstall_magisk_title">Magisk 제거</string>
-    <string name="uninstall_magisk_msg">모든 모듈과 MagiskSU를 제거합니다. 또한 데이터가 암호화되어 있지 않은 경우 암호화될 가능성이 있습니다.\n정말 계속하시겠습니까?</string>
-    <string name="version_none">(없음)</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(제공된 정보 없음)</string>
@@ -58,7 +42,6 @@
     <string name="disable_file_created">모듈이 다음 다시 시작 시 비활성화됨</string>
     <string name="disable_file_removed">모듈이 다음 다시 시작 시 활성화됨</string>
     <string name="author">제작: %1$s</string>
-    <string name="fab_flash_zip">모듈 ZIp 파일 플래싱</string>
 
     <!--Repo Fragment-->
     <string name="update_available">업데이트 있음</string>
@@ -93,31 +76,17 @@
     <string name="close">닫기</string>
     <string name="repo_install_title">%1$s 설치</string>
     <string name="repo_install_msg">정말 %1$s을(를) 설치하시겠습니까?</string>
-    <string name="download_install">다운로드 및 설치</string>
-    <string name="goto_install">\"설치\" 섹션으로 이동</string>
     <string name="download_file_error">파일 다운로드 오류</string>
     <string name="install_error">설치 오류!</string>
     <string name="invalid_zip">이 zip 파일은 Magisk 모듈이 아닙니다!!</string>
-    <string name="reboot_title">설치 성공!</string>
-    <string name="reboot_msg">지금 기기를 다시 시작하시겠습니까?</string>
     <string name="reboot">다시 시작</string>
-    <string name="copying_msg">임시 디렉터리에 zip 파일 복사 중</string>
-    <string name="zip_install_progress_title">설치 중</string>
-    <string name="zip_unzip_msg">zip 파일 압축 해제 중…</string>
     <string name="zip_process_msg">zip 파일 처리 중…</string>
-    <string name="zip_install_progress_msg">%1$s 설치 중…</string>
-    <string name="no_magisk_title">Magisk가 설치되어 있지 않습니다!</string>
-    <string name="no_magisk_msg">Magisk를 다운로드하고 설치하시겠습니까?</string>
     <string name="downloading_toast">%1$s 다운로드 중</string>
     <string name="magisk_update_title">새 버전의 Magisk를 사용할 수 있습니다!</string>
     <string name="settings_reboot_toast">기기를 다시 시작하면 설정이 적용됩니다.</string>
     <string name="release_notes">릴리즈 노트</string>
     <string name="repo_cache_cleared">저장소 캐시 비워짐</string>
     <string name="safetyNet_hide_notice">이 앱은 MagiskHide에서\n이미 기본적으로 관리하는 SafetyNet을 사용합니다.</string>
-    <string name="start_magiskhide">MagiskHide 시작 중…</string>
-    <string name="no_magisksu_title">MagiskSU를 사용하고 있지 않습니다!</string>
-    <string name="no_magisksu_msg">MagiskSU로 루팅이 되어있지 않아 MagiskHide 하나만으로는 충분하지 않을 수 있습니다!\n이는 공식적으로 지원되지 않으며, SafetyNet을 통과하려면 추가적인 도구(suhide 등)가 필요할 수 있습니다.</string>
-    <string name="understand">알겠습니다</string>
     <string name="process_error">처리 오류</string>
     <string name="internal_storage">zip 파일이 다음 위치에 저장됨:\n[내부 저장소]%1$s</string>
     <string name="zip_process_title">처리 중</string>
@@ -135,8 +104,6 @@
     <string name="settings_core_only_title">Magisk 핵심 기능 모드</string>
     <string name="settings_core_only_summary">핵심 기능만 사용합니다. 모든 모듈은 로드하지 않습니다. MagiskSU, MagiskHide 및 systemless hosts 는 계속 사용할 수 있습니다.</string>
     <string name="settings_magiskhide_summary">다양한 감지로부터 Magisk를 숨깁니다.</string>
-    <string name="settings_busybox_title">BusyBox 사용</string>
-    <string name="settings_busybox_summary">xbin 디렉터리에 Magisk의 빌트인 busybox를 바인드합니다.</string>
     <string name="settings_hosts_title">systemless hosts</string>
     <string name="settings_hosts_summary">광고 차단 앱에서 사용하는 systemless hosts를 지원합니다.</string>
 
@@ -154,12 +121,6 @@
     <string name="superuser_notification">슈퍼유저 알림</string>
     <string name="request_timeout_summary">%1$s초</string>
 
-    <string name="settings_development_category">앱 개발</string>
-    <string name="settings_developer_logging_title">고급 디버그 로깅 사용</string>
-    <string name="settings_developer_logging_summary">더 자세한 로그를 보려면 체크하세요.</string>
-    <string name="settings_shell_logging_title">셸 커맨드 디버그 로깅 사용</string>
-    <string name="settings_shell_logging_summary">모든 셸 커맨드와 그 출력을 로그에 기록하려면 체크하세요.</string>
-
     <!--Superuser-->
     <string name="su_request_title">슈퍼유저 요청</string>
     <string name="deny_with_str">거부%1$s</string>
@@ -192,5 +153,6 @@
     <string name="pid">PID:\u0020</string>
     <string name="target_uid">대상 UID:\u0020</string>
     <string name="command">명령:\u0020</string>
+    <string name="download">다운로드</string>
 
 </resources>

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

@@ -2,40 +2,27 @@
     <!--Universal-->
 
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">Navigatielade openen</string>
-    <string name="navigation_drawer_close">Navigatielade sluiten</string>
     <string name="modules">Modules</string>
     <string name="downloads">Downloads</string>
     <string name="superuser">Superuser</string>
     <string name="log">Log</string>
     <string name="settings">Instellingen</string>
-    <string name="status">Status</string>
     <string name="install">Installeren</string>
 
     <!--Status Fragment-->
-    <string name="magisk_version">Magisk v%1$s geïnstalleerd</string>
-    <string name="magisk_version_core_only">Magisk v%1$s geïnstalleerd (basismodus)</string>
     <string name="magisk_version_error">Magisk niet geïnstalleerd</string>
 
     <string name="checking_for_updates">Controleren op updates…</string>
     <string name="magisk_update_available">Magisk v%1$s beschikbaar!</string>
     <string name="cannot_check_updates">Kan niet controleren op updates. Geen internet?</string>
-    <string name="up_to_date">Laatste versie van %1$s geïnstalleerd</string>
     <string name="root_error">Geroot, maar geen root-permissie. Niet toegestaan?</string>
     <string name="not_rooted">Niet geroot</string>
-    <string name="proper_root">Correct geroot</string>
     <string name="safetyNet_check_text">Tik om SafetyNet controle te starten</string>
     <string name="checking_safetyNet_status">SafetyNet status controleren…</string>
     <string name="safetyNet_check_success">SafetyNet controle succesvol</string>
-    <string name="safetyNet_connection_failed">Kan niet verbinden met Google API</string>
-    <string name="safetyNet_connection_suspended">Verbinding met Google API was geschorst</string>
-    <string name="safetyNet_no_response">Kan SafetyNet niet controleren. Geen internet?</string>
-    <string name="safetyNet_fail">SafetyNet gefaald</string>
-    <string name="safetyNet_pass">SafetyNet geslaagd</string>
     <string name="safetyNet_network_loss">Netwerkverbinding verloren</string>
     <string name="safetyNet_service_disconnected">Service is beëindigd</string>
     <string name="safetyNet_res_invalid">Reactie is ongeldig</string>
-    <string name="root_info_warning">Functionaliteit zeer beperkt</string>
 
     <!--Install Fragment-->
     <string name="auto_detect">(Auto) %1$s</string>
@@ -48,10 +35,9 @@
     <string name="current_magisk_title">Geïnstalleerde Magisk versie: %1$s</string>
     <string name="install_magisk_title">Recentste Magisk versie: %1$s</string>
     <string name="uninstall">Deïnstalleren</string>
-    <string name="reboot_countdown">Herstarten in %1$d</string>
     <string name="uninstall_magisk_title">Magisk deïnstalleren</string>
-    <string name="uninstall_magisk_msg">Dit verwijdert alle modules, MagiskSU, en versleutelt mogelijk alle niet-versleutelde data\nZeker weten voortzetten?</string>
-    <string name="version_none">(Geen)</string>
+    <string name="uninstall_magisk_msg">Alle modules worden uitgeschakeld/verwijderd. Root wordt verwijderd, en je data wordt mogelijk versleuteld als deze dat momenteel niet is</string>
+    <string name="update">Bijwerken %1$s</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(Geen info verstrekt)</string>
@@ -62,7 +48,6 @@
     <string name="disable_file_created">Module wordt uitgeschakeld bij volgende herstart</string>
     <string name="disable_file_removed">Module wordt ingeschakeld bij volgende herstart</string>
     <string name="author">Gemaakt door %1$s</string>
-    <string name="fab_flash_zip">Module zip flashen</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Update beschikbaar</string>
@@ -97,36 +82,42 @@
     <string name="close">Sluiten</string>
     <string name="repo_install_title">%1$s installeren</string>
     <string name="repo_install_msg">Zeker weten %1$s installeren?</string>
-    <string name="download_install">Downloaden &amp; installeren</string>
     <string name="download">Downloaden</string>
-    <string name="goto_install">Ga naar \"Installeren\" sectie</string>
     <string name="download_file_error">Fout tijdens downloaden</string>
     <string name="install_error">Installatiefout!</string>
     <string name="invalid_zip">De zip is geen Magisk module!</string>
-    <string name="reboot_title">Installatie geslaagd!</string>
-    <string name="reboot_msg">Wil je nu herstarten?</string>
     <string name="reboot">Herstarten</string>
-    <string name="copying_msg">Zip naar tijdelijke map kopiëren</string>
-    <string name="zip_install_progress_title">Installeren</string>
-    <string name="zip_unzip_msg">Zip-bestand uitpakken…</string>
-    <string name="zip_process_msg">Zip-bestand verwerken…</string>
-    <string name="zip_install_progress_msg">%1$s installeren…</string>
-    <string name="no_magisk_title">Geen Magisk geïnstalleerd!</string>
-    <string name="no_magisk_msg">Wil je Magisk downloaden en installeren?</string>
     <string name="downloading_toast">%1$s downloaden</string>
     <string name="magisk_update_title">Nieuwe Magisk update beschikbaar!</string>
     <string name="settings_reboot_toast">Herstarten om instellingen toe te passen</string>
     <string name="release_notes">Publicatie notities</string>
     <string name="repo_cache_cleared">Opslagcache gewist</string>
     <string name="safetyNet_hide_notice">Deze app gebruikt SafetyNet\nReeds afgehandeld door standaard MagiskHide</string>
-    <string name="start_magiskhide">MagiskHide starten…</string>
-    <string name="no_magisksu_title">Geen gebruik van MagiskSU!</string>
-    <string name="no_magisksu_msg">Je bent niet geroot met MagiskSU, waardoor alleen MagiskHide mogelijk onvoldoende is!\nHet wordt niet officieel ondersteund, waardoor aanvullende acties (bijv. suhide) benodigd zijn om te slagen voor SafetyNet.</string>
-    <string name="understand">Ik begrijp het</string>
     <string name="process_error">Verwerkingsfout</string>
     <string name="internal_storage">De zip is opgeslagen in:\n[Interne opslag]%1$s</string>
+    <string name="zip_download_title">Downloaden</string>
+    <string name="zip_download_msg">Zip-bestand downloaden (%1$d%%) …</string>
     <string name="zip_process_title">Verwerken</string>
+    <string name="zip_process_msg">Zip-bestand verwerken…</string>
     <string name="manual_boot_image">Gelieve handmatig een boot image te selecteren!</string>
+    <string name="manager_update_title">Nieuwe Magisk Manager update beschikbaar!</string>
+    <string name="manager_download_install">Tik om te downloaden en installeren</string>
+    <string name="magisk_updates">Magisk updates</string>
+    <string name="flashing">Flashen</string>
+    <string name="hide_manager_toast">Magisk Manager verbergen…</string>
+    <string name="hide_manager_fail_toast">Magisk Manager verbergen mislukt…</string>
+    <string name="download_zip_only">Alleen zip downloaden</string>
+    <string name="patch_boot_file">Boot image-bestand patchen</string>
+    <string name="direct_install">Direct installeren (aangeraden)</string>
+    <string name="install_second_slot">Op tweede positie installeren (na OTA)</string>
+    <string name="select_method">Methode kiezen</string>
+    <string name="no_boot_file_patch_support">Magisk versie ondersteund geen boot image-bestand patchen</string>
+    <string name="boot_file_patch_msg">Kies originele boot image-dump in .img- of .img.tar-formaat</string>
+    <string name="complete_uninstall">Compleet deïnstalleren</string>
+    <string name="restore_stock_boot">Originele boot herstellen</string>
+    <string name="restore_done">Herstel voltooid!</string>
+    <string name="restore_fail">Originele back-up bestaat niet!</string>
+    <string name="uninstall_toast">Magisk Manager wordt over 5 seconden verwijderd, hierna handmatig herstarten aub</string>
 
     <!--Settings Activity -->
     <string name="settings_general_category">Algemeen</string>
@@ -136,12 +127,20 @@
     <string name="settings_notification_summary">Een update melding weergeven wanneer een nieuwe versie beschikbaar is</string>
     <string name="settings_clear_cache_title">Opslagcache wissen</string>
     <string name="settings_clear_cache_summary">Wis de gecachte informatie voor online opslagplaatsen. Dit dwingt de app om online te verversen</string>
-
+    <string name="settings_hide_manager_title">Magisk Manager verbergen</string>
+    <string name="settings_hide_manager_summary">Magisk Manager tijdelijk verbergen.\nDit installeert een nieuwe app genaamd \"Unhide Magisk Manager\"</string>
+    <string name="language">Taal</string>
+    <string name="system_default">(Systeem standaard)</string>
+    <string name="settings_update">Instellingen bijwerken</string>
+    <string name="settings_update_channel_title">Update-kanaal</string>
+    <string name="settings_update_stable">Stabiel</string>
+    <string name="settings_update_beta">Beta</string>
+    <string name="settings_boot_format_title">Gepatchte boot uitvoerformaat</string>
+    <string name="settings_boot_format_summary">Kies het formaat van de boot image uitvoer.\nKies .img om via fastboot/downloadmodus te flashen; kies .img.tar om via ODIN te flashen.</string>
+    
     <string name="settings_core_only_title">Magisk basismodus</string>
     <string name="settings_core_only_summary">Alleen kernfuncties inschakelen. Alle modules worden niet geladen. MagiskSU, MagiskHide, en systeemloze hosts blijven ingeschakeld</string>
     <string name="settings_magiskhide_summary">Magisk van verschillende detecties verbergen</string>
-    <string name="settings_busybox_title">Busybox inschakelen</string>
-    <string name="settings_busybox_summary">Magisk\'s ingebouwde busybox naar xbin bind mounten</string>
     <string name="settings_hosts_title">Systeemloze hosts</string>
     <string name="settings_hosts_summary">Systemloze hosts ondersteuning voor Adblock apps</string>
 
@@ -177,13 +176,7 @@
     <string name="global_summary">Alle rootsessies gebruiken de globale naamruimte</string>
     <string name="requester_summary">Rootsessies verkrijgen de verzoeker\'s naamruimte</string>
     <string name="isolate_summary">Iedere rootsessie heeft een eigen geïsoleerde naamruimte</string>
-    
-    <string name="settings_development_category">App-ontwikkeling</string>
-    <string name="settings_developer_logging_title">Geavanceerde debug logs inschakelen</string>
-    <string name="settings_developer_logging_summary">Aanvinken om uitgebreide logs in te schakelen</string>
-    <string name="settings_shell_logging_title">Shell-opdracht debug logs inschakelen</string>
-    <string name="settings_shell_logging_summary">Aanvinken om alle shell-opdracht en uitvoer logs in te schakelen</string>
-    
+
     <!--Superuser-->
     <string name="su_request_title">Superuser verzoek</string>
     <string name="deny_with_str">Weigeren %1$s</string>

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

@@ -4,41 +4,28 @@
     
     
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">Otwórz szufladę nawigacji</string>
-    <string name="navigation_drawer_close">Zamknij szufladę nawigacji</string>
-    
+
     <string name="modules">Moduły</string>
     <string name="downloads">Pobieranie</string>
     <string name="superuser">Superuser</string>
     <string name="log">Log</string>
     <string name="settings">Ustawienia</string>
-    <string name="status">Status</string>
     <string name="install">Instalacja</string>
 
     <!--Status Fragment-->
-    <string name="magisk_version">Zainstalowany Magisk v%1$s</string>
-    <string name="magisk_version_core_only">Zainstalowany Magisk v%1$s (Tylko Tryb Rdzeni)</string>
     <string name="magisk_version_error">Magisk nie jest zainstalowany</string>
 
     <string name="checking_for_updates">Sprawdzanie aktualizacji…</string>
     <string name="magisk_update_available">Magisk v%1$s dostępny!</string>
     <string name="cannot_check_updates">Nie można sprawdzić dostępności aktualizacji, brak internetu</string>
-    <string name="up_to_date">Zainstalowana najnowsza wersja %1$s</string>
     <string name="root_error">Root dostępny, ale dostęp nie przyznany</string>
     <string name="not_rooted">Brak Roota</string>
-    <string name="proper_root">Root Dostępny</string>
     <string name="safetyNet_check_text">Dotknij aby sprawdzić SafetyNet</string>
     <string name="checking_safetyNet_status">Sprawdzanie statusu SafetyNet…</string>
     <string name="safetyNet_check_success">Sprawdzanie SafetyNet z Powodzeniem</string>
-    <string name="safetyNet_connection_failed">Nie można połączyć się z Google API</string>
-    <string name="safetyNet_connection_suspended">Połączenie z Google API zostało zawieszone</string>
-    <string name="safetyNet_no_response">Nie można sprawdzić SafetyNet bez internetu</string>
-    <string name="safetyNet_fail">Błąd SafetyNet: Niezgodność profilu CTS</string>
-    <string name="safetyNet_pass">SafetyNet Poprawny</string>
     <string name="safetyNet_network_loss">Brak połączenia z internetem</string>
     <string name="safetyNet_service_disconnected">Usługa została zamknięta</string>
     <string name="safetyNet_res_invalid">Usługa nie odpowiada</string>
-    <string name="root_info_warning">Funkcjonalność znacznie ograniczona</string>
 
     <!--Install Fragment-->
     <string name="auto_detect">(Auto) %1$s</string>
@@ -51,10 +38,9 @@
     <string name="current_magisk_title">Zainstalowana Wersja Magisk: %1$s</string>
     <string name="install_magisk_title">Ostatnia Wersja Magisk: %1$s</string>
     <string name="uninstall">Odinstaluj</string>
-    <string name="reboot_countdown">Restartuj do %1$d</string>
     <string name="uninstall_magisk_title">Odinstaluj Magisk</string>
-    <string name="uninstall_magisk_msg">Spowoduje to usunięcie wszystkich modułów, MagiskSU i potencjalnie szyfrowanie danych jeśli nie były szyfrowane \ nCzy na pewno kontynuować?</string>
-    <string name="version_none">(Brak)</string>
+	<string name="uninstall_magisk_msg">Wszystkie moduły będą wyłączone/usunięte.Root zostanie usunięty i przywrócone szyfrowanie danych, jeśli nie są te dane obecnie szyfrowane</string>
+    <string name="update">Aktualizacja %1$s</string>
     
     <!--Module Fragment-->
     <string name="no_info_provided">(Nie umieszczono informacji)</string>
@@ -65,7 +51,6 @@
     <string name="disable_file_created">Moduł zostanie wyłączony przy następnym restarcie</string>
     <string name="disable_file_removed">Moduł zostanie włączony przy następnym restarcie</string>
     <string name="author">Autor: %1$s</string>
-    <string name="fab_flash_zip">Zainstaluj Moduł Zip</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Aktualizacja jest dostępna</string>
@@ -100,40 +85,44 @@
     <string name="close">Zamknij</string>
     <string name="repo_install_title">Zainstaluj %1$s</string>
     <string name="repo_install_msg">Czy chcesz zainstalować  %1$s ?</string>
-    <string name="download_install">Pobierz i zainstaluj</string>
     <string name="download">Pobierz</string>
-    <string name="goto_install">Idź do sekcji \"Instalacja\"</string>
     <string name="download_file_error">Błąd pobierania pliku</string>
     <string name="install_error">Błąd instalacji!</string>
     <string name="invalid_zip">Ten zip nie jest Modułem Magisk!!</string>
-    <string name="reboot_title">Instalacja zakończona powodzeniem!</string>
-    <string name="reboot_msg">Czy chcesz teraz ponownie uruchomić?</string>
     <string name="reboot">Restart</string>
-    <string name="copying_msg">Kopiowanie zip do katalogu temp</string>
-    <string name="zip_install_progress_title">Instalacja</string>
-    <string name="zip_unzip_msg">Rozpakowywanie pliku zip …</string>
-    <string name="zip_process_msg">Przetwarzanie pliku zip …</string>
-    <string name="zip_install_progress_msg">Instalowanie %1$s …</string>
-    <string name="no_magisk_title">Brak zainstalowanego Magisk!</string>
-    <string name="no_magisk_msg">Chcesz pobrać i zainstalować Magisk?</string>
     <string name="downloading_toast">Pobieranie %1$s</string>
     <string name="magisk_update_title">Nowa Wersja Magisk Dostępna!</string>
     <string name="settings_reboot_toast">Uruchom ponownie, aby zastosować ustawienia</string>
     <string name="release_notes">Zmiany</string>
     <string name="repo_cache_cleared">Cache repozytorium wyczyszczone</string>
     <string name="safetyNet_hide_notice">Ta aplikacja wykorzystuje SafetyNet\nJest już domyślnie obsługiwana przez MagiskHide</string>
-    <string name="start_magiskhide">Uruchamianie MagiskHide …</string>
-    <string name="no_magisksu_title">Nie Używaj MagiskSU!</string>
-    <string name="no_magisksu_msg">Jeśli nie masz roota z MagiskSU, używanie samego MagiskHide może nie wystarczyć! Inne metody nie są oficjalnie obsługiwane. Do poprawnego działania SaftyNet potrzebne będą dodatkowe narzędzia (np suhide)</string>
-    <string name="understand">Rozumiem</string>
     <string name="process_error">Błąd procesu</string>
     <string name="internal_storage">Zip jest przechowywany w:\n[Pamięć Wewnętrzna]%1$s</string>
-    <string name="zip_process_title">Przetwarzanie</string>
-    <string name="manual_boot_image">Proszę ręcznie wybrać boot image!</string>
+    <string name="zip_download_title">Pobieranie</string>
+    <string name="zip_download_msg">Pobieranie pliku zip (%1$d%%) …</string>
+	<string name="zip_process_title">Przetwarzanie</string>
+	<string name="zip_process_msg">Przetwarzanie pliku zip …</string>
+	<string name="manual_boot_image">Proszę ręcznie wybrać boot image!</string>
     <string name="manager_update_title">Nowa Wersja Magisk Manager Jest Dostępna!</string>
     <string name="manager_download_install">Naciśnij aby pobrać i zainstalować</string>
+    <string name="magisk_updates">Aktualizacja Magisk</string>
+    <string name="flashing">Flashowanie</string>
+    <string name="hide_manager_toast">Ukryj Magisk Manager…</string>
+    <string name="hide_manager_fail_toast">Błąd ukrycia Magisk Manager</string>
+    <string name="download_zip_only">Pobierz Tylko Zip</string>
+    <string name="patch_boot_file">Patchowanie Pliku Boot Image</string>
+    <string name="direct_install">Bezpośrednia instalacja (Zalecane)</string>
+	<string name="install_second_slot">Zainstaluj na Drugim Slocie (Po OTA)</string>
+    <string name="select_method">Wybierz Metodę</string>
+    <string name="no_boot_file_patch_support">Wersja docelowa programu Magisk nie obsługuje ładowania pliku boot image</string>
+    <string name="boot_file_patch_msg">Wybierz stock boot image w formacie .img lub .img.tar</string>
+    <string name="complete_uninstall">Odinstalowywanie Zakończone</string>
+    <string name="restore_stock_boot">Przywróć Stockowy Boot</string>
+    <string name="restore_done">Przywracanie zakonczone!</string>
+    <string name="restore_fail">Stock backup nie istnieje!</string>
+    <string name="uninstall_toast">Odinstalowanie Magisk Manager w ciągu 5 sekund, proszę następnie ręcznie ponownie uruchomić urządzenie</string>
    
-   <!--Settings Activity -->
+    <!--Settings Activity -->
     <string name="settings_general_category">Ogólne</string>
     <string name="settings_dark_theme_title">Ciemny Motyw</string>
     <string name="settings_dark_theme_summary">Włącz ciemny motyw</string>
@@ -141,12 +130,20 @@
     <string name="settings_notification_summary">Pokaż powiadomienie o aktualizacji kiedy będzie dostępna nowa wersja</string>
     <string name="settings_clear_cache_title">Wyczyść Pamięć Repozytorium</string>
     <string name="settings_clear_cache_summary">Wymusza na aplikacji odświeżenie online repozytorium</string>
-
-    <string name="settings_core_only_title">Tylko Tryb Rdzeni Magisk</string>
+    <string name="settings_hide_manager_title">Ukryj Magisk Manager</string>
+    <string name="settings_hide_manager_summary">Tymczasowo ukryj Magisk Manager.\nSpowoduje to zainstalowanie nowej aplikacji o nazwie \"Pokaż Magisk Manager\"</string>
+    <string name="language">Język</string>
+    <string name="system_default">(Domyślny Systemu)</string>
+    <string name="settings_update">Aktualizacja Ustawień</string>
+    <string name="settings_update_channel_title">Aktualizacja Kanału</string>
+    <string name="settings_update_stable">Stabilna</string>
+    <string name="settings_update_beta">Beta</string>
+    <string name="settings_boot_format_title">Poprawiony format wyjścia rozruchowego</string>
+    <string name="settings_boot_format_summary">Wybierz format wyjściowy pliku boot image.\nWybierz .img do programu za pośrednictwem fastboot/download mode; wybierz .img.tar za pomocą ODINA.</string>
+    
+	<string name="settings_core_only_title">Tylko Tryb Rdzeni Magisk</string>
     <string name="settings_core_only_summary">Włącz tylko podstawowe funkcje, wszystkie moduły nie zostaną załadowane. MagiskSU, MagiskHide i systemless hosts nadal będą włączone</string>
     <string name="settings_magiskhide_summary">Włącz Hide Magisk dla wykrytych aplikacji</string>
-    <string name="settings_busybox_title">Włącz BusyBox</string>
-    <string name="settings_busybox_summary">Zmień montowanie Magisk z wbudowanego busybox do xbin</string>
     <string name="settings_hosts_title">Włącz systemless hosts</string>
     <string name="settings_hosts_summary">Wsparcie systemless dla aplikacji Adblock</string>
     
@@ -182,13 +179,7 @@
     <string name="global_summary">Wszystkie sesje root za pomocą globalnej przestrzeni montowań nazw</string>
     <string name="requester_summary">Sesje Root będzie dziedziczyć prośby i nazwy</string>
     <string name="isolate_summary">W każdej sesji root będzie miał własną odosobnioną nazwę</string>
-	
-    <string name="settings_development_category">Dla Developerów</string>
-    <string name="settings_developer_logging_title">Włącz zaawansowane logowanie debugowania</string>
-    <string name="settings_developer_logging_summary">Zaznacz, aby umożliwić pełne rejestrowanie</string>
-    <string name="settings_shell_logging_title">Włącz rejestrowanie poleceń powłoki debugowania</string>
-    <string name="settings_shell_logging_summary">Włącz, aby rejestrować wszystkie polecenia powłoki i wyjścia</string>
-   
+
     <!--Superuser-->
     <string name="su_request_title">Prośba o dostęp Superusera</string>
     <string name="deny_with_str">Odmów%1$s</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -4,41 +4,29 @@
 	
 	
     <!--Welcome Activity-->
-    <string name="navigation_drawer_open">Abrir gaveta de notificação</string>
-    <string name="navigation_drawer_close">Fechar gaveta de notificação</string>
-	
+
     <string name="modules">Módulos</string>
     <string name="downloads">Baixar</string>
 	<string name="superuser">Superusuário</string>
     <string name="log">Registro</string>
     <string name="settings">Configurações</string>
-	<string name="status">Status</string>
     <string name="install">Instalar</string>
 
     <!--Status Fragment-->
-    <string name="magisk_version">Magisk v%1$s Instalado</string>
-	<string name="magisk_version_core_only">Magisk v%1$s Instalado(Somente em modo Core)</string>
     <string name="magisk_version_error">Magisk não instalado</string>
 
 	<string name="checking_for_updates">Checando por atualizações…</string>
     <string name="magisk_update_available">Magisk v%1$s disponível!</string>
     <string name="cannot_check_updates">Não é possível verificar se há atualizações</string>
-    <string name="up_to_date">Última versão do %1$s instalado</string>
     <string name="root_error">Rooteado mas sem permissão de root, o acesso foi permitido?</string>
     <string name="not_rooted">Sem root</string>
-    <string name="proper_root">Rooteado</string>
     <string name="safetyNet_check_text">Pressione para checar o SafetyNet</string>
     <string name="checking_safetyNet_status">Verificando status do SafetyNet…</string>
 	<string name="safetyNet_check_success">SafetyNet verificado</string>
-    <string name="safetyNet_connection_failed">Não é possível conectar-se à API do Google</string>
-    <string name="safetyNet_connection_suspended">A conexão com API do Google foi suspensa</string>
-    <string name="safetyNet_no_response">Não é possível verificar o SafetyNet, sem Internet?</string>
-    <string name="safetyNet_fail">SafetyNet Falhou: CTS profile mismatch</string>
-    <string name="safetyNet_pass">SafetyNet Passado</string>
-	<string name="safetyNet_network_loss">Conexão com a rede perdida</string>
+	<string name="safetyNet_api_error">SafetyNet erro na API</string>
+    <string name="safetyNet_network_loss">Conexão com a rede perdida</string>
     <string name="safetyNet_service_disconnected">O serviço foi morto</string>
     <string name="safetyNet_res_invalid">A resposta é inválida</string>
-    <string name="root_info_warning">Funcionalidade muito limitada</string>
 
     <!--Install Fragment-->
 	<string name="auto_detect">(Auto) %1$s</string>
@@ -51,10 +39,9 @@
     <string name="current_magisk_title">Versão instalada do Magisk: %1$s</string>
     <string name="install_magisk_title">Última versão do Magisk: %1$s</string>
 	<string name="uninstall">Desinstalar</string>
-    <string name="reboot_countdown">Reiniciando em %1$d</string>
     <string name="uninstall_magisk_title">Desinstalar Magisk</string>
-    <string name="uninstall_magisk_msg">Isso removerá todos os módulos, MagiskSU, e Potencialmente criptografar seus dados se não criptografados\nVocê deseja continuar?</string>
-    <string name="version_none">(Nenhum)</string>
+	<string name="uninstall_magisk_msg">Todos os modulos magisk será desativado/removido. O root será removido, e possivelmente a encriptação de seus dados se seus dados não foram encriptado.</string>
+    <string name="update">Atualizar %1$s</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(Nenhuma informação fornecida)</string>
@@ -65,7 +52,6 @@
     <string name="disable_file_created">Módulo será desativado na próxima reinicialização</string>
     <string name="disable_file_removed">Módulo será ativado na próxima reinicialização</string>
     <string name="author">Criado por %1$s</string>
-	<string name="fab_flash_zip">Flashear Módulo Zip</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Atualização disponível</string>
@@ -100,39 +86,44 @@
     <string name="close">Fechar</string>
     <string name="repo_install_title">Instalar %1$s</string>
     <string name="repo_install_msg">Você deseja instalar%1$s ?</string>
-    <string name="download_install">Baixar &amp; instalar</string>
-	<string name="download">Baixar</string>
-	<string name="goto_install">Ir na seção \"Instalar\"</string>
+    <string name="download">Baixar</string>
     <string name="download_file_error">Erro ao baixar o arquivo</string>
     <string name="install_error">Erro na instalação!</string>
     <string name="invalid_zip">O zip não é um Módulo Magisk!!</string>
-    <string name="reboot_title">Instalação bem-sucedida!</string>
-    <string name="reboot_msg">Você quer reiniciar agora?</string>
     <string name="reboot">Reiniciar</string>
-	<string name="copying_msg">Copiando zip para diretório temporário</string>
-    <string name="zip_install_progress_title">Instalando</string>
-	<string name="zip_unzip_msg">Descompactando arquivo zip …</string>
-    <string name="zip_process_msg">Processando arquivo zip …</string>
-    <string name="zip_install_progress_msg">Instalando %1$s …</string>
-    <string name="no_magisk_title">Magisk Não Instalado!</string>
-    <string name="no_magisk_msg">Você quer baixar e instalar o Magisk?</string>
-	<string name="downloading_toast">Baixando %1$s</string>
+    <string name="downloading_toast">Baixando %1$s</string>
     <string name="magisk_update_title">Nova atualização do Magisk disponível!</string>
     <string name="settings_reboot_toast">Reinicie para aplicar configurações</string>
     <string name="release_notes">Notas da atualização</string>
 	<string name="repo_cache_cleared">Cache do Repo. limpado</string>
     <string name="safetyNet_hide_notice">Este aplicativo usa SafetyNet\nJá manipulado pelo MagiskHide por padrão</string>
-    <string name="start_magiskhide">Iniciando MagiskHide …</string>
-	<string name="no_magisksu_title">Não está usando MagiskSU!</string>
-    <string name="no_magisksu_msg">Você não está rooteado com MagiskSU, Usar MagiskHide em si pode não ser suficiente!\Ele não é oficialmente suportado, E você precisaria de ferramentas adicionais (ex: suhide) para passar pelo Safety Net.</string>
-    <string name="understand">Eu entendo</string>
     <string name="process_error">Erro no processo</string>
     <string name="internal_storage">O zip foi salvo em:\n[Armazenamento interno]%1$s</string>
+	<string name="zip_download_title">Baixando</string>
+    <string name="zip_download_msg">Baixando o arquivo zip (%1$d%%) …</string>
     <string name="zip_process_title">Processando</string>
+	<string name="zip_process_msg">Processando arquivo zip …</string>
     <string name="manual_boot_image">Por Favor, selecione manualmente a Boot Image</string>
 	<string name="manager_update_title">Nova atualização do Magisk Manager disponível!</string>
     <string name="manager_download_install">Pressione para baixar e instalar</string>
     <string name="magisk_updates">Atualizações do Magisk</string>
+    <string name="flashing">Flasheando</string>
+    <string name="hide_manager_toast">Ocultando Magisk Manager…</string>
+    <string name="hide_manager_fail_toast">Falha ao ocultar o Magisk Manager…</string>
+    <string name="download_zip_only">Baixar somente o zip</string>
+    <string name="patch_boot_file">Arquivo Patch Boot Image</string>
+    <string name="direct_install">Instalação Direta (Recomendado)</string>
+    <string name="install_second_slot">Instalação no segundo Slot (Depois do OTA)</string>
+    <string name="select_method">Selecionar Método</string>
+    <string name="no_boot_file_patch_support">Versão do Magisk escolhida não suporta arquivo de patch boot image</string>
+    <string name="boot_file_patch_msg">Selecione a stock boot image despejada(dump) no formato .img ou img.tar</string>
+    <string name="complete_uninstall">Desinstalação Completa</string>
+    <string name="restore_stock_boot">Restaurar Stock Boot</string>
+    <string name="restore_done">Restauração Completa!</string>
+    <string name="restore_fail">backup da Stock não existe!</string>
+    <string name="uninstall_toast">Desinstalando o Magisk Manager em 5 segundos, por favor reinicie manualmente depois</string>
+    <string name="proprietary_title">Baixar Código do Proprietário</string>
+    <string name="proprietary_notice">Magisk Manager é FOSS então não contém o código proprietário da API SafetyNet do Google.\n\nVocê permite que o Magisk Manager baixe uma extensão (contém o GoogleApiClient) para verificações SafetyNet?</string>
 	
     <!--Settings Fragment -->
     <string name="settings_general_category">Geral</string>
@@ -142,12 +133,20 @@
     <string name="settings_notification_summary">Mostrar notificações de atualização quando a nova versão estiver disponível</string>
     <string name="settings_clear_cache_title">Limpar Repo Cache</string>
     <string name="settings_clear_cache_summary">Limpe as informações armazenadas em cache para repos. online, forçando o aplicativo a atualizar online</string>
-
+	<string name="settings_hide_manager_title">Ocultar Magisk Manager</string>
+    <string name="settings_hide_manager_summary">Oculta temporariamente o Magisk Manager.\nIsso irá instalar um novo aplicativo chamado \"Unhide Magisk Manager\"</string>
+    <string name="language">Linguagem</string>
+    <string name="system_default">(Padrão do Sistema)</string>
+    <string name="settings_update">Atualizar Configurações</string>
+    <string name="settings_update_channel_title">Canal de atualizações</string>
+    <string name="settings_update_stable">Estável</string>
+    <string name="settings_update_beta">Beta</string>
+    <string name="settings_boot_format_title">Formato de Saida do Boot Patcheado</string>
+    <string name="settings_boot_format_summary">Selecione o formato de saida do Boot Image Patcheado.\nSelecione .img para flashear através do fastboot/modo de download; Selecione .img.tar para flashear com o ODIN.</string>
+	
 	<string name="settings_core_only_title">Magisk modo somente Core</string>
     <string name="settings_core_only_summary">Ativar somente recursos principais, todos os módulos não serão carregados. MagiskSU, MagiskHide, e systemless hosts ainda estará ativado</string>
     <string name="settings_magiskhide_summary">Ocultar Magisk de várias detecções</string>
-    <string name="settings_busybox_title">Ativar BusyBox</string>
-    <string name="settings_busybox_summary">Monta a busybox interna do Magisk\'s para xbin</string>
     <string name="settings_hosts_title">Ativar systemless hosts</string>
     <string name="settings_hosts_summary">Suporte do systemless para Adblock apps</string>
 
@@ -183,14 +182,8 @@
     <string name="global_summary">Todas as sessões raiz usam o namespace de montagem global</string>
     <string name="requester_summary">As sessões de raiz herdarão o namespace do seu solicitante</string>
     <string name="isolate_summary">Cada sessão raiz terá seu próprio namespace isolado</string>
-	
-    <string name="settings_development_category">Desenvolvimento</string>
-    <string name="settings_developer_logging_title">Ativar registro mais detalhado</string>
-    <string name="settings_developer_logging_summary">Marque essa opção para habilitar um registro mais detalhado</string>
-    <string name="settings_shell_logging_title">Ativar registro da shell de comando</string>
-    <string name="settings_shell_logging_summary">Marque esta opção para habilitar o registro de todos os comandos shell e de saída</string>
 
-	<!--Superuser-->
+    <!--Superuser-->
 	<string name="su_request_title">Solicitação de superusuário</string>
     <string name="deny_with_str">Negar%1$s</string>
     <string name="deny">Negar</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -1,224 +1,190 @@
 <resources>
-	
-	
-	
-	
-    <!--Welcome Activity-->
-    <string name="navigation_drawer_open">Abrir gaveta de notificação</string>
-    <string name="navigation_drawer_close">Fechar gaveta de notificação</string>
-	
+<!--Universal-->
+
+<!--Welcome Activity-->
     <string name="modules">Módulos</string>
-    <string name="downloads">Transferir</string>
-	<string name="superuser">Super-Utilizador</string>
-    <string name="log">Registo</string>
-    <string name="settings">Definições</string>
-	<string name="status">Estado</string>
+<string name="downloads">Transferir</string>
+<string name="superuser">Super-Utilizador</string>
+<string name="log">Registo</string>
+<string name="settings">Definições</string>
     <string name="install">Instalar</string>
 
-    <!--Status Fragment-->
-    <string name="magisk_version">Magisk v%1$s Instalado</string>
-	<string name="magisk_version_core_only">Magisk v%1$s Instalado(Somente em modo Core)</string>
+<!--Status Fragment-->
     <string name="magisk_version_error">Magisk não instalado</string>
 
-	<string name="checking_for_updates">A procurar por atualizações…</string>
-    <string name="magisk_update_available">Magisk v%1$s disponível!</string>
-    <string name="cannot_check_updates">Não foi possível verificar atualizações, sem internet?</string>
-    <string name="up_to_date">Última versão do %1$s instalado</string>
+<string name="checking_for_updates">A procurar por atualizações…</string>
+<string name="magisk_update_available">Magisk v%1$s disponível!</string>
+<string name="cannot_check_updates">Não foi possível verificar atualizações, sem internet?</string>
     <string name="root_error">Com root mas sem permissão de root, o acesso foi permitido?</string>
-    <string name="not_rooted">Sem root</string>
-    <string name="proper_root">Root instalado corretamente</string>
+<string name="not_rooted">Sem root</string>
     <string name="safetyNet_check_text">Pressione para verificar SafetyNet</string>
-    <string name="checking_safetyNet_status">A verificar o estado do SafetyNet…</string>
-    <string name="safetyNet_connection_failed">Não é possível ligar à API do Google</string>
-    <string name="safetyNet_connection_suspended">A ligação com API do Google foi suspensa</string>
-    <string name="safetyNet_no_response">Não é possível verificar o SafetyNet, sem Internet?</string>
-    <string name="safetyNet_fail">SafetyNet Falhou: perfil CTS não corresponde</string>
-    <string name="safetyNet_pass">SafetyNet Passado</string>
-    <string name="root_info_warning">Funcionalidade muito limitada</string>
+<string name="checking_safetyNet_status">A verificar o estado do SafetyNet…</string>
+<string name="safetyNet_check_success">SafetyNet verificado com sucesso</string>
+    <string name="safetyNet_network_loss">Perda de ligação</string>
+<string name="safetyNet_service_disconnected">Serviço foi interrompido</string>
+<string name="safetyNet_res_invalid">A resposta é inválida</string>
 
     <!--Install Fragment-->
-	<string name="auto_detect">(Auto) %1$s</string>
-	<string name="cannot_auto_detect">(Não foi auto detetado)</string>
-    <string name="boot_image_title">Local da Imagem de Arranque</string>
-    <string name="detect_button">Detectar</string>
-    <string name="advanced_settings_title">Definições avançadas</string>
-    <string name="keep_force_encryption">Manter encriptação forçada</string>
-    <string name="keep_dm_verity">Manter dm-verity</string>
-    <string name="current_magisk_title">Versão instalada do Magisk: %1$s</string>
-    <string name="install_magisk_title">Última versão do Magisk: %1$s</string>
-	<string name="uninstall">Desinstalar</string>
-    <string name="reboot_countdown">A reiniciar em %1$d</string>
+<string name="auto_detect">(Auto) %1$s</string>
+<string name="cannot_auto_detect">(Não foi auto detetado)</string>
+<string name="boot_image_title">Local da Imagem de Arranque</string>
+<string name="detect_button">Detectar</string>
+<string name="advanced_settings_title">Definições avançadas</string>
+<string name="keep_force_encryption">Manter encriptação forçada</string>
+<string name="keep_dm_verity">Manter dm-verity</string>
+<string name="current_magisk_title">Versão instalada do Magisk: %1$s</string>
+<string name="install_magisk_title">Última versão do Magisk: %1$s</string>
+<string name="uninstall">Desinstalar</string>
     <string name="uninstall_magisk_title">Desinstalar Magisk</string>
-    <string name="uninstall_magisk_msg">Isso irá remover todos os módulos, MagiskSU, e Potencialmente encriptar seus dados se estiverem encriptados\nDeseja continuar?</string>
-    <string name="version_none">(Nenhum)</string>
+    <string name="update">Atualizar %1$s</string>
 
-    <!--Module Fragment-->
-    <string name="no_info_provided">(Nenhuma informação fornecida)</string>
-    <string name="no_modules_found">Nenhum módulo encontrado</string>
-    <string name="update_file_created">Módulo será atualizado depois de reiniciar</string>
-    <string name="remove_file_created">Módulo será removido depois de reiniciar</string>
-    <string name="remove_file_deleted">Módulo não será removido ao reiniciar</string>
-    <string name="disable_file_created">Módulo será desativado depois de reiniciar</string>
-    <string name="disable_file_removed">Módulo será ativado depois de reiniciar</string>
-    <string name="author">Criado por %1$s</string>
-	<string name="fab_flash_zip">Instalar Módulo Zip</string>
+<!--Module Fragment-->
+<string name="no_info_provided">(Nenhuma informação fornecida)</string>
+<string name="no_modules_found">Nenhum módulo encontrado</string>
+<string name="update_file_created">Módulo será atualizado depois de reiniciar</string>
+<string name="remove_file_created">Módulo será removido depois de reiniciar</string>
+<string name="remove_file_deleted">Módulo não será removido ao reiniciar</string>
+<string name="disable_file_created">Módulo será desativado depois de reiniciar</string>
+<string name="disable_file_removed">Módulo será ativado depois de reiniciar</string>
+<string name="author">Criado por %1$s</string>
 
     <!--Repo Fragment-->
-    <string name="update_available">Atualização disponível</string>
-    <string name="installed">Instalado</string>
-    <string name="not_installed">Não Instalado</string>
+<string name="update_available">Atualização disponível</string>
+<string name="installed">Instalado</string>
+<string name="not_installed">Não Instalado</string>
 
-    <!--Log Fragment-->
-    <string name="menuSaveToSd">Gravar no SD</string>
-    <string name="menuReload">Recarregar</string>
-    <string name="menuClearLog">Limpar registo agora</string>
-    <string name="logs_cleared">Registo limpo com sucesso</string>
-    <string name="log_is_empty">Registo está vazio</string>
-    <string name="logs_save_failed">Não foi possível gravar o registo para o cartão SD:</string>
+<!--Log Fragment-->
+<string name="menuSaveToSd">Gravar no SD</string>
+<string name="menuReload">Recarregar</string>
+<string name="menuClearLog">Limpar registo agora</string>
+<string name="logs_cleared">Registo limpo com sucesso</string>
+<string name="log_is_empty">Registo está vazio</string>
+<string name="logs_save_failed">Não foi possível gravar o registo para o cartão SD:</string>
 
-    <!--About Activity-->
-    <string name="about">Sobre</string>
-    <string name="app_developers">Principais programadores</string>
-    <string name="app_developers_"><![CDATA[App criado por <a href="https://github.com/topjohnwu">topjohnwu</a> em colaboração com <a href="https://github.com/d8ahazard">Digitalhigh</a> e <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
-    <string name="app_changelog">Lista de alterações da aplicação</string>
-    <string name="translators">Bruno Guerreiro</string>
-    <string name="app_version">Versão do aplicação</string>
-    <string name="app_source_code">Código fonte</string>
-    <string name="donation">Doar</string>
-    <string name="app_translators">Tradutores da Aplicação</string>
-    <string name="support_thread">Suporte</string>
+<!--About Activity-->
+<string name="about">Sobre</string>
+<string name="app_developers">Principais programadores</string>
+<string name="app_developers_"><![CDATA[App criado por <a href="https://github.com/topjohnwu">topjohnwu</a> em colaboração com <a href="https://github.com/d8ahazard">Digitalhigh</a> e <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
+<string name="app_changelog">Lista de alterações da aplicação</string>
+<string name="app_version">Versão do aplicação</string>
+<string name="app_source_code">Código fonte</string>
+<string name="donation">Doar</string>
+<string name="app_translators">Tradutores da Aplicação</string>
+<string name="support_thread">Suporte</string>
 
-    <!--Toasts, Dialogs-->
-    <string name="permissionNotGranted">Esta funcionalidade não funcionará sem permissão de escrita do armazenamento externo.</string>
-    <string name="no_thanks">Não, Obrigado</string>
-	<string name="yes">Sim</string>
-	<string name="ok">OK</string>
-    <string name="close">Fechar</string>
-    <string name="repo_install_title">Instalar %1$s</string>
-    <string name="repo_install_msg">Deseja instalar%1$s ?</string>
-    <string name="download_install">Transferir &amp; instalar</string>
-	<string name="download">Transferir</string>
-	<string name="goto_install">Ir para secção instalar</string>
+<!--Toasts, Dialogs-->
+<string name="permissionNotGranted">Esta funcionalidade não funcionará sem permissão de escrita do armazenamento externo.</string>
+<string name="no_thanks">Não, Obrigado</string>
+<string name="yes">Sim</string>
+<string name="ok">OK</string>
+<string name="close">Fechar</string>
+<string name="repo_install_title">Instalar %1$s</string>
+<string name="repo_install_msg">Deseja instalar%1$s agora?</string>
+    <string name="download">Transferir</string>
     <string name="download_file_error">Erro ao transferir ficheiro</string>
-    <string name="install_error">Erro na instalação!</string>
-    <string name="invalid_zip">O zip não é um Módulo Magisk!!</string>
-    <string name="reboot_title">Instalação bem-sucedida!</string>
-    <string name="reboot_msg">Deseja reiniciar agora?</string>
+<string name="install_error">Erro na instalação!</string>
+<string name="invalid_zip">Este zip não é um Módulo Magisk!!</string>
     <string name="reboot">Reiniciar</string>
-	<string name="copying_msg">A copiar zip para diretório temporário</string>
-    <string name="zip_install_progress_title">A instalar</string>
-	<string name="zip_unzip_msg">A descompactar ficheiro zip …</string>
     <string name="zip_process_msg">A processar ficheiro zip …</string>
-    <string name="zip_install_progress_msg">A instalar %1$s …</string>
-    <string name="no_magisk_title">Magisk Não Instalado!</string>
-    <string name="no_magisk_msg">Deseja transferir e instalar o Magisk?</string>
-	<string name="downloading_toast">A transferir %1$s</string>
-    <string name="magisk_update_title">Nova atualização do Magisk disponível!</string>
-    <string name="settings_reboot_toast">Reinicie para aplicar definições</string>
-    <string name="release_notes">Notas da atualização</string>
-	<string name="repo_cache_cleared">Cache do repositório apagado</string>
-    <string name="safetyNet_hide_notice">Esta aplicação usa SafetyNet\nJá manipulado pelo MagiskHide por padrão</string>
-    <string name="start_magiskhide">A iniciar MagiskHide …</string>
-	<string name="no_magisksu_title">Não está a usar MagiskSU!</string>
-    <string name="no_magisksu_msg">Não está root instalado com MagiskSU, Usar somente MagiskHide pode não ser suficiente!\nNão é oficialmente suportado, E precisaria de ferramentas adicionais (ex: suhide) para passar pelo SafetyNet.</string>
-    <string name="understand">Eu entendo</string>
+    <string name="downloading_toast">A transferir %1$s</string>
+<string name="magisk_update_title">Nova atualização do Magisk disponível!</string>
+<string name="settings_reboot_toast">Reinicie para aplicar definições</string>
+<string name="release_notes">Notas da atualização</string>
+<string name="repo_cache_cleared">Cache do repositório apagado</string>
+<string name="safetyNet_hide_notice">Esta aplicação usa SafetyNet
+\nJá manipulado pelo MagiskHide por padrão</string>
     <string name="process_error">Erro no processo</string>
-    <string name="internal_storage">O zip foi guardado em:\n[Armazenamento interno]%1$s</string>
-    <string name="zip_process_title">A processar</string>
-    <string name="manual_boot_image">Por Favor, selecione manualmente a imagem de Arranque</string>
-	
-    <!--Settings Fragment -->
-    <string name="settings_general_category">Geral</string>
-    <string name="settings_dark_theme_title">Tema escuro</string>
-    <string name="settings_dark_theme_summary">Ativa o tema escuro</string>
-	<string name="settings_notification_title">Notificação de Atualização</string>
-    <string name="settings_notification_summary">Mostrar notificações de atualização quando a nova versão estiver disponível</string>
-    <string name="settings_clear_cache_title">Apagar Cache de Repositório</string>
-    <string name="settings_clear_cache_summary">Apaga a informação cache de repositórios online. online, forçando a aplicação a atualizar online</string>
+<string name="internal_storage">O zip foi guardado em:
+\n[Armazenamento interno]%1$s</string>
+<string name="zip_process_title">A processar</string>
+<string name="manual_boot_image">Por Favor, selecione manualmente a imagem de Arranque</string>
+<string name="manager_update_title">Nova atualização do Magisk Manager disponível!</string>
+<string name="manager_download_install">Pressione para transferir e instalar</string>
+<string name="magisk_updates">Atualizações do Magisk</string>
+<string name="flashing">A instalar</string>
 
-	<string name="settings_core_only_title">Magisk somente em Modo Core</string>
-    <string name="settings_core_only_summary">Ativar somente funcionalidades principais, todos os módulos não serão carregados. MagiskSU, MagiskHide, e systemless hosts ainda estará ativado</string>
-    <string name="settings_magiskhide_summary">Oculta Magisk de várias deteções</string>
-    <string name="settings_busybox_title">Ativar BusyBox</string>
-    <string name="settings_busybox_summary">Ativar systemless hosts</string>
+<!--Settings Activity -->
+<string name="settings_general_category">Geral</string>
+<string name="settings_dark_theme_title">Tema escuro</string>
+<string name="settings_dark_theme_summary">Ativa o tema escuro</string>
+<string name="settings_notification_title">Notificação de Atualização</string>
+<string name="settings_notification_summary">Mostrar notificações de atualização quando a nova versão estiver disponível</string>
+<string name="settings_clear_cache_title">Apagar Cache de Repositório</string>
+<string name="settings_clear_cache_summary">Apaga a informação cache de repositórios online. online, forçando a aplicação a atualizar online</string>
+<string name="language">Língua</string>
+<string name="system_default">(Padrão do Sistema)</string>
+
+<string name="settings_core_only_title">Magisk somente em Modo Core</string>
+<string name="settings_core_only_summary">Ativar somente funcionalidades principais, todos os módulos não serão carregados. MagiskSU, MagiskHide, e systemless hosts ainda estará ativado</string>
+<string name="settings_magiskhide_summary">Oculta Magisk de várias deteções</string>
     <string name="settings_hosts_title">Ativar systemless hosts</string>
-    <string name="settings_hosts_summary">Suporte de systemless para aplicações Adblock</string>
+<string name="settings_hosts_summary">Suporte de systemless para aplicações Adblock</string>
 
-	<string name="settings_su_app_adb">Aplicações e ADB</string>
-    <string name="settings_su_app">Somente Aplicações</string>
-    <string name="settings_su_adb">Somente ADB</string>
-    <string name="settings_su_disable">Desativado</string>
-    <string name="settings_su_request_10">10 segundos</string>
-    <string name="settings_su_request_20">20 segundos</string>
-    <string name="settings_su_request_30">30 segundos</string>
-    <string name="settings_su_request_60">60 segundos</string>
-    <string name="superuser_access">Acesso de Super-Utilizador</string>
-    <string name="auto_response">Resposta Automática</string>
-    <string name="request_timeout">Tempo limite de solicitação</string>
-    <string name="superuser_notification">Notificação de Super-Utilizador</string>
-    <string name="request_timeout_summary">%1$s segundos</string>
+<string name="settings_su_app_adb">Aplicações e ADB</string>
+<string name="settings_su_app">Somente Aplicações</string>
+<string name="settings_su_adb">Somente ADB</string>
+<string name="settings_su_disable">Desativado</string>
+<string name="settings_su_request_10">10 segundos</string>
+<string name="settings_su_request_20">20 segundos</string>
+<string name="settings_su_request_30">30 segundos</string>
+<string name="settings_su_request_60">60 segundos</string>
+<string name="superuser_access">Acesso de Super-Utilizador</string>
+<string name="auto_response">Resposta Automática</string>
+<string name="request_timeout">Tempo limite de solicitação</string>
+<string name="superuser_notification">Notificação de Super-Utilizador</string>
+<string name="request_timeout_summary">%1$s segundos</string>
+<string name="settings_su_reauth_title">Autenticar novamente após atualizar</string>
+<string name="settings_su_reauth_summary">Autenticar novamente permissões de Super-Utilizador após atualizar aplicações</string>
 
-    <string name="settings_development_category">Desenvolvimento</string>
-    <string name="settings_developer_logging_title">Ativar registo mais detalhado</string>
-    <string name="settings_developer_logging_summary">Marque essa opção para permitir um registo mais detalhado</string>
-    <string name="settings_shell_logging_title">Ativar registo da linha de comandos</string>
-    <string name="settings_shell_logging_summary">Marque esta opção para permitir o registo de todos os comandos</string>
+<string name="multiuser_mode">Modo Multi-Utilizador</string>
+<string name="settings_owner_only">Apenas Proprietário de Dispositivo</string>
+<string name="settings_owner_manage">Gerido Proprietário do Dispositivo</string>
+<string name="settings_user_independent">Independente de Utilizadores</string>
+<string name="owner_only_summary">Apenas o proprietário tem acesso a root</string>
+<string name="owner_manage_summary">Apenas o proprietário pode gerir acesso root e receber pedidos</string>
+<string name="user_indepenent_summary">Cada utilizador tem suas próprias regras de root separadas</string>
+<string name="multiuser_hint_owner_request">Um pedido foi enviado ao proprietário do dispositivo. Mude para o proprietário e conceda a permissão</string>
 
-	<!--Superuser-->
-	<string name="su_request_title">Pedido de Super-Utilizador</string>
-    <string name="deny_with_str">Negar%1$s</string>
-    <string name="deny">Negar</string>
-    <string name="prompt">Perguntar</string>
-    <string name="grant">Permitir</string>
-    <string name="su_warning">Concede acesso total ao seu dispositivo.\nNegue se não tiver certeza!</string>
-    <string name="forever">Sempre</string>
-    <string name="once">Uma vez</string>
-    <string name="tenmin">10 minutos</string>
-    <string name="twentymin">20 minutos</string>
-    <string name="thirtymin">30 minutos</string>
-    <string name="sixtymin">60 minutos</string>
-    <string name="su_allow_toast">%1$s foi permitido o acesso de Super-Utilizador</string>
-    <string name="su_deny_toast">%1$s foi negado o acesso de Super-Utilizador</string>
-    <string name="no_apps_found">Não foram encontrados aplicações</string>
-    <string name="su_snack_grant">Acesso de Super-Utilizador a %1$s foi permitido</string>
-    <string name="su_snack_deny">Acesso de Super-Utilizador a %1$s foi negado</string>
-    <string name="su_snack_notif_on">Notificações de %1$s está ativado</string>
-    <string name="su_snack_notif_off">Notificações da %1$s está desativado</string>
-    <string name="su_snack_log_on">Registo de %1$s está ativado</string>
-    <string name="su_snack_log_off">Registo de %1$s está desativado</string>
-    <string name="su_snack_revoke">%1$s direitos foram revogados</string>
-    <string name="su_revoke_title">Revogar?</string>
-    <string name="su_revoke_msg">Revogar os diretos do %1$s, Confirmar?</string>
-    <string name="toast">Notificação(pop-up)</string>
-    <string name="none">Nenhum</string>
+<string name="mount_namespace_mode">Cada sessão root terá sua própria identificação isolada</string>
+<string name="settings_ns_global">Identificação Global</string>
+<string name="settings_ns_requester">Herdar Identificação</string>
+<string name="settings_ns_isolate">Identificação Isolada</string>
+<string name="global_summary">Todas as sessões root usam a identificação de montagem global</string>
+<string name="requester_summary">As sessões de root herdarão a identificação do seu solicitante</string>
+<string name="isolate_summary">Cada sessão root terá sua própria identificação isolada</string>
 
-    <!--Superuser logs-->
-    <string name="pid">PID:\u0020</string>
-    <string name="target_uid">Alvo UID:\u0020</string>
-    <string name="command">Comando:\u0020</string>
-    <string name="safetyNet_check_success">SafetyNet verificado com sucesso</string>
-    <string name="safetyNet_network_loss">Perda de ligação</string>
-    <string name="safetyNet_service_disconnected">Serviço foi interrompido</string>
-    <string name="safetyNet_res_invalid">A resposta é inválida</string>
-    <string name="manager_update_title">Nova atualização do Magisk Manager disponível!</string>
-    <string name="manager_download_install">Pressione para transferir e instalar</string>
-    <string name="settings_su_reauth_title">Autenticar novamente após atualizar</string>
-    <string name="settings_su_reauth_summary">Autenticar novamente permissões de Super-Utilizador após atualizar aplicações</string>
-    <string name="multiuser_mode">Modo Multi-Utilizador</string>
-    <string name="settings_owner_only">Apenas Proprietário de Dispositivo</string>
-    <string name="settings_owner_manage">Gerido Proprietário do Dispositivo</string>
-    <string name="settings_user_independent">Independente de Utilizadores</string>
-    <string name="owner_only_summary">Apenas o proprietário tem acesso a root</string>
-    <string name="owner_manage_summary">Apenas o proprietário pode gerir acesso root e receber pedidos</string>
-    <string name="user_indepenent_summary">Cada utilizador tem suas próprias regras de root separadas</string>
-    <string name="multiuser_hint_owner_request">Um pedido foi enviado ao proprietário do dispositivo. Mude para o proprietário e conceda a permissão</string>
-    <string name="mount_namespace_mode">Cada sessão root terá sua própria identificação isolada</string>
-    <string name="settings_ns_global">Identificação Global</string>
-    <string name="settings_ns_requester">Herdar Identificação</string>
-    <string name="settings_ns_isolate">Identificação Isolada</string>
-    <string name="global_summary">Todas as sessões root usam a identificação de montagem global</string>
-    <string name="requester_summary">As sessões de root herdarão a identificação do seu solicitante</string>
-    <string name="isolate_summary">Cada sessão root terá sua própria identificação isolada</string>
+    <!--Superuser-->
+<string name="su_request_title">Pedido de Super-Utilizador</string>
+<string name="deny_with_str">Negar%1$s</string>
+<string name="deny">Negar</string>
+<string name="prompt">Perguntar</string>
+<string name="grant">Permitir</string>
+<string name="su_warning">Concede acesso total ao seu dispositivo.
+\nNegue se não tiver certeza!</string>
+<string name="forever">Sempre</string>
+<string name="once">Uma vez</string>
+<string name="tenmin">10 minutos</string>
+<string name="twentymin">20 minutos</string>
+<string name="thirtymin">30 minutos</string>
+<string name="sixtymin">60 minutos</string>
+<string name="su_allow_toast">%1$s foi permitido o acesso de Super-Utilizador</string>
+<string name="su_deny_toast">%1$s foi negado o acesso de Super-Utilizador</string>
+<string name="no_apps_found">Não foram encontrados aplicações</string>
+<string name="su_snack_grant">Acesso de Super-Utilizador a %1$s foi permitido</string>
+<string name="su_snack_deny">Acesso de Super-Utilizador a %1$s foi negado</string>
+<string name="su_snack_notif_on">Notificações de %1$s está ativado</string>
+<string name="su_snack_notif_off">Notificações da %1$s está desativado</string>
+<string name="su_snack_log_on">Registo de %1$s está ativado</string>
+<string name="su_snack_log_off">Registo de %1$s está desativado</string>
+<string name="su_snack_revoke">%1$s direitos foram revogados</string>
+<string name="su_revoke_title">Revogar?</string>
+<string name="su_revoke_msg">Revogar os diretos do %1$s, Confirmar?</string>
+<string name="toast">Notificação(pop-up)</string>
+<string name="none">Nenhum</string>
 
+<!--Superuser logs-->
+<string name="pid">PID:\u0020</string>
+<string name="target_uid">Alvo UID:\u0020</string>
+<string name="command">Comando:\u0020</string>
 
 </resources>