Bump version

Split Portuguese into pt_BR and pt_PT

.gitignore

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

README.md

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

app/build.gradle

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

app/proguard-rules.pro

@@ -16,31 +16,10 @@
 #   public *;
 #}
 
-# Gson uses generic type information stored in a class file when working with fields. Proguard
-# removes such information by default, so configure it to keep all of it.
--keepattributes Signature
-
-# For using GSON @Expose annotation
--keepattributes *Annotation*
-
-# Gson specific classes
--keep class sun.misc.Unsafe { *; }
--keep class com.google.gson.** { *; }
-
-# Application classes that will be serialized/deserialized over Gson
--keep class com.topjohnwu.magisk.module.** { *; }
--keep class com.topjohnwu.magisk.module.ModuleHelper$ValueSortedMap { *; }
-
-# Prevent proguard from stripping interface information from TypeAdapterFactory,
-# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
-
--keep class android.support.v7.internal.** { *; }
--keep interface android.support.v7.internal.** { *; }
--keep class android.support.v7.** { *; }
--keep interface android.support.v7.** { *; }
-
 # SpongyCastle
--keep class org.spongycastle.** {*;}
+-keep class org.spongycastle.** { *; }
+-dontwarn javax.naming.**
+
+-dontwarn android.content.**
+-dontwarn android.animation.**
+

app/src/main/AndroidManifest.xml

@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.topjohnwu.magisk"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-
-          xmlns:tools="http://schemas.android.com/tools">
+<manifest
+    package="com.topjohnwu.magisk"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
+        android:name=".MagiskManager"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -50,8 +53,7 @@
             android:taskAffinity="internal.superuser"
             android:theme="@style/SuRequest" />
 
-        <receiver
-            android:name=".superuser.SuReceiver" />
+        <receiver android:name=".superuser.SuReceiver" />
 
         <receiver android:name=".receivers.BootReceiver">
             <intent-filter>
@@ -59,6 +61,23 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name=".receivers.PackageReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name=".receivers.ManagerUpdate" />
+
+        <service android:name=".services.OnBootIntentService" />
+
+        <service
+            android:name=".services.UpdateCheckService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="true" />
+
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.topjohnwu.magisk.provider"

app/src/main/assets/dark.css

@@ -0,0 +1,276 @@
+body {
+  font-family: Helvetica, arial, sans-serif;
+  font-size: 14px;
+  line-height: 1.6;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  background-color: #303030;
+  color: white;
+  padding: 15px; }
+
+body > *:first-child {
+  margin-top: 0 !important; }
+body > *:last-child {
+  margin-bottom: 0 !important; }
+
+a {
+  color: #4183C4; }
+a.absent {
+  color: #cc0000; }
+a.anchor {
+  display: block;
+  padding-left: 30px;
+  margin-left: -30px;
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0; }
+
+h1, h2, h3, h4, h5, h6 {
+  margin: 20px 0 10px;
+  padding: 0;
+  font-weight: bold;
+  -webkit-font-smoothing: antialiased;
+  cursor: text;
+  position: relative; }
+
+h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor, h5:hover a.anchor, h6:hover a.anchor {
+  background: url("../../images/modules/styleguide/para.png") no-repeat 10px center;
+  text-decoration: none; }
+
+h1 tt, h1 code {
+  font-size: inherit; }
+
+h2 tt, h2 code {
+  font-size: inherit; }
+
+h3 tt, h3 code {
+  font-size: inherit; }
+
+h4 tt, h4 code {
+  font-size: inherit; }
+
+h5 tt, h5 code {
+  font-size: inherit; }
+
+h6 tt, h6 code {
+  font-size: inherit; }
+
+h1 {
+  font-size: 28px; }
+
+h2 {
+  font-size: 24px;
+  border-bottom: 1px solid #cccccc; }
+
+h3 {
+  font-size: 18px; }
+
+h4 {
+  font-size: 16px; }
+
+h5 {
+  font-size: 14px; }
+
+h6 {
+  color: #888888;
+  font-size: 14px; }
+
+p, blockquote, ul, ol, dl, li, table, pre {
+  margin: 15px 0; }
+
+hr {
+  background: transparent url("../../images/modules/pulls/dirty-shade.png") repeat-x 0 0;
+  border: 0 none;
+  color: #cccccc;
+  height: 4px;
+  padding: 0; }
+
+body > h2:first-child {
+  margin-top: 0;
+  padding-top: 0; }
+body > h1:first-child {
+  margin-top: 0;
+  padding-top: 0; }
+  body > h1:first-child + h2 {
+    margin-top: 0;
+    padding-top: 0; }
+body > h3:first-child, body > h4:first-child, body > h5:first-child, body > h6:first-child {
+  margin-top: 0;
+  padding-top: 0; }
+
+a:first-child h1, a:first-child h2, a:first-child h3, a:first-child h4, a:first-child h5, a:first-child h6 {
+  margin-top: 0;
+  padding-top: 0; }
+
+h1 p, h2 p, h3 p, h4 p, h5 p, h6 p {
+  margin-top: 0; }
+
+li p.first {
+  display: inline-block; }
+
+ul, ol {
+  padding-left: 30px; }
+
+ul :first-child, ol :first-child {
+  margin-top: 0; }
+
+ul :last-child, ol :last-child {
+  margin-bottom: 0; }
+
+dl {
+  padding: 0; }
+  dl dt {
+    font-size: 14px;
+    font-weight: bold;
+    font-style: italic;
+    padding: 0;
+    margin: 15px 0 5px; }
+    dl dt:first-child {
+      padding: 0; }
+    dl dt > :first-child {
+      margin-top: 0; }
+    dl dt > :last-child {
+      margin-bottom: 0; }
+  dl dd {
+    margin: 0 0 15px;
+    padding: 0 15px; }
+    dl dd > :first-child {
+      margin-top: 0; }
+    dl dd > :last-child {
+      margin-bottom: 0; }
+
+blockquote {
+  border-left: 4px solid #404040;
+  padding: 0 15px;
+  color: #888888; }
+  blockquote > :first-child {
+    margin-top: 0; }
+  blockquote > :last-child {
+    margin-bottom: 0; }
+
+table {
+  padding: 0; }
+  table tr {
+    border-top: 1px solid #707070;
+    background-color: #303030;
+    margin: 0;
+    padding: 0; }
+    table tr:nth-child(2n) {
+      background-color: #505050; }
+    table tr th {
+      font-weight: bold;
+      border: 1px solid #707070;
+      text-align: left;
+      margin: 0;
+      padding: 6px 13px; }
+    table tr td {
+      border: 1px solid #707070;
+      text-align: left;
+      margin: 0;
+      padding: 6px 13px; }
+    table tr th :first-child, table tr td :first-child {
+      margin-top: 0; }
+    table tr th :last-child, table tr td :last-child {
+      margin-bottom: 0; }
+
+img {
+  max-width: 100%; }
+
+span.frame {
+  display: block;
+  overflow: hidden; }
+  span.frame > span {
+    border: 1px solid #dddddd;
+    display: block;
+    float: left;
+    overflow: hidden;
+    margin: 13px 0 0;
+    padding: 7px;
+    width: auto; }
+  span.frame span img {
+    display: block;
+    float: left; }
+  span.frame span span {
+    clear: both;
+    color: #cccccc;
+    display: block;
+    padding: 5px 0 0; }
+span.align-center {
+  display: block;
+  overflow: hidden;
+  clear: both; }
+  span.align-center > span {
+    display: block;
+    overflow: hidden;
+    margin: 13px auto 0;
+    text-align: center; }
+  span.align-center span img {
+    margin: 0 auto;
+    text-align: center; }
+span.align-right {
+  display: block;
+  overflow: hidden;
+  clear: both; }
+  span.align-right > span {
+    display: block;
+    overflow: hidden;
+    margin: 13px 0 0;
+    text-align: right; }
+  span.align-right span img {
+    margin: 0;
+    text-align: right; }
+span.float-left {
+  display: block;
+  margin-right: 13px;
+  overflow: hidden;
+  float: left; }
+  span.float-left span {
+    margin: 13px 0 0; }
+span.float-right {
+  display: block;
+  margin-left: 13px;
+  overflow: hidden;
+  float: right; }
+  span.float-right > span {
+    display: block;
+    overflow: hidden;
+    margin: 13px auto 0;
+    text-align: right; }
+
+code, tt {
+  margin: 0 2px;
+  padding: 0 5px;
+  white-space: nowrap;
+  border: 1px solid #707070;
+  background-color: #606060;
+  border-radius: 3px; }
+
+pre code {
+  margin: 0;
+  padding: 0;
+  white-space: pre;
+  border: none;
+  background: transparent; }
+
+.highlight pre {
+  background-color: #3f3f3f;
+  border: 1px solid #707070;
+  font-size: 13px;
+  line-height: 19px;
+  overflow: auto;
+  padding: 6px 10px;
+  border-radius: 3px; }
+
+pre {
+  background-color: #606060;
+  border: 1px solid #707070;
+  font-size: 13px;
+  line-height: 19px;
+  overflow: auto;
+  padding: 6px 10px;
+  border-radius: 3px; }
+  pre code, pre tt {
+    background-color: transparent;
+    border: none; }

app/src/main/assets/light.css

@@ -0,0 +1,277 @@
+body {
+  font-family: Helvetica, arial, sans-serif;
+  font-size: 14px;
+  line-height: 1.6;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  background-color: white;
+  padding: 15px; }
+
+body > *:first-child {
+  margin-top: 0 !important; }
+body > *:last-child {
+  margin-bottom: 0 !important; }
+
+a {
+  color: #4183C4; }
+a.absent {
+  color: #cc0000; }
+a.anchor {
+  display: block;
+  padding-left: 30px;
+  margin-left: -30px;
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0; }
+
+h1, h2, h3, h4, h5, h6 {
+  margin: 20px 0 10px;
+  padding: 0;
+  font-weight: bold;
+  -webkit-font-smoothing: antialiased;
+  cursor: text;
+  position: relative; }
+
+h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor, h5:hover a.anchor, h6:hover a.anchor {
+  background: url("../../images/modules/styleguide/para.png") no-repeat 10px center;
+  text-decoration: none; }
+
+h1 tt, h1 code {
+  font-size: inherit; }
+
+h2 tt, h2 code {
+  font-size: inherit; }
+
+h3 tt, h3 code {
+  font-size: inherit; }
+
+h4 tt, h4 code {
+  font-size: inherit; }
+
+h5 tt, h5 code {
+  font-size: inherit; }
+
+h6 tt, h6 code {
+  font-size: inherit; }
+
+h1 {
+  font-size: 28px;
+  color: black; }
+
+h2 {
+  font-size: 24px;
+  border-bottom: 1px solid #cccccc;
+  color: black; }
+
+h3 {
+  font-size: 18px; }
+
+h4 {
+  font-size: 16px; }
+
+h5 {
+  font-size: 14px; }
+
+h6 {
+  color: #777777;
+  font-size: 14px; }
+
+p, blockquote, ul, ol, dl, li, table, pre {
+  margin: 15px 0; }
+
+hr {
+  background: transparent url("../../images/modules/pulls/dirty-shade.png") repeat-x 0 0;
+  border: 0 none;
+  color: #cccccc;
+  height: 4px;
+  padding: 0; }
+
+body > h2:first-child {
+  margin-top: 0;
+  padding-top: 0; }
+body > h1:first-child {
+  margin-top: 0;
+  padding-top: 0; }
+  body > h1:first-child + h2 {
+    margin-top: 0;
+    padding-top: 0; }
+body > h3:first-child, body > h4:first-child, body > h5:first-child, body > h6:first-child {
+  margin-top: 0;
+  padding-top: 0; }
+
+a:first-child h1, a:first-child h2, a:first-child h3, a:first-child h4, a:first-child h5, a:first-child h6 {
+  margin-top: 0;
+  padding-top: 0; }
+
+h1 p, h2 p, h3 p, h4 p, h5 p, h6 p {
+  margin-top: 0; }
+
+li p.first {
+  display: inline-block; }
+
+ul, ol {
+  padding-left: 30px; }
+
+ul :first-child, ol :first-child {
+  margin-top: 0; }
+
+ul :last-child, ol :last-child {
+  margin-bottom: 0; }
+
+dl {
+  padding: 0; }
+  dl dt {
+    font-size: 14px;
+    font-weight: bold;
+    font-style: italic;
+    padding: 0;
+    margin: 15px 0 5px; }
+    dl dt:first-child {
+      padding: 0; }
+    dl dt > :first-child {
+      margin-top: 0; }
+    dl dt > :last-child {
+      margin-bottom: 0; }
+  dl dd {
+    margin: 0 0 15px;
+    padding: 0 15px; }
+    dl dd > :first-child {
+      margin-top: 0; }
+    dl dd > :last-child {
+      margin-bottom: 0; }
+
+blockquote {
+  border-left: 4px solid #dddddd;
+  padding: 0 15px;
+  color: #777777; }
+  blockquote > :first-child {
+    margin-top: 0; }
+  blockquote > :last-child {
+    margin-bottom: 0; }
+
+table {
+  padding: 0; }
+  table tr {
+    border-top: 1px solid #cccccc;
+    background-color: white;
+    margin: 0;
+    padding: 0; }
+    table tr:nth-child(2n) {
+      background-color: #f8f8f8; }
+    table tr th {
+      font-weight: bold;
+      border: 1px solid #cccccc;
+      text-align: left;
+      margin: 0;
+      padding: 6px 13px; }
+    table tr td {
+      border: 1px solid #cccccc;
+      text-align: left;
+      margin: 0;
+      padding: 6px 13px; }
+    table tr th :first-child, table tr td :first-child {
+      margin-top: 0; }
+    table tr th :last-child, table tr td :last-child {
+      margin-bottom: 0; }
+
+img {
+  max-width: 100%; }
+
+span.frame {
+  display: block;
+  overflow: hidden; }
+  span.frame > span {
+    border: 1px solid #dddddd;
+    display: block;
+    float: left;
+    overflow: hidden;
+    margin: 13px 0 0;
+    padding: 7px;
+    width: auto; }
+  span.frame span img {
+    display: block;
+    float: left; }
+  span.frame span span {
+    clear: both;
+    color: #333333;
+    display: block;
+    padding: 5px 0 0; }
+span.align-center {
+  display: block;
+  overflow: hidden;
+  clear: both; }
+  span.align-center > span {
+    display: block;
+    overflow: hidden;
+    margin: 13px auto 0;
+    text-align: center; }
+  span.align-center span img {
+    margin: 0 auto;
+    text-align: center; }
+span.align-right {
+  display: block;
+  overflow: hidden;
+  clear: both; }
+  span.align-right > span {
+    display: block;
+    overflow: hidden;
+    margin: 13px 0 0;
+    text-align: right; }
+  span.align-right span img {
+    margin: 0;
+    text-align: right; }
+span.float-left {
+  display: block;
+  margin-right: 13px;
+  overflow: hidden;
+  float: left; }
+  span.float-left span {
+    margin: 13px 0 0; }
+span.float-right {
+  display: block;
+  margin-left: 13px;
+  overflow: hidden;
+  float: right; }
+  span.float-right > span {
+    display: block;
+    overflow: hidden;
+    margin: 13px auto 0;
+    text-align: right; }
+
+code, tt {
+  margin: 0 2px;
+  padding: 0 5px;
+  white-space: nowrap;
+  border: 1px solid #eaeaea;
+  background-color: #f8f8f8;
+  border-radius: 3px; }
+
+pre code {
+  margin: 0;
+  padding: 0;
+  white-space: pre;
+  border: none;
+  background: transparent; }
+
+.highlight pre {
+  background-color: #f8f8f8;
+  border: 1px solid #cccccc;
+  font-size: 13px;
+  line-height: 19px;
+  overflow: auto;
+  padding: 6px 10px;
+  border-radius: 3px; }
+
+pre {
+  background-color: #f8f8f8;
+  border: 1px solid #cccccc;
+  font-size: 13px;
+  line-height: 19px;
+  overflow: auto;
+  padding: 6px 10px;
+  border-radius: 3px; }
+  pre code, pre tt {
+    background-color: transparent;
+    border: none; }

app/src/main/assets/magisk_uninstaller.sh

@@ -1,150 +1,137 @@
 #!/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)
+#
+##########################################################################################
 
-[ -z $BOOTMODE ] && BOOTMODE=false
-TMPDIR=/tmp
-($BOOTMODE) && TMPDIR=/dev/tmp
-
-BINDIR=/data/magisk
-CHROMEDIR=$BINDIR/chromeos
-
-NEWBOOT=$TMPDIR/boottmp/new-boot.img
-UNPACKDIR=$TMPDIR/boottmp/bootunpack
-RAMDISK=$TMPDIR/boottmp/ramdisk
-
-SYSTEMLIB=/system/lib
-[ -d /system/lib64 ] && SYSTEMLIB=/system/lib64
-
-ui_print() {
-  echo "$1"
+# 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"
 }
 
-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
-}
-
-find_boot_image() {
-  if [ -z "$BOOTIMAGE" ]; then
-    for PARTITION in kern-a KERN-A android_boot ANDROID_BOOT kernel KERNEL boot BOOT lnx LNX; do
-      BOOTIMAGE=`readlink /dev/block/by-name/$PARTITION || readlink /dev/block/platform/*/by-name/$PARTITION || readlink /dev/block/platform/*/*/by-name/$PARTITION`
-      if [ ! -z "$BOOTIMAGE" ]; then break; fi
-    done
-  fi
-  if [ -z "$BOOTIMAGE" ]; then
-    FSTAB="/etc/recovery.fstab"
-    [ ! -f "$FSTAB" ] && FSTAB="/etc/recovery.fstab.bak"
-    [ -f "$FSTAB" ] && BOOTIMAGE=`grep -E '\b/boot\b' "$FSTAB" | grep -oE '/dev/[a-zA-Z0-9_./-]*'`
+# 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
 }
 
-unpack_boot() {
-  rm -rf $UNPACKDIR $RAMDISK 2>/dev/null
-  mkdir -p $UNPACKDIR
-  mkdir -p $RAMDISK
-  cd $UNPACKDIR
-  LD_LIBRARY_PATH=$SYSTEMLIB $BINDIR/bootimgtools --extract $1
-
-  cd $RAMDISK
-  $BINDIR/busybox gunzip -c < $UNPACKDIR/ramdisk.gz | cpio -i
-}
-
-repack_boot() {
-  cd $RAMDISK
-  find . | cpio -o -H newc 2>/dev/null | gzip -9 > $UNPACKDIR/ramdisk.gz
-  cd $UNPACKDIR
-  LD_LIBRARY_PATH=$SYSTEMLIB $BINDIR/bootimgtools --repack $BOOTIMAGE
-  if [ -f chromeos ]; then
-    echo " " > config
-    echo " " > bootloader
-    LD_LIBRARY_PATH=$SYSTEMLIB $CHROMEDIR/futility vbutil_kernel --pack new-boot.img.signed --keyblock $CHROMEDIR/kernel.keyblock --signprivate $CHROMEDIR/kernel_data_key.vbprivk --version 1 --vmlinuz new-boot.img --config config --arch arm --bootloader bootloader --flags 0x1
-    rm -f new-boot.img
-    mv new-boot.img.signed new-boot.img
-  fi
-  if ($SAMSUNG); then
-    SAMSUNG_CHECK=$(cat new-boot.img | grep SEANDROIDENFORCE)
-    if [ $? -ne 0 ]; then
-      echo -n "SEANDROIDENFORCE" >> new-boot.img
-    fi
-  fi
-  if ($LGE_G); then
-    # Prevent secure boot error on LG G2/G3.
-    # Just for know, It's a pattern which bootloader verifies at boot. Thanks to LG hackers.
-    echo -n -e "\x41\xa9\xe4\x67\x74\x4d\x1d\x1b\xa4\x29\xf2\xec\xea\x65\x52\x79" >> new-boot.img
-  fi
-  mv new-boot.img $NEWBOOT
-}
-
-# Set permissions
-chmod -R 755 $CHROMEDIR/futility $BINDIR
-
-# Find the boot image
-find_boot_image
-if [ -z "$BOOTIMAGE" ]; then
-  ui_print "! Unable to detect boot image"
+if [ ! -d $MAGISKBIN -o ! -f $MAGISKBIN/magiskboot -o ! -f $MAGISKBIN/util_functions.sh ]; then
+  ui_print_wrap "! Cannot find $MAGISKBIN"
   exit 1
 fi
 
-ui_print "- Found Boot Image: $BOOTIMAGE"
+[ -z $BOOTMODE ] && BOOTMODE=false
 
-# Detect special vendors 
-SAMSUNG=false
-SAMSUNG_CHECK=$(cat /system/build.prop | grep "ro.build.fingerprint=" | grep -i "samsung")
-if [ $? -eq 0 ]; then
-  SAMSUNG=true
-fi
-LGE_G=false
-RBRAND=$(grep_prop ro.product.brand)
-RMODEL=$(grep_prop ro.product.device)
-if [ "$RBRAND" = "lge" ] || [ "$RBRAND" = "LGE" ];  then 
-  if [ "$RMODEL" = "*D80*" ] || 
-     [ "$RMODEL" = "*S98*" ] || 
-     [ "$RMODEL" = "*D85*" ] ||
-     [ "$RMODEL" = "*F40*" ]; then
-    LGE_G=true
-    ui_print "! Bump device detected"
-  fi
+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"
+[ $? -ne 0 ] && abort_wrap "! Unable to unpack boot image"
+
+# 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
 
-# First unpack the boot image
-unpack_boot $BOOTIMAGE
-
-SUPERSU=false
-[ -f sbin/launch_daemonsu.sh ] && SUPERSU=true
-
-if ($SUPERSU); then
-  ui_print "- SuperSU patched image detected"
-  rm -f magisk sbin/init.magisk.rc sbin/magic_mask.sh
-  repack_boot
-else
-  if [ -f /data/stock_boot.img ]; then
-    ui_print "- Boot image backup found!"
-    NEWBOOT=/data/stock_boot.img
-  else
-    ui_print "! Boot image backup unavailable"
-    if [ -d ".backup" ]; then
-      ui_print "- Restoring ramdisk with backup"
-      cp -af .backup/. .
+# 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
-    rm -f magisk sbin/init.magisk.rc sbin/magic_mask.sh
-    repack_boot
-  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 [ -f chromeos ]; then
+  echo > empty
+
+  LD_LIBRARY_PATH=$SYSTEMLIB $CHROMEDIR/futility vbutil_kernel --pack stock_boot.img.signed \
+  --keyblock $CHROMEDIR/kernel.keyblock --signprivate $CHROMEDIR/kernel_data_key.vbprivk \
+  --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
 
-chmod 644 $NEWBOOT
+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 "- Flashing stock/reverted image"
-[ ! -L "$BOOTIMAGE" ] && dd if=/dev/zero of=$BOOTIMAGE bs=4096 2>/dev/null
-dd if=$NEWBOOT of=$BOOTIMAGE bs=4096
-
-ui_print "- Removing Magisk files"
+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.apk /data/magisk.apk /data/magisk.img /data/magisk_merge.img /data/magisk_debug.log \
         /data/busybox /data/magisk /data/custom_ramdisk_patch.sh 2>/dev/null
 
-($BOOTMODE) && reboot
+$BOOTMODE && reboot

app/src/main/assets/util_functions.sh

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

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

@@ -1,24 +1,22 @@
 package com.topjohnwu.magisk;
 
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.TextView;
 
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.components.AboutCardRow;
+import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.components.AlertDialogBuilder;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,9 +24,9 @@ import java.io.InputStream;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class AboutActivity extends AppCompatActivity {
+public class AboutActivity extends Activity {
 
-    private static final String DONATION_URL = "http://topjohnwu.github.io/donate";
+    private static final String DONATION_URL = "https://www.paypal.me/topjohnwu";
     private static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382";
     private static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/MagiskManager";
 
@@ -44,10 +42,8 @@ public class AboutActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        String theme = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("theme", "");
-        Logger.dev("AboutActivity: Theme is " + theme);
-        if (Global.Configs.isDarkTheme) {
-            setTheme(R.style.AppTheme_dh);
+        if (getApplicationContext().isDarkTheme) {
+            setTheme(R.style.AppTheme_Transparent_Dark);
         }
         setContentView(R.layout.activity_about);
         ButterKnife.bind(this);
@@ -85,7 +81,7 @@ public class AboutActivity extends AppCompatActivity {
                 result = Html.fromHtml(changes);
             }
             appChangelog.setOnClickListener(v -> {
-                AlertDialog d = Utils.getAlertDialogBuilder(this)
+                AlertDialog d = new AlertDialogBuilder(this)
                         .setTitle(R.string.app_changelog)
                         .setMessage(result)
                         .setPositiveButton(android.R.string.ok, null)
@@ -104,7 +100,7 @@ public class AboutActivity extends AppCompatActivity {
             } else {
                 result = Html.fromHtml(getString(R.string.app_developers_));
             }
-            AlertDialog d = Utils.getAlertDialogBuilder(this)
+            AlertDialog d = new AlertDialogBuilder(this)
                     .setTitle(R.string.app_developers)
                     .setMessage(result)
                     .setPositiveButton(android.R.string.ok, null)
@@ -134,18 +130,4 @@ public class AboutActivity extends AppCompatActivity {
         setFloating();
     }
 
-    public void setFloating() {
-        boolean isTablet = getResources().getBoolean(R.bool.isTablet);
-        if (isTablet) {
-            WindowManager.LayoutParams params = getWindow().getAttributes();
-            params.height = getResources().getDimensionPixelSize(R.dimen.floating_height);
-            params.width = getResources().getDimensionPixelSize(R.dimen.floating_width);
-            params.alpha = 1.0f;
-            params.dimAmount = 0.6f;
-            params.flags |= 2;
-            getWindow().setAttributes(params);
-            setFinishOnTouchOutside(true);
-        }
-    }
-
 }

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

@@ -1,133 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
-import android.preference.PreferenceManager;
-import android.util.SparseArray;
-
-import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.module.Repo;
-import com.topjohnwu.magisk.utils.CallbackHandler;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ValueSortedMap;
-
-import java.io.File;
-import java.util.List;
-
-public class Global {
-
-    public static final String MAGISK_DISABLE_FILE = "/cache/.disable_magisk";
-
-    public static class Info {
-        public static double magiskVersion;
-        public static String magiskVersionString = "(none)";
-        public static double remoteMagiskVersion = -1;
-        public static String magiskLink;
-        public static String releaseNoteLink;
-        public static int SNCheckResult = -1;
-        public static String bootBlock = null;
-        public static boolean isSuClient = false;
-        public static String suVersion = null;
-        public static boolean disabled = false;
-    }
-    public static class Data {
-        public static ValueSortedMap<String, Repo> repoMap;
-        public static ValueSortedMap<String, Module> moduleMap;
-        public static List<String> blockList;
-        public static List<ApplicationInfo> appList;
-        public static List<String> magiskHideList;
-    }
-    public static class Events {
-        public static final CallbackHandler.Event blockDetectionDone = new CallbackHandler.Event();
-        public static final CallbackHandler.Event packageLoadDone = new CallbackHandler.Event();
-        public static final CallbackHandler.Event reloadMainActivity = new CallbackHandler.Event();
-        public static final CallbackHandler.Event moduleLoadDone = new CallbackHandler.Event();
-        public static final CallbackHandler.Event repoLoadDone = new CallbackHandler.Event();
-        public static final CallbackHandler.Event updateCheckDone = new CallbackHandler.Event();
-        public static final CallbackHandler.Event safetyNetDone = new CallbackHandler.Event();
-        public static SparseArray<CallbackHandler.Event> uidMap = new SparseArray<>();
-    }
-    public static class Configs {
-        public static boolean isDarkTheme;
-        public static boolean shellLogging;
-        public static boolean devLogging;
-        public static boolean magiskHide;
-        public static int suRequestTimeout;
-        public static int suLogTimeout = 14;
-        public static int suAccessState;
-        public static int suResponseType;
-        public static int suNotificationType;
-    }
-    
-    public static void init(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        Configs.isDarkTheme = prefs.getBoolean("dark_theme", false);
-        Configs.devLogging = prefs.getBoolean("developer_logging", false);
-        Configs.shellLogging = prefs.getBoolean("shell_logging", false);
-        Configs.magiskHide = prefs.getBoolean("magiskhide", false);
-        updateMagiskInfo();
-        initSuAccess();
-        initSuConfigs(context);
-        // Initialize prefs
-        prefs.edit()
-                .putBoolean("dark_theme", Configs.isDarkTheme)
-                .putBoolean("magiskhide", Configs.magiskHide)
-                .putBoolean("busybox", Utils.commandExists("busybox"))
-                .putBoolean("hosts", new File("/magisk/.core/hosts").exists())
-                .putBoolean("disable", Utils.itemExist(MAGISK_DISABLE_FILE))
-                .putString("su_request_timeout", String.valueOf(Configs.suRequestTimeout))
-                .putString("su_auto_response", String.valueOf(Configs.suResponseType))
-                .putString("su_notification", String.valueOf(Configs.suNotificationType))
-                .putString("su_access", String.valueOf(Configs.suAccessState))
-                .apply();
-    }
-
-    public static void initSuConfigs(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        Configs.suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
-        Configs.suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", 0);
-        Configs.suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
-    }
-
-    public static void initSuAccess() {
-        List<String> ret = Shell.sh("su -v");
-        if (Utils.isValidShellResponse(ret)) {
-            Info.suVersion = ret.get(0);
-            Info.isSuClient = Info.suVersion.toUpperCase().contains("MAGISK");
-        }
-        if (Info.isSuClient) {
-            ret = Shell.sh("getprop persist.sys.root_access");
-            if (Utils.isValidShellResponse(ret))
-                Configs.suAccessState = Integer.parseInt(ret.get(0));
-            else {
-                Shell.su(true, "setprop persist.sys.root_access 3");
-                Configs.suAccessState = 3;
-            }
-        }
-    }
-
-    public static void updateMagiskInfo() {
-        List<String> ret = Shell.sh("getprop magisk.version");
-        if (!Utils.isValidShellResponse(ret)) {
-            Info.magiskVersion = -1;
-        } else {
-            try {
-                Info.magiskVersionString = ret.get(0);
-                Info.magiskVersion = Double.parseDouble(ret.get(0));
-            } catch (NumberFormatException e) {
-                // Custom version don't need to receive updates
-                Info.magiskVersion = Double.POSITIVE_INFINITY;
-            }
-        }
-        ret = Shell.sh("getprop ro.magisk.disable");
-        try {
-            Info.disabled = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0;
-        } catch (NumberFormatException e) {
-            Info.disabled = false;
-        }
-        
-    }
-
-}

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

@@ -1,174 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.CountDownTimer;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.CardView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.receivers.MagiskDlReceiver;
-import com.topjohnwu.magisk.utils.CallbackHandler;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-
-public class InstallFragment extends Fragment implements CallbackHandler.EventListener {
-
-
-    private static final String UNINSTALLER = "magisk_uninstaller.sh";
-
-    private Unbinder unbinder;
-    @BindView(R.id.current_version_title) TextView currentVersionTitle;
-    @BindView(R.id.install_title) TextView installTitle;
-    @BindView(R.id.block_spinner) Spinner spinner;
-    @BindView(R.id.detect_bootimage) Button detectButton;
-    @BindView(R.id.flash_button) CardView flashButton;
-    @BindView(R.id.uninstall_button) CardView uninstallButton;
-    @BindView(R.id.keep_force_enc) CheckBox keepEncChkbox;
-    @BindView(R.id.keep_verity) CheckBox keepVerityChkbox;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.fragment_install, container, false);
-        unbinder = ButterKnife.bind(this, v);
-        detectButton.setOnClickListener(v1 -> toAutoDetect());
-        currentVersionTitle.setText(getString(R.string.current_magisk_title, Global.Info.magiskVersionString));
-        installTitle.setText(getString(R.string.install_magisk_title, Global.Info.remoteMagiskVersion));
-        flashButton.setOnClickListener(v1 -> {
-            String bootImage;
-            if (Global.Info.bootBlock != null) {
-                if (spinner.getSelectedItemPosition() > 0)
-                    bootImage = Global.Data.blockList.get(spinner.getSelectedItemPosition() - 1);
-                else
-                    bootImage = Global.Info.bootBlock;
-            } else {
-                bootImage = Global.Data.blockList.get(spinner.getSelectedItemPosition());
-            }
-            String filename = "Magisk-v" + Global.Info.remoteMagiskVersion + ".zip";
-            Utils.getAlertDialogBuilder(getActivity())
-                    .setTitle(getString(R.string.repo_install_title, getString(R.string.magisk)))
-                    .setMessage(getString(R.string.repo_install_msg, filename))
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.download_install, (dialogInterface, i) -> Utils.dlAndReceive(
-                            getActivity(),
-                            new MagiskDlReceiver(bootImage, keepEncChkbox.isChecked(), keepVerityChkbox.isChecked()),
-                            Global.Info.magiskLink,
-                            Utils.getLegalFilename(filename)))
-                    .setNeutralButton(R.string.check_release_notes, (dialog, which) -> {
-                        getActivity().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Global.Info.releaseNoteLink)));
-                    })
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
-        });
-        if (Global.Info.magiskVersion < 10.3) {
-            uninstallButton.setVisibility(View.GONE);
-        } else {
-            uninstallButton.setOnClickListener(vi -> {
-                Utils.getAlertDialogBuilder(getActivity())
-                        .setTitle("Uninstall Magisk")
-                        .setMessage("This will remove all modules, MagiskSU, and potentially re-encrypt your device\nAre you sure to process?")
-                        .setPositiveButton(R.string.yes, (dialogInterface, i) -> {
-                            try {
-                                InputStream in = getActivity().getAssets().open(UNINSTALLER);
-                                File uninstaller = new File(getActivity().getCacheDir().getAbsolutePath() + "/" + UNINSTALLER);
-                                FileOutputStream out = new FileOutputStream(uninstaller);
-                                byte[] bytes = new byte[1024];
-                                int read;
-                                while ((read = in.read(bytes)) != -1)
-                                    out.write(bytes, 0, read);
-                                in.close();
-                                out.close();
-                                ProgressDialog progress = new ProgressDialog(getActivity());
-                                progress.setTitle(R.string.reboot);
-                                progress.show();
-                                new CountDownTimer(5000, 1000) {
-                                    @Override
-                                    public void onTick(long millisUntilFinished) {
-                                        progress.setMessage(getString(R.string.reboot_countdown, millisUntilFinished / 1000));
-                                    }
-
-                                    @Override
-                                    public void onFinish() {
-                                        progress.setMessage(getString(R.string.reboot_countdown, 0));
-                                        Shell.su(true, "cp -af " + uninstaller + " /cache/" + UNINSTALLER,
-                                                "reboot");
-                                    }
-                                }.start();
-                            } catch (IOException e) {
-                                e.printStackTrace();
-                            }
-                        })
-                        .setNegativeButton(R.string.no_thanks, null)
-                        .show();
-            });
-        }
-
-        if (Global.Events.blockDetectionDone.isTriggered) {
-            updateUI();
-        }
-        return v;
-    }
-
-    @Override
-    public void onTrigger(CallbackHandler.Event event) {
-        updateUI();
-    }
-
-    private void updateUI() {
-        List<String> items = new ArrayList<>(Global.Data.blockList);
-        if (Global.Info.bootBlock != null)
-            items.add(0, getString(R.string.auto_detect, Global.Info.bootBlock));
-        ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
-                android.R.layout.simple_spinner_item, items);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(adapter);
-        toAutoDetect();
-    }
-
-    private void toAutoDetect() {
-        if (Global.Info.bootBlock != null) {
-            spinner.setSelection(0);
-        }
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        getActivity().setTitle(R.string.install);
-        CallbackHandler.register(Global.Events.blockDetectionDone, this);
-    }
-
-    @Override
-    public void onStop() {
-        CallbackHandler.unRegister(Global.Events.blockDetectionDone, this);
-        super.onStop();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-}

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

@@ -3,13 +3,13 @@ package com.topjohnwu.magisk;
 
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.topjohnwu.magisk.adapters.TabFragmentAdapter;
+import com.topjohnwu.magisk.components.Fragment;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -31,14 +31,14 @@ public class LogFragment extends Fragment {
 
         TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());
 
-        adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
-
-        if (Global.Info.isSuClient) {
+        if (getApplication().isSuClient) {
             adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
             tab.setupWithViewPager(viewPager);
             tab.setVisibility(View.VISIBLE);
         }
 
+        adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
+
         viewPager.setAdapter(adapter);
 
         return v;

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

@@ -0,0 +1,509 @@
+package com.topjohnwu.magisk;
+
+import android.animation.Animator;
+import android.animation.ValueAnimator;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.support.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;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.topjohnwu.magisk.asyncs.CheckUpdates;
+import com.topjohnwu.magisk.asyncs.ProcessMagiskZip;
+import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.components.SnackbarMaker;
+import com.topjohnwu.magisk.receivers.DownloadReceiver;
+import com.topjohnwu.magisk.utils.CallbackEvent;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindColor;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.Unbinder;
+
+public class MagiskFragment extends Fragment
+        implements CallbackEvent.Listener<Void>, SwipeRefreshLayout.OnRefreshListener {
+
+    private static boolean noDialog = false;
+    private static int expandHeight = 0;
+    private static boolean mExpanded = false;
+
+    private MagiskManager magiskManager;
+    private Unbinder unbinder;
+
+    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
+
+    @BindView(R.id.magisk_update_card) CardView magiskUpdateCard;
+    @BindView(R.id.magisk_update_icon) ImageView magiskUpdateIcon;
+    @BindView(R.id.magisk_update_status) TextView magiskUpdateText;
+    @BindView(R.id.magisk_update_progress) ProgressBar magiskUpdateProgress;
+
+    @BindView(R.id.magisk_status_icon) ImageView magiskStatusIcon;
+    @BindView(R.id.magisk_version) TextView magiskVersionText;
+    @BindView(R.id.root_status_icon) ImageView rootStatusIcon;
+    @BindView(R.id.root_status) TextView rootStatusText;
+
+    @BindView(R.id.safetyNet_card) CardView safetyNetCard;
+    @BindView(R.id.safetyNet_refresh) ImageView safetyNetRefreshIcon;
+    @BindView(R.id.safetyNet_status) TextView safetyNetStatusText;
+    @BindView(R.id.safetyNet_check_progress) ProgressBar safetyNetProgress;
+    @BindView(R.id.expand_layout) LinearLayout expandLayout;
+    @BindView(R.id.cts_status_icon) ImageView ctsStatusIcon;
+    @BindView(R.id.cts_status) TextView ctsStatusText;
+    @BindView(R.id.basic_status_icon) ImageView basicStatusIcon;
+    @BindView(R.id.basic_status) TextView basicStatusText;
+
+    @BindView(R.id.bootimage_card) CardView bootImageCard;
+    @BindView(R.id.block_spinner) Spinner spinner;
+    @BindView(R.id.detect_bootimage) Button detectButton;
+    @BindView(R.id.install_option_card) CardView installOptionCard;
+    @BindView(R.id.keep_force_enc) CheckBox keepEncChkbox;
+    @BindView(R.id.keep_verity) CheckBox keepVerityChkbox;
+    @BindView(R.id.install_button) CardView installButton;
+    @BindView(R.id.install_text) TextView installText;
+    @BindView(R.id.uninstall_button) CardView uninstallButton;
+
+    @BindColor(R.color.red500) int colorBad;
+    @BindColor(R.color.green500) int colorOK;
+    @BindColor(R.color.yellow500) int colorWarn;
+    @BindColor(R.color.grey500) int colorNeutral;
+    @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();
+    }
+
+    @OnClick(R.id.detect_bootimage)
+    public void toAutoDetect() {
+        if (magiskManager.bootBlock != null) {
+            spinner.setSelection(0);
+        }
+    }
+
+    @OnClick(R.id.install_button)
+    public void install() {
+        String bootImage = null;
+        if (magiskManager.blockList != null) {
+            int idx = spinner.getSelectedItemPosition();
+            if (magiskManager.bootBlock != null) {
+                bootImage = magiskManager.bootBlock;
+            } else {
+                if (idx > 0)  {
+                    bootImage = magiskManager.blockList.get(idx - 1);
+                } else {
+                    SnackbarMaker.make(getActivity(), R.string.manual_boot_image, Snackbar.LENGTH_LONG);
+                    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,
+                        (dialogInterface, i) -> Utils.dlAndReceive(
+                                getActivity(),
+                                new DownloadReceiver() {
+                                    private String boot = finalBootImage;
+                                    private boolean enc = keepEncChkbox.isChecked();
+                                    private boolean verity = keepVerityChkbox.isChecked();
+
+                                    @Override
+                                    public void onDownloadDone(Uri uri) {
+                                        new ProcessMagiskZip(getActivity(), uri, boot, enc, verity).exec();
+                                    }
+                                },
+                                magiskManager.magiskLink,
+                                Utils.getLegalFilename(filename)))
+                .setNeutralButton(R.string.release_notes, (dialog, which) -> {
+                    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();
+    }
+
+    @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));
+                                Shell.su(true,
+                                        "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();
+    }
+
+    @Nullable
+    @Override
+    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();
+
+        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);
+                        setExpanded();
+                        return true;
+                    }
+
+                });
+
+        mSwipeRefreshLayout.setOnRefreshListener(this);
+
+        if (magiskManager.magiskVersionCode < 0 && Shell.rootAccess() && !noDialog) {
+            noDialog = true;
+            new AlertDialogBuilder(getActivity())
+                    .setTitle(R.string.no_magisk_title)
+                    .setMessage(R.string.no_magisk_msg)
+                    .setCancelable(true)
+                    .setPositiveButton(R.string.goto_install, (d, i) -> {})
+                    .setNegativeButton(R.string.no_thanks, null)
+                    .show();
+        }
+
+        updateUI();
+
+        return v;
+    }
+
+    @Override
+    public void onRefresh() {
+        updateUI();
+
+        magiskUpdateText.setText(R.string.checking_for_updates);
+        magiskUpdateProgress.setVisibility(View.VISIBLE);
+        magiskUpdateIcon.setVisibility(View.GONE);
+
+        safetyNetStatusText.setText(R.string.safetyNet_check_text);
+
+        magiskManager.safetyNetDone.isTriggered = false;
+        magiskManager.updateCheckDone.isTriggered = false;
+        magiskManager.remoteMagiskVersionString = null;
+        magiskManager.remoteMagiskVersionCode = -1;
+        collapse();
+        noDialog = false;
+
+        // Trigger state check
+        if (Utils.checkNetworkStatus(magiskManager)) {
+            new CheckUpdates(getActivity()).exec();
+        } else {
+            mSwipeRefreshLayout.setRefreshing(false);
+        }
+    }
+
+    @Override
+    public void onTrigger(CallbackEvent<Void> event) {
+        if (event == magiskManager.updateCheckDone) {
+            updateCheckUI();
+        } else if (event == magiskManager.safetyNetDone) {
+            updateSafetyNetUI();
+        } else if (event == magiskManager.blockDetectionDone) {
+            updateInstallUI();
+        }
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        // Manual trigger if already done
+        if (magiskManager.updateCheckDone.isTriggered)
+            updateCheckUI();
+        if (magiskManager.safetyNetDone.isTriggered)
+            updateSafetyNetUI();
+        if (magiskManager.blockDetectionDone.isTriggered || !Shell.rootAccess())
+            updateInstallUI();
+        magiskManager.updateCheckDone.register(this);
+        magiskManager.safetyNetDone.register(this);
+        magiskManager.blockDetectionDone.register(this);
+        getActivity().setTitle(R.string.magisk);
+    }
+
+    @Override
+    public void onStop() {
+        magiskManager.updateCheckDone.unRegister(this);
+        magiskManager.safetyNetDone.unRegister(this);
+        magiskManager.blockDetectionDone.unRegister(this);
+        super.onStop();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    private void updateUI() {
+        ((MainActivity) getActivity()).checkHideSection();
+        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);
+        updateVersionUI();
+    }
+
+    private void updateVersionUI() {
+        int image, color;
+
+        magiskManager.updateMagiskInfo();
+
+        if (magiskManager.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));
+        }
+
+        magiskStatusIcon.setImageResource(image);
+        magiskStatusIcon.setColorFilter(color);
+
+        switch (Shell.rootStatus) {
+            case 0:
+                color = colorBad;
+                image = R.drawable.ic_cancel;
+                rootStatusText.setText(R.string.not_rooted);
+                break;
+            case 1:
+                if (magiskManager.suVersion != null) {
+                    color = colorOK;
+                    image = R.drawable.ic_check_circle;
+                    rootStatusText.setText(magiskManager.suVersion);
+                    break;
+                }
+            case -1:
+            default:
+                color = colorNeutral;
+                image = R.drawable.ic_help;
+                rootStatusText.setText(R.string.root_error);
+        }
+
+        rootStatusIcon.setImageResource(image);
+        rootStatusIcon.setColorFilter(color);
+    }
+
+    private void updateCheckUI() {
+        int image, color;
+
+        if (magiskManager.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));
+        }
+
+        magiskUpdateIcon.setImageResource(image);
+        magiskUpdateIcon.setColorFilter(color);
+        magiskUpdateIcon.setVisibility(View.VISIBLE);
+
+        magiskUpdateProgress.setVisibility(View.GONE);
+        mSwipeRefreshLayout.setRefreshing(false);
+    }
+
+    private void updateInstallUI() {
+        if (!Shell.rootAccess()) {
+            installText.setText(R.string.download);
+        } else {
+            installText.setText(R.string.download_install);
+
+            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);
+            toAutoDetect();
+        }
+    }
+
+    private void updateSafetyNetUI() {
+        int image, color;
+        safetyNetProgress.setVisibility(View.GONE);
+        safetyNetRefreshIcon.setVisibility(View.VISIBLE);
+        if (magiskManager.SNCheckResult.failed) {
+            safetyNetStatusText.setText(magiskManager.SNCheckResult.errmsg);
+            collapse();
+        } else {
+            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);
+            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);
+            }
+
+            @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;
+    }
+}
+

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

@@ -3,7 +3,6 @@ package com.topjohnwu.magisk;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
@@ -16,15 +15,16 @@ import android.view.ViewGroup;
 import android.widget.SearchView;
 
 import com.topjohnwu.magisk.adapters.ApplicationAdapter;
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.CallbackHandler;
+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 butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 
-public class MagiskHideFragment extends Fragment implements CallbackHandler.EventListener {
+public class MagiskHideFragment extends Fragment implements CallbackEvent.Listener<Void> {
 
     private Unbinder unbinder;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
@@ -50,7 +50,7 @@ public class MagiskHideFragment extends Fragment implements CallbackHandler.Even
         PackageManager packageManager = getActivity().getPackageManager();
 
         mSwipeRefreshLayout.setRefreshing(true);
-        mSwipeRefreshLayout.setOnRefreshListener(() -> new Async.LoadApps(packageManager).exec());
+        mSwipeRefreshLayout.setOnRefreshListener(() -> new MagiskHide(getActivity()).list());
 
         appAdapter = new ApplicationAdapter(packageManager);
         recyclerView.setAdapter(appAdapter);
@@ -71,6 +71,10 @@ public class MagiskHideFragment extends Fragment implements CallbackHandler.Even
             }
         };
 
+        if (getApplication().magiskHideDone.isTriggered) {
+            onTrigger(getApplication().magiskHideDone);
+        }
+
         return view;
     }
 
@@ -85,15 +89,12 @@ public class MagiskHideFragment extends Fragment implements CallbackHandler.Even
     public void onStart() {
         super.onStart();
         getActivity().setTitle(R.string.magiskhide);
-        CallbackHandler.register(Global.Events.packageLoadDone, this);
-        if (Global.Events.packageLoadDone.isTriggered) {
-            onTrigger(Global.Events.packageLoadDone);
-        }
+        getApplication().magiskHideDone.register(this);
     }
 
     @Override
     public void onStop() {
-        CallbackHandler.unRegister(Global.Events.packageLoadDone, this);
+        getApplication().magiskHideDone.unRegister(this);
         super.onStop();
     }
 
@@ -104,9 +105,9 @@ public class MagiskHideFragment extends Fragment implements CallbackHandler.Even
     }
 
     @Override
-    public void onTrigger(CallbackHandler.Event event) {
+    public void onTrigger(CallbackEvent<Void> event) {
         Logger.dev("MagiskHideFragment: UI refresh");
-        appAdapter.setLists(Global.Data.appList, Global.Data.magiskHideList);
+        appAdapter.setLists(getApplication().appList, getApplication().magiskHideList);
         mSwipeRefreshLayout.setRefreshing(false);
         if (!TextUtils.isEmpty(lastFilter)) {
             appAdapter.filter(lastFilter);

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

@@ -11,7 +11,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -25,7 +24,9 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.topjohnwu.magisk.utils.Async;
+import com.topjohnwu.magisk.asyncs.RootTask;
+import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 
@@ -121,19 +122,19 @@ public class MagiskLogFragment extends Fragment {
                     new Handler().postDelayed(() -> onOptionsItemSelected(mClickedMenuItem), 500);
                 }
             } else {
-                Snackbar.make(txtLog, R.string.permissionNotGranted, Snackbar.LENGTH_LONG).show();
+                SnackbarMaker.make(txtLog, R.string.permissionNotGranted, Snackbar.LENGTH_LONG).show();
             }
         }
     }
 
-    public class LogManager extends Async.RootTask<Object, Void, Object> {
+    private class LogManager extends RootTask<Object, Void, Object> {
 
         int mode;
         File targetFile;
 
         @SuppressLint("DefaultLocale")
         @Override
-        protected Object doInBackground(Object... params) {
+        protected Object doInRoot(Object... params) {
             mode = (int) params[0];
             switch (mode) {
                 case 0:
@@ -150,7 +151,7 @@ public class MagiskLogFragment extends Fragment {
 
                 case 1:
                     Shell.su("echo > " + MAGISK_LOG);
-                    Snackbar.make(txtLog, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
+                    SnackbarMaker.make(txtLog, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
                     return "";
 
                 case 2:
@@ -161,8 +162,9 @@ public class MagiskLogFragment extends Fragment {
                         return false;
                     }
 
-                    if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED))
+                    if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
                         return false;
+                    }
 
                     Calendar now = Calendar.getInstance();
                     String filename = String.format(
@@ -174,8 +176,9 @@ public class MagiskLogFragment extends Fragment {
                     targetFile = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/MagiskManager/" + filename);
 
                     if ((!targetFile.getParentFile().exists() && !targetFile.getParentFile().mkdirs())
-                            || (targetFile.exists() && !targetFile.delete()))
+                            || (targetFile.exists() && !targetFile.delete())) {
                         return false;
+                    }
 
                     List<String> in = Utils.readFile(MAGISK_LOG);
 
@@ -213,10 +216,11 @@ public class MagiskLogFragment extends Fragment {
                     break;
                 case 2:
                     bool = (boolean) o;
-                    if (bool)
+                    if (bool) {
                         Toast.makeText(getActivity(), targetFile.toString(), Toast.LENGTH_LONG).show();
-                    else
+                    } else {
                         Toast.makeText(getActivity(), getString(R.string.logs_save_failed), Toast.LENGTH_LONG).show();
+                    }
                     break;
             }
         }

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

@@ -0,0 +1,220 @@
+package com.topjohnwu.magisk;
+
+import android.app.Application;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.os.Build;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+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.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.ValueSortedMap;
+
+import java.io.File;
+import java.util.List;
+
+public class MagiskManager extends Application {
+
+    public static final String MAGISK_DISABLE_FILE = "/cache/.disable_magisk";
+    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 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";
+
+    // Events
+    public final CallbackEvent<Void> blockDetectionDone = new CallbackEvent<>();
+    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<>();
+
+    // Info
+    public String magiskVersionString;
+    public int magiskVersionCode = -1;
+    public String remoteMagiskVersionString;
+    public int remoteMagiskVersionCode = -1;
+    public String magiskLink;
+    public String releaseNoteLink;
+    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 List<String> blockList;
+    public List<ApplicationInfo> appList;
+    public List<String> magiskHideList;
+
+    // Configurations
+    public static boolean shellLogging;
+    public static boolean devLogging;
+
+    public boolean magiskHide;
+    public boolean isDarkTheme;
+    public boolean updateNotification;
+    public boolean suReauth;
+    public int suRequestTimeout;
+    public int suLogTimeout = 14;
+    public int suAccessState;
+    public int multiuserMode;
+    public int suResponseType;
+    public int suNotificationType;
+    public int suNamespaceMode;
+
+    // Global resources
+    public SharedPreferences prefs;
+    public SuDatabaseHelper suDB;
+
+    private static Handler mHandler = new Handler();
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        prefs = PreferenceManager.getDefaultSharedPreferences(this);
+    }
+
+    public void toast(String msg, int duration) {
+        mHandler.post(() -> Toast.makeText(this, msg, duration).show());
+    }
+
+    public void toast(int resId, int duration) {
+        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;
+        }
+        magiskHide = prefs.getBoolean("magiskhide", true);
+        updateNotification = prefs.getBoolean("notification", true);
+        initSU();
+        // Always start a new root shell manually, just for safety
+        Shell.init();
+        updateMagiskInfo();
+        // Initialize busybox
+        File busybox = new File(getApplicationInfo().dataDir + "/busybox/busybox");
+        if (!busybox.exists() || !TextUtils.equals(prefs.getString("busybox_version", ""), BUSYBOX_VERSION)) {
+            busybox.getParentFile().mkdirs();
+            Shell.su(
+                    "cp -f " + new File(getApplicationInfo().nativeLibraryDir, "libbusybox.so") + " " + busybox,
+                    "chmod -R 755 " + busybox.getParent(),
+                    busybox + " --install -s " + busybox.getParent()
+            );
+        }
+        // Initialize prefs
+        prefs.edit()
+                .putBoolean("dark_theme", isDarkTheme)
+                .putBoolean("magiskhide", magiskHide)
+                .putBoolean("notification", updateNotification)
+                .putBoolean("hosts", new File("/magisk/.core/hosts").exists())
+                .putBoolean("disable", Utils.itemExist(MAGISK_DISABLE_FILE))
+                .putBoolean("su_reauth", suReauth)
+                .putString("su_request_timeout", String.valueOf(suRequestTimeout))
+                .putString("su_auto_response", String.valueOf(suResponseType))
+                .putString("su_notification", String.valueOf(suNotificationType))
+                .putString("su_access", String.valueOf(suAccessState))
+                .putString("multiuser_mode", String.valueOf(multiuserMode))
+                .putString("mnt_ns", String.valueOf(suNamespaceMode))
+                .putString("busybox_version", BUSYBOX_VERSION)
+                .apply();
+        // Add busybox to PATH
+        Shell.su("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);
+        }
+
+    }
+
+    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() {
+        // Create the app data directory, so su binary can work properly
+        new File(getApplicationInfo().dataDir).mkdirs();
+
+        initSUConfig();
+
+        List<String> 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() {
+        List<String> ret;
+        ret = Shell.sh("magisk -v");
+        if (!Utils.isValidShellResponse(ret)) {
+            ret = Shell.sh("getprop magisk.version");
+            if (Utils.isValidShellResponse(ret)) {
+                try {
+                    magiskVersionString = ret.get(0);
+                    magiskVersionCode = (int) Double.parseDouble(ret.get(0)) * 10;
+                } catch (NumberFormatException ignored) {}
+            }
+        } else {
+            magiskVersionString = ret.get(0).split(":")[0];
+            ret = Shell.sh("magisk -V");
+            try {
+                magiskVersionCode = Integer.parseInt(ret.get(0));
+            } catch (NumberFormatException ignored) {}
+        }
+        ret = Shell.sh("getprop " + DISABLE_INDICATION_PROP);
+        try {
+            disabled = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0;
+        } catch (NumberFormatException e) {
+            disabled = false;
+        }
+        ret = Shell.sh("getprop " + MAGISKHIDE_PROP);
+        try {
+            magiskHide = !Utils.isValidShellResponse(ret) || Integer.parseInt(ret.get(0)) != 0;
+        } catch (NumberFormatException e) {
+            magiskHide = true;
+        }
+        
+    }
+
+}

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

@@ -7,7 +7,6 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
 import android.support.v4.app.ActivityCompat;
@@ -15,23 +14,25 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
-import com.topjohnwu.magisk.utils.CallbackHandler;
+import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.utils.CallbackEvent;
 import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class MainActivity extends AppCompatActivity
-        implements NavigationView.OnNavigationItemSelectedListener, CallbackHandler.EventListener {
+public class MainActivity extends Activity
+        implements NavigationView.OnNavigationItemSelectedListener, CallbackEvent.Listener<Void> {
 
     private final Handler mDrawerHandler = new Handler();
     private SharedPreferences prefs;
+    private int mDrawerItem;
 
     @BindView(R.id.toolbar) Toolbar toolbar;
     @BindView(R.id.drawer_layout) DrawerLayout drawer;
@@ -42,10 +43,10 @@ public class MainActivity extends AppCompatActivity
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
 
-        prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        prefs = getApplicationContext().prefs;
 
-        if (Global.Configs.isDarkTheme) {
-            setTheme(R.style.AppTheme_dh);
+        if (getApplicationContext().isDarkTheme) {
+            setTheme(R.style.AppTheme_Dark);
         }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
@@ -76,40 +77,35 @@ public class MainActivity extends AppCompatActivity
         drawer.addDrawerListener(toggle);
         toggle.syncState();
 
-        navigate(R.id.status);
+        if (savedInstanceState == null)
+            navigate(getIntent().getStringExtra(MagiskManager.INTENT_SECTION));
 
         navigationView.setNavigationItemSelectedListener(this);
-        CallbackHandler.register(Global.Events.reloadMainActivity, this);
+        getApplicationContext().reloadMainActivity.register(this);
 
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        CallbackHandler.register(Global.Events.updateCheckDone, this);
-        if (Global.Events.updateCheckDone.isTriggered)
-            onTrigger(Global.Events.updateCheckDone);
         checkHideSection();
     }
 
-    @Override
-    protected void onPause() {
-        CallbackHandler.unRegister(Global.Events.updateCheckDone, this);
-        super.onPause();
-    }
-
     @Override
     protected void onDestroy() {
-        CallbackHandler.unRegister(Global.Events.reloadMainActivity, this);
+        getApplicationContext().reloadMainActivity.unRegister(this);
         super.onDestroy();
     }
 
     @Override
     public void onBackPressed() {
-        if (drawer.isDrawerOpen(navigationView))
+        if (drawer.isDrawerOpen(navigationView)) {
             drawer.closeDrawer(navigationView);
-        else
+        } else if (mDrawerItem != R.id.magisk) {
+            navigate(R.id.magisk);
+        } else {
             finish();
+        }
     }
 
     @Override
@@ -121,35 +117,65 @@ public class MainActivity extends AppCompatActivity
     }
 
     @Override
-    public void onTrigger(CallbackHandler.Event event) {
-        if (event == Global.Events.updateCheckDone) {
-            Menu menu = navigationView.getMenu();
-            menu.findItem(R.id.install).setVisible(Global.Info.remoteMagiskVersion > 0 &&
-                    Shell.rootAccess());
-        } else if (event == Global.Events.reloadMainActivity) {
-            recreate();
-        }
+    public void onTrigger(CallbackEvent<Void> event) {
+        recreate();
     }
 
-    private void checkHideSection() {
+    public void checkHideSection() {
         Menu menu = navigationView.getMenu();
-        if (Shell.rootAccess()) {
-            menu.findItem(R.id.magiskhide).setVisible(
-                    Global.Info.magiskVersion >= 8 && prefs.getBoolean("magiskhide", false));
-            menu.findItem(R.id.modules).setVisible(Global.Info.magiskVersion >= 4);
-            menu.findItem(R.id.downloads).setVisible(Global.Info.magiskVersion >= 4);
-            menu.findItem(R.id.log).setVisible(true);
-            menu.findItem(R.id.superuser).setVisible(Global.Info.isSuClient);
+        menu.findItem(R.id.magiskhide).setVisible(
+                Shell.rootAccess() && getApplicationContext().magiskVersionCode >= 1300
+                        && prefs.getBoolean("magiskhide", false));
+        menu.findItem(R.id.modules).setVisible(
+                Shell.rootAccess() && getApplicationContext().magiskVersionCode >= 0);
+        menu.findItem(R.id.downloads).setVisible(Utils.checkNetworkStatus(this) &&
+                Shell.rootAccess() && getApplicationContext().magiskVersionCode >= 0);
+        menu.findItem(R.id.log).setVisible(Shell.rootAccess());
+        menu.findItem(R.id.superuser).setVisible(
+                Shell.rootAccess() && getApplicationContext().isSuClient);
+    }
+
+    public void navigate(String item) {
+        int itemId = R.id.magisk;
+        if (item != null) {
+            switch (item) {
+                case "magisk":
+                case "install":
+                    itemId = R.id.magisk;
+                    break;
+                case "superuser":
+                    itemId = R.id.superuser;
+                    break;
+                case "modules":
+                    itemId = R.id.modules;
+                    break;
+                case "downloads":
+                    itemId = R.id.downloads;
+                    break;
+                case "magiskhide":
+                    itemId = R.id.magiskhide;
+                    break;
+                case "log":
+                    itemId = R.id.log;
+                    break;
+                case "settings":
+                    itemId = R.id.settings;
+                    break;
+                case "about":
+                    itemId = R.id.app_about;
+                    break;
+            }
         }
+        navigate(itemId);
     }
 
     public void navigate(int itemId) {
+        int bak = mDrawerItem;
+        mDrawerItem = itemId;
+        navigationView.setCheckedItem(itemId);
         switch (itemId) {
-            case R.id.status:
-                displayFragment(new StatusFragment(), "status", true);
-                break;
-            case R.id.install:
-                displayFragment(new InstallFragment(), "install", true);
+            case R.id.magisk:
+                displayFragment(new MagiskFragment(), "magisk", true);
                 break;
             case R.id.superuser:
                 displayFragment(new SuperuserFragment(), "superuser", true);
@@ -165,13 +191,14 @@ public class MainActivity extends AppCompatActivity
                 break;
             case R.id.log:
                 displayFragment(new LogFragment(), "log", false);
-                toolbar.setElevation(0);
                 break;
             case R.id.settings:
                 startActivity(new Intent(this, SettingsActivity.class));
+                mDrawerItem = bak;
                 break;
             case R.id.app_about:
                 startActivity(new Intent(this, AboutActivity.class));
+                mDrawerItem = bak;
                 break;
         }
     }
@@ -182,5 +209,6 @@ public class MainActivity extends AppCompatActivity
         transaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out);
         transaction.replace(R.id.content_frame, navFragment, tag).commitNow();
         if (setElevation) toolbar.setElevation(toolbarElevation);
+        else toolbar.setElevation(0);
     }
 }

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

@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -13,12 +13,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.github.clans.fab.FloatingActionButton;
 import com.topjohnwu.magisk.adapters.ModulesAdapter;
+import com.topjohnwu.magisk.asyncs.FlashZip;
+import com.topjohnwu.magisk.asyncs.LoadModules;
+import com.topjohnwu.magisk.components.Fragment;
 import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.module.ModuleHelper;
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.CallbackHandler;
+import com.topjohnwu.magisk.utils.CallbackEvent;
 import com.topjohnwu.magisk.utils.Logger;
 
 import java.util.ArrayList;
@@ -28,7 +28,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 
-public class ModulesFragment extends Fragment implements CallbackHandler.EventListener {
+public class ModulesFragment extends Fragment implements CallbackEvent.Listener<Void> {
 
     private static final int FETCH_ZIP_CODE = 2;
 
@@ -54,7 +54,7 @@ public class ModulesFragment extends Fragment implements CallbackHandler.EventLi
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
             recyclerView.setVisibility(View.GONE);
-            new Async.LoadModules().exec();
+            new LoadModules(getActivity()).exec();
         });
 
         recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@@ -69,7 +69,7 @@ public class ModulesFragment extends Fragment implements CallbackHandler.EventLi
             }
         });
 
-        if (Global.Events.moduleLoadDone.isTriggered) {
+        if (getApplication().moduleLoadDone.isTriggered) {
             updateUI();
         }
 
@@ -77,7 +77,7 @@ public class ModulesFragment extends Fragment implements CallbackHandler.EventLi
     }
 
     @Override
-    public void onTrigger(CallbackHandler.Event event) {
+    public void onTrigger(CallbackEvent<Void> event) {
         Logger.dev("ModulesFragment: UI refresh triggered");
         updateUI();
     }
@@ -87,7 +87,7 @@ public class ModulesFragment extends Fragment implements CallbackHandler.EventLi
         if (requestCode == FETCH_ZIP_CODE && resultCode == Activity.RESULT_OK && data != null) {
             // Get the URI of the selected file
             final Uri uri = data.getData();
-            new Async.FlashZIP(getActivity(), uri).exec();
+            new FlashZip(getActivity(), uri).exec();
         }
 
     }
@@ -95,13 +95,13 @@ public class ModulesFragment extends Fragment implements CallbackHandler.EventLi
     @Override
     public void onStart() {
         super.onStart();
-        CallbackHandler.register(Global.Events.moduleLoadDone, this);
+        getApplication().moduleLoadDone.register(this);
         getActivity().setTitle(R.string.modules);
     }
 
     @Override
     public void onStop() {
-        CallbackHandler.unRegister(Global.Events.moduleLoadDone, this);
+        getApplication().moduleLoadDone.unRegister(this);
         super.onStop();
     }
 
@@ -112,7 +112,8 @@ public class ModulesFragment extends Fragment implements CallbackHandler.EventLi
     }
 
     private void updateUI() {
-        ModuleHelper.getModuleList(listModules);
+        listModules.clear();
+        listModules.addAll(getApplication().moduleMap.values());
         if (listModules.size() == 0) {
             emptyRv.setVisibility(View.VISIBLE);
             recyclerView.setVisibility(View.GONE);

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

@@ -2,7 +2,6 @@ package com.topjohnwu.magisk;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
@@ -16,10 +15,12 @@ import android.widget.TextView;
 
 import com.topjohnwu.magisk.adapters.ReposAdapter;
 import com.topjohnwu.magisk.adapters.SimpleSectionedRecyclerViewAdapter;
-import com.topjohnwu.magisk.module.ModuleHelper;
+import com.topjohnwu.magisk.asyncs.LoadRepos;
+import com.topjohnwu.magisk.asyncs.ParallelTask;
+import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.module.Module;
 import com.topjohnwu.magisk.module.Repo;
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.CallbackHandler;
+import com.topjohnwu.magisk.utils.CallbackEvent;
 import com.topjohnwu.magisk.utils.Logger;
 
 import java.util.ArrayList;
@@ -29,7 +30,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 
-public class ReposFragment extends Fragment implements CallbackHandler.EventListener {
+public class ReposFragment extends Fragment implements CallbackEvent.Listener<Void> {
 
     private Unbinder unbinder;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
@@ -68,10 +69,10 @@ public class ReposFragment extends Fragment implements CallbackHandler.EventList
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
             recyclerView.setVisibility(View.GONE);
-            new Async.LoadRepos(getActivity()).exec();
+            new LoadRepos(getActivity()).exec();
         });
 
-        if (Global.Events.repoLoadDone.isTriggered) {
+        if (getApplication().repoLoadDone.isTriggered) {
             reloadRepos();
             updateUI();
         }
@@ -93,7 +94,7 @@ public class ReposFragment extends Fragment implements CallbackHandler.EventList
     }
 
     @Override
-    public void onTrigger(CallbackHandler.Event event) {
+    public void onTrigger(CallbackEvent<Void> event) {
         Logger.dev("ReposFragment: UI refresh triggered");
         reloadRepos();
         updateUI();
@@ -109,13 +110,13 @@ public class ReposFragment extends Fragment implements CallbackHandler.EventList
     @Override
     public void onStart() {
         super.onStart();
-        CallbackHandler.register(Global.Events.repoLoadDone, this);
+        getApplication().repoLoadDone.register(this);
         getActivity().setTitle(R.string.downloads);
     }
 
     @Override
     public void onStop() {
-        CallbackHandler.unRegister(Global.Events.repoLoadDone, this);
+        getApplication().repoLoadDone.unRegister(this);
         super.onStop();
     }
 
@@ -126,7 +127,21 @@ public class ReposFragment extends Fragment implements CallbackHandler.EventList
     }
 
     private void reloadRepos() {
-        ModuleHelper.getRepoLists(mUpdateRepos, mInstalledRepos, mOthersRepos);
+        mUpdateRepos.clear();
+        mInstalledRepos.clear();
+        mOthersRepos.clear();
+        for (Repo repo : getApplication().repoMap.values()) {
+            Module module = getApplication().moduleMap.get(repo.getId());
+            if (module != null) {
+                if (repo.getVersionCode() > module.getVersionCode()) {
+                    mUpdateRepos.add(repo);
+                } else {
+                    mInstalledRepos.add(repo);
+                }
+            } else {
+                mOthersRepos.add(repo);
+            }
+        }
         fUpdateRepos.clear();
         fInstalledRepos.clear();
         fOthersRepos.clear();
@@ -158,7 +173,7 @@ public class ReposFragment extends Fragment implements CallbackHandler.EventList
         mSwipeRefreshLayout.setRefreshing(false);
     }
 
-    private class FilterApps extends Async.NormalTask<String, Void, Void> {
+    private class FilterApps extends ParallelTask<String, Void, Void> {
         @Override
         protected Void doInBackground(String... strings) {
             String newText = strings[0];

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

@@ -1,6 +1,7 @@
 package com.topjohnwu.magisk;
 
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.PreferenceCategory;
@@ -9,13 +10,13 @@ import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.view.WindowManager;
 import android.widget.Toast;
 
-import com.topjohnwu.magisk.module.ModuleHelper;
-import com.topjohnwu.magisk.utils.Async;
+import com.topjohnwu.magisk.asyncs.MagiskHide;
+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.Utils;
@@ -23,18 +24,18 @@ import com.topjohnwu.magisk.utils.Utils;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class SettingsActivity extends AppCompatActivity {
+public class SettingsActivity extends Activity {
 
     @BindView(R.id.toolbar) Toolbar toolbar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (Global.Configs.isDarkTheme) {
-            setTheme(R.style.AppTheme_dh);
+        if (getApplicationContext().isDarkTheme) {
+            setTheme(R.style.AppTheme_Transparent_Dark);
         }
 
-        setContentView(R.layout.activity_container);
+        setContentView(R.layout.activity_settings);
         ButterKnife.bind(this);
 
         setSupportActionBar(toolbar);
@@ -55,27 +56,14 @@ public class SettingsActivity extends AppCompatActivity {
 
     }
 
-    public void setFloating() {
-        boolean isTablet = getResources().getBoolean(R.bool.isTablet);
-        if (isTablet) {
-            WindowManager.LayoutParams params = getWindow().getAttributes();
-            params.height = getResources().getDimensionPixelSize(R.dimen.floating_height);
-            params.width = getResources().getDimensionPixelSize(R.dimen.floating_width);
-            params.alpha = 1.0f;
-            params.dimAmount = 0.6f;
-            params.flags |= 2;
-            getWindow().setAttributes(params);
-            setFinishOnTouchOutside(true);
-        }
-    }
-
     public static class SettingsFragment extends PreferenceFragment
             implements SharedPreferences.OnSharedPreferenceChangeListener {
 
         private SharedPreferences prefs;
         private PreferenceScreen prefScreen;
 
-        private ListPreference suAccess, autoRes, suNotification, requestTimeout;
+        private ListPreference suAccess, autoRes, suNotification, requestTimeout, multiuserMode, namespaceMode;
+        private MagiskManager magiskManager;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -83,38 +71,51 @@ public class SettingsActivity extends AppCompatActivity {
             addPreferencesFromResource(R.xml.app_settings);
             prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
             prefScreen = getPreferenceScreen();
-
-            SwitchPreference busybox = (SwitchPreference) findPreference("busybox");
-            SwitchPreference magiskHide = (SwitchPreference) findPreference("magiskhide");
-            SwitchPreference hosts = (SwitchPreference) findPreference("hosts");
+            magiskManager = Utils.getMagiskManager(getActivity());
 
             PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
             PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
+            PreferenceCategory developer = (PreferenceCategory) findPreference("developer");
 
             suAccess = (ListPreference) findPreference("su_access");
             autoRes = (ListPreference) findPreference("su_auto_response");
             requestTimeout = (ListPreference) findPreference("su_request_timeout");
             suNotification = (ListPreference) findPreference("su_notification");
+            multiuserMode = (ListPreference) findPreference("multiuser_mode");
+            namespaceMode = (ListPreference) findPreference("mnt_ns");
+            SwitchPreference reauth = (SwitchPreference) findPreference("su_reauth");
 
             setSummary();
 
+            // Disable dangerous settings in user mode if selected owner manage
+            if (getActivity().getApplicationInfo().uid > 99999) {
+                prefScreen.removePreference(magiskCategory);
+                prefScreen.removePreference(suCategory);
+            }
+
+            // Remove re-authentication option on Android O, it will not work
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                suCategory.removePreference(reauth);
+            }
+
             findPreference("clear").setOnPreferenceClickListener((pref) -> {
-                ModuleHelper.clearRepoCache(getActivity());
+                Utils.clearRepoCache(getActivity());
                 return true;
             });
 
+            if (!BuildConfig.DEBUG) {
+                prefScreen.removePreference(developer);
+            }
+
             if (!Shell.rootAccess()) {
                 prefScreen.removePreference(magiskCategory);
                 prefScreen.removePreference(suCategory);
             } else {
-                if (!Global.Info.isSuClient)
+                if (!magiskManager.isSuClient) {
                     prefScreen.removePreference(suCategory);
-                if (Global.Info.magiskVersion < 11)
+                }
+                if (magiskManager.magiskVersionCode < 1300) {
                     prefScreen.removePreference(magiskCategory);
-                if (Global.Info.disabled) {
-                    busybox.setEnabled(false);
-                    magiskHide.setEnabled(false);
-                    hosts.setEnabled(false);
                 }
             }
         }
@@ -139,96 +140,76 @@ public class SettingsActivity extends AppCompatActivity {
             switch (key) {
                 case "dark_theme":
                     enabled = prefs.getBoolean("dark_theme", false);
-                    if (Global.Configs.isDarkTheme != enabled) {
-                        Global.Configs.isDarkTheme = enabled;
+                    if (magiskManager.isDarkTheme != enabled) {
+                        magiskManager.isDarkTheme = enabled;
+                        magiskManager.reloadMainActivity.trigger();
                         getActivity().recreate();
-                        Global.Events.reloadMainActivity.trigger();
                     }
                     break;
                 case "disable":
                     enabled = prefs.getBoolean("disable", false);
-                    new Async.RootTask<Void, Void, Void>() {
-                        private boolean enable = enabled;
-                        @Override
-                        protected Void doInBackground(Void... voids) {
-                            if (enable) {
-                                Utils.createFile(Global.MAGISK_DISABLE_FILE);
-                            } else {
-                                Utils.removeItem(Global.MAGISK_DISABLE_FILE);
-                            }
-                            return null;
-                        }
-                    }.exec();
+                    if (enabled) {
+                        Utils.createFile(MagiskManager.MAGISK_DISABLE_FILE);
+                    } else {
+                        Utils.removeItem(MagiskManager.MAGISK_DISABLE_FILE);
+                    }
                     Toast.makeText(getActivity(), R.string.settings_reboot_toast, Toast.LENGTH_LONG).show();
                     break;
-                case "busybox":
-                    enabled = prefs.getBoolean("busybox", false);
-                    new Async.RootTask<Void, Void, Void>() {
-                        private boolean enable = enabled;
-                        @Override
-                        protected Void doInBackground(Void... voids) {
-                            if (enable) {
-                                Shell.su(
-                                        "setprop persist.magisk.busybox 1",
-                                        "sh /sbin/magic_mask.sh mount_busybox");
-                            } else {
-                                Shell.su(
-                                        "setprop persist.magisk.busybox 0",
-                                        "umount /system/xbin");
-                            }
-                            return null;
-                        }
-                    }.exec();
-                    break;
                 case "magiskhide":
                     enabled = prefs.getBoolean("magiskhide", false);
                     if (enabled) {
-                        if (!Global.Info.isSuClient) {
-                            Utils.getAlertDialogBuilder(getActivity())
+                        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 Async.MagiskHide().enable())
+                                    .setPositiveButton(R.string.understand, (dialog, which) -> new MagiskHide().enable())
                                     .setCancelable(false)
                                     .show();
-                        } else new Async.MagiskHide().enable();
-                    } else
-                        new Async.MagiskHide().disable();
+                        } else {
+                            new MagiskHide().enable();
+                        }
+                    } else {
+                        new MagiskHide().disable();
+                    }
                     break;
                 case "hosts":
                     enabled = prefs.getBoolean("hosts", false);
-                    new Async.RootTask<Void, Void, Void>() {
-                        private boolean enable = enabled;
-                        @Override
-                        protected Void doInBackground(Void... voids) {
-                            if (enable) {
-                                Shell.su("cp -af /system/etc/hosts /magisk/.core/hosts",
-                                        "mount -o bind /magisk/.core/hosts /system/etc/hosts");
-                            } else {
-                                Shell.su("umount -l /system/etc/hosts",
-                                        "rm -f /magisk/.core/hosts");
-                            }
-                            return null;
-                        }
-                    }.exec();
+                    if (enabled) {
+                        Shell.su_async(null,
+                                "cp -af /system/etc/hosts /magisk/.core/hosts",
+                                "mount -o bind /magisk/.core/hosts /system/etc/hosts");
+                    } else {
+                        Shell.su_async(null,
+                                "umount -l /system/etc/hosts",
+                                "rm -f /magisk/.core/hosts");
+                    }
                     break;
                 case "su_access":
-                    Global.Configs.suAccessState = Utils.getPrefsInt(prefs, "su_access", 0);
-                    Shell.su("setprop persist.sys.root_access " + Global.Configs.suAccessState);
+                    magiskManager.suAccessState = Utils.getPrefsInt(prefs, "su_access", 3);
+                    magiskManager.suDB.setSettings(SuDatabaseHelper.ROOT_ACCESS, magiskManager.suAccessState);
+                    break;
+                case "multiuser_mode":
+                    magiskManager.multiuserMode = Utils.getPrefsInt(prefs, "multiuser_mode", 0);
+                    magiskManager.suDB.setSettings(SuDatabaseHelper.MULTIUSER_MODE, magiskManager.multiuserMode);
+                    break;
+                case "mnt_ns":
+                    magiskManager.suNamespaceMode = Utils.getPrefsInt(prefs, "mnt_ns", 1);
+                    magiskManager.suDB.setSettings(SuDatabaseHelper.MNT_NS, magiskManager.suNamespaceMode);
                     break;
                 case "su_request_timeout":
-                    Global.Configs.suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
+                    magiskManager.suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
                     break;
                 case "su_auto_response":
-                    Global.Configs.suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", 0);
+                    magiskManager.suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", 0);
                     break;
                 case "su_notification":
-                    Global.Configs.suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
+                    magiskManager.suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
                     break;
                 case "developer_logging":
-                    Global.Configs.devLogging = prefs.getBoolean("developer_logging", false);
+                    MagiskManager.devLogging = prefs.getBoolean("developer_logging", false);
                     break;
                 case "shell_logging":
-                    Global.Configs.shellLogging = prefs.getBoolean("shell_logging", false);
+                    MagiskManager.shellLogging = prefs.getBoolean("shell_logging", false);
                     break;
             }
             setSummary();
@@ -236,13 +217,17 @@ public class SettingsActivity extends AppCompatActivity {
 
         private void setSummary() {
             suAccess.setSummary(getResources()
-                    .getStringArray(R.array.su_access)[Global.Configs.suAccessState]);
+                    .getStringArray(R.array.su_access)[magiskManager.suAccessState]);
             autoRes.setSummary(getResources()
-                    .getStringArray(R.array.auto_response)[Global.Configs.suResponseType]);
+                    .getStringArray(R.array.auto_response)[magiskManager.suResponseType]);
             suNotification.setSummary(getResources()
-                    .getStringArray(R.array.su_notification)[Global.Configs.suNotificationType]);
+                    .getStringArray(R.array.su_notification)[magiskManager.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]);
+            namespaceMode.setSummary(getResources()
+                    .getStringArray(R.array.namespace_summary)[magiskManager.suNamespaceMode]);
         }
     }
 

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

@@ -1,12 +1,24 @@
 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.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
 
-import com.topjohnwu.magisk.utils.Async;
+import com.topjohnwu.magisk.asyncs.GetBootBlocks;
+import com.topjohnwu.magisk.asyncs.LoadApps;
+import com.topjohnwu.magisk.asyncs.LoadModules;
+import com.topjohnwu.magisk.asyncs.LoadRepos;
+import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.services.UpdateCheckService;
+import com.topjohnwu.magisk.utils.Utils;
 
-public class SplashActivity extends AppCompatActivity {
+public class SplashActivity extends Activity{
+
+    private static final int UPDATE_SERVICE_ID = 1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -14,22 +26,32 @@ public class SplashActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         // Init the info and configs and root shell
-        Global.init(getApplicationContext());
+        getApplicationContext().init();
 
         // Now fire all async tasks
-        new Async.CheckUpdates().exec();
-        new Async.GetBootBlocks().exec();
-        new Async.LoadModules() {
-            @Override
-            protected void onPostExecute(Void v) {
-                super.onPostExecute(v);
-                new Async.LoadRepos(getApplicationContext()).exec();
-            }
-        }.exec();
-        new Async.LoadApps(getPackageManager()).exec();
+        new GetBootBlocks(this).exec();
+        new LoadModules(this).setCallBack(() -> new LoadRepos(this).exec()).exec();
+        new LoadApps(this).exec();
 
-        // Preparation done, now start main activity
-        Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+        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);
+            }
+        }
+
+        Intent intent = new Intent(this, MainActivity.class);
+        String section = getIntent().getStringExtra(MagiskManager.INTENT_SECTION);
+        if (section != null) {
+            intent.putExtra(MagiskManager.INTENT_SECTION, section);
+        }
         startActivity(intent);
         finish();
     }

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

@@ -1,296 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.AlertDialog;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.CallbackHandler;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-
-import butterknife.BindColor;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-
-public class StatusFragment extends Fragment implements CallbackHandler.EventListener {
-
-    private static boolean noDialog = false;
-
-    private Unbinder unbinder;
-    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
-
-    @BindView(R.id.magisk_status_container) View magiskStatusContainer;
-    @BindView(R.id.magisk_status_icon) ImageView magiskStatusIcon;
-    @BindView(R.id.magisk_version) TextView magiskVersionText;
-    @BindView(R.id.magisk_update_status) TextView magiskUpdateText;
-    @BindView(R.id.magisk_check_updates_progress) ProgressBar magiskCheckUpdatesProgress;
-
-    @BindView(R.id.root_status_container) View rootStatusContainer;
-    @BindView(R.id.root_status_icon) ImageView rootStatusIcon;
-    @BindView(R.id.root_status) TextView rootStatusText;
-    @BindView(R.id.root_info) TextView rootInfoText;
-
-    @BindView(R.id.safetyNet_container) View safetyNetContainer;
-    @BindView(R.id.safetyNet_icon) ImageView safetyNetIcon;
-    @BindView(R.id.safetyNet_status) TextView safetyNetStatusText;
-    @BindView(R.id.safetyNet_check_progress) ProgressBar safetyNetProgress;
-
-    @BindColor(R.color.red500) int colorBad;
-    @BindColor(R.color.green500) int colorOK;
-    @BindColor(R.color.yellow500) int colorWarn;
-    @BindColor(R.color.grey500) int colorNeutral;
-    @BindColor(R.color.blue500) int colorInfo;
-    @BindColor(android.R.color.transparent) int trans;
-    int defaultColor;
-
-    private AlertDialog updateMagisk;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.fragment_status, container, false);
-        unbinder = ButterKnife.bind(this, v);
-
-        defaultColor = magiskUpdateText.getCurrentTextColor();
-
-        mSwipeRefreshLayout.setOnRefreshListener(() -> {
-            magiskStatusContainer.setBackgroundColor(trans);
-            magiskStatusIcon.setImageResource(0);
-            magiskUpdateText.setText(R.string.checking_for_updates);
-            magiskCheckUpdatesProgress.setVisibility(View.VISIBLE);
-            magiskUpdateText.setTextColor(defaultColor);
-
-            safetyNetProgress.setVisibility(View.GONE);
-            safetyNetContainer.setBackgroundColor(colorNeutral);
-            safetyNetIcon.setImageResource(R.drawable.ic_safetynet);
-            safetyNetStatusText.setText(R.string.safetyNet_check_text);
-            safetyNetStatusText.setTextColor(defaultColor);
-
-            Global.Events.safetyNetDone.isTriggered = false;
-            noDialog = false;
-
-            updateUI();
-            new Async.CheckUpdates().exec();
-        });
-
-        safetyNetContainer.setOnClickListener(view -> {
-            safetyNetProgress.setVisibility(View.VISIBLE);
-            safetyNetContainer.setBackgroundColor(trans);
-            safetyNetIcon.setImageResource(0);
-            safetyNetStatusText.setText(R.string.checking_safetyNet_status);
-            Async.checkSafetyNet(getActivity());
-        });
-
-        if (Global.Info.magiskVersion < 0 && Shell.rootAccess() && !noDialog) {
-            noDialog = true;
-            Utils.getAlertDialogBuilder(getActivity())
-                    .setTitle(R.string.no_magisk_title)
-                    .setMessage(R.string.no_magisk_msg)
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.goto_install, (dialogInterface, i) -> {
-                        ((MainActivity) getActivity()).navigationView.setCheckedItem(R.id.install);
-                        FragmentTransaction transaction = getFragmentManager().beginTransaction();
-                        transaction.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);
-                        try {
-                            transaction.replace(R.id.content_frame, new InstallFragment(), "install").commit();
-                        } catch (IllegalStateException ignored) {}
-                    })
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
-        }
-
-        updateUI();
-
-        return v;
-    }
-
-    @Override
-    public void onTrigger(CallbackHandler.Event event) {
-        if (event == Global.Events.updateCheckDone) {
-            Logger.dev("StatusFragment: Update Check UI refresh triggered");
-            updateCheckUI();
-        } else if (event == Global.Events.safetyNetDone) {
-            Logger.dev("StatusFragment: SafetyNet UI refresh triggered");
-            updateSafetyNetUI();
-        }
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        CallbackHandler.register(Global.Events.updateCheckDone, this);
-        CallbackHandler.register(Global.Events.safetyNetDone, this);
-        if (Global.Events.updateCheckDone.isTriggered) {
-            updateCheckUI();
-        }
-        if (Global.Events.safetyNetDone.isTriggered) {
-            updateSafetyNetUI();
-        }
-        getActivity().setTitle(R.string.status);
-    }
-
-    @Override
-    public void onStop() {
-        CallbackHandler.unRegister(Global.Events.updateCheckDone, this);
-        CallbackHandler.unRegister(Global.Events.safetyNetDone, this);
-        super.onStop();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
-    private void updateUI() {
-        int image, color;
-
-        Global.updateMagiskInfo();
-
-        if (Global.Info.magiskVersion < 0) {
-            magiskVersionText.setText(R.string.magisk_version_error);
-        } else if (Global.Info.disabled) {
-            magiskVersionText.setText(getString(R.string.magisk_version_disable, Global.Info.magiskVersionString));
-        } else {
-            magiskVersionText.setText(getString(R.string.magisk_version, Global.Info.magiskVersionString));
-        }
-
-        switch (Shell.rootStatus) {
-            case 0:
-                color = colorBad;
-                image = R.drawable.ic_cancel;
-                rootStatusText.setText(R.string.not_rooted);
-                rootInfoText.setText(R.string.root_info_warning);
-                break;
-            case 1:
-                if (Global.Info.suVersion != null) {
-                    color = colorOK;
-                    image = R.drawable.ic_check_circle;
-                    rootStatusText.setText(R.string.proper_root);
-                    rootInfoText.setText(Global.Info.suVersion);
-                    break;
-                }
-            case -1:
-            default:
-                color = colorNeutral;
-                image = R.drawable.ic_help;
-                rootStatusText.setText(R.string.root_error);
-                rootInfoText.setText(R.string.root_info_warning);
-        }
-        rootStatusContainer.setBackgroundColor(color);
-        rootStatusText.setTextColor(color);
-        rootInfoText.setTextColor(color);
-        rootStatusIcon.setImageResource(image);
-    }
-
-    private void updateCheckUI() {
-        int image, color;
-
-        if (Global.Info.remoteMagiskVersion < 0) {
-            color = colorNeutral;
-            image = R.drawable.ic_help;
-            magiskUpdateText.setText(R.string.cannot_check_updates);
-        } else if (Global.Info.remoteMagiskVersion > Global.Info.magiskVersion) {
-            color = colorInfo;
-            image = R.drawable.ic_update;
-            magiskUpdateText.setText(getString(R.string.magisk_update_available, Global.Info.remoteMagiskVersion));
-        } else {
-            color = colorOK;
-            image = R.drawable.ic_check_circle;
-            magiskUpdateText.setText(getString(R.string.up_to_date, getString(R.string.magisk)));
-        }
-
-        if (Global.Info.magiskVersion < 0) {
-            color = colorBad;
-            image = R.drawable.ic_cancel;
-        } else if (Global.Info.disabled) {
-            color = colorNeutral;
-            image = R.drawable.ic_cancel;
-        }
-
-        magiskStatusContainer.setBackgroundColor(color);
-        magiskVersionText.setTextColor(color);
-        magiskUpdateText.setTextColor(color);
-        magiskStatusIcon.setImageResource(image);
-
-        magiskCheckUpdatesProgress.setVisibility(View.GONE);
-        mSwipeRefreshLayout.setRefreshing(false);
-
-        updateMagisk = Utils.getAlertDialogBuilder(getActivity())
-                .setTitle(R.string.magisk_update_title)
-                .setMessage(getString(R.string.magisk_update_message, Global.Info.remoteMagiskVersion))
-                .setCancelable(true)
-                .setPositiveButton(R.string.goto_install, (dialogInterface, i) -> {
-                    ((MainActivity) getActivity()).navigationView.setCheckedItem(R.id.install);
-                    FragmentTransaction transaction = getFragmentManager().beginTransaction();
-                    transaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out);
-                    try {
-                        transaction.replace(R.id.content_frame, new InstallFragment(), "install").commit();
-                    } catch (IllegalStateException ignored) {}
-                })
-                .setNeutralButton(R.string.check_release_notes, (dialog, which) -> {
-                    getActivity().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Global.Info.releaseNoteLink)));
-                })
-                .setNegativeButton(R.string.no_thanks, null)
-                .create();
-
-        if (Global.Info.magiskVersion < Global.Info.remoteMagiskVersion && Shell.rootAccess()) {
-            magiskStatusContainer.setOnClickListener(view -> updateMagisk.show());
-            if (!noDialog) {
-                noDialog = true;
-                updateMagisk.show();
-            }
-        }
-    }
-
-    private void updateSafetyNetUI() {
-        int image, color;
-        safetyNetProgress.setVisibility(View.GONE);
-        switch (Global.Info.SNCheckResult) {
-            case -3:
-                color = colorNeutral;
-                image = R.drawable.ic_help;
-                safetyNetStatusText.setText(R.string.safetyNet_connection_suspended);
-                break;
-            case -2:
-                color = colorNeutral;
-                image = R.drawable.ic_help;
-                safetyNetStatusText.setText(R.string.safetyNet_connection_failed);
-                break;
-            case -1:
-                color = colorNeutral;
-                image = R.drawable.ic_help;
-                safetyNetStatusText.setText(R.string.safetyNet_error);
-                break;
-            case 0:
-                color = colorBad;
-                image = R.drawable.ic_cancel;
-                safetyNetStatusText.setText(R.string.safetyNet_fail);
-                break;
-            case 1:
-            default:
-                color = colorOK;
-                image = R.drawable.ic_check_circle;
-                safetyNetStatusText.setText(R.string.safetyNet_pass);
-                break;
-        }
-        safetyNetContainer.setBackgroundColor(color);
-        safetyNetStatusText.setTextColor(color);
-        safetyNetIcon.setImageResource(image);
-    }
-}
-

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

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

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

@@ -3,7 +3,6 @@ package com.topjohnwu.magisk;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,8 +10,8 @@ import android.view.ViewGroup;
 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.superuser.SuDatabaseHelper;
 
 import java.util.List;
 
@@ -33,15 +32,15 @@ public class SuperuserFragment extends Fragment {
         unbinder = ButterKnife.bind(this, view);
 
         PackageManager pm = getActivity().getPackageManager();
+        MagiskManager magiskManager = getApplication();
 
-        SuDatabaseHelper dbHelper = new SuDatabaseHelper(getActivity());
-        List<Policy> policyList = dbHelper.getPolicyList(pm);
+        List<Policy> policyList = magiskManager.suDB.getPolicyList(pm);
 
         if (policyList.size() == 0) {
             emptyRv.setVisibility(View.VISIBLE);
             recyclerView.setVisibility(View.GONE);
         } else {
-            recyclerView.setAdapter(new PolicyAdapter(policyList, dbHelper, pm));
+            recyclerView.setAdapter(new PolicyAdapter(policyList, magiskManager.suDB, pm));
             emptyRv.setVisibility(View.GONE);
             recyclerView.setVisibility(View.VISIBLE);
         }

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

@@ -13,7 +13,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Async;
+import com.topjohnwu.magisk.asyncs.MagiskHide;
+import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.ArrayList;
@@ -50,8 +51,8 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
     }
 
     public void setLists(List<ApplicationInfo> listApps, List<String> hideList) {
-        mOriginalList = mList = Collections.unmodifiableList(listApps);
-        mHideList = new ArrayList<>(hideList);
+        mOriginalList = mList = listApps;
+        mHideList = hideList;
         notifyDataSetChanged();
     }
 
@@ -76,20 +77,19 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
         if (SNLIST.contains(info.packageName)) {
             holder.checkBox.setChecked(true);
             holder.checkBox.setEnabled(false);
-            holder.itemView.setOnClickListener(v -> {
-                Snackbar snackbar = Snackbar.make(holder.itemView, R.string.safetyNet_hide_notice, Snackbar.LENGTH_LONG);
-                ((TextView) snackbar.getView().findViewById(android.support.design.R.id.snackbar_text)).setMaxLines(2);
-                snackbar.show();
-            });
+            holder.itemView.setOnClickListener(v ->
+                SnackbarMaker.make(holder.itemView,
+                        R.string.safetyNet_hide_notice, Snackbar.LENGTH_LONG).show()
+            );
         } else {
             holder.checkBox.setEnabled(true);
             holder.checkBox.setChecked(mHideList.contains(info.packageName));
             holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
                 if (isChecked) {
-                    new Async.MagiskHide().add(info.packageName);
+                    new MagiskHide().add(info.packageName);
                     mHideList.add(info.packageName);
                 } else {
-                    new Async.MagiskHide().rm(info.packageName);
+                    new MagiskHide().rm(info.packageName);
                     mHideList.remove(info.packageName);
                 }
             });

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

@@ -12,8 +12,8 @@ import android.widget.ImageView;
 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.utils.Async;
 import com.topjohnwu.magisk.utils.Shell;
 
 import java.util.List;
@@ -52,44 +52,31 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
 
         holder.checkBox.setOnCheckedChangeListener(null);
         holder.checkBox.setChecked(module.isEnabled());
-        holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> new Async.RootTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... voids) {
-                if (isChecked) {
-                    module.removeDisableFile();
-                } else {
-                    module.createDisableFile();
-                }
-                return null;
+        holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
+            int snack;
+            if (isChecked) {
+                module.removeDisableFile();
+                snack = R.string.disable_file_removed;
+            } else {
+                module.createDisableFile();
+                snack = R.string.disable_file_created;
             }
+            SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
+        });
 
-            @Override
-            protected void onPostExecute(Void v) {
-                int snack = isChecked ? R.string.disable_file_removed : R.string.disable_file_created;
-                Snackbar.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
+        holder.delete.setOnClickListener(v -> {
+            boolean removed = module.willBeRemoved();
+            int snack;
+            if (removed) {
+                module.deleteRemoveFile();
+                snack = R.string.remove_file_deleted;
+            } else {
+                module.createRemoveFile();
+                snack = R.string.remove_file_created;
             }
-        }.exec());
-
-        holder.delete.setOnClickListener(v -> new Async.RootTask<Void, Void, Void>() {
-            private final boolean removed = module.willBeRemoved();
-
-            @Override
-            protected Void doInBackground(Void... voids) {
-                if (removed) {
-                    module.deleteRemoveFile();
-                } else {
-                    module.createRemoveFile();
-                }
-                return null;
-            }
-
-            @Override
-            protected void onPostExecute(Void v) {
-                int snack = removed ? R.string.remove_file_deleted : R.string.remove_file_created;
-                Snackbar.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
-                updateDeleteButton(holder, module);
-            }
-        }.exec());
+            SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
+            updateDeleteButton(holder, module);
+        });
 
         if (module.isUpdated()) {
             holder.notice.setVisibility(View.VISIBLE);

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

@@ -1,23 +1,21 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.animation.Animator;
-import android.animation.ValueAnimator;
 import android.content.pm.PackageManager;
 import android.support.design.widget.Snackbar;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.Switch;
 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.SnackbarMaker;
+import com.topjohnwu.magisk.database.SuDatabaseHelper;
 import com.topjohnwu.magisk.superuser.Policy;
-import com.topjohnwu.magisk.superuser.SuDatabaseHelper;
-import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.HashSet;
 import java.util.List;
@@ -48,78 +46,72 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
         Policy policy = policyList.get(position);
-        try {
-            holder.setExpanded(expandList.contains(policy));
 
-            holder.itemView.setOnClickListener(view -> {
-                if (holder.mExpanded) {
-                    holder.collapse();
-                    expandList.remove(policy);
-                } else {
-                    holder.expand();
-                    expandList.add(policy);
-                }
-            });
+        holder.setExpanded(expandList.contains(policy));
 
-            holder.appName.setText(policy.appName);
-            holder.packageName.setText(policy.packageName);
-            holder.appIcon.setImageDrawable(pm.getPackageInfo(policy.packageName, 0).applicationInfo.loadIcon(pm));
-            holder.masterSwitch.setOnCheckedChangeListener((v, isChecked) -> {
-                if ((isChecked && policy.policy == Policy.DENY) ||
-                        (!isChecked && policy.policy == Policy.ALLOW)) {
-                    policy.policy = isChecked ? Policy.ALLOW : Policy.DENY;
-                    String message = v.getContext().getString(
-                            isChecked ? R.string.su_snack_grant : R.string.su_snack_deny, policy.appName);
-                    Snackbar.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                    dbHelper.addPolicy(policy);
-                }
-            });
-            holder.notificationSwitch.setOnCheckedChangeListener((v, isChecked) -> {
-                if ((isChecked && !policy.notification) ||
-                        (!isChecked && policy.notification)) {
-                    policy.notification = isChecked;
-                    String message = v.getContext().getString(
-                            isChecked ? R.string.su_snack_notif_on : R.string.su_snack_notif_off, policy.appName);
-                    Snackbar.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                    dbHelper.addPolicy(policy);
-                }
-            });
-            holder.loggingSwitch.setOnCheckedChangeListener((v, isChecked) -> {
-                if ((isChecked && !policy.logging) ||
-                        (!isChecked && policy.logging)) {
-                    policy.logging = isChecked;
-                    String message = v.getContext().getString(
-                            isChecked ? R.string.su_snack_log_on : R.string.su_snack_log_off, policy.appName);
-                    Snackbar.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                    dbHelper.addPolicy(policy);
-                }
-            });
-            holder.delete.setOnClickListener(v -> Utils.getAlertDialogBuilder(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) -> {
-                        policyList.remove(position);
-                        notifyItemRemoved(position);
-                        notifyItemRangeChanged(position, policyList.size());
-                        Snackbar.make(holder.itemView, v.getContext().getString(R.string.su_snack_revoke, policy.appName),
-                                Snackbar.LENGTH_SHORT).show();
-                        dbHelper.deletePolicy(policy.uid);
-                    })
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .setCancelable(true)
-                    .show());
-            holder.masterSwitch.setChecked(policy.policy == Policy.ALLOW);
-            holder.notificationSwitch.setChecked(policy.notification);
-            holder.loggingSwitch.setChecked(policy.logging);
+        holder.itemView.setOnClickListener(view -> {
+            if (holder.mExpanded) {
+                holder.collapse();
+                expandList.remove(policy);
+            } else {
+                holder.expand();
+                expandList.add(policy);
+            }
+        });
 
-            // Hide for now
-            holder.moreInfo.setVisibility(View.GONE);
+        holder.appName.setText(policy.appName);
+        holder.packageName.setText(policy.packageName);
+        holder.appIcon.setImageDrawable(policy.info.loadIcon(pm));
+        holder.masterSwitch.setOnCheckedChangeListener((v, isChecked) -> {
+            if ((isChecked && policy.policy == Policy.DENY) ||
+                    (!isChecked && policy.policy == Policy.ALLOW)) {
+                policy.policy = isChecked ? Policy.ALLOW : Policy.DENY;
+                String message = v.getContext().getString(
+                        isChecked ? R.string.su_snack_grant : R.string.su_snack_deny, policy.appName);
+                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
+                dbHelper.updatePolicy(policy);
+            }
+        });
+        holder.notificationSwitch.setOnCheckedChangeListener((v, isChecked) -> {
+            if ((isChecked && !policy.notification) ||
+                    (!isChecked && policy.notification)) {
+                policy.notification = isChecked;
+                String message = v.getContext().getString(
+                        isChecked ? R.string.su_snack_notif_on : R.string.su_snack_notif_off, policy.appName);
+                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
+                dbHelper.updatePolicy(policy);
+            }
+        });
+        holder.loggingSwitch.setOnCheckedChangeListener((v, isChecked) -> {
+            if ((isChecked && !policy.logging) ||
+                    (!isChecked && policy.logging)) {
+                policy.logging = isChecked;
+                String message = v.getContext().getString(
+                        isChecked ? R.string.su_snack_log_on : R.string.su_snack_log_off, policy.appName);
+                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
+                dbHelper.updatePolicy(policy);
+            }
+        });
+        holder.delete.setOnClickListener(v -> new AlertDialogBuilder(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) -> {
+                    policyList.remove(position);
+                    notifyItemRemoved(position);
+                    notifyItemRangeChanged(position, policyList.size());
+                    SnackbarMaker.make(holder.itemView, v.getContext().getString(R.string.su_snack_revoke, policy.appName),
+                            Snackbar.LENGTH_SHORT).show();
+                    dbHelper.deletePolicy(policy);
+                })
+                .setNegativeButton(R.string.no_thanks, null)
+                .setCancelable(true)
+                .show());
+        holder.masterSwitch.setChecked(policy.policy == Policy.ALLOW);
+        holder.notificationSwitch.setChecked(policy.notification);
+        holder.loggingSwitch.setChecked(policy.logging);
 
-        } catch (PackageManager.NameNotFoundException e) {
-            policyList.remove(position);
-            dbHelper.deletePolicy(policy.uid);
-            onBindViewHolder(holder, position);
-        }
+        // Hide for now
+        holder.moreInfo.setVisibility(View.GONE);
     }
 
     @Override
@@ -127,11 +119,10 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
         return policyList.size();
     }
 
-    static class ViewHolder extends RecyclerView.ViewHolder {
+    static class ViewHolder extends ExpandableViewHolder {
 
         @BindView(R.id.app_name) TextView appName;
         @BindView(R.id.package_name) TextView packageName;
-        @BindView(R.id.expand_layout) LinearLayout expandLayout;
         @BindView(R.id.app_icon) ImageView appIcon;
         @BindView(R.id.master_switch) Switch masterSwitch;
         @BindView(R.id.notification_switch) Switch notificationSwitch;
@@ -140,83 +131,14 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
         @BindView(R.id.delete) ImageView delete;
         @BindView(R.id.more_info) ImageView moreInfo;
 
-        private ValueAnimator mAnimator;
-        private boolean mExpanded = false;
-        private static int expandHeight = 0;
-
-        ViewHolder(View itemView) {
+        public ViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, 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);
-                            mAnimator = slideAnimator(0, expandHeight);
-                            return true;
-                        }
-
-                    });
         }
 
-        private void setExpanded(boolean expanded) {
-            mExpanded = expanded;
-            ViewGroup.LayoutParams layoutParams = expandLayout.getLayoutParams();
-            layoutParams.height = expanded ? expandHeight : 0;
-            expandLayout.setLayoutParams(layoutParams);
-            expandLayout.setVisibility(expanded ? View.VISIBLE : View.GONE);
+        @Override
+        public void setExpandLayout(View itemView) {
+            expandLayout = itemView.findViewById(R.id.expand_layout);
         }
-
-        private void expand() {
-            expandLayout.setVisibility(View.VISIBLE);
-            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);
-                }
-
-                @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;
-        }
-
     }
 }

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

@@ -1,30 +1,26 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
+import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.net.Uri;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.asyncs.ProcessRepoZip;
+import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.components.MarkDownWindow;
 import com.topjohnwu.magisk.module.Repo;
-import com.topjohnwu.magisk.receivers.RepoDlReceiver;
+import com.topjohnwu.magisk.receivers.DownloadReceiver;
 import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.WebWindow;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -32,7 +28,7 @@ import butterknife.ButterKnife;
 public class ReposAdapter extends RecyclerView.Adapter<ReposAdapter.ViewHolder> {
 
     private List<Repo> mUpdateRepos, mInstalledRepos, mOthersRepos;
-    private Set<Repo> expandList = new HashSet<>();
+    private Context mContext;
 
     public ReposAdapter(List<Repo> update, List<Repo> installed, List<Repo> others) {
         mUpdateRepos = update;
@@ -42,61 +38,54 @@ public class ReposAdapter extends RecyclerView.Adapter<ReposAdapter.ViewHolder>
 
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_repo, parent, false);
+        mContext = parent.getContext();
+        View v = LayoutInflater.from(mContext).inflate(R.layout.list_item_repo, parent, false);
         return new ViewHolder(v);
     }
 
     @Override
     public void onBindViewHolder(final ViewHolder holder, int position) {
-        Context context = holder.itemView.getContext();
         Repo repo = getItem(position);
 
         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.author.setText(TextUtils.isEmpty(author) ? null : mContext.getString(R.string.author, author));
         holder.description.setText(repo.getDescription());
 
-        holder.setExpanded(expandList.contains(repo));
+        holder.infoLayout.setOnClickListener(v -> new MarkDownWindow(null, repo.getDetailUrl(), mContext));
 
-        holder.itemView.setOnClickListener(view -> {
-            if (holder.mExpanded) {
-                holder.collapse();
-                expandList.remove(repo);
-            } else {
-                holder.expand();
-                expandList.add(repo);
-            }
-        });
-        holder.changeLog.setOnClickListener(view -> {
-            if (!TextUtils.isEmpty(repo.getLogUrl())) {
-                new WebWindow(context.getString(R.string.changelog), repo.getLogUrl(), context);
-            }
-        });
-        holder.updateImage.setOnClickListener(view -> {
+        holder.downloadImage.setOnClickListener(v -> {
             String filename = repo.getName() + "-" + repo.getVersion() + ".zip";
-            Utils.getAlertDialogBuilder(context)
-                    .setTitle(context.getString(R.string.repo_install_title, repo.getName()))
-                    .setMessage(context.getString(R.string.repo_install_msg, filename))
+            new AlertDialogBuilder(mContext)
+                    .setTitle(mContext.getString(R.string.repo_install_title, repo.getName()))
+                    .setMessage(mContext.getString(R.string.repo_install_msg, filename))
                     .setCancelable(true)
-                    .setPositiveButton(R.string.download_install, (dialogInterface, i) -> Utils.dlAndReceive(
-                            context,
-                            new RepoDlReceiver(),
+                    .setPositiveButton(R.string.install, (d, i) -> Utils.dlAndReceive(
+                            mContext,
+                            new DownloadReceiver() {
+                                @Override
+                                public void onDownloadDone(Uri uri) {
+                                    Activity activity = (Activity) mContext;
+                                    new ProcessRepoZip(activity, uri, true).exec();
+                                }
+                            },
+                            repo.getZipUrl(),
+                            Utils.getLegalFilename(filename)))
+                    .setNeutralButton(R.string.download, (d, i) -> Utils.dlAndReceive(
+                            mContext,
+                            new DownloadReceiver() {
+                                @Override
+                                public void onDownloadDone(Uri uri) {
+                                    Activity activity = (Activity) mContext;
+                                    new ProcessRepoZip(activity, uri, false).exec();
+                                }
+                            },
                             repo.getZipUrl(),
                             Utils.getLegalFilename(filename)))
                     .setNegativeButton(R.string.no_thanks, null)
                     .show();
         });
-        holder.authorLink.setOnClickListener(view -> {
-            if (!TextUtils.isEmpty(repo.getDonateUrl())) {
-                context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(repo.getDonateUrl())));
-            }
-        });
-        holder.supportLink.setOnClickListener(view -> {
-            if (!TextUtils.isEmpty(repo.getSupportUrl())) {
-                context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(repo.getSupportUrl())));
-            }
-        });
     }
 
     @Override
@@ -124,97 +113,12 @@ public class ReposAdapter extends RecyclerView.Adapter<ReposAdapter.ViewHolder>
         @BindView(R.id.version_name) TextView versionName;
         @BindView(R.id.description) TextView description;
         @BindView(R.id.author) TextView author;
-        @BindView(R.id.expand_layout) LinearLayout expandLayout;
-        @BindView(R.id.update) ImageView updateImage;
-        @BindView(R.id.changeLog) ImageView changeLog;
-        @BindView(R.id.authorLink) ImageView authorLink;
-        @BindView(R.id.supportLink) ImageView supportLink;
-
-        private ValueAnimator mAnimator;
-        private ObjectAnimator animY2;
-        private boolean mExpanded = false;
-        private static int expandHeight = 0;
+        @BindView(R.id.info_layout) LinearLayout infoLayout;
+        @BindView(R.id.download) ImageView downloadImage;
 
         ViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, 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);
-                            mAnimator = slideAnimator(0, expandHeight);
-                            animY2 = ObjectAnimator.ofFloat(updateImage, "translationY", expandHeight / 2);
-                            return true;
-                        }
-
-                    });
-        }
-
-        private void setExpanded(boolean expanded) {
-            mExpanded = expanded;
-            ViewGroup.LayoutParams layoutParams = expandLayout.getLayoutParams();
-            layoutParams.height = expanded ? expandHeight : 0;
-            expandLayout.setLayoutParams(layoutParams);
-            expandLayout.setVisibility(expanded ? View.VISIBLE : View.GONE);
-            if (expanded) {
-                updateImage.setTranslationY(expandHeight / 2);
-            } else {
-                updateImage.setTranslationY(0);
-            }
-        }
-
-        private void expand() {
-            expandLayout.setVisibility(View.VISIBLE);
-            mAnimator.start();
-            animY2.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);
-                }
-
-                @Override
-                public void onAnimationStart(Animator animator) {}
-
-                @Override
-                public void onAnimationCancel(Animator animator) {}
-
-                @Override
-                public void onAnimationRepeat(Animator animator) {}
-            });
-            mAnimator.start();
-            animY2.reverse();
-            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;
         }
 
     }

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

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

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

@@ -0,0 +1,57 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.content.Context;
+
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.WebService;
+
+import org.json.JSONException;
+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";
+
+    private boolean showNotification = false;
+
+    public CheckUpdates(Context context, boolean b) {
+        this(context);
+        showNotification = b;
+    }
+
+    public CheckUpdates(Context context) {
+        magiskManager = Utils.getMagiskManager(context);
+    }
+
+    @Override
+    protected Void doInBackground(Void... voids) {
+        String jsonStr = WebService.request(UPDATE_JSON, WebService.GET);
+        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");
+            JSONObject manager = json.getJSONObject("app");
+            magiskManager.remoteManagerVersionString = manager.getString("version");
+            magiskManager.remoteManagerVersionCode = manager.getInt("versionCode");
+            magiskManager.managerLink = manager.getString("link");
+        } catch (JSONException ignored) {}
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(Void v) {
+        if (showNotification && magiskManager.updateNotification) {
+            if (BuildConfig.VERSION_CODE < magiskManager.remoteManagerVersionCode) {
+                Utils.showManagerUpdate(magiskManager);
+            } else if (magiskManager.magiskVersionCode < magiskManager.remoteMagiskVersionCode) {
+                Utils.showMagiskUpdate(magiskManager);
+            }
+        }
+        magiskManager.updateCheckDone.trigger();
+        super.onPostExecute(v);
+    }
+}

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

@@ -0,0 +1,154 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.net.Uri;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.ZipUtils;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
+
+public class FlashZip extends RootTask<Void, String, Integer> {
+
+    private Uri mUri;
+    private File mCachedFile, mScriptFile, mCheckFile;
+
+    private String mFilename;
+    private ProgressDialog progress;
+
+    public FlashZip(Activity context, Uri uri) {
+        super(context);
+        mUri = uri;
+
+        mCachedFile = new File(magiskManager.getCacheDir(), "install.zip");
+        mScriptFile = new File(magiskManager.getCacheDir(), "/META-INF/com/google/android/update-binary");
+        mCheckFile = new File(mScriptFile.getParent(), "updater-script");
+
+        // Try to get the filename ourselves
+        mFilename = Utils.getNameFromUri(magiskManager, mUri);
+    }
+
+    private void copyToCache() throws Throwable {
+        publishProgress(magiskManager.getString(R.string.copying_msg));
+
+        if (mCachedFile.exists() && !mCachedFile.delete()) {
+            Logger.error("FlashZip: Error while deleting already existing file");
+            throw new IOException();
+        }
+        try (
+                InputStream in = magiskManager.getContentResolver().openInputStream(mUri);
+                OutputStream outputStream = new FileOutputStream(mCachedFile)
+        ) {
+            byte buffer[] = new byte[1024];
+            int length;
+            if (in == null) throw new FileNotFoundException();
+            while ((length = in.read(buffer)) > 0)
+                outputStream.write(buffer, 0, length);
+
+            Logger.dev("FlashZip: File created successfully - " + mCachedFile.getPath());
+        } catch (FileNotFoundException e) {
+            Logger.error("FlashZip: Invalid Uri");
+            throw e;
+        } catch (IOException e) {
+            Logger.error("FlashZip: Error in creating file");
+            throw e;
+        }
+    }
+
+    private boolean unzipAndCheck() throws Exception {
+        ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android");
+        List<String> ret;
+        ret = Utils.readFile(mCheckFile.getPath());
+        return Utils.isValidShellResponse(ret) && ret.get(0).contains("#MAGISK");
+    }
+
+    private int cleanup(int ret) {
+        Shell.su(
+                "rm -rf " + mCachedFile.getParent() + "/*",
+                "rm -rf " + MagiskManager.TMP_FOLDER_PATH
+        );
+        return ret;
+    }
+
+    @Override
+    protected void onPreExecute() {
+        progress = new ProgressDialog(activity);
+        progress.setTitle(R.string.zip_install_progress_title);
+        progress.show();
+    }
+
+    @Override
+    protected void onProgressUpdate(String... values) {
+        progress.setMessage(values[0]);
+    }
+
+    @Override
+    protected Integer doInRoot(Void... voids) {
+        Logger.dev("FlashZip Running... " + mFilename);
+        List<String> ret;
+        try {
+            copyToCache();
+            if (!unzipAndCheck()) return cleanup(0);
+            publishProgress(magiskManager.getString(R.string.zip_install_progress_msg, mFilename));
+            ret = Shell.su(
+                    "BOOTMODE=true sh " + mScriptFile + " dummy 1 " + mCachedFile,
+                    "if [ $? -eq 0 ]; then echo true; else echo false; fi"
+            );
+            if (!Utils.isValidShellResponse(ret)) return -1;
+            Logger.dev("FlashZip: Console log:");
+            for (String line : ret) {
+                Logger.dev(line);
+            }
+            if (Boolean.parseBoolean(ret.get(ret.size() - 1)))
+                return cleanup(1);
+
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+        return cleanup(-1);
+    }
+
+    // -1 = error, manual install; 0 = invalid zip; 1 = success
+    @Override
+    protected void onPostExecute(Integer result) {
+        progress.dismiss();
+        switch (result) {
+            case -1:
+                Toast.makeText(magiskManager, magiskManager.getString(R.string.install_error), Toast.LENGTH_LONG).show();
+                Utils.showUriSnack(activity, mUri);
+                break;
+            case 0:
+                Toast.makeText(magiskManager, magiskManager.getString(R.string.invalid_zip), Toast.LENGTH_LONG).show();
+                break;
+            case 1:
+                onSuccess();
+                break;
+        }
+        super.onPostExecute(result);
+    }
+
+    protected void onSuccess() {
+        magiskManager.updateCheckDone.trigger();
+        new LoadModules(activity).exec();
+
+        new AlertDialogBuilder(activity)
+                .setTitle(R.string.reboot_title)
+                .setMessage(R.string.reboot_msg)
+                .setPositiveButton(R.string.reboot, (dialogInterface, i) -> Shell.su(true, "reboot"))
+                .setNegativeButton(R.string.no_thanks, null)
+                .show();
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
+
+public class GetBootBlocks extends RootTask<Void, Void, Void> {
+
+    public GetBootBlocks(Activity context) {
+        super(context);
+    }
+
+    @Override
+    protected Void doInRoot(Void... params) {
+        magiskManager.blockList = Shell.su(
+                "find /dev/block -type b -maxdepth 1 | grep -v -E \"loop|ram|dm-0\""
+        );
+        if (magiskManager.bootBlock == null) {
+            magiskManager.bootBlock = Utils.detectBootImage();
+        }
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(Void v) {
+        magiskManager.blockDetectionDone.trigger();
+        super.onPostExecute(v);
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+
+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(Activity context) {
+        super(context);
+    }
+
+    @Override
+    protected Void doInBackground(Void... voids) {
+        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) {
+        new MagiskHide(activity).list();
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+
+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.utils.Utils;
+import com.topjohnwu.magisk.utils.ValueSortedMap;
+
+public class LoadModules extends RootTask<Void, Void, Void> {
+
+    public LoadModules(Activity context) {
+        super(context);
+    }
+
+    @Override
+    protected Void doInRoot(Void... voids) {
+        Logger.dev("LoadModules: Loading modules");
+
+        magiskManager.moduleMap = new ValueSortedMap<>();
+
+        for (String path : Utils.getModList(MagiskManager.MAGISK_PATH)) {
+            Logger.dev("LoadModules: Adding modules from " + path);
+            Module module;
+            try {
+                module = new Module(path);
+                magiskManager.moduleMap.put(module.getId(), module);
+            } catch (BaseModule.CacheModException ignored) {}
+        }
+
+        Logger.dev("LoadModules: Data load done");
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(Void v) {
+        magiskManager.moduleLoadDone.trigger();
+        super.onPostExecute(v);
+    }
+}

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

@@ -0,0 +1,189 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.text.TextUtils;
+
+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(Activity context) {
+        super(context);
+        prefs = magiskManager.prefs;
+        String prefsPath = context.getApplicationInfo().dataDir + "/shared_prefs";
+        repoDB = new RepoDatabaseHelper(magiskManager);
+        // 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(magiskManager.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) {
+        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.repoLoadDone.trigger();
+        super.onPostExecute(v);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+
+import com.topjohnwu.magisk.utils.Shell;
+
+import java.util.List;
+
+public class MagiskHide extends RootTask<Object, Void, Void> {
+
+    private boolean isList = false;
+
+    public MagiskHide() {}
+
+    public MagiskHide(Activity context) {
+        super(context);
+    }
+
+    @Override
+    protected Void doInRoot(Object... params) {
+        String command = (String) params[0];
+        List<String> ret = Shell.su("magiskhide --" + command);
+        if (isList) {
+            magiskManager.magiskHideList = ret;
+        }
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(Void v) {
+        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 (magiskManager == null) return;
+        exec("ls");
+    }
+
+}

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

@@ -0,0 +1,37 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.os.AsyncTask;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.Utils;
+
+public abstract class ParallelTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
+
+    protected Activity activity;
+    protected MagiskManager magiskManager;
+
+    private Runnable callback = null;
+
+    public ParallelTask() {}
+
+    public ParallelTask(Activity context) {
+        activity = context;
+        magiskManager = Utils.getMagiskManager(context);
+    }
+
+    @SuppressWarnings("unchecked")
+    public void exec(Params... params) {
+        executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, params);
+    }
+
+    @Override
+    protected void onPostExecute(Result result) {
+        if (callback != null) callback.run();
+    }
+
+    public ParallelTask<Params, Progress, Result> setCallBack(Runnable next) {
+        callback = next;
+        return this;
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.net.Uri;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
+
+public class ProcessMagiskZip extends ParallelTask<Void, Void, Boolean> {
+
+    private Uri mUri;
+    private ProgressDialog progressDialog;
+    private String mBoot;
+    private boolean mEnc, mVerity;
+
+    public ProcessMagiskZip(Activity context, Uri uri, String boot, boolean enc, boolean verity) {
+        super(context);
+        mUri = uri;
+        mBoot = boot;
+        mEnc = enc;
+        mVerity = verity;
+    }
+
+    @Override
+    protected void onPreExecute() {
+        progressDialog = ProgressDialog.show(activity,
+                activity.getString(R.string.zip_process_title),
+                activity.getString(R.string.zip_unzip_msg));
+    }
+
+    @Override
+    protected Boolean doInBackground(Void... params) {
+        if (Shell.rootAccess()) {
+            synchronized (Shell.lock) {
+                Shell.su("rm -f /dev/.magisk",
+                        (mBoot != null) ? "echo \"BOOTIMAGE=" + mBoot + "\" >> /dev/.magisk" : "",
+                        "echo \"KEEPFORCEENCRYPT=" + String.valueOf(mEnc) + "\" >> /dev/.magisk",
+                        "echo \"KEEPVERITY=" + String.valueOf(mVerity) + "\" >> /dev/.magisk"
+                );
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected void onPostExecute(Boolean result) {
+        progressDialog.dismiss();
+        if (result) {
+            new FlashZip(activity, mUri).exec();
+        } else {
+            Utils.showUriSnack(activity, mUri);
+        }
+        super.onPostExecute(result);
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.net.Uri;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.ZipUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.OutputStream;
+
+public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
+
+    private Uri mUri;
+    private ProgressDialog progressDialog;
+    private boolean mInstall;
+
+    public ProcessRepoZip(Activity context, Uri uri, boolean install) {
+        super(context);
+        mUri = uri;
+        mInstall = install;
+    }
+
+    @Override
+    protected void onPreExecute() {
+        progressDialog = ProgressDialog.show(activity,
+                activity.getString(R.string.zip_process_title),
+                activity.getString(R.string.zip_process_msg));
+    }
+
+    @Override
+    protected Boolean doInBackground(Void... params) {
+        try {
+
+            // Create temp file
+            File temp1 = new File(magiskManager.getCacheDir(), "1.zip");
+            File temp2 = new File(magiskManager.getCacheDir(), "2.zip");
+            magiskManager.getCacheDir().mkdirs();
+            temp1.createNewFile();
+            temp2.createNewFile();
+
+            // First remove top folder in Github source zip, Uri -> temp1
+            ZipUtils.removeTopFolder(activity.getContentResolver().openInputStream(mUri), temp1);
+
+            // Then sign the zip for the first time, temp1 -> temp2
+            ZipUtils.signZip(activity, temp1, temp2, false);
+
+            // Adjust the zip to prevent unzip issues, temp2 -> temp1
+            ZipUtils.zipAdjust(temp2.getPath(), temp1.getPath());
+
+            // 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)) {
+                byte[] buffer = new byte[4096];
+                int length;
+                if (target == null) throw new FileNotFoundException();
+                while ((length = in.read(buffer)) > 0)
+                    target.write(buffer, 0, length);
+            }
+
+            // Delete the temp file
+            temp1.delete();
+            temp2.delete();
+
+            return true;
+        } catch (Exception e) {
+            Logger.error("ProcessRepoZip: Error!");
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    @Override
+    protected void onPostExecute(Boolean result) {
+        progressDialog.dismiss();
+        if (result) {
+            if (Shell.rootAccess() && mInstall) {
+                new FlashZip(activity, mUri).exec();
+            } else {
+                Utils.showUriSnack(activity, mUri);
+            }
+
+        } else {
+            Toast.makeText(activity, R.string.process_error, Toast.LENGTH_LONG).show();
+        }
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+
+import com.topjohnwu.magisk.utils.Shell;
+
+public abstract class RootTask <Params, Progress, Result> extends ParallelTask<Params, Progress, Result> {
+
+    public RootTask() {}
+
+    public RootTask(Activity context) {
+        super(context);
+    }
+
+    @SafeVarargs
+    @Override
+    final protected Result doInBackground(Params... params) {
+        synchronized (Shell.lock) {
+            return doInRoot(params);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    abstract protected Result doInRoot(Params... params);
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void exec(Params... params) {
+        if (Shell.rootAccess()) {
+            super.exec(params);
+        }
+    }
+}

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.components;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -26,6 +26,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.topjohnwu.magisk.R;
+
 /**
  * @author dvdandroid
  */

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

@@ -0,0 +1,30 @@
+package com.topjohnwu.magisk.components;
+
+import android.support.v7.app.AppCompatActivity;
+import android.view.WindowManager;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+
+public class Activity extends AppCompatActivity {
+
+    @Override
+    public MagiskManager getApplicationContext() {
+        return (MagiskManager) super.getApplicationContext();
+    }
+
+    protected void setFloating() {
+        boolean isTablet = getResources().getBoolean(R.bool.isTablet);
+        if (isTablet) {
+            WindowManager.LayoutParams params = getWindow().getAttributes();
+            params.height = getResources().getDimensionPixelSize(R.dimen.floating_height);
+            params.width = getResources().getDimensionPixelSize(R.dimen.floating_width);
+            params.alpha = 1.0f;
+            params.dimAmount = 0.6f;
+            params.flags |= 2;
+            getWindow().setAttributes(params);
+            setFinishOnTouchOutside(true);
+        }
+    }
+
+}

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

@@ -0,0 +1,161 @@
+package com.topjohnwu.magisk.components;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.support.annotation.StyleRes;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewStub;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.topjohnwu.magisk.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class AlertDialogBuilder extends AlertDialog.Builder {
+
+    @BindView(R.id.button_panel) LinearLayout buttons;
+    @BindView(R.id.message_panel) LinearLayout messagePanel;
+
+    @BindView(R.id.negative) Button negative;
+    @BindView(R.id.positive) Button positive;
+    @BindView(R.id.neutral) Button neutral;
+    @BindView(R.id.message) TextView messageView;
+    @BindView(R.id.custom_view) ViewStub custom;
+
+    private DialogInterface.OnClickListener positiveListener;
+    private DialogInterface.OnClickListener negativeListener;
+    private DialogInterface.OnClickListener neutralListener;
+
+    private AlertDialog dialog;
+
+    public AlertDialogBuilder(@NonNull Context context) {
+        super(context);
+        setup();
+    }
+
+    public AlertDialogBuilder(@NonNull Context context, @StyleRes int themeResId) {
+        super(context, themeResId);
+        setup();
+    }
+
+    private void setup() {
+        View v = LayoutInflater.from(getContext()).inflate(R.layout.alert_dialog, null);
+        ButterKnife.bind(this, v);
+        super.setView(v);
+        negative.setVisibility(View.GONE);
+        positive.setVisibility(View.GONE);
+        neutral.setVisibility(View.GONE);
+        buttons.setVisibility(View.GONE);
+        messagePanel.setVisibility(View.GONE);
+    }
+
+    @Override
+    public AlertDialog.Builder setView(int layoutResId) {
+        custom.setLayoutResource(layoutResId);
+        custom.inflate();
+        return this;
+    }
+
+    @Override
+    public AlertDialog.Builder setView(View view) {
+        ViewGroup parent = (ViewGroup) custom.getParent();
+        int idx = parent.indexOfChild(custom);
+        parent.removeView(custom);
+        parent.addView(view, idx);
+        return this;
+    }
+
+    @Override
+    public AlertDialog.Builder setMessage(@Nullable CharSequence message) {
+        messageView.setText(message);
+        messagePanel.setVisibility(View.VISIBLE);
+        return this;
+    }
+
+    @Override
+    public AlertDialog.Builder setMessage(@StringRes int messageId) {
+        return setMessage(getContext().getString(messageId));
+    }
+
+    @Override
+    public AlertDialog.Builder setPositiveButton(CharSequence text, DialogInterface.OnClickListener listener) {
+        buttons.setVisibility(View.VISIBLE);
+        positive.setVisibility(View.VISIBLE);
+        positive.setText(text);
+        positiveListener = listener;
+        positive.setOnClickListener((v) -> {
+            if (positiveListener != null) {
+                positiveListener.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
+            }
+            dialog.dismiss();
+        });
+        return this;
+    }
+
+    @Override
+    public AlertDialog.Builder setPositiveButton(@StringRes int textId, DialogInterface.OnClickListener listener) {
+        return setPositiveButton(getContext().getString(textId), listener);
+    }
+
+    @Override
+    public AlertDialog.Builder setNegativeButton(CharSequence text, DialogInterface.OnClickListener listener) {
+        buttons.setVisibility(View.VISIBLE);
+        negative.setVisibility(View.VISIBLE);
+        negative.setText(text);
+        negativeListener = listener;
+        negative.setOnClickListener((v) -> {
+            if (negativeListener != null) {
+                negativeListener.onClick(dialog, DialogInterface.BUTTON_NEGATIVE);
+            }
+            dialog.dismiss();
+        });
+        return this;
+    }
+
+    @Override
+    public AlertDialog.Builder setNegativeButton(@StringRes int textId, DialogInterface.OnClickListener listener) {
+        return setNegativeButton(getContext().getString(textId), listener);
+    }
+
+    @Override
+    public AlertDialog.Builder setNeutralButton(CharSequence text, DialogInterface.OnClickListener listener) {
+        buttons.setVisibility(View.VISIBLE);
+        neutral.setVisibility(View.VISIBLE);
+        neutral.setText(text);
+        neutralListener = listener;
+        neutral.setOnClickListener((v) -> {
+            if (neutralListener != null) {
+                neutralListener.onClick(dialog, DialogInterface.BUTTON_NEUTRAL);
+            }
+            dialog.dismiss();
+        });
+        return this;
+    }
+
+    @Override
+    public AlertDialog.Builder setNeutralButton(@StringRes int textId, DialogInterface.OnClickListener listener) {
+        return setNeutralButton(getContext().getString(textId), listener);
+    }
+
+    @Override
+    public AlertDialog create() {
+        dialog = super.create();
+        return dialog;
+    }
+
+    @Override
+    public AlertDialog show() {
+        create();
+        dialog.show();
+        return dialog;
+    }
+}

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

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

@@ -0,0 +1,12 @@
+package com.topjohnwu.magisk.components;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.Utils;
+
+public class Fragment extends android.support.v4.app.Fragment {
+
+    public MagiskManager getApplication() {
+        return Utils.getMagiskManager(getActivity());
+    }
+
+}

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

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

@@ -0,0 +1,39 @@
+package com.topjohnwu.magisk.components;
+
+import android.app.Activity;
+import android.support.annotation.StringRes;
+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) {
+        View view = activity.findViewById(android.R.id.content);
+        return make(view, text, duration);
+    }
+
+    public static Snackbar make(Activity activity, @StringRes int resId, int duration) {
+        return make(activity, activity.getString(resId), duration);
+    }
+
+    public static Snackbar make(View view, CharSequence text, int duration) {
+        Snackbar snack = Snackbar.make(view, text, duration);
+        setup(snack);
+        return snack;
+    }
+
+    public static Snackbar make(View view, @StringRes int resId, int duration) {
+        Snackbar snack = Snackbar.make(view, resId, duration);
+        setup(snack);
+        return snack;
+    }
+
+    private static void setup(Snackbar snack) {
+        TextView text = ButterKnife.findById(snack.getView(), android.support.design.R.id.snackbar_text);
+        text.setMaxLines(Integer.MAX_VALUE);
+    }
+
+}

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

@@ -0,0 +1,93 @@
+package com.topjohnwu.magisk.database;
+
+import android.content.Context;
+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 java.util.Collection;
+
+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;
+
+    public RepoDatabaseHelper(Context context) {
+        super(context, "repo.db", null, DATABASE_VER);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        onUpgrade(db, 0, DATABASE_VER);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        if (oldVersion == 0) {
+            db.execSQL(
+                    "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
+                    "(id TEXT, name TEXT, version TEXT, versionCode INT, " +
+                    "author TEXT, description TEXT, repo_name TEXT, last_update INT, " +
+                    "PRIMARY KEY(id))");
+            oldVersion++;
+        }
+        if (oldVersion == 1) {
+            db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD template INT");
+            oldVersion++;
+        }
+    }
+
+    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();
+    }
+
+    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() });
+        }
+        db.close();
+    }
+
+    public ValueSortedMap<String, Repo> getRepoMap() {
+        return getRepoMap(true);
+    }
+
+    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);
+                }
+            }
+        }
+        db.close();
+        return ret;
+    }
+}

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

@@ -0,0 +1,263 @@
+package com.topjohnwu.magisk.database;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.superuser.Policy;
+import com.topjohnwu.magisk.superuser.SuLogEntry;
+import com.topjohnwu.magisk.utils.Utils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+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";
+
+    private static final int DATABASE_VER = 2;
+    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 PackageManager pm;
+
+    public SuDatabaseHelper(Context context) {
+        super(context, "su.db", null, DATABASE_VER);
+        magiskManager = Utils.getMagiskManager(context);
+        pm = context.getPackageManager();
+        cleanup();
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        onUpgrade(db, 0, DATABASE_VER);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        if (oldVersion == 0) {
+            createTables(db);
+            oldVersion = 2;
+        }
+        if (oldVersion == 1) {
+            // We're dropping column app_name, rename and re-construct table
+            db.execSQL("ALTER TABLE " + POLICY_TABLE + " RENAME TO " + POLICY_TABLE + "_old");
+
+            // Create the new tables
+            createTables(db);
+
+            // Migrate old data to new tables
+            db.execSQL(
+                    "INSERT INTO " + POLICY_TABLE + " SELECT " +
+                    "uid, package_name, policy, until, logging, notification " +
+                    "FROM " + POLICY_TABLE + "_old");
+            db.execSQL("DROP TABLE " + POLICY_TABLE + "_old");
+
+            File oldDB = magiskManager.getDatabasePath("sulog.db");
+            if (oldDB.exists()) {
+                migrateLegacyLogList(oldDB, db);
+                magiskManager.deleteDatabase("sulog.db");
+            }
+            ++oldVersion;
+        }
+    }
+
+    private void createTables(SQLiteDatabase db) {
+        // Policies
+        db.execSQL(
+                "CREATE TABLE IF NOT EXISTS " + POLICY_TABLE + " " +
+                "(uid INT, package_name TEXT, policy INT, " +
+                "until INT, logging INT, notification INT, " +
+                "PRIMARY KEY(uid))");
+
+        // Logs
+        db.execSQL(
+                "CREATE TABLE IF NOT EXISTS " + LOG_TABLE + " " +
+                "(from_uid INT, package_name TEXT, app_name TEXT, from_pid INT, " +
+                "to_uid INT, action INT, time INT, command TEXT)");
+
+        // Settings
+        db.execSQL(
+                "CREATE TABLE IF NOT EXISTS " + SETTINGS_TABLE + " " +
+                "(key TEXT, value INT, PRIMARY KEY(key))");
+    }
+
+    private void cleanup() {
+        SQLiteDatabase db = getWritableDatabase();
+        // Clear outdated policies
+        db.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) });
+    }
+
+    public void deletePolicy(Policy policy) {
+        deletePolicy(policy.packageName);
+    }
+
+    public void deletePolicy(String pkg) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(POLICY_TABLE, "package_name=?", new String[] { pkg });
+        db.close();
+    }
+
+    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)});
+    }
+
+    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)) {
+            if (c.moveToNext()) {
+                policy = new Policy(c, pm);
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            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)) {
+            if (c.moveToNext()) {
+                policy = new Policy(c, pm);
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            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();
+    }
+
+    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=?",
+                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)) {
+            while (c.moveToNext()) {
+                try {
+                    policy = new Policy(c, pm);
+                    // The application changed UID for some reason, check user config
+                    if (policy.info.uid != policy.uid) {
+                        if (magiskManager.suReauth) {
+                            // Reauth required, remove from DB
+                            deletePolicy(db, policy.uid);
+                            continue;
+                        } else {
+                            // No reauth, update to use the new UID
+                            policy.uid = policy.info.uid;
+                            updatePolicy(db, policy);
+                        }
+                    }
+                    ret.add(policy);
+                } catch (PackageManager.NameNotFoundException e) {
+                    // The app no longer exist, remove from DB
+                    deletePolicy(db, c.getInt(c.getColumnIndex("uid")));
+                }
+            }
+        }
+        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")) {
+            while (c.moveToNext()) {
+                ret.add(new SuLogEntry(c));
+            }
+        }
+        db.close();
+        return ret;
+    }
+
+    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());
+        }
+    }
+
+    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();
+    }
+
+    public void clearLogs() {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(LOG_TABLE, null, null);
+        db.close();
+    }
+
+    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();
+    }
+
+    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()) {
+                value = c.getInt(c.getColumnIndex("value"));
+            }
+        }
+        db.close();
+        return value;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.topjohnwu.magisk.module;
 
 
+import android.database.Cursor;
 import android.support.annotation.NonNull;
 
 import com.topjohnwu.magisk.utils.Logger;
@@ -9,66 +10,76 @@ import java.util.List;
 
 public abstract class BaseModule implements Comparable<BaseModule> {
 
-    protected String mId, mName, mVersion, mAuthor, mDescription, mSupportUrl, mDonateUrl;
-    protected boolean mIsCacheModule = false;
-    protected int mVersionCode = 0;
+    private String mId, mName, mVersion, mAuthor, mDescription;
+    private int mVersionCode = 0, templateVersion = 0;
+
+    protected BaseModule() {}
+
+    protected BaseModule(Cursor c) {
+        mId = c.getString(c.getColumnIndex("id"));
+        mName = c.getString(c.getColumnIndex("name"));
+        mVersion = c.getString(c.getColumnIndex("version"));
+        mVersionCode = c.getInt(c.getColumnIndex("versionCode"));
+        mAuthor = c.getString(c.getColumnIndex("author"));
+        mDescription = c.getString(c.getColumnIndex("description"));
+        templateVersion = c.getInt(c.getColumnIndex("template"));
+    }
 
     protected void parseProps(List<String> props) throws CacheModException { parseProps(props.toArray(new String[props.size()])); }
 
     protected void parseProps(String[] props) throws CacheModException {
         for (String line : props) {
             String[] prop = line.split("=", 2);
-            if (prop.length != 2) {
+            if (prop.length != 2)
                 continue;
-            }
 
             String key = prop[0].trim();
-            if (key.charAt(0) == '#') {
+            if (key.charAt(0) == '#')
                 continue;
-            }
 
             switch (key) {
                 case "id":
-                    this.mId = prop[1];
+                    mId = prop[1];
                     break;
                 case "name":
-                    this.mName = prop[1];
+                    mName = prop[1];
                     break;
                 case "version":
-                    this.mVersion = prop[1];
+                    mVersion = prop[1];
                     break;
                 case "versionCode":
                     try {
-                        this.mVersionCode = Integer.parseInt(prop[1]);
+                        mVersionCode = Integer.parseInt(prop[1]);
                     } catch (NumberFormatException ignored) {}
                     break;
                 case "author":
-                    this.mAuthor = prop[1];
+                    mAuthor = prop[1];
                     break;
                 case "description":
-                    this.mDescription = prop[1];
-                    break;
-                case "support":
-                    this.mSupportUrl = prop[1];
-                    break;
-                case "donate":
-                    this.mDonateUrl = prop[1];
+                    mDescription = prop[1];
                     break;
+                case "template":
+                    try {
+                        templateVersion = Integer.parseInt(prop[1]);
+                    } catch (NumberFormatException ignored) {}
                 case "cacheModule":
-                    this.mIsCacheModule = Boolean.parseBoolean(prop[1]);
+                    if (Boolean.parseBoolean(prop[1]))
+                        throw new CacheModException(mId);
                     break;
                 default:
                     break;
             }
         }
-        if (mIsCacheModule)
-            throw new CacheModException(mId);
     }
 
     public String getName() {
         return mName;
     }
 
+    public void setName(String name) {
+        mName = name;
+    }
+
     public String getVersion() {
         return mVersion;
     }
@@ -77,7 +88,13 @@ public abstract class BaseModule implements Comparable<BaseModule> {
         return mAuthor;
     }
 
-    public String getId() {return mId; }
+    public String getId() {
+        return mId;
+    }
+
+    public void setId(String id) {
+        mId = id;
+    }
 
     public String getDescription() {
         return mDescription;
@@ -87,22 +104,18 @@ public abstract class BaseModule implements Comparable<BaseModule> {
         return mVersionCode;
     }
 
-    public String getDonateUrl() {
-        return mDonateUrl;
-    }
-
-    public String getSupportUrl() {
-        return mSupportUrl;
+    public int getTemplateVersion() {
+        return templateVersion;
     }
 
     public static class CacheModException extends Exception {
         public CacheModException(String id) {
-            Logger.dev("Cache mods are no longer supported! id: " + id);
+            Logger.error("Cache mods are no longer supported! id: " + id);
         }
     }
 
     @Override
-    public int compareTo(@NonNull BaseModule o) {
-        return this.getName().toLowerCase().compareTo(o.getName().toLowerCase());
+    public int compareTo(@NonNull BaseModule module) {
+        return this.getName().toLowerCase().compareTo(module.getName().toLowerCase());
     }
 }

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

@@ -16,15 +16,16 @@ public class Module extends BaseModule {
         mDisableFile = path + "/disable";
         mUpdateFile = path + "/update";
 
-        if (mId == null) {
+        if (getId() == null) {
             int sep = path.lastIndexOf('/');
-            mId = path.substring(sep + 1);
+            setId(path.substring(sep + 1));
         }
 
-        if (mName == null)
-            mName = mId;
+        if (getName() == null) {
+            setName(getId());
+        }
 
-        Logger.dev("Creating Data, id: " + mId);
+        Logger.dev("Creating Module, id: " + getId());
 
         mEnable = !Utils.itemExist(mDisableFile);
         mRemove = Utils.itemExist(mRemoveFile);
@@ -32,11 +33,13 @@ public class Module extends BaseModule {
     }
 
     public void createDisableFile() {
-        mEnable = !Utils.createFile(mDisableFile);
+        mEnable = false;
+        Utils.createFile(mDisableFile);
     }
 
     public void removeDisableFile() {
-        mEnable = Utils.removeItem(mDisableFile);
+        mEnable = true;
+        Utils.removeItem(mDisableFile);
     }
 
     public boolean isEnabled() {
@@ -44,11 +47,13 @@ public class Module extends BaseModule {
     }
 
     public void createRemoveFile() {
-        mRemove = Utils.createFile(mRemoveFile);
+        mRemove = true;
+        Utils.createFile(mRemoveFile);
     }
 
     public void deleteRemoveFile() {
-        mRemove = !Utils.removeItem(mRemoveFile);
+        mRemove = false;
+        Utils.removeItem(mRemoveFile);
     }
 
     public boolean willBeRemoved() {

app/src/main/java/com/topjohnwu/magisk/module/ModuleHelper.java

@@ -1,180 +0,0 @@
-package com.topjohnwu.magisk.module;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.widget.Toast;
-
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.topjohnwu.magisk.Global;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ValueSortedMap;
-import com.topjohnwu.magisk.utils.WebService;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-public class ModuleHelper {
-
-    private static final String MAGISK_PATH = "/magisk";
-
-    private static final int GSON_DB_VER = 1;
-    private static final String ETAG_KEY = "ETag";
-    private static final String VERSION_KEY = "version";
-    private static final String REPO_KEY = "repomap";
-    private static final String FILE_KEY = "RepoMap";
-
-    public static void createModuleMap() {
-        Logger.dev("ModuleHelper: Loading modules");
-
-        Global.Data.moduleMap = new ValueSortedMap<>();
-
-        for (String path : Utils.getModList(MAGISK_PATH)) {
-            Logger.dev("ModuleHelper: Adding modules from " + path);
-            Module module;
-            try {
-                module = new Module(path);
-                Global.Data.moduleMap.put(module.getId(), module);
-            } catch (BaseModule.CacheModException ignored) {}
-        }
-
-        Logger.dev("ModuleHelper: Data load done");
-    }
-
-    public static void createRepoMap(Context context) {
-        Logger.dev("ModuleHelper: Loading repos");
-
-        SharedPreferences prefs = context.getSharedPreferences(FILE_KEY, Context.MODE_PRIVATE);
-
-        Global.Data.repoMap = new ValueSortedMap<>();
-
-        Gson gson = new Gson();
-        String jsonString;
-
-        int cachedVersion = prefs.getInt(VERSION_KEY, 0);
-        if (cachedVersion != GSON_DB_VER) {
-            // Ignore incompatible cached database
-            jsonString = null;
-        } else {
-            jsonString = prefs.getString(REPO_KEY, null);
-        }
-
-        Map<String, Repo> cached = null;
-
-        if (jsonString != null) {
-            cached = gson.fromJson(jsonString, new TypeToken<ValueSortedMap<String, Repo>>(){}.getType());
-        }
-
-        if (cached == null) {
-            cached = new ValueSortedMap<>();
-        }
-
-        // Get cached ETag to add in the request header
-        String etag = prefs.getString(ETAG_KEY, "");
-        Map<String, String> header = new HashMap<>();
-        header.put("If-None-Match", etag);
-
-        // Making a request to main URL for repo info
-        jsonString = WebService.request(
-                context.getString(R.string.url_main), WebService.GET, null, header, false);
-
-        if (!jsonString.isEmpty()) {
-            try {
-                JSONArray jsonArray = new JSONArray(jsonString);
-                // If it gets to this point, the response is valid, update ETag
-                etag = WebService.getLastResponseHeader().get(ETAG_KEY).get(0);
-                // Maybe bug in Android build tools, sometimes the ETag has crap in it...
-                etag = etag.substring(etag.indexOf('\"'), etag.lastIndexOf('\"') + 1);
-
-                // Update repo info
-                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;
-                    try {
-                        updatedDate = format.parse(lastUpdate);
-                    } catch (ParseException e) {
-                        continue;
-                    }
-                    Repo repo = cached.get(id);
-                    try {
-                        if (repo == null) {
-                            Logger.dev("ModuleHelper: Create new repo " + id);
-                            repo = new Repo(context, name, updatedDate);
-                        } else {
-                            Logger.dev("ModuleHelper: Update cached repo " + id);
-                            repo.update(updatedDate);
-                        }
-                        if (repo.getId() != null) {
-                            Global.Data.repoMap.put(id, repo);
-                        }
-                    } catch (BaseModule.CacheModException ignored) {}
-                }
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-        } else {
-            // Use cached if no internet or no updates
-            Logger.dev("ModuleHelper: No updates, use cached");
-            Global.Data.repoMap.putAll(cached);
-        }
-
-        prefs.edit()
-                .putInt(VERSION_KEY, GSON_DB_VER)
-                .putString(REPO_KEY, gson.toJson(Global.Data.repoMap))
-                .putString(ETAG_KEY, etag)
-                .apply();
-
-        Logger.dev("ModuleHelper: Repo load done");
-    }
-
-    public static void getModuleList(List<Module> moduleList) {
-        moduleList.clear();
-        moduleList.addAll(Global.Data.moduleMap.values());
-    }
-
-    public static void getRepoLists(List<Repo> update, List<Repo> installed, List<Repo> others) {
-        update.clear();
-        installed.clear();
-        others.clear();
-        for (Repo repo : Global.Data.repoMap.values()) {
-            Module module = Global.Data.moduleMap.get(repo.getId());
-            if (module != null) {
-                if (repo.getVersionCode() > module.getVersionCode()) {
-                    update.add(repo);
-                } else {
-                    installed.add(repo);
-                }
-            } else {
-                others.add(repo);
-            }
-        }
-    }
-
-    public static void clearRepoCache(Context context) {
-        SharedPreferences repoMap = context.getSharedPreferences(FILE_KEY, Context.MODE_PRIVATE);
-        repoMap.edit()
-                .remove(ETAG_KEY)
-                .remove(VERSION_KEY)
-                .apply();
-        Global.Events.repoLoadDone.isTriggered = false;
-        new Async.LoadRepos(context).exec();
-        Toast.makeText(context, R.string.repo_cache_cleared, Toast.LENGTH_SHORT).show();
-    }
-
-}

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

@@ -1,53 +1,71 @@
 package com.topjohnwu.magisk.module;
 
-import android.content.Context;
+import android.content.ContentValues;
+import android.database.Cursor;
 
-import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.WebService;
 
 import java.util.Date;
 
 public class Repo extends BaseModule {
-    private String mLogUrl, mManifestUrl, mZipUrl;
+
+    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(Context context, String name, Date lastUpdate) throws CacheModException {
+    public Repo(String name, Date lastUpdate) throws CacheModException {
         mLastUpdate = lastUpdate;
-        mLogUrl = context.getString(R.string.file_url, name, "changelog.txt");
-        mManifestUrl = context.getString(R.string.file_url, name, "module.prop");
-        mZipUrl = context.getString(R.string.zip_url, name);
+        repoName = name;
         update();
     }
 
+    public Repo(Cursor c) {
+        super(c);
+        repoName = c.getString(c.getColumnIndex("repo_name"));
+        mLastUpdate = new Date(c.getLong(c.getColumnIndex("last_update")));
+    }
+
     public void update() throws CacheModException {
-        Logger.dev("Repo: Re-fetch prop");
-        String props = WebService.request(mManifestUrl, WebService.GET, true);
+        String props = WebService.request(getManifestUrl(), WebService.GET);
         String lines[] = props.split("\\n");
         parseProps(lines);
+        Logger.dev("Repo: Fetching prop: " + getId());
     }
 
     public void update(Date lastUpdate) throws CacheModException {
-        Logger.dev("Repo: Old: " + mLastUpdate);
-        Logger.dev("Repo: New: " + lastUpdate);
-        if (mIsCacheModule)
-            throw new CacheModException(mId);
         if (lastUpdate.after(mLastUpdate)) {
             mLastUpdate = lastUpdate;
             update();
         }
     }
 
-    public String getZipUrl() {
-        return mZipUrl;
+    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());
+        values.put("repo_name", repoName);
+        values.put("last_update", mLastUpdate.getTime());
+        values.put("template", getTemplateVersion());
+        return values;
     }
 
-    public String getLogUrl() {
-        return mLogUrl;
+    public String getZipUrl() {
+        return String.format(ZIP_URL, repoName);
     }
 
     public String getManifestUrl() {
-        return mManifestUrl;
+        return String.format(FILE_URL, repoName, "module.prop");
+    }
+
+    public String getDetailUrl() {
+        return String.format(FILE_URL, repoName, "README.md");
     }
 
     public Date getLastUpdate() {

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

@@ -3,24 +3,28 @@ package com.topjohnwu.magisk.receivers;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.widget.Toast;
+import android.os.Build;
 
-import com.topjohnwu.magisk.Global;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Async;
+import com.topjohnwu.magisk.services.OnBootIntentService;
+import com.topjohnwu.magisk.utils.Utils;
 
 public class BootReceiver extends BroadcastReceiver {
 
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Global.initSuAccess();
-        Global.updateMagiskInfo();
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        if (prefs.getBoolean("magiskhide", false) && !Global.Info.disabled && Global.Info.magiskVersion > 10.3) {
-            Toast.makeText(context, R.string.start_magiskhide, Toast.LENGTH_SHORT).show();
-            new Async.MagiskHide(true).enable();
+    private void startIntentService(Context context) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            context.startForegroundService(new Intent(context, OnBootIntentService.class));
+        } else {
+            context.startService(new Intent(context, OnBootIntentService.class));
         }
     }
+
+    @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/MagiskDlReceiver.java

@@ -1,67 +0,0 @@
-package com.topjohnwu.magisk.receivers;
-
-import android.net.Uri;
-
-import com.topjohnwu.magisk.Global;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.ZipUtils;
-
-import java.io.File;
-
-public class MagiskDlReceiver extends DownloadReceiver {
-
-    String mBoot;
-    boolean mEnc, mVerity;
-
-    public MagiskDlReceiver(String bootImage, boolean keepEnc, boolean keepVerity) {
-        mBoot = bootImage;
-        mEnc = keepEnc;
-        mVerity = keepVerity;
-    }
-
-    @Override
-    public void onDownloadDone(Uri uri) {
-        new Async.FlashZIP(mContext, uri, mFilename) {
-
-            @Override
-            protected void preProcessing() throws Throwable {
-                Shell.su(
-                        "echo \"BOOTIMAGE=/dev/block/" + mBoot + "\" > /dev/.magisk",
-                        "echo \"KEEPFORCEENCRYPT=" + String.valueOf(mEnc) + "\" >> /dev/.magisk",
-                        "echo \"KEEPVERITY=" + String.valueOf(mVerity) + "\" >> /dev/.magisk"
-                );
-            }
-
-            @Override
-            protected boolean unzipAndCheck() {
-                publishProgress(mContext.getString(R.string.zip_install_unzip_zip_msg));
-                if (Shell.rootAccess()) {
-                    // We might not have busybox yet, unzip with Java
-                    // We will have complete busybox after Magisk installation
-                    ZipUtils.unzip(mCachedFile, new File(mCachedFile.getParent(), "magisk"));
-                    Shell.su(
-                            "mkdir -p " + Async.TMP_FOLDER_PATH + "/magisk",
-                            "cp -af " + mCachedFile.getParent() + "/magisk/. " + Async.TMP_FOLDER_PATH + "/magisk",
-                            "mv -f " + mCachedFile.getParent() + "/magisk/META-INF " + mCachedFile.getParent() + "/META-INF"
-                    );
-                }
-                return true;
-            }
-
-            @Override
-            protected void onSuccess() {
-                new Async.RootTask<Void, Void, Void>() {
-                    @Override
-                    protected Void doInBackground(Void... params) {
-                        Shell.su("setprop magisk.version "
-                                + String.valueOf(Global.Info.remoteMagiskVersion));
-                        return null;
-                    }
-                }.exec();
-                super.onSuccess();
-            }
-        }.exec();
-    }
-}

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

@@ -0,0 +1,41 @@
+package com.topjohnwu.magisk.receivers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.support.v4.content.FileProvider;
+
+import com.topjohnwu.magisk.utils.Utils;
+
+import java.io.File;
+
+public class ManagerUpdate extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Utils.dlAndReceive(
+                context,
+                new DownloadReceiver() {
+                    @Override
+                    public void onDownloadDone(Uri uri) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            Intent install = new Intent(Intent.ACTION_INSTALL_PACKAGE);
+                            install.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                            Uri content = FileProvider.getUriForFile(mContext,
+                                    "com.topjohnwu.magisk.provider", new File(uri.getPath()));
+                            install.setData(content);
+                            mContext.startActivity(install);
+                        } else {
+                            Intent install = new Intent(Intent.ACTION_VIEW);
+                            install.setDataAndType(uri, "application/vnd.android.package-archive");
+                            install.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            mContext.startActivity(install);
+                        }
+                    }
+                },
+                intent.getStringExtra("link"),
+                Utils.getLegalFilename("MagiskManager-v" +
+                        intent.getStringExtra("version") + ".apk"));
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.topjohnwu.magisk.receivers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.superuser.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);
+        if (policy == null)
+            return;
+
+        switch (intent.getAction()) {
+            case Intent.ACTION_PACKAGE_REPLACED:
+                // This will only work pre-O
+                if (magiskManager.suReauth) {
+                    magiskManager.suDB.deletePolicy(policy);
+                } else {
+                    int uid = intent.getIntExtra(Intent.EXTRA_UID, -1);
+                    // Update the UID if available
+                    if (uid > 0) {
+                        policy.uid = uid % 100000;
+                    }
+                    magiskManager.suDB.updatePolicy(policy);
+                }
+                break;
+            case Intent.ACTION_PACKAGE_FULLY_REMOVED:
+                magiskManager.suDB.deletePolicy(policy);
+                break;
+        }
+    }
+}

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

@@ -1,42 +0,0 @@
-package com.topjohnwu.magisk.receivers;
-
-import android.net.Uri;
-
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.ByteArrayInOutStream;
-import com.topjohnwu.magisk.utils.ZipUtils;
-
-import java.io.OutputStream;
-
-public class RepoDlReceiver extends DownloadReceiver {
-    @Override
-    public void onDownloadDone(Uri uri) {
-        // Flash the zip
-        new Async.FlashZIP(mContext, uri, mFilename){
-            @Override
-            protected void preProcessing() throws Throwable {
-                // Process and sign the zip
-                publishProgress(mContext.getString(R.string.zip_install_process_zip_msg));
-                ByteArrayInOutStream buffer = new ByteArrayInOutStream();
-
-                // First remove top folder (the folder with the repo name) in Github source zip
-                ZipUtils.removeTopFolder(mContext.getContentResolver().openInputStream(mUri), buffer);
-
-                // Then sign the zip for the first time
-                ZipUtils.signZip(mContext, buffer.getInputStream(), buffer, false);
-
-                // Adjust the zip to prevent unzip issues
-                ZipUtils.adjustZip(buffer);
-
-                // Finally, sign the whole zip file again
-                ZipUtils.signZip(mContext, buffer.getInputStream(), buffer, true);
-
-                // Write it back to the downloaded zip
-                try (OutputStream out = mContext.getContentResolver().openOutputStream(mUri)) {
-                    buffer.writeTo(out);
-                }
-            }
-        }.exec();
-    }
-}

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

@@ -0,0 +1,34 @@
+package com.topjohnwu.magisk.services;
+
+import android.app.IntentService;
+import android.content.Intent;
+import android.os.Build;
+import android.support.v7.app.NotificationCompat;
+
+import com.topjohnwu.magisk.R;
+
+public class OnBootIntentService extends IntentService {
+
+    private static final int ONBOOT_NOTIFICATION_ID = 3;
+
+    public OnBootIntentService() {
+        super("OnBootIntentService");
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+            builder.setSmallIcon(R.drawable.ic_magisk)
+                    .setContentTitle("onBoot")
+                    .setContentText("Running onBoot operations...");
+            startForeground(ONBOOT_NOTIFICATION_ID, builder.build());
+        }
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        // Currently nothing to do
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.topjohnwu.magisk.services;
+
+import android.app.job.JobParameters;
+import android.app.job.JobService;
+
+import com.topjohnwu.magisk.asyncs.CheckUpdates;
+
+public class UpdateCheckService extends JobService {
+    @Override
+    public boolean onStartJob(JobParameters params) {
+        new CheckUpdates(this, true){
+            @Override
+            protected Void doInBackground(Void... voids) {
+                magiskManager.updateMagiskInfo();
+                magiskManager.updateNotification = magiskManager.prefs.getBoolean("notification", true);
+                return super.doInBackground(voids);
+            }
+
+            @Override
+            protected void onPostExecute(Void v) {
+                jobFinished(params, false);
+                super.onPostExecute(v);
+            }
+        }.exec();
+        return true;
+    }
+
+    @Override
+    public boolean onStopJob(JobParameters params) {
+        return true;
+    }
+}

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

@@ -1,51 +1,57 @@
 package com.topjohnwu.magisk.superuser;
 
 import android.content.ContentValues;
-import android.content.pm.PackageInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
+import android.support.annotation.NonNull;
 
 
-public class Policy {
+public class Policy implements Comparable<Policy>{
     public static final int INTERACTIVE = 0;
     public static final int DENY = 1;
     public static final int ALLOW = 2;
 
-    public int uid, policy;
+    public int uid, policy = INTERACTIVE;
     public long until;
     public boolean logging = true, notification = true;
     public String packageName, appName;
-    public PackageInfo info;
+    public ApplicationInfo info;
 
     public Policy(int uid, PackageManager pm) throws PackageManager.NameNotFoundException {
         String[] pkgs = pm.getPackagesForUid(uid);
         if (pkgs != null && pkgs.length > 0) {
-            info = pm.getPackageInfo(pkgs[0], 0);
             this.uid = uid;
             packageName = pkgs[0];
-            appName = info.applicationInfo.loadLabel(pm).toString();
+            info = pm.getApplicationInfo(packageName, 0);
+            appName = info.loadLabel(pm).toString();
         } else throw new PackageManager.NameNotFoundException();
     }
 
-    public Policy(Cursor c) {
+    public Policy(Cursor c, PackageManager pm) throws PackageManager.NameNotFoundException {
         uid = c.getInt(c.getColumnIndex("uid"));
         packageName = c.getString(c.getColumnIndex("package_name"));
-        appName = c.getString(c.getColumnIndex("app_name"));
         policy = c.getInt(c.getColumnIndex("policy"));
         until = c.getLong(c.getColumnIndex("until"));
         logging = c.getInt(c.getColumnIndex("logging")) != 0;
         notification = c.getInt(c.getColumnIndex("notification")) != 0;
+        info = pm.getApplicationInfo(packageName, 0);
+        appName = info.loadLabel(pm).toString();
     }
     
     public ContentValues getContentValues() {
         ContentValues values = new ContentValues();
         values.put("uid", uid);
         values.put("package_name", packageName);
-        values.put("app_name", appName);
         values.put("policy", policy);
         values.put("until", until);
         values.put("logging", logging ? 1 : 0);
         values.put("notification", notification ? 1 : 0);
         return values;
     }
+
+    @Override
+    public int compareTo(@NonNull Policy policy) {
+        return appName.toLowerCase().compareTo(policy.appName.toLowerCase());
+    }
 }

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

@@ -2,11 +2,10 @@ package com.topjohnwu.magisk.superuser;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 
-import com.topjohnwu.magisk.Global;
+import com.topjohnwu.magisk.components.Activity;
 
-public class RequestActivity extends AppCompatActivity {
+public class RequestActivity extends Activity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -18,9 +17,8 @@ public class RequestActivity extends AppCompatActivity {
             return;
         }
 
-        Global.initSuConfigs(this);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.setClass(this, SuRequestActivity.class);
+        getApplicationContext().initSUConfig();
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setClass(this, SuRequestActivity.class);
         startActivity(intent);
         finish();
     }

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

@@ -1,79 +0,0 @@
-package com.topjohnwu.magisk.superuser;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SuDatabaseHelper extends SQLiteOpenHelper {
-
-    private static final int DATABASE_VER = 1;
-    private static final String TABLE_NAME = "policies";
-
-    public SuDatabaseHelper(Context context) {
-        super(context, "su.db", null, DATABASE_VER);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        db.execSQL(
-                "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
-                "(uid INT, package_name TEXT, app_name TEXT, policy INT, " +
-                "until INT, logging INT, notification INT, " +
-                "PRIMARY KEY(uid))");
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        // Currently new database, no upgrading
-    }
-
-    public boolean deletePolicy(int uid) {
-        SQLiteDatabase db = getWritableDatabase();
-        db.delete(TABLE_NAME, "uid=?", new String[] { String.valueOf(uid) });
-        db.close();
-        return getPolicy(uid) == null;
-    }
-
-    public Policy getPolicy(int uid) {
-        Policy policy = null;
-        SQLiteDatabase db = getReadableDatabase();
-        try (Cursor c = db.query(TABLE_NAME, null, "uid=?", new String[] { String.valueOf(uid) }, null, null, null)) {
-            if (c.moveToNext())
-                policy = new Policy(c);
-        }
-        db.close();
-        return policy;
-    }
-
-    public void addPolicy(Policy policy) {
-        SQLiteDatabase db = getWritableDatabase();
-        db.replace(TABLE_NAME, null, policy.getContentValues());
-        db.close();
-    }
-
-    public List<Policy> getPolicyList(PackageManager pm) {
-        List<Policy> ret = new ArrayList<>();
-        SQLiteDatabase db = getWritableDatabase();
-        Policy policy;
-        // Clear outdated policies
-        db.delete(TABLE_NAME, "until > 0 and until < ?", new String[] { String.valueOf(System.currentTimeMillis()) });
-        try (Cursor c = db.query(TABLE_NAME, null, null, null, null, null, "app_name ASC")) {
-            while (c.moveToNext()) {
-                policy = new Policy(c);
-                // Package is uninstalled
-                if (pm.getPackagesForUid(policy.uid) == null) {
-                    deletePolicy(policy.uid);
-                } else {
-                    ret.add(policy);
-                }
-            }
-        }
-        db.close();
-        return ret;
-    }
-}

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

@@ -1,68 +0,0 @@
-package com.topjohnwu.magisk.superuser;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-
-import com.topjohnwu.magisk.Global;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SuLogDatabaseHelper extends SQLiteOpenHelper {
-
-    private static final int DATABASE_VER = 1;
-    private static final String TABLE_NAME = "logs";
-
-    public SuLogDatabaseHelper(Context context) {
-        super(context, "sulog.db", null, DATABASE_VER);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        db.execSQL(
-                "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " (id INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                "from_uid INT, package_name TEXT, app_name TEXT, from_pid INT, " +
-                "to_uid INT, action INT, time INT, command TEXT)");
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        // Currently new database, no upgrading
-    }
-
-    public void addLog(SuLogEntry log) {
-        SQLiteDatabase db = getWritableDatabase();
-        db.insert(TABLE_NAME, null, log.getContentValues());
-        db.close();
-    }
-
-    public void clearLogs() {
-        SQLiteDatabase db = getWritableDatabase();
-        db.delete(TABLE_NAME, null, null);
-        db.close();
-    }
-
-    public List<SuLogEntry> getLogList() {
-        return getLogList(null);
-    }
-
-    public List<SuLogEntry> getLogList(int uid) {
-        return getLogList("uid=" + uid);
-    }
-
-    public List<SuLogEntry> getLogList(String selection) {
-        List<SuLogEntry> ret = new ArrayList<>();
-        SQLiteDatabase db = getWritableDatabase();
-        // Clear outdated logs
-        db.delete(TABLE_NAME, "time < ?", new String[] { String.valueOf(
-                System.currentTimeMillis() / 1000 - Global.Configs.suLogTimeout * 86400) });
-        try (Cursor c = db.query(TABLE_NAME, null, selection, null, null, null, "time DESC")) {
-            while (c.moveToNext())
-                ret.add(new SuLogEntry(c));
-        }
-        db.close();
-        return ret;
-    }
-}

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

@@ -3,10 +3,11 @@ package com.topjohnwu.magisk.superuser;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Process;
 import android.widget.Toast;
 
-import com.topjohnwu.magisk.Global;
+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 
 import java.util.Date;
@@ -15,16 +16,29 @@ public class SuReceiver extends BroadcastReceiver {
 
     private static final int NO_NOTIFICATION = 0;
     private 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;
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        int fromUid, toUid, pid;
+        int fromUid, toUid, pid, mode;
         String command, action;
         Policy policy;
 
+        MagiskManager magiskManager = (MagiskManager) context.getApplicationContext();
+        magiskManager.initSUConfig();
+
         if (intent == null) return;
 
+        mode = intent.getIntExtra("mode", -1);
+        if (mode < 0) return;
+
+        if (mode == NOTIFY_USER_TO_OWNER) {
+            magiskManager.toast(R.string.multiuser_hint_owner_request, Toast.LENGTH_LONG);
+            return;
+        }
+
         fromUid = intent.getIntExtra("from.uid", -1);
         if (fromUid < 0) return;
         if (fromUid == Process.myUid()) return; // Don't show anything if it's Magisk Manager
@@ -32,16 +46,16 @@ public class SuReceiver extends BroadcastReceiver {
         action = intent.getStringExtra("action");
         if (action == null) return;
 
-        SuDatabaseHelper suDbHelper = new SuDatabaseHelper(context);
-        policy = suDbHelper.getPolicy(fromUid);
-        if (policy == null) try {
-            policy = new Policy(fromUid, context.getPackageManager());
-        } catch (Throwable throwable) {
-            return;
+        policy = magiskManager.suDB.getPolicy(fromUid);
+        if (policy == null) {
+            try {
+                policy = new Policy(fromUid, context.getPackageManager());
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
+                return;
+            }
         }
 
-        Global.initSuConfigs(context);
-
         SuLogEntry log = new SuLogEntry(policy);
 
         String message;
@@ -58,10 +72,11 @@ public class SuReceiver extends BroadcastReceiver {
                 return;
         }
 
-        if (policy.notification && Global.Configs.suNotificationType == TOAST)
-            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+        if (policy.notification && magiskManager.suNotificationType == TOAST) {
+            magiskManager.toast(message, Toast.LENGTH_SHORT);
+        }
 
-        if (policy.logging) {
+        if (mode == NOTIFY_NORMAL_LOG && policy.logging) {
             toUid = intent.getIntExtra("to.uid", -1);
             if (toUid < 0) return;
             pid = intent.getIntExtra("pid", -1);
@@ -72,8 +87,7 @@ public class SuReceiver extends BroadcastReceiver {
             log.fromPid = pid;
             log.command = command;
             log.date = new Date();
-            SuLogDatabaseHelper logDbHelper = new SuLogDatabaseHelper(context);
-            logDbHelper.addLog(log);
+            magiskManager.suDB.addLog(log);
         }
     }
 }

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

@@ -8,7 +8,6 @@ import android.net.LocalSocketAddress;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.FileObserver;
-import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.Window;
 import android.widget.ArrayAdapter;
@@ -18,10 +17,10 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.topjohnwu.magisk.Global;
+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.CallbackHandler;
+import com.topjohnwu.magisk.asyncs.ParallelTask;
+import com.topjohnwu.magisk.components.Activity;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -29,13 +28,9 @@ import java.io.IOException;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class SuRequestActivity extends AppCompatActivity implements CallbackHandler.EventListener {
+public class SuRequestActivity extends Activity {
 
     private static final int[] timeoutList = {0, -1, 10, 20, 30, 60};
-    private static final int SU_PROTOCOL_PARAM_MAX = 20;
-    private static final int SU_PROTOCOL_NAME_MAX = 20;
-    private static final int SU_PROTOCOL_VALUE_MAX = 256;
-
     private static final int PROMPT = 0;
     private static final int AUTO_DENY = 1;
     private static final int AUTO_ALLOW = 2;
@@ -51,12 +46,11 @@ public class SuRequestActivity extends AppCompatActivity implements CallbackHand
     private String socketPath;
     private LocalSocket socket;
     private PackageManager pm;
+    private MagiskManager magiskManager;
 
-    private int uid;
+    private boolean hasTimeout;
     private Policy policy;
     private CountDownTimer timer;
-    private CallbackHandler.EventListener self;
-    private CallbackHandler.Event event = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -64,28 +58,32 @@ public class SuRequestActivity extends AppCompatActivity implements CallbackHand
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         pm = getPackageManager();
+        magiskManager = getApplicationContext();
 
         Intent intent = getIntent();
         socketPath = intent.getStringExtra("socket");
-        self = this;
+        hasTimeout = intent.getBooleanExtra("timeout", true);
 
         new FileObserver(socketPath) {
             @Override
             public void onEvent(int fileEvent, String path) {
                 if (fileEvent == FileObserver.DELETE_SELF) {
-                    if (event != null)
-                        event.trigger();
                     finish();
                 }
             }
         }.startWatching();
 
-        new SocketManager().exec();
+        new SocketManager(this).exec();
     }
 
-    void showRequest() {
+    private boolean cancelTimeout() {
+        timer.cancel();
+        deny_btn.setText(getString(R.string.deny));
+        return false;
+    }
 
-        switch (Global.Configs.suResponseType) {
+    private void showRequest() {
+        switch (magiskManager.suResponseType) {
             case AUTO_DENY:
                 handleAction(Policy.DENY, 0);
                 return;
@@ -96,10 +94,16 @@ public class SuRequestActivity extends AppCompatActivity implements CallbackHand
             default:
         }
 
+        // If not interactive, response directly
+        if (policy.policy != Policy.INTERACTIVE) {
+            handleAction();
+            return;
+        }
+
         setContentView(R.layout.activity_request);
         ButterKnife.bind(this);
 
-        appIcon.setImageDrawable(policy.info.applicationInfo.loadIcon(pm));
+        appIcon.setImageDrawable(policy.info.loadIcon(pm));
         appNameView.setText(policy.appName);
         packageNameView.setText(policy.packageName);
 
@@ -108,7 +112,7 @@ public class SuRequestActivity extends AppCompatActivity implements CallbackHand
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         timeout.setAdapter(adapter);
 
-        timer = new CountDownTimer(Global.Configs.suRequestTimeout * 1000, 1000) {
+        timer = new CountDownTimer(magiskManager.suRequestTimeout * 1000, 1000) {
             @Override
             public void onTick(long millisUntilFinished) {
                 deny_btn.setText(getString(R.string.deny_with_str, "(" + millisUntilFinished / 1000 + ")"));
@@ -116,42 +120,49 @@ public class SuRequestActivity extends AppCompatActivity implements CallbackHand
             @Override
             public void onFinish() {
                 deny_btn.setText(getString(R.string.deny_with_str, "(0)"));
-                event.trigger();
+                handleAction(Policy.DENY);
             }
         };
 
-        grant_btn.setOnClickListener(v -> handleAction(Policy.ALLOW));
-        deny_btn.setOnClickListener(v -> handleAction(Policy.DENY));
-        suPopup.setOnClickListener((v) -> {
+        grant_btn.setOnClickListener(v -> {
+            handleAction(Policy.ALLOW);
             timer.cancel();
-            deny_btn.setText(getString(R.string.deny));
         });
-        timeout.setOnTouchListener((v, event) -> {
+        deny_btn.setOnClickListener(v -> {
+            handleAction(Policy.DENY);
             timer.cancel();
-            deny_btn.setText(getString(R.string.deny));
-            return false;
         });
+        suPopup.setOnClickListener(v -> cancelTimeout());
+        timeout.setOnTouchListener((v, event) -> cancelTimeout());
 
-        timer.start();
+        if (hasTimeout) {
+            timer.start();
+        } else {
+            cancelTimeout();
+        }
     }
 
     @Override
     public void onBackPressed() {
-        event.trigger();
+        if (policy != null) {
+            handleAction(Policy.DENY);
+        }
+        finish();
     }
 
-    @Override
-    public void onTrigger(CallbackHandler.Event event) {
-        Policy policy = (Policy) event.getResult();
-        String response = "socket:DENY";
-        if (policy != null) {
-            Global.Events.uidMap.remove(policy.uid);
-            if (policy.policy == Policy.ALLOW)
-                response = "socket:ALLOW";
+    void handleAction() {
+        String response;
+        if (policy.policy == Policy.ALLOW) {
+            response = "socket:ALLOW";
+        } else {
+            response = "socket:DENY";
         }
         try {
             socket.getOutputStream().write((response).getBytes());
-        } catch (Exception ignored) {}
+            socket.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         finish();
     }
 
@@ -161,56 +172,53 @@ public class SuRequestActivity extends AppCompatActivity implements CallbackHand
 
     void handleAction(int action, int time) {
         policy.policy = action;
-        event.trigger(policy);
         if (time >= 0) {
-            policy.until = time == 0 ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
-            new SuDatabaseHelper(this).addPolicy(policy);
+            policy.until = (time == 0) ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
+            magiskManager.suDB.addPolicy(policy);
         }
+        handleAction();
     }
 
-    private class SocketManager extends Async.NormalTask<Void, Void, Boolean> {
+    private class SocketManager extends ParallelTask<Void, Void, Boolean> {
+
+        SocketManager(Activity context) {
+            super(context);
+        }
 
         @Override
         protected Boolean doInBackground(Void... params) {
-            try{
+            try {
                 socket = new LocalSocket();
                 socket.connect(new LocalSocketAddress(socketPath, LocalSocketAddress.Namespace.FILESYSTEM));
 
                 DataInputStream is = new DataInputStream(socket.getInputStream());
-
                 ContentValues payload = new ContentValues();
 
-                for (int i = 0; i < SU_PROTOCOL_PARAM_MAX; i++) {
-
+                while (true) {
                     int nameLen = is.readInt();
-                    if (nameLen > SU_PROTOCOL_NAME_MAX)
-                        throw new IllegalArgumentException("name length too long: " + nameLen);
-
                     byte[] nameBytes = new byte[nameLen];
                     is.readFully(nameBytes);
-
                     String name = new String(nameBytes);
-
                     if (TextUtils.equals(name, "eof"))
                         break;
 
                     int dataLen = is.readInt();
-                    if (dataLen > SU_PROTOCOL_VALUE_MAX)
-                        throw new IllegalArgumentException(name + " data length too long: " + dataLen);
-
                     byte[] dataBytes = new byte[dataLen];
                     is.readFully(dataBytes);
-
                     String data = new String(dataBytes);
-
                     payload.put(name, data);
                 }
 
-                if (payload.getAsInteger("uid") == null)
+                if (payload.getAsInteger("uid") == null) {
                     return false;
-                uid = payload.getAsInteger("uid");
+                }
 
-            } catch (IOException e) {
+                int uid = payload.getAsInteger("uid");
+                policy = magiskManager.suDB.getPolicy(uid);
+                if (policy == null) {
+                    policy = new Policy(uid, pm);
+                }
+            } catch (Exception e) {
                 e.printStackTrace();
                 return false;
             }
@@ -219,34 +227,10 @@ public class SuRequestActivity extends AppCompatActivity implements CallbackHand
 
         @Override
         protected void onPostExecute(Boolean result) {
-            if (!result) {
+            if (result) {
+                showRequest();
+            } else {
                 finish();
-                return;
-            }
-            boolean showRequest = false;
-            event = Global.Events.uidMap.get(uid);
-            if (event == null) {
-                showRequest = true;
-                event = new CallbackHandler.Event() {
-                    @Override
-                    public void trigger(Object result) {
-                        super.trigger(result);
-                        CallbackHandler.unRegister(this);
-                    }
-                };
-                Global.Events.uidMap.put(uid, event);
-            }
-            CallbackHandler.register(event, self);
-            try {
-                if (showRequest) {
-                    policy = new Policy(uid, pm);
-                    showRequest();
-                } else {
-                    finish();
-                }
-            } catch (PackageManager.NameNotFoundException e) {
-                e.printStackTrace();
-                event.trigger();
             }
         }
     }

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

@@ -1,344 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.provider.OpenableColumns;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.Global;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.adapters.ApplicationAdapter;
-import com.topjohnwu.magisk.module.ModuleHelper;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-public class Async {
-
-    public abstract static class RootTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
-        @SafeVarargs
-        public final void exec(Params... params) {
-            if (!Shell.rootAccess()) return;
-            executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, params);
-        }
-    }
-
-    public abstract static class NormalTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
-        @SafeVarargs
-        public final void exec(Params... params) {
-            executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, params);
-        }
-    }
-
-    public static final String UPDATE_JSON = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/updates/magisk_update.json";
-    public static final String MAGISK_HIDE_PATH = "/magisk/.core/magiskhide/";
-    public static final String TMP_FOLDER_PATH = "/dev/tmp";
-
-    public static class CheckUpdates extends NormalTask<Void, Void, Void> {
-
-        @Override
-        protected Void doInBackground(Void... voids) {
-            String jsonStr = WebService.request(UPDATE_JSON, WebService.GET);
-            try {
-                JSONObject json = new JSONObject(jsonStr);
-                JSONObject magisk = json.getJSONObject("magisk");
-                Global.Info.remoteMagiskVersion = magisk.getDouble("versionCode");
-                Global.Info.magiskLink = magisk.getString("link");
-                Global.Info.releaseNoteLink = magisk.getString("note");
-            } catch (JSONException ignored) {}
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            Global.Events.updateCheckDone.trigger();
-        }
-    }
-
-    public static void checkSafetyNet(Context context) {
-        new SafetyNetHelper(context) {
-            @Override
-            public void handleResults(int i) {
-                Global.Info.SNCheckResult = i;
-                Global.Events.safetyNetDone.trigger();
-            }
-        }.requestTest();
-    }
-
-    public static class LoadModules extends RootTask<Void, Void, Void> {
-
-        @Override
-        protected Void doInBackground(Void... voids) {
-            ModuleHelper.createModuleMap();
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            Global.Events.moduleLoadDone.trigger();
-        }
-    }
-
-    public static class LoadRepos extends NormalTask<Void, Void, Void> {
-
-        private Context mContext;
-
-        public LoadRepos(Context context) {
-            mContext = context;
-        }
-
-        @Override
-        protected Void doInBackground(Void... voids) {
-            ModuleHelper.createRepoMap(mContext);
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            Global.Events.repoLoadDone.trigger();
-        }
-    }
-
-    public static class LoadApps extends RootTask<Void, Void, Void> {
-
-        private PackageManager pm;
-
-        public LoadApps(PackageManager packageManager) {
-           pm = packageManager;
-        }
-
-        @Override
-        protected Void doInBackground(Void... voids) {
-            Global.Data.appList = pm.getInstalledApplications(0);
-            for (Iterator<ApplicationInfo> i = Global.Data.appList.iterator(); i.hasNext(); ) {
-                ApplicationInfo info = i.next();
-                if (ApplicationAdapter.BLACKLIST.contains(info.packageName) || !info.enabled)
-                    i.remove();
-            }
-            Collections.sort(Global.Data.appList, (a, b) -> a.loadLabel(pm).toString().toLowerCase()
-                    .compareTo(b.loadLabel(pm).toString().toLowerCase()));
-            Global.Data.magiskHideList = Shell.su(Async.MAGISK_HIDE_PATH + "list");
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            Global.Events.packageLoadDone.trigger();
-        }
-    }
-
-    public static class FlashZIP extends RootTask<Void, String, Integer> {
-
-        protected Uri mUri;
-        protected File mCachedFile;
-        private String mFilename;
-        protected ProgressDialog progress;
-        private Context mContext;
-
-        public FlashZIP(Context context, Uri uri, String filename) {
-            mContext = context;
-            mUri = uri;
-            mFilename = filename;
-        }
-
-        public FlashZIP(Context context, Uri uri) {
-            mContext = context;
-            mUri = uri;
-
-            // Try to get the filename ourselves
-            Cursor c = mContext.getContentResolver().query(uri, null, null, null, null);
-            if (c != null) {
-                int nameIndex = c.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-                c.moveToFirst();
-                if (nameIndex != -1) {
-                    mFilename = c.getString(nameIndex);
-                }
-                c.close();
-            }
-            if (mFilename == null) {
-                int idx = uri.getPath().lastIndexOf('/');
-                mFilename = uri.getPath().substring(idx + 1);
-            }
-        }
-
-        protected void preProcessing() throws Throwable {}
-
-        protected void copyToCache() throws Throwable {
-            publishProgress(mContext.getString(R.string.copying_msg));
-            mCachedFile = new File(mContext.getCacheDir().getAbsolutePath() + "/install.zip");
-            if (mCachedFile.exists() && !mCachedFile.delete()) {
-                Logger.error("FlashZip: Error while deleting already existing file");
-                throw new IOException();
-            }
-            try (
-                    InputStream in = mContext.getContentResolver().openInputStream(mUri);
-                    OutputStream outputStream = new FileOutputStream(mCachedFile)
-            ) {
-                byte buffer[] = new byte[1024];
-                int length;
-                if (in == null) throw new FileNotFoundException();
-                while ((length = in.read(buffer)) > 0) {
-                    outputStream.write(buffer, 0, length);
-                }
-                Logger.dev("FlashZip: File created successfully - " + mCachedFile.getPath());
-            } catch (FileNotFoundException e) {
-                Logger.error("FlashZip: Invalid Uri");
-                throw e;
-            } catch (IOException e) {
-                Logger.error("FlashZip: Error in creating file");
-                throw e;
-            }
-        }
-
-        protected boolean unzipAndCheck() {
-            ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android");
-            List<String> ret;
-            ret = Utils.readFile(mCachedFile.getParent() + "/META-INF/com/google/android/updater-script");
-            return Utils.isValidShellResponse(ret) && ret.get(0).contains("#MAGISK");
-        }
-
-        @Override
-        protected void onPreExecute() {
-            progress = new ProgressDialog(mContext);
-            progress.setTitle(R.string.zip_install_progress_title);
-            progress.show();
-        }
-
-        @Override
-        protected void onProgressUpdate(String... values) {
-            progress.setMessage(values[0]);
-        }
-
-        @Override
-        protected Integer doInBackground(Void... voids) {
-            Logger.dev("FlashZip Running... " + mFilename);
-            List<String> ret;
-            try {
-                preProcessing();
-                copyToCache();
-            } catch (Throwable e) {
-                e.printStackTrace();
-                return -1;
-            }
-            if (!unzipAndCheck()) return 0;
-            publishProgress(mContext.getString(R.string.zip_install_progress_msg, mFilename));
-            ret = Shell.su(
-                    "BOOTMODE=true sh " + mCachedFile.getParent() +
-                            "/META-INF/com/google/android/update-binary dummy 1 " + mCachedFile.getPath(),
-                    "if [ $? -eq 0 ]; then echo true; else echo false; fi"
-            );
-            if (!Utils.isValidShellResponse(ret)) return -1;
-            Logger.dev("FlashZip: Console log:");
-            for (String line : ret) {
-                Logger.dev(line);
-            }
-            Shell.su(
-                    "rm -rf " + mCachedFile.getParent() + "/*",
-                    "rm -rf " + TMP_FOLDER_PATH
-            );
-            if (Boolean.parseBoolean(ret.get(ret.size() - 1))) {
-                return 1;
-            }
-            return -1;
-        }
-
-        // -1 = error, manual install; 0 = invalid zip; 1 = success
-        @Override
-        protected void onPostExecute(Integer result) {
-            super.onPostExecute(result);
-            progress.dismiss();
-            switch (result) {
-                case -1:
-                    Toast.makeText(mContext, mContext.getString(R.string.install_error), Toast.LENGTH_LONG).show();
-                    Toast.makeText(mContext, mContext.getString(R.string.manual_install_1, mUri.getPath()), Toast.LENGTH_LONG).show();
-                    Toast.makeText(mContext, mContext.getString(R.string.manual_install_2), Toast.LENGTH_LONG).show();
-                    break;
-                case 0:
-                    Toast.makeText(mContext, mContext.getString(R.string.invalid_zip), Toast.LENGTH_LONG).show();
-                    break;
-                case 1:
-                    onSuccess();
-                    break;
-            }
-        }
-
-        protected void onSuccess() {
-            Global.Events.updateCheckDone.trigger();
-            new LoadModules().exec();
-
-            Utils.getAlertDialogBuilder(mContext)
-                    .setTitle(R.string.reboot_title)
-                    .setMessage(R.string.reboot_msg)
-                    .setPositiveButton(R.string.reboot, (dialogInterface, i) -> Shell.su(true, "reboot"))
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
-        }
-    }
-
-    public static class MagiskHide extends RootTask<Object, Void, Void> {
-
-        private boolean newShell = false;
-
-        public MagiskHide() {}
-
-        public MagiskHide(boolean b) {
-            newShell = b;
-        }
-
-        @Override
-        protected Void doInBackground(Object... params) {
-            String command = (String) params[0];
-            Shell.su(newShell, MAGISK_HIDE_PATH + command);
-            return null;
-        }
-
-        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 static class GetBootBlocks extends RootTask<Void, Void, Void> {
-        @Override
-        protected Void doInBackground(Void... params) {
-            if (Shell.rootAccess()) {
-                Global.Data.blockList = Shell.su("ls /dev/block | grep mmc");
-                if (Global.Info.bootBlock == null)
-                    Global.Info.bootBlock = Utils.detectBootImage();
-            }
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            Global.Events.blockDetectionDone.trigger();
-        }
-    }
-}

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

@@ -0,0 +1,50 @@
+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/CallbackHandler.java

@@ -1,67 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-public class CallbackHandler {
-
-    private static Map<Event, Set<EventListener>> listeners = new HashMap<>();
-
-    public static void register(Event event, EventListener listener) {
-        Set<EventListener> list = listeners.get(event);
-        if (list == null) {
-            list = new HashSet<>();
-            listeners.put(event, list);
-        }
-        list.add(listener);
-    }
-
-    public static void unRegister(Event event) {
-        Set<EventListener> list = listeners.remove(event);
-        if (list != null) {
-            list.clear();
-        }
-    }
-
-    public static void unRegister(Event event, EventListener listener) {
-        Set<EventListener> list = listeners.get(event);
-        if (list != null) {
-            list.remove(listener);
-        }
-    }
-
-    private static void triggerCallback(Event event) {
-        Set<EventListener> list = listeners.get(event);
-        if (list != null) {
-            for (EventListener listener : list) {
-                listener.onTrigger(event);
-            }
-        }
-    }
-
-    public static class Event {
-
-        public boolean isTriggered = false;
-        private Object result;
-
-        public void trigger() {
-            trigger(null);
-        }
-
-        public void trigger(Object result) {
-            this.result = result;
-            isTriggered = true;
-            triggerCallback(this);
-        }
-
-        public Object getResult() {
-            return result;
-        }
-    }
-
-    public interface EventListener {
-        void onTrigger(Event event);
-    }
-}

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

@@ -1,114 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-
-import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPropertyAnimatorCompat;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.github.clans.fab.FloatingActionMenu;
-
-import java.util.List;
-
-/**
- * Created by Matteo on 08/08/2015.
- *
- * Floating Action Menu Behavior for Clans.FloatingActionButton
- * https://github.com/Clans/FloatingActionButton/
- *
- * Use this behavior as your app:layout_behavior attribute in your Floating Action Menu to use the
- * FabMenu in a Coordinator Layout.
- *
- * Remember to use the correct namespace for the fab:
- * xmlns:app="http://schemas.android.com/apk/res-auto"
- */
-public class FABBehavior extends CoordinatorLayout.Behavior<View> {
-
-    private float mTranslationY;
-
-    public FABBehavior(Context context, AttributeSet attrs) {
-        super();
-    }
-
-    @Override
-    public boolean layoutDependsOn(CoordinatorLayout parent, View child, View dependency) {
-        return dependency instanceof Snackbar.SnackbarLayout;
-    }
-
-    @Override
-    public boolean onDependentViewChanged(CoordinatorLayout parent, View child, View dependency) {
-        if (dependency instanceof Snackbar.SnackbarLayout) {
-            updateTranslation(parent, child);
-        }
-
-        return false;
-    }
-
-    @Override
-    public void onDependentViewRemoved(CoordinatorLayout parent, View child, View dependency) {
-        if (dependency instanceof Snackbar.SnackbarLayout) {
-            revertTranslation(child);
-        }
-    }
-
-    private void updateTranslation(CoordinatorLayout parent, View child) {
-        float translationY = getTranslationY(parent, child);
-        if (translationY != mTranslationY) {
-            ViewPropertyAnimatorCompat anim = ViewCompat.animate(child);
-            anim.cancel();
-            anim.translationY(translationY).setDuration(100);
-            mTranslationY = translationY;
-        }
-    }
-
-    private void revertTranslation(View child) {
-        if (mTranslationY != 0) {
-            ViewPropertyAnimatorCompat anim = ViewCompat.animate(child);
-            anim.cancel();
-            anim.translationY(0).setDuration(100);
-            mTranslationY = 0;
-        }
-    }
-
-    private float getTranslationY(CoordinatorLayout parent, View child) {
-        float minOffset = 0.0F;
-        List<View> dependencies = parent.getDependencies(child);
-        int i = 0;
-
-        for (int z = dependencies.size(); i < z; ++i) {
-            View view = dependencies.get(i);
-            if (view instanceof Snackbar.SnackbarLayout && parent.doViewsOverlap(child, view)) {
-                minOffset = Math.min(minOffset, ViewCompat.getTranslationY(view) - (float) view.getHeight());
-            }
-        }
-
-        return minOffset;
-    }
-
-    /**
-     * onStartNestedScroll and onNestedScroll will hide/show the FabMenu when a scroll is detected.
-     */
-    @Override
-    public boolean onStartNestedScroll(CoordinatorLayout coordinatorLayout, View child,
-                                       View directTargetChild, View target, int nestedScrollAxes) {
-        return nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL ||
-                super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target,
-                        nestedScrollAxes);
-    }
-
-    @Override
-    public void onNestedScroll(CoordinatorLayout coordinatorLayout, View child, View target,
-                               int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
-        super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed,
-                dyUnconsumed);
-        FloatingActionMenu fabMenu = (FloatingActionMenu) child;
-        if (dyConsumed > 0 && !fabMenu.isMenuButtonHidden()) {
-            fabMenu.hideMenuButton(true);
-        } else if (dyConsumed < 0 && fabMenu.isMenuButtonHidden()) {
-            fabMenu.showMenuButton(true);
-        }
-    }
-}

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

@@ -2,39 +2,32 @@ package com.topjohnwu.magisk.utils;
 
 import android.util.Log;
 
-import com.topjohnwu.magisk.Global;
+import com.topjohnwu.magisk.MagiskManager;
+
+import java.util.Locale;
 
 public class Logger {
 
-    public static final String TAG = "Magisk";
+    public static final String MAIN_TAG = "Magisk";
+    public static final String DEBUG_TAG = "MagiskManager";
 
-    public static void debug(String msg) {
-        Log.d(TAG, "DEBUG: " + msg);
+    public static void debug(String fmt, Object... args) {
+        Log.d(DEBUG_TAG, "DEBUG: " + String.format(Locale.US, fmt, args));
     }
 
-    public static void error(String msg) {
-        Log.e(TAG, "ERROR: " + msg);
+    public static void error(String fmt, Object... args) {
+        Log.e(MAIN_TAG, "MANAGERERROR: " + String.format(Locale.US, fmt, args));
     }
 
-    public static void dev(String msg, Object... args) {
-        if (Global.Configs.devLogging) {
-            if (args.length == 1 && args[0] instanceof Throwable) {
-                Log.d(TAG, "DEV: " + msg, (Throwable) args[0]);
-            } else {
-                Log.d(TAG, "DEV: " + String.format(msg, args));
-            }
+    public static void dev(String fmt, Object... args) {
+        if (MagiskManager.devLogging) {
+            Log.d(DEBUG_TAG, String.format(Locale.US, fmt, args));
         }
     }
 
-    public static void dev(String msg) {
-        if (Global.Configs.devLogging) {
-            Log.d(TAG, "DEBUG: " + msg);
-        }
-    }
-
-    public static void shell(boolean root, String msg) {
-        if (Global.Configs.shellLogging) {
-            Log.d(root ? "SU" : "SH", msg);
+    public static void shell(boolean root, String fmt, Object... args) {
+        if (MagiskManager.shellLogging) {
+            Log.d(DEBUG_TAG, (root ? "MANAGERSU: " : "MANAGERSH: ") + String.format(Locale.US, fmt, args));
         }
     }
 }

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

@@ -1,15 +1,16 @@
 package com.topjohnwu.magisk.utils;
 
-import android.content.Context;
 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;
@@ -19,40 +20,55 @@ import java.security.SecureRandom;
 public abstract class SafetyNetHelper
         implements GoogleApiClient.OnConnectionFailedListener, GoogleApiClient.ConnectionCallbacks {
 
-    private GoogleApiClient mGoogleApiClient;
+    private static boolean isRunning = false;
 
-    public SafetyNetHelper(Context context) {
-        mGoogleApiClient = new GoogleApiClient.Builder(context)
+    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)
-                .addOnConnectionFailedListener(this)
                 .build();
+        mGoogleApiClient.connect();
+        isRunning = true;
     }
 
     @Override
     public void onConnectionFailed(@NonNull ConnectionResult result) {
         Logger.dev("SN: Google API fail");
-        handleResults(-2);
-    }
-
-    @Override
-    public void onConnected(@Nullable Bundle bundle) {
-        Logger.dev("SN: Google API Connected");
-        safetyNetCheck();
+        ret.errmsg = result.getErrorMessage();
+        handleResults(ret);
     }
 
     @Override
     public void onConnectionSuspended(int i) {
         Logger.dev("SN: Google API Suspended");
-        handleResults(-3);
+        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);
     }
 
-    public void requestTest() {
-        // Connect Google Service
-        mGoogleApiClient.connect();
-    }
-
-    private void safetyNetCheck() {
+    @Override
+    public void onConnected(@Nullable Bundle bundle) {
+        Logger.dev("SN: Google API Connected");
         // Create nonce
         byte[] nonce = new byte[24];
         new SecureRandom().nextBytes(nonce);
@@ -68,16 +84,31 @@ public abstract class SafetyNetHelper
                         Logger.dev("SN: Response: " + json);
                         try {
                             JSONObject decoded = new JSONObject(json);
-                            handleResults(decoded.getBoolean("ctsProfileMatch") ? 1 : 0);
-                        } catch (JSONException ignored) {}
+                            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");
-                        handleResults(-1);
+                        ret.errmsg = mActivity.getString(R.string.safetyNet_no_response);
                     }
                     // Disconnect
+                    mGoogleApiClient.stopAutoManage(mActivity);
                     mGoogleApiClient.disconnect();
+                    isRunning = false;
+                    handleResults(ret);
                 });
     }
 
-    public abstract void handleResults(int i);
+    // 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,5 +1,7 @@
 package com.topjohnwu.magisk.utils;
 
+import com.topjohnwu.magisk.asyncs.RootTask;
+
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -14,6 +16,7 @@ public class Shell {
 
     // -1 = problematic/unknown issue; 0 = not rooted; 1 = properly rooted
     public static int rootStatus;
+    public static final Object lock = new Object();
 
     private static boolean isInit = false;
     private static Process rootShell;
@@ -40,7 +43,6 @@ public class Shell {
 
         // Setup umask and PATH
         su("umask 022");
-        su("PATH=`[ -e /dev/busybox ] && echo /dev/busybox || echo /data/busybox`:$PATH");
 
         List<String> ret = su("echo -BOC-", "id");
 
@@ -120,11 +122,13 @@ public class Shell {
         StreamGobbler STDOUT;
 
         // Create the default shell if not init
-        if (!newShell && !isInit)
+        if (!newShell && !isInit) {
             init();
+        }
 
-        if (!newShell && !rootAccess())
+        if (!newShell && !rootAccess()) {
             return null;
+        }
 
         if (newShell) {
             res = Collections.synchronizedList(new ArrayList<String>());
@@ -132,6 +136,10 @@ public class Shell {
                 process = Runtime.getRuntime().exec("su");
                 STDIN = new DataOutputStream(process.getOutputStream());
                 STDOUT = new StreamGobbler(process.getInputStream(), res);
+
+                // Run the new shell with busybox and proper umask
+                STDIN.write(("umask 022\n").getBytes("UTF-8"));
+                STDIN.flush();
             } catch (IOException err) {
                 return null;
             }
@@ -207,4 +215,15 @@ public class Shell {
 
         return new ArrayList<>(res);
     }
+
+    public static void su_async(List<String> result, String... commands) {
+        new RootTask<Void, Void, Void>() {
+            @Override
+            protected Void doInRoot(Void... params) {
+                List<String> ret = Shell.su(commands);
+                if (result != null) result.addAll(ret);
+                return null;
+            }
+        }.exec();
+    }
 }

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

@@ -1,21 +1,37 @@
 package com.topjohnwu.magisk.utils;
 
 import android.Manifest;
-import android.app.AlertDialog;
+import android.app.Activity;
 import android.app.DownloadManager;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.Context;
+import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Environment;
+import android.provider.OpenableColumns;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.TaskStackBuilder;
+import android.support.v7.app.NotificationCompat;
 import android.text.TextUtils;
 import android.widget.Toast;
 
-import com.topjohnwu.magisk.Global;
+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.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.util.List;
@@ -24,29 +40,24 @@ public class Utils {
 
     public static boolean isDownloading = false;
 
+    private static final int MAGISK_UPDATE_NOTIFICATION_ID = 1;
+    private static final int APK_UPDATE_NOTIFICATION_ID = 2;
+
     public static boolean itemExist(String path) {
         String command = "if [ -e " + path + " ]; then echo true; else echo false; fi";
         List<String> ret = Shell.su(command);
         return isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(0));
     }
 
-    public static boolean commandExists(String s) {
-        String command = "if [ -z $(which " + s + ") ]; then echo false; else echo true; fi";
-        List<String> ret = Shell.sh(command);
-        return isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(0));
-    }
-
-    public static boolean createFile(String path) {
+    public static void createFile(String path) {
         String folder = path.substring(0, path.lastIndexOf('/'));
         String command = "mkdir -p " + folder + " 2>/dev/null; touch " + path + " 2>/dev/null; if [ -f \"" + path + "\" ]; then echo true; else echo false; fi";
-        List<String> ret = Shell.su(command);
-        return isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(0));
+        Shell.su_async(null, command);
     }
 
-    public static boolean removeItem(String path) {
+    public static void removeItem(String path) {
         String command = "rm -rf " + path + " 2>/dev/null; if [ -e " + path + " ]; then echo false; else echo true; fi";
-        List<String> ret = Shell.su(command);
-        return isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(0));
+        Shell.su_async(null, command);
     }
 
     public static List<String> getModList(String path) {
@@ -66,18 +77,19 @@ public class Utils {
     }
 
     public static void dlAndReceive(Context context, DownloadReceiver receiver, String link, String filename) {
-        if (isDownloading) {
+        if (isDownloading)
             return;
-        }
 
-        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
             Toast.makeText(context, R.string.permissionNotGranted, Toast.LENGTH_LONG).show();
             return;
         }
 
         File file = new File(Environment.getExternalStorageDirectory() + "/MagiskManager/" + filename);
 
-        if ((!file.getParentFile().exists() && !file.getParentFile().mkdirs()) || (file.exists() && !file.delete())) {
+        if ((!file.getParentFile().exists() && !file.getParentFile().mkdirs())
+                || (file.exists() && !file.delete())) {
             Toast.makeText(context, R.string.permissionNotGranted, Toast.LENGTH_LONG).show();
             return;
         }
@@ -86,12 +98,14 @@ public class Utils {
         isDownloading = true;
 
         DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(link));
-        request.setDestinationUri(Uri.fromFile(file));
 
-        receiver.setDownloadID(downloadManager.enqueue(request));
+        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.registerReceiver(receiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+        context.getApplicationContext().registerReceiver(receiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
     }
 
     public static String getLegalFilename(CharSequence filename) {
@@ -103,23 +117,18 @@ public class Utils {
     public static String detectBootImage() {
         String[] commands = {
                 "for PARTITION in kern-a KERN-A android_boot ANDROID_BOOT kernel KERNEL boot BOOT lnx LNX; do",
-                "BOOTIMAGE=`readlink /dev/block/by-name/$PARTITION || readlink /dev/block/platform/*/by-name/$PARTITION || readlink /dev/block/platform/*/*/by-name/$PARTITION`",
+                "BOOTIMAGE=`readlink /dev/block/by-name/$PARTITION || " +
+                        "readlink /dev/block/platform/*/by-name/$PARTITION || " +
+                        "readlink /dev/block/platform/*/*/by-name/$PARTITION`",
                 "if [ ! -z \"$BOOTIMAGE\" ]; then break; fi",
                 "done",
-                "echo \"${BOOTIMAGE##*/}\""
+                "echo \"$BOOTIMAGE\""
         };
         List<String> ret = Shell.su(commands);
-        if (isValidShellResponse(ret))
+        if (isValidShellResponse(ret)) {
             return ret.get(0);
-        return null;
-    }
-
-    public static AlertDialog.Builder getAlertDialogBuilder(Context context) {
-        if (Global.Configs.isDarkTheme) {
-            return new AlertDialog.Builder(context, R.style.AlertDialog_dh);
-        } else {
-            return new AlertDialog.Builder(context);
         }
+        return null;
     }
 
     public static boolean lowercaseContains(CharSequence string, CharSequence nonNullLowercaseSearch) {
@@ -140,13 +149,103 @@ public class Utils {
         return Integer.parseInt(prefs.getString(key, String.valueOf(def)));
     }
 
-    public static void checkAndStartMagiskHide() {
-        String command = "ps | grep magiskhide >/dev/null; echo $?";
-        List<String> ret = Shell.su(command);
-        if (!isValidShellResponse(ret))
-            return;
-        if (Integer.parseInt(ret.get(0)) != 0)
-            new Async.MagiskHide().enable();
+    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 String getNameFromUri(Context context, Uri uri) {
+        String name = null;
+        try (Cursor c = context.getContentResolver().query(uri, null, null, null, null)) {
+            if (c != null) {
+                int nameIndex = c.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+                if (nameIndex != -1) {
+                    c.moveToFirst();
+                    name = c.getString(nameIndex);
+                }
+            }
+        }
+        if (name == null) {
+            int idx = uri.getPath().lastIndexOf('/');
+            name = uri.getPath().substring(idx + 1);
+        }
+        return name;
+    }
+
+    public static void showUriSnack(Activity activity, Uri uri) {
+        SnackbarMaker.make(activity, activity.getString(R.string.internal_storage,
+                "/MagiskManager/" + Utils.getNameFromUri(activity, uri)),
+                Snackbar.LENGTH_LONG)
+                .setAction(R.string.ok, (v)->{}).show();
+    }
+
+    public static boolean checkNetworkStatus(Context context) {
+        ConnectivityManager manager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo networkInfo = manager.getActiveNetworkInfo();
+        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);
+        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)
+                .setVibrate(new long[]{0, 100, 100, 100})
+                .setAutoCancel(true);
+        Intent intent = new Intent(magiskManager, SplashActivity.class);
+        intent.putExtra(MagiskManager.INTENT_SECTION, "install");
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(magiskManager);
+        stackBuilder.addParentStack(SplashActivity.class);
+        stackBuilder.addNextIntent(intent);
+        PendingIntent pendingIntent = stackBuilder.getPendingIntent(MAGISK_UPDATE_NOTIFICATION_ID,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+        builder.setContentIntent(pendingIntent);
+        NotificationManager notificationManager =
+                (NotificationManager) magiskManager.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);
+        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)
+                .setVibrate(new long[]{0, 100, 100, 100})
+                .setAutoCancel(true);
+        Intent intent = new Intent(magiskManager, ManagerUpdate.class);
+        intent.putExtra("link", magiskManager.managerLink);
+        intent.putExtra("version", magiskManager.remoteManagerVersionString);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(magiskManager,
+                APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        builder.setContentIntent(pendingIntent);
+        NotificationManager notificationManager =
+                (NotificationManager) magiskManager.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(APK_UPDATE_NOTIFICATION_ID, builder.build());
+    }
 }

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

@@ -1,13 +1,9 @@
 package com.topjohnwu.magisk.utils;
 
 import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
 
@@ -18,8 +14,6 @@ public class WebService {
     public final static int GET = 1;
     public final static int POST = 2;
 
-    private static Map<String, List<String>> responseHeader;
-
     /**
      * Making web service call
      *
@@ -27,11 +21,11 @@ public class WebService {
      * @requestmethod - http request method
      */
     public static String request(String url, int method) {
-        return request(url, method, null, null, false);
+        return request(url, method, null, true);
     }
 
     public static String request(String url, int method, boolean newline) {
-        return request(url, method, null, null, newline);
+        return request(url, method, null, newline);
     }
 
     /**
@@ -44,8 +38,7 @@ public class WebService {
      * @newline - true to append a newline each line
      */
     public static String request(String urlAddress, int method,
-                                 Map<String, String> params, Map<String, String> header,
-                                 boolean newline) {
+                                 Map<String, String> header, boolean newline) {
         Logger.dev("WebService: Service call " + urlAddress);
         URL url;
         StringBuilder response = new StringBuilder();
@@ -69,31 +62,6 @@ public class WebService {
                 }
             }
 
-            if (params != null) {
-                OutputStream os = conn.getOutputStream();
-                BufferedWriter writer = new BufferedWriter(
-                        new OutputStreamWriter(os, "UTF-8"));
-
-                StringBuilder result = new StringBuilder();
-                boolean first = true;
-                for (Map.Entry<String, String> entry : params.entrySet()) {
-                    if (first)
-                        first = false;
-                    else
-                        result.append("&");
-
-                    result.append(URLEncoder.encode(entry.getKey(), "UTF-8"));
-                    result.append("=");
-                    result.append(URLEncoder.encode(entry.getValue(), "UTF-8"));
-                }
-
-                writer.write(result.toString());
-
-                writer.flush();
-                writer.close();
-                os.close();
-            }
-
             int responseCode = conn.getResponseCode();
 
             if (responseCode == HttpsURLConnection.HTTP_OK) {
@@ -106,9 +74,13 @@ public class WebService {
                         response.append(line);
                     }
                 }
-                responseHeader = conn.getHeaderFields();
-            } else {
-                responseHeader = null;
+                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));
+                    }
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -117,8 +89,4 @@ public class WebService {
         return response.toString();
     }
 
-    public static Map<String, List<String>> getLastResponseHeader() {
-        return responseHeader;
-    }
-
 }

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

@@ -1,32 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-public class WebWindow {
-
-public WebWindow(String title, String url, Context context) {
-    AlertDialog.Builder alert = Utils.getAlertDialogBuilder(context);
-    alert.setTitle(title);
-
-    Logger.dev("WebView: URL = " + url);
-
-    WebView wv = new WebView(context);
-    wv.loadUrl(url);
-    wv.setWebViewClient(new WebViewClient() {
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-            view.loadUrl(url);
-            return true;
-        }
-    });
-
-    alert.setView(wv);
-    alert.setNegativeButton("Close", (dialog, id) -> dialog.dismiss());
-    alert.show();
-}
-
-}

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

@@ -1,12 +1,12 @@
 package com.topjohnwu.magisk.utils;
 
 import android.content.Context;
-import android.util.Pair;
 
 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;
@@ -21,8 +21,10 @@ import org.spongycastle.operator.jcajce.JcaContentSignerBuilder;
 import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
 import org.spongycastle.util.encoders.Base64;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
@@ -31,18 +33,14 @@ import java.io.OutputStream;
 import java.io.PrintStream;
 import java.security.DigestOutputStream;
 import java.security.GeneralSecurityException;
-import java.security.Key;
 import java.security.KeyFactory;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 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.InvalidKeySpecException;
-import java.security.spec.KeySpec;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -59,39 +57,35 @@ import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 import java.util.regex.Pattern;
 
-import javax.crypto.Cipher;
-import javax.crypto.EncryptedPrivateKeyInfo;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
+/*
+* Modified from from AOSP(Marshmallow) SignAPK.java
+* */
 
 public class ZipUtils {
-    private static final String CERT_SF_NAME = "META-INF/CERT.SF";
-    private static final String CERT_SIG_NAME = "META-INF/CERT.%s";
-    private static final String OTACERT_NAME = "META-INF/com/android/otacert";
+    // 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 {
-        System.loadLibrary("zipadjust");
         sBouncyCastleProvider = new BouncyCastleProvider();
         Security.insertProviderAt(sBouncyCastleProvider, 1);
+        System.loadLibrary("zipadjust");
     }
 
-    public native static byte[] zipAdjust(byte[] bytes, int size);
+    public native static void zipAdjust(String filenameIn, String filenameOut);
 
-    // Wrapper function for the JNI function
-    public static void adjustZip(ByteArrayInOutStream buffer) {
-        buffer.setBuffer(zipAdjust(buffer.toByteArray(), buffer.size()));
-    }
-
-    public static void removeTopFolder(InputStream in, OutputStream out) {
+    public static void removeTopFolder(InputStream in, File output) throws IOException {
         try {
             JarInputStream source = new JarInputStream(in);
-            JarOutputStream dest = new JarOutputStream(out);
+            JarOutputStream dest = new JarOutputStream(new FileOutputStream(output));
             JarEntry entry;
             String path;
             int size;
@@ -100,29 +94,28 @@ public class ZipUtils {
                 // 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())
+                if (path.isEmpty()) {
                     continue;
+                }
                 // Don't include placeholder
-                if (path.contains("system/placeholder"))
+                if (path.contains("system/placeholder")) {
                     continue;
+                }
                 dest.putNextEntry(new JarEntry(path));
-                while((size = source.read(buffer, 0, 2048)) != -1)
+                while((size = source.read(buffer, 0, 2048)) != -1) {
                     dest.write(buffer, 0, size);
+                }
             }
             source.close();
             dest.close();
             in.close();
         } catch (IOException e) {
-            e.printStackTrace();
             Logger.dev("ZipUtils: removeTopFolder IO error!");
+            throw e;
         }
     }
 
-    public static void unzip(File file, File folder) {
-        unzip(file, folder, "");
-    }
-
-    public static void unzip(File file, File folder, String path) {
+    public static void unzip(File file, File folder, String path) throws Exception {
         int count;
         FileOutputStream out;
         File dest;
@@ -133,8 +126,7 @@ public class ZipUtils {
             Enumeration<JarEntry> e = zipfile.entries();
             while(e.hasMoreElements()) {
                 entry = e.nextElement();
-                if (!entry.getName().contains(path)
-                        || entry.getName().charAt(entry.getName().length() - 1) == '/') {
+                if (!entry.getName().contains(path) || entry.isDirectory()){
                     // Ignore directories, only create files
                     continue;
                 }
@@ -145,7 +137,7 @@ public class ZipUtils {
                     dest.createNewFile();
                 }
                 out = new FileOutputStream(dest);
-                while ((count = is.read(data, 0, 4096)) != -1) {
+                while ((count = is.read(data)) != -1) {
                     out.write(data, 0, count);
                 }
                 out.flush();
@@ -154,30 +146,31 @@ public class ZipUtils {
             }
         } catch(Exception e) {
             e.printStackTrace();
+            throw e;
         }
     }
 
-    public static void signZip(Context context, InputStream inputStream,
-                               OutputStream outputStream, boolean signWholeFile) {
-        JarMap inputJar;
+    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));
-            inputJar = new JarMap(new JarInputStream(inputStream));
-            if (signWholeFile) {
-                if (!"RSA".equalsIgnoreCase(privateKey.getAlgorithm())) {
-                    throw new IOException("Cannot sign OTA packages with non-RSA keys");
-                }
-                signWholeFile(inputJar, context.getAssets().open(PUBLIC_KEY_NAME),
-                        publicKey, privateKey, outputStream);
+
+            outputFile = new FileOutputStream(output);
+            if (minSign) {
+                ZipUtils.signWholeFile(input, publicKey, privateKey, outputFile);
             } else {
-                JarOutputStream outputJar = new JarOutputStream(outputStream);
+                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
@@ -186,49 +179,23 @@ public class ZipUtils {
                 // (~0.1% on full OTA packages I tested).
                 outputJar.setLevel(9);
                 Manifest manifest = addDigestsToManifest(inputJar, hashes);
-                copyFiles(manifest, inputJar, outputJar, timestamp);
+                copyFiles(manifest, inputJar, outputJar, timestamp, alignment);
                 signFile(manifest, inputJar, publicKey, privateKey, outputJar);
                 outputJar.close();
             }
         } catch (Exception e) {
             e.printStackTrace();
-        }
-    }
-
-    public static class JarMap extends TreeMap<String, Pair<JarEntry, ByteArrayOutputStream> > {
-
-        private Manifest manifest;
-
-        public JarMap(JarInputStream in) throws IOException {
-            super();
-            manifest = in.getManifest();
-            byte[] buffer = new byte[4096];
-            int num;
-            JarEntry entry;
-            while ((entry = in.getNextJarEntry()) != null) {
-                ByteArrayOutputStream stream = new ByteArrayOutputStream();
-                while ((num = in.read(buffer)) > 0) {
-                    stream.write(buffer, 0, num);
-                }
-                put(entry.getName(), entry, stream);
+        } finally {
+            try {
+                if (inputJar != null) inputJar.close();
+                if (outputFile != null) outputFile.close();
+            } catch (IOException e) {
+                e.printStackTrace();
             }
-            in.close();
-        }
-
-        public JarEntry getJarEntry(String name) {
-            return get(name).first;
-        }
-        public ByteArrayOutputStream getStream(String name) {
-            return get(name).second;
-        }
-        public void put(String name, JarEntry entry, ByteArrayOutputStream stream) {
-            put(name, new Pair<>(entry, stream));
-        }
-        public Manifest getManifest() {
-            return manifest;
         }
     }
 
+
     /**
      * Return one of USE_SHA1 or USE_SHA256 according to the signature
      * algorithm specified in the cert.
@@ -255,8 +222,6 @@ public class ZipUtils {
             } else {
                 return "SHA1withRSA";
             }
-        } else if ("DSA".equalsIgnoreCase(keyType)) {
-            return "SHA256withDSA";
         } else if ("EC".equalsIgnoreCase(keyType)) {
             return "SHA256withECDSA";
         } else {
@@ -277,79 +242,32 @@ public class ZipUtils {
         }
     }
 
-    /**
-     * Decrypt an encrypted PKCS 8 format private key.
-     *
-     * Based on ghstark's post on Aug 6, 2006 at
-     * http://forums.sun.com/thread.jspa?threadID=758133&messageID=4330949
-     *
-     * @param encryptedPrivateKey The raw data of the private key
-     * @param keyFile The file containing the private key
-     */
-    private static KeySpec decryptPrivateKey(byte[] encryptedPrivateKey, File keyFile)
-            throws GeneralSecurityException {
-        EncryptedPrivateKeyInfo epkInfo;
-        try {
-            epkInfo = new EncryptedPrivateKeyInfo(encryptedPrivateKey);
-        } catch (IOException ex) {
-            // Probably not an encrypted key.
-            return null;
-        }
-        // We no longer have console, so need to use another way to input password
-        // This function is left here if needed in the future, so no use for now
-        char[] password = new char[0];
-        SecretKeyFactory skFactory = SecretKeyFactory.getInstance(epkInfo.getAlgName());
-        Key key = skFactory.generateSecret(new PBEKeySpec(password));
-        Cipher cipher = Cipher.getInstance(epkInfo.getAlgName());
-        cipher.init(Cipher.DECRYPT_MODE, key, epkInfo.getAlgParameters());
-        try {
-            return epkInfo.getKeySpec(cipher);
-        } catch (InvalidKeySpecException ex) {
-            System.err.println("signapk: Password for " + keyFile + " may be bad.");
-            throw ex;
-        }
-    }
-
-    /** Read a PKCS 8 format private key. */
+    /** 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);
-            KeySpec spec = new PKCS8EncodedKeySpec(bytes);
-            PrivateKey key;
-            key = decodeAsKeyType(spec, "RSA");
-            if (key != null) {
-                return key;
-            }
-            key = decodeAsKeyType(spec, "DSA");
-            if (key != null) {
-                return key;
-            }
-            key = decodeAsKeyType(spec, "EC");
-            if (key != null) {
-                return key;
-            }
-            throw new NoSuchAlgorithmException("Must be an RSA, DSA, or EC key");
+            /* 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();
         }
     }
-    private static PrivateKey decodeAsKeyType(KeySpec spec, String keyType)
-            throws GeneralSecurityException {
-        try {
-            return KeyFactory.getInstance(keyType).generatePrivate(spec);
-        } catch (InvalidKeySpecException e) {
-            return null;
-        }
-    }
-
     /**
      * Add the hash(es) of every file to the manifest, creating it if
      * necessary.
      */
-    private static Manifest addDigestsToManifest(JarMap jar, int hashes)
+    private static Manifest addDigestsToManifest(JarFile jar, int hashes)
             throws IOException, GeneralSecurityException {
         Manifest input = jar.getManifest();
         Manifest output = new Manifest();
@@ -368,17 +286,25 @@ public class ZipUtils {
         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.
-            /* JarMap is a TreeMap, so it's already sorted */
-        for (String name : jar.keySet()) {
-            JarEntry entry = jar.getJarEntry(name);
+        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())) {
-                byte[] buffer = jar.getStream(name).toByteArray();
-                if (md_sha1 != null) md_sha1.update(buffer, 0, buffer.length);
-                if (md_sha256 != null) md_sha256.update(buffer, 0, buffer.length);
+                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();
@@ -396,36 +322,6 @@ public class ZipUtils {
         return output;
     }
 
-    /**
-     * Add a copy of the public key to the archive; this should
-     * exactly match one of the files in
-     * /system/etc/security/otacerts.zip on the device.  (The same
-     * cert can be extracted from the CERT.RSA file but this is much
-     * easier to get at.)
-     */
-    private static void addOtacert(JarOutputStream outputJar,
-                                   InputStream input,
-                                   long timestamp,
-                                   Manifest manifest,
-                                   int hash)
-            throws IOException, GeneralSecurityException {
-        MessageDigest md = MessageDigest.getInstance(hash == USE_SHA1 ? "SHA1" : "SHA256");
-        JarEntry je = new JarEntry(OTACERT_NAME);
-        je.setTime(timestamp);
-        outputJar.putNextEntry(je);
-        byte[] b = new byte[4096];
-        int read;
-        while ((read = input.read(b)) != -1) {
-            outputJar.write(b, 0, read);
-            md.update(b, 0, read);
-        }
-        input.close();
-        Attributes attr = new Attributes();
-        attr.putValue(hash == USE_SHA1 ? "SHA1-Digest" : "SHA-256-Digest",
-                new String(Base64.encode(md.digest()), "ASCII"));
-        manifest.getEntries().put(OTACERT_NAME, attr);
-    }
-
     /** Write to another stream and track how many bytes have been
      *  written.
      */
@@ -449,7 +345,6 @@ public class ZipUtils {
             return mCount;
         }
     }
-
     /** Write a .SF file with a digest of the specified manifest. */
     private static void writeSignatureFile(Manifest manifest, OutputStream out,
                                            int hash)
@@ -493,12 +388,15 @@ public class ZipUtils {
             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<X509Certificate>(1);
+            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();
@@ -514,10 +412,9 @@ public class ZipUtils {
                         .build(signer, publicKey));
         gen.addCertificates(certs);
         CMSSignedData sigData = gen.generate(data, false);
-        try (ASN1InputStream asn1 = new ASN1InputStream(sigData.getEncoded())) {
-            DEROutputStream dos = new DEROutputStream(out);
-            dos.writeObject(asn1.readObject());
-        }
+        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
@@ -525,141 +422,124 @@ public class ZipUtils {
      * reduce variation in the output file and make incremental OTAs
      * more efficient.
      */
-    private static void copyFiles(Manifest manifest,
-                                  JarMap in, JarOutputStream out, long timestamp) throws IOException {
+    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<>(entries.keySet());
+        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;
-            if (inEntry.getMethod() == JarEntry.STORED) {
-                // Preserve the STORED method of the input entry.
-                outEntry = new JarEntry(inEntry);
-            } else {
-                // Create a new entry so that the compressed len is recomputed.
-                outEntry = new JarEntry(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);
-            in.getStream(name).writeTo(out);
+            InputStream data = in.getInputStream(inEntry);
+            while ((num = data.read(buffer)) > 0) {
+                out.write(buffer, 0, num);
+            }
             out.flush();
         }
     }
 
-    private static class WholeFileSignerOutputStream extends FilterOutputStream {
-        private boolean closing = false;
-        private ByteArrayOutputStream footer = new ByteArrayOutputStream();
-        private OutputStream tee;
-        public WholeFileSignerOutputStream(OutputStream out, OutputStream tee) {
-            super(out);
-            this.tee = tee;
-        }
-        public void notifyClosing() {
-            closing = true;
-        }
-        public void finish() throws IOException {
-            closing = false;
-            byte[] data = footer.toByteArray();
-            if (data.length < 2)
-                throw new IOException("Less than two bytes written to footer");
-            write(data, 0, data.length - 2);
-        }
-        public byte[] getTail() {
-            return footer.toByteArray();
-        }
-        @Override
-        public void write(byte[] b) throws IOException {
-            write(b, 0, b.length);
-        }
-        @Override
-        public void write(byte[] b, int off, int len) throws IOException {
-            if (closing) {
-                // if the jar is about to close, save the footer that will be written
-                footer.write(b, off, len);
-            }
-            else {
-                // write to both output streams. out is the CMSTypedData signer and tee is the file.
-                out.write(b, off, len);
-                tee.write(b, off, len);
-            }
-        }
-        @Override
-        public void write(int b) throws IOException {
-            if (closing) {
-                // if the jar is about to close, save the footer that will be written
-                footer.write(b);
-            }
-            else {
-                // write to both output streams. out is the CMSTypedData signer and tee is the file.
-                out.write(b);
-                tee.write(b);
-            }
-        }
-    }
+    // 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 static class CMSSigner implements CMSTypedData {
-        private JarMap inputJar;
-        private InputStream publicKeyFile;
-        private X509Certificate publicKey;
-        private PrivateKey privateKey;
-        private OutputStream outputStream;
-        private final ASN1ObjectIdentifier type;
-        private WholeFileSignerOutputStream signer;
-        public CMSSigner(JarMap inputJar, InputStream publicKeyFile,
-                         X509Certificate publicKey, PrivateKey privateKey,
-                         OutputStream outputStream) {
-            this.inputJar = inputJar;
-            this.publicKeyFile = publicKeyFile;
-            this.publicKey = publicKey;
-            this.privateKey = privateKey;
-            this.outputStream = outputStream;
-            this.type = new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId());
-        }
-        public Object getContent() {
-            // Not supported, but still don't crash or return null
-            return 1;
+        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;
         }
-        public void write(OutputStream out) throws IOException {
-            try {
-                signer = new WholeFileSignerOutputStream(out, outputStream);
-                JarOutputStream outputJar = new JarOutputStream(signer);
-                int hash = getDigestAlgorithm(publicKey);
-                // Assume the certificate is valid for at least an hour.
-                long timestamp = publicKey.getNotBefore().getTime() + 3600L * 1000;
-                Manifest manifest = addDigestsToManifest(inputJar, hash);
-                copyFiles(manifest, inputJar, outputJar, timestamp);
-                // Don't add Otacert, it's not an OTA
-                // addOtacert(outputJar, publicKeyFile, timestamp, manifest, hash);
-                signFile(manifest, inputJar, publicKey, privateKey, outputJar);
-                signer.notifyClosing();
-                outputJar.close();
-                signer.finish();
-            }
-            catch (Exception e) {
-                throw new IOException(e);
+
+        @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;
             }
         }
-        public void writeSignatureBlock(ByteArrayOutputStream temp)
-                throws IOException,
-                CertificateEncodingException,
-                OperatorCreationException,
-                CMSException {
-            ZipUtils.writeSignatureBlock(this, publicKey, privateKey, temp);
+
+        @Override
+        public Object getContent() {
+            return file;
         }
-        public WholeFileSignerOutputStream getSigner() {
-            return signer;
+
+        byte[] getTail() {
+            return Arrays.copyOfRange(buffer, 0, bufferSize);
         }
     }
 
-    private static void signWholeFile(JarMap inputJar, InputStream publicKeyFile,
-                                      X509Certificate publicKey, PrivateKey privateKey,
-                                      OutputStream outputStream) throws Exception {
-        CMSSigner cmsOut = new CMSSigner(inputJar, publicKeyFile,
-                publicKey, privateKey, outputStream);
+    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
@@ -668,11 +548,14 @@ public class ZipUtils {
         byte[] message = "signed by SignApk".getBytes("UTF-8");
         temp.write(message);
         temp.write(0);
-        cmsOut.writeSignatureBlock(temp);
-        byte[] zipData = cmsOut.getSigner().getTail();
+
+        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 ||
@@ -710,12 +593,12 @@ public class ZipUtils {
                 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, JarMap inputJar,
+    private static void signFile(Manifest manifest, JarFile inputJar,
                                  X509Certificate publicKey, PrivateKey privateKey,
                                  JarOutputStream outputJar)
             throws Exception {
@@ -726,7 +609,6 @@ public class ZipUtils {
         je.setTime(timestamp);
         outputJar.putNextEntry(je);
         manifest.write(outputJar);
-        // CERT.SF / CERT#.SF
         je = new JarEntry(CERT_SF_NAME);
         je.setTime(timestamp);
         outputJar.putNextEntry(je);
@@ -734,11 +616,12 @@ public class ZipUtils {
         writeSignatureFile(manifest, baos, getDigestAlgorithm(publicKey));
         byte[] signedData = baos.toByteArray();
         outputJar.write(signedData);
-        // CERT.{DSA,EC,RSA} / CERT#.{DSA,EC,RSA}
-        je = new JarEntry((String.format(CERT_SIG_NAME, privateKey.getAlgorithm())));
+        // 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);
     }
-}
+}

app/src/main/jni/jni_glue.c

@@ -3,21 +3,17 @@
 //
 
 #include <jni.h>
-#include <stdlib.h>
 #include "zipadjust.h"
 
-JNIEXPORT jbyteArray JNICALL
-Java_com_topjohnwu_magisk_utils_ZipUtils_zipAdjust(JNIEnv *env, jclass type, jbyteArray jbytes, jint size) {
-    fin = (*env)->GetPrimitiveArrayCritical(env, jbytes, NULL);
-    insize = (size_t) size;
+JNIEXPORT void JNICALL
+Java_com_topjohnwu_magisk_utils_ZipUtils_zipAdjust(JNIEnv *env, jclass type, jstring filenameIn_,
+                                                    jstring filenameOut_) {
+    const char *filenameIn = (*env)->GetStringUTFChars(env, filenameIn_, 0);
+    const char *filenameOut = (*env)->GetStringUTFChars(env, filenameOut_, 0);
 
-    zipadjust(0);
+    // TODO
+    zipadjust(filenameIn, filenameOut, 0);
 
-    (*env)->ReleasePrimitiveArrayCritical(env, jbytes, fin, 0);
-
-    jbyteArray ret = (*env)->NewByteArray(env, outsize);
-    (*env)->SetByteArrayRegion(env, ret, 0, outsize, (const jbyte*) fout);
-    free(fout);
-
-    return ret;
-}
+    (*env)->ReleaseStringUTFChars(env, filenameIn_, filenameIn);
+    (*env)->ReleaseStringUTFChars(env, filenameOut_, filenameOut);
+}

app/src/main/jni/zipadjust.c

@@ -1,16 +1,14 @@
 #include <stdlib.h>
-#include <stdio.h>
+#include <fcntl.h>
+#include <string.h>
 #include <zlib.h>
-#include <android/log.h>
+#include <unistd.h>
 #include "zipadjust.h"
 
-#define  LOG_TAG    "zipadjust"
-
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
-#define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
-
-size_t insize = 0, outsize = 0, alloc = 0;
-unsigned char *fin = NULL, *fout = NULL;
+#ifndef O_BINARY
+#define O_BINARY  0
+#define O_TEXT    0
+#endif
 
 #pragma pack(1)
 struct local_header_struct {
@@ -88,41 +86,43 @@ static int xerror(char* message) {
     return 0;
 }
 
-static int xseekread(off_t offset, void* buf, size_t bytes) {
-    memcpy(buf, fin + offset, bytes);
+static int xseekread(int fd, off_t offset, void* buf, size_t bytes) {
+    if (lseek(fd, offset, SEEK_SET) == (off_t)-1) return xerror("Seek failed");
+    if (read(fd, buf, bytes) != bytes) return xerror("Read failed");
     return 1;
 }
 
-static int xseekwrite(off_t offset, const void* buf, size_t bytes) {
-    if (offset + bytes > outsize) outsize = offset + bytes;
-    if (outsize > alloc) {
-        fout = realloc(fout, outsize);
-        alloc = outsize;
-    }
-    memcpy(fout + offset, buf, bytes);
+static int xseekwrite(int fd, off_t offset, void* buf, size_t bytes) {
+    if (lseek(fd, offset, SEEK_SET) == (off_t)-1) return xerror("Seek failed");
+    if (write(fd, buf, bytes) != bytes) return xerror("Write failed");
     return 1;
 }
 
-static int xfilecopy(off_t offsetIn, off_t offsetOut, size_t bytes) {
-    unsigned int CHUNK = 256 * 1024;
-    unsigned char* buf = malloc(CHUNK);
+static int xfilecopy(int fdIn, int fdOut, off_t offsetIn, off_t offsetOut, size_t bytes) {
+    if ((offsetIn != (off_t)-1) && (lseek(fdIn, offsetIn, SEEK_SET) == (off_t)-1)) return xerror("Seek failed");
+    if ((offsetOut != (off_t)-1) && (lseek(fdOut, offsetOut, SEEK_SET) == (off_t)-1)) return xerror("Seek failed");
+
+    int CHUNK = 256 * 1024;
+    void* buf = malloc(CHUNK);
     if (buf == NULL) return xerror("malloc failed");
     size_t left = bytes;
     while (left > 0) {
         size_t wanted = (left < CHUNK) ? left : CHUNK;
-        xseekread(offsetIn, buf, wanted);
-        xseekwrite(offsetOut, buf, wanted);
-        offsetIn += wanted;
-        offsetOut += wanted;
-        left -= wanted;
+        size_t r = read(fdIn, buf, wanted);
+        if (r <= 0) return xerror("Read failed");
+        if (write(fdOut, buf, r) != r) return xerror("Write failed");
+        left -= r;
     }
     free(buf);
 
     return 1;
 }
 
-static int xdecompress(off_t offsetIn, off_t offsetOut, size_t bytes) {
-    unsigned int CHUNK = 256 * 1024;
+static int xdecompress(int fdIn, int fdOut, off_t offsetIn, off_t offsetOut, size_t bytes) {
+    if ((offsetIn != (off_t)-1) && (lseek(fdIn, offsetIn, SEEK_SET) == (off_t)-1)) return xerror("Seek failed");
+    if ((offsetOut != (off_t)-1) && (lseek(fdOut, offsetOut, SEEK_SET) == (off_t)-1)) return xerror("Seek failed");
+
+    int CHUNK = 256 * 1024;
 
     int ret;
     unsigned have;
@@ -139,12 +139,9 @@ static int xdecompress(off_t offsetIn, off_t offsetOut, size_t bytes) {
     if (ret != Z_OK) return xerror("ret != Z_OK");
 
     do {
-        strm.avail_in = insize - offsetIn;
+        strm.avail_in = read(fdIn, in, CHUNK);
         if (strm.avail_in == 0) break;
-        strm.avail_in = (strm.avail_in > CHUNK) ? CHUNK : strm.avail_in;
-        xseekread(offsetIn, in, strm.avail_in);
         strm.next_in = in;
-        offsetIn += strm.avail_in;
 
         do {
             strm.avail_out = CHUNK;
@@ -162,8 +159,10 @@ static int xdecompress(off_t offsetIn, off_t offsetOut, size_t bytes) {
             }
 
             have = CHUNK - strm.avail_out;
-            xseekwrite(offsetOut, out, have);
-            offsetOut += have;
+            if (write(fdOut, out, have) != have) {
+                (void)inflateEnd(&strm);
+                return xerror("Write failed");
+            }
         } while (strm.avail_out == 0);
     } while (ret != Z_STREAM_END);
     (void)inflateEnd(&strm);
@@ -171,118 +170,128 @@ static int xdecompress(off_t offsetIn, off_t offsetOut, size_t bytes) {
     return ret == Z_STREAM_END ? 1 : 0;
 }
 
-int zipadjust(int decompress) {
+int zipadjust(const char* filenameIn, const char* filenameOut, int decompress) {
     int ok = 0;
 
-    char filename[1024];
+    int fin = open(filenameIn, O_RDONLY | O_BINARY);
+    if (fin > 0) {
+        unsigned int size = lseek(fin, 0, SEEK_END);
+        lseek(fin, 0, SEEK_SET);
+        LOGD("%d bytes\n", size);
 
-    central_footer_t central_footer;
-    uint32_t central_directory_in_position = 0;
-    uint32_t central_directory_in_size = 0;
-    uint32_t central_directory_out_size = 0;
+        char filename[1024];
 
-    int i;
-    for (i = insize - 4; i >= 0; i--) {
-        uint32_t magic = 0;
-        if (!xseekread(i, &magic, sizeof(uint32_t))) return 0;
-        if (magic == MAGIC_CENTRAL_FOOTER) {
-            LOGD("central footer @ %08X\n", i);
-            if (!xseekread(i, &central_footer, sizeof(central_footer_t))) return 0;
+        central_footer_t central_footer;
+        uint32_t central_directory_in_position = 0;
+        uint32_t central_directory_in_size = 0;
+        uint32_t central_directory_out_size = 0;
 
-            central_header_t central_header;
-            if (!xseekread(central_footer.central_directory_offset, &central_header, sizeof(central_header_t))) return 0;
-            if ( central_header.signature == MAGIC_CENTRAL_HEADER ) {
-                central_directory_in_position = central_footer.central_directory_offset;
-                central_directory_in_size = insize - central_footer.central_directory_offset;
-                LOGD("central header @ %08X (%d)\n", central_footer.central_directory_offset, central_footer.central_directory_size);
-                break;
+        int i;
+        for (i = size - 4; i >= 0; i--) {
+            uint32_t magic = 0;
+            if (!xseekread(fin, i, &magic, sizeof(uint32_t))) return 0;
+            if (magic == MAGIC_CENTRAL_FOOTER) {
+                LOGD("central footer @ %08X\n", i);
+                if (!xseekread(fin, i, &central_footer, sizeof(central_footer_t))) return 0;
+
+                central_header_t central_header;
+                if (!xseekread(fin, central_footer.central_directory_offset, &central_header, sizeof(central_header_t))) return 0;
+                if ( central_header.signature == MAGIC_CENTRAL_HEADER ) {
+                    central_directory_in_position = central_footer.central_directory_offset;
+                    central_directory_in_size = size - central_footer.central_directory_offset;
+                    LOGD("central header @ %08X (%d)\n", central_footer.central_directory_offset, central_footer.central_directory_size);
+                    break;
+                }
             }
         }
+
+        if (central_directory_in_position == 0) return 0;
+
+        unsigned char* central_directory_in = (unsigned char*)malloc(central_directory_in_size);
+        unsigned char* central_directory_out = (unsigned char*)malloc(central_directory_in_size);
+        if (!xseekread(fin, central_directory_in_position, central_directory_in, central_directory_in_size)) return 0;
+        memset(central_directory_out, 0, central_directory_in_size);
+
+        unlink(filenameOut);
+        int fout = open(filenameOut, O_CREAT | O_WRONLY | O_BINARY, 0644);
+        if (fout > 0) {
+
+            uintptr_t central_directory_in_index = 0;
+            uintptr_t central_directory_out_index = 0;
+
+            central_header_t* central_header = NULL;
+
+            uint32_t out_index = 0;
+
+            while (1) {
+                central_header = (central_header_t*)&central_directory_in[central_directory_in_index];
+                if (central_header->signature != MAGIC_CENTRAL_HEADER) break;
+
+                filename[central_header->length_filename] = (char)0;
+                memcpy(filename, &central_directory_in[central_directory_in_index + sizeof(central_header_t)], central_header->length_filename);
+                LOGD("%s (%d --> %d) [%08X] (%d)\n", filename, central_header->size_uncompressed, central_header->size_compressed, central_header->crc32, central_header->length_extra + central_header->length_comment);
+
+                local_header_t local_header;
+                if (!xseekread(fin, central_header->offset, &local_header, sizeof(local_header_t))) return 0;
+
+                // save and update to next index before we clobber the data
+                uint16_t compression_method_old = central_header->compression_method;
+                uint32_t size_compressed_old = central_header->size_compressed;
+                uint32_t offset_old = central_header->offset;
+                uint32_t length_extra_old = central_header->length_extra;
+                central_directory_in_index += sizeof(central_header_t) + central_header->length_filename + central_header->length_extra + central_header->length_comment;
+
+                // copying, rewriting, and correcting local and central headers so all the information matches, and no data descriptors are necessary
+                central_header->offset = out_index;
+                central_header->flags = central_header->flags & !8;
+                if (decompress && (compression_method_old == 8)) {
+                    central_header->compression_method = 0;
+                    central_header->size_compressed = central_header->size_uncompressed;
+                }
+                central_header->length_extra = 0;
+                central_header->length_comment = 0;
+                local_header.compression_method = central_header->compression_method;
+                local_header.flags = central_header->flags;
+                local_header.crc32 = central_header->crc32;
+                local_header.size_uncompressed = central_header->size_uncompressed;
+                local_header.size_compressed = central_header->size_compressed;
+                local_header.length_extra = 0;
+
+                if (!xseekwrite(fout, out_index, &local_header, sizeof(local_header_t))) return 0;
+                out_index += sizeof(local_header_t);
+                if (!xseekwrite(fout, out_index, &filename[0], central_header->length_filename)) return 0;
+                out_index += central_header->length_filename;
+
+                if (decompress && (compression_method_old == 8)) {
+                    if (!xdecompress(fin, fout, offset_old + sizeof(local_header_t) + central_header->length_filename + length_extra_old, out_index, size_compressed_old)) return 0;
+                } else {
+                    if (!xfilecopy(fin, fout, offset_old + sizeof(local_header_t) + central_header->length_filename + length_extra_old, out_index, size_compressed_old)) return 0;
+                }
+                out_index += local_header.size_compressed;
+
+                memcpy(&central_directory_out[central_directory_out_index], central_header, sizeof(central_header_t) + central_header->length_filename);
+                central_directory_out_index += sizeof(central_header_t) + central_header->length_filename;
+            }
+
+            central_directory_out_size = central_directory_out_index;
+            central_footer.central_directory_size = central_directory_out_size;
+            central_footer.central_directory_offset = out_index;
+            central_footer.length_comment = 0;
+            if (!xseekwrite(fout, out_index, central_directory_out, central_directory_out_size)) return 0;
+            out_index += central_directory_out_size;
+            if (!xseekwrite(fout, out_index, &central_footer, sizeof(central_footer_t))) return 0;
+
+            LOGD("central header @ %08X (%d)\n", central_footer.central_directory_offset, central_footer.central_directory_size);
+            LOGD("central footer @ %08X\n", out_index);
+
+            close(fout);
+            ok = 1;
+        }
+
+        free(central_directory_in);
+        free(central_directory_out);
+        close(fin);
     }
 
-    if (central_directory_in_position == 0) return 0;
-
-    unsigned char* central_directory_in = (unsigned char*)malloc(central_directory_in_size);
-    unsigned char* central_directory_out = (unsigned char*)malloc(central_directory_in_size);
-    if (!xseekread(central_directory_in_position, central_directory_in, central_directory_in_size)) return 0;
-    memset(central_directory_out, 0, central_directory_in_size);
-
-
-
-    fout = (unsigned char*) malloc(insize);
-    alloc = insize;
-
-    uintptr_t central_directory_in_index = 0;
-    uintptr_t central_directory_out_index = 0;
-
-    central_header_t* central_header = NULL;
-
-    uint32_t out_index = 0;
-
-    while (1) {
-        central_header = (central_header_t*)&central_directory_in[central_directory_in_index];
-        if (central_header->signature != MAGIC_CENTRAL_HEADER) break;
-
-        filename[central_header->length_filename] = (char)0;
-        memcpy(filename, &central_directory_in[central_directory_in_index + sizeof(central_header_t)], central_header->length_filename);
-        LOGD("%s (%d --> %d) [%08X] (%d)\n", filename, central_header->size_uncompressed, central_header->size_compressed, central_header->crc32, central_header->length_extra + central_header->length_comment);
-
-        local_header_t local_header;
-        if (!xseekread(central_header->offset, &local_header, sizeof(local_header_t))) return 0;
-
-        // save and update to next index before we clobber the data
-        uint16_t compression_method_old = central_header->compression_method;
-        uint32_t size_compressed_old = central_header->size_compressed;
-        uint32_t offset_old = central_header->offset;
-        uint32_t length_extra_old = central_header->length_extra;
-        central_directory_in_index += sizeof(central_header_t) + central_header->length_filename + central_header->length_extra + central_header->length_comment;
-
-        // copying, rewriting, and correcting local and central headers so all the information matches, and no data descriptors are necessary
-        central_header->offset = out_index;
-        central_header->flags = central_header->flags & !8;
-        if (decompress && (compression_method_old == 8)) {
-            central_header->compression_method = 0;
-            central_header->size_compressed = central_header->size_uncompressed;
-        }
-        central_header->length_extra = 0;
-        central_header->length_comment = 0;
-        local_header.compression_method = central_header->compression_method;
-        local_header.flags = central_header->flags;
-        local_header.crc32 = central_header->crc32;
-        local_header.size_uncompressed = central_header->size_uncompressed;
-        local_header.size_compressed = central_header->size_compressed;
-        local_header.length_extra = 0;
-
-        if (!xseekwrite(out_index, &local_header, sizeof(local_header_t))) return 0;
-        out_index += sizeof(local_header_t);
-        if (!xseekwrite(out_index, &filename[0], central_header->length_filename)) return 0;
-        out_index += central_header->length_filename;
-
-        if (decompress && (compression_method_old == 8)) {
-            if (!xdecompress(offset_old + sizeof(local_header_t) + central_header->length_filename + length_extra_old, out_index, size_compressed_old)) return 0;
-        } else {
-            if (!xfilecopy(offset_old + sizeof(local_header_t) + central_header->length_filename + length_extra_old, out_index, size_compressed_old)) return 0;
-        }
-        out_index += local_header.size_compressed;
-
-        memcpy(&central_directory_out[central_directory_out_index], central_header, sizeof(central_header_t) + central_header->length_filename);
-        central_directory_out_index += sizeof(central_header_t) + central_header->length_filename;
-    }
-
-    central_directory_out_size = central_directory_out_index;
-    central_footer.central_directory_size = central_directory_out_size;
-    central_footer.central_directory_offset = out_index;
-    central_footer.length_comment = 0;
-    if (!xseekwrite(out_index, central_directory_out, central_directory_out_size)) return 0;
-    out_index += central_directory_out_size;
-    if (!xseekwrite(out_index, &central_footer, sizeof(central_footer_t))) return 0;
-
-    LOGD("central header @ %08X (%d)\n", central_footer.central_directory_offset, central_footer.central_directory_size);
-    LOGD("central footer @ %08X\n", out_index);
-
-    ok = 1;
-
-    free(central_directory_in);
-    free(central_directory_out);
     return ok;
-}
+}

app/src/main/jni/zipadjust.h

@@ -1,9 +1,13 @@
 #ifndef MAGISKMANAGER_ZIPADJUST_H_H
 #define MAGISKMANAGER_ZIPADJUST_H_H
 
-int zipadjust(int decompress);
+#include <android/log.h>
 
-extern size_t insize, outsize, alloc;
-extern unsigned char *fin, *fout;
+int zipadjust(const char* filenameIn, const char* filenameOut, int decompress);
+
+#define  LOG_TAG    "zipadjust"
+
+#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
 
 #endif //MAGISKMANAGER_ZIPADJUST_H_H

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-    <path
-        android:fillColor="#000"
-        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
-</vector>

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

@@ -56,35 +56,35 @@
                             android:textAppearance="@style/TextAppearance.AppCompat.Headline"/>
                     </LinearLayout>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/app_version_info"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:icon="@drawable/ic_info_outline"
                         app:text="@string/app_version"/>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/app_changelog"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:icon="@drawable/ic_history"
                         app:text="@string/app_changelog"/>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/app_developers"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:icon="@drawable/ic_person"
                         app:text="@string/app_developers"/>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/app_translators"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:icon="@drawable/ic_language"
                         app:text="@string/app_translators"/>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/app_source_code"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -109,14 +109,14 @@
                     android:layout_marginBottom="8dp"
                     android:orientation="vertical">
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/support_thread"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:icon="@drawable/ic_xda"
                         app:text="@string/support_thread"/>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/donation"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"

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

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/message_panel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:overScrollMode="ifContentScrolls"
+            android:paddingBottom="12dip"
+            android:paddingEnd="20dip"
+            android:paddingStart="20dip"
+            android:paddingTop="12dip">
+
+            <TextView
+                android:id="@+id/message"
+                style="?android:attr/textAppearanceMedium"
+                android:textColor="?android:attr/textColorPrimary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="5dip" />
+
+        </ScrollView>
+
+    </LinearLayout>
+
+    <ViewStub
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/custom_view"/>
+
+    <LinearLayout
+        style="?android:attr/buttonBarStyle"
+        android:id="@+id/button_panel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="54dip"
+        android:measureWithLargestChild="true"
+        android:orientation="horizontal"
+        android:paddingEnd="2dip"
+        android:paddingStart="2dip"
+        android:paddingTop="4dip">
+
+        <Button
+            android:id="@+id/negative"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:layout_weight="1"
+            android:maxLines="2" />
+
+        <Button
+            android:id="@+id/neutral"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            android:maxLines="2" />
+
+        <Button
+            android:id="@+id/positive"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_weight="1"
+            android:maxLines="2" />
+
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="?attr/actionBarSize"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/install_info_card"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginTop="6dp"
-            style="?attr/cardStyle"
-            app:cardUseCompatPadding="true">
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:padding="5dp">
-
-                <TextView
-                    android:id="@+id/install_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:padding="5dp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/current_version_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:padding="5dp"
-                    android:textStyle="bold" />
-            </LinearLayout>
-
-        </android.support.v7.widget.CardView>
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:maxWidth="400dp"
-            android:minWidth="400dp">
-
-            <android.support.v7.widget.CardView
-                android:id="@+id/bootimage_card"
-                android:layout_gravity="center"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:layout_marginTop="6dp"
-                style="?attr/cardStyle"
-                app:cardUseCompatPadding="true"
-                android:layout_width="match_parent">
-
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="15dp"
-                    android:layout_marginBottom="15dp">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:paddingBottom="10dp"
-                        android:text="@string/boot_image_title"
-                        android:textStyle="bold" />
-
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginEnd="15dp"
-                        android:layout_marginStart="15dp">
-
-                        <Spinner
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:id="@+id/block_spinner"
-                            android:layout_weight="1" />
-
-                        <Button
-                            android:text="@string/detect_button"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/detect_bootimage"/>
-                    </LinearLayout>
-
-                </LinearLayout>
-
-            </android.support.v7.widget.CardView>
-
-            <android.support.v7.widget.CardView
-                android:id="@+id/install_option_card"
-                android:layout_gravity="center"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:layout_marginTop="6dp"
-                style="?attr/cardStyle"
-                app:cardUseCompatPadding="true"
-                android:layout_width="match_parent">
-
-
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="15dp"
-                    android:layout_marginBottom="15dp">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:paddingBottom="10dp"
-                        android:text="@string/advanced_settings_title"
-                        android:textStyle="bold" />
-
-                    <CheckBox
-                        android:text="@string/keep_force_encryption"
-                        android:id="@+id/keep_force_enc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="25dp"
-                        android:layout_marginStart="25dp" />
-
-                    <CheckBox
-                        android:text="@string/keep_dm_verity"
-                        android:id="@+id/keep_verity"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="25dp"
-                        android:layout_marginStart="25dp" />
-
-                </LinearLayout>
-            </android.support.v7.widget.CardView>
-
-            <android.support.v7.widget.CardView
-                android:id="@+id/flash_button"
-                android:layout_gravity="center"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:layout_marginTop="6dp"
-                style="?attr/cardStyle"
-                app:cardUseCompatPadding="true"
-                android:layout_width="match_parent"
-                android:foreground="?android:attr/selectableItemBackground"
-                android:clickable="true">
-
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginEnd="25dp"
-                    android:layout_marginStart="25dp">
-
-                    <ImageView
-                        android:layout_width="50dp"
-                        android:layout_height="wrap_content"
-                        app:srcCompat="@mipmap/ic_launcher"
-                        android:id="@+id/imageView"
-                        android:layout_weight="0"
-                        android:layout_marginEnd="20dp"/>
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text="@string/magiskify"
-                        android:ems="10"
-                        android:gravity="center"
-                        android:layout_weight="1"
-                        android:textStyle="bold"
-                        android:textAllCaps="false"
-                        android:textSize="20sp"
-                        android:fontFamily="sans-serif" />
-
-                    <FrameLayout
-                        android:layout_width="50dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="0"
-                        android:layout_marginStart="20dp">
-
-                    </FrameLayout>
-
-                </LinearLayout>
-
-            </android.support.v7.widget.CardView>
-
-            <android.support.v7.widget.CardView
-                android:id="@+id/uninstall_button"
-                android:layout_gravity="center"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:layout_marginTop="6dp"
-                style="?attr/cardStyle"
-                app:cardUseCompatPadding="true"
-                android:layout_width="match_parent"
-                android:foreground="?android:attr/selectableItemBackground"
-                android:clickable="true">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/uninstall"
-                    android:ems="10"
-                    android:gravity="center"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:textStyle="bold"
-                    android:textAllCaps="false"
-                    android:textSize="20sp"
-                    android:fontFamily="sans-serif" />
-
-            </android.support.v7.widget.CardView>
-
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-
-</ScrollView>

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

@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.SwipeRefreshLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/swipeRefreshLayout"
+    android:layout_width="match_parent"
+    android:layout_height="fill_parent"
+    android:layout_marginTop="?attr/actionBarSize"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="8dp"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <android.support.v7.widget.CardView
+                android:id="@+id/magisk_update_card"
+                style="?attr/cardStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="4dp"
+                app:cardCornerRadius="@dimen/card_corner_radius"
+                app:cardElevation="@dimen/card_elevation">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <ImageView
+                        android:id="@+id/magisk_update_icon"
+                        android:layout_width="25dp"
+                        android:layout_height="25dp"
+                        android:layout_centerVertical="true"
+                        android:layout_margin="15dp"
+                        android:layout_toStartOf="@+id/magisk_update_status"
+                        android:src="@drawable/ic_refresh"
+                        android:visibility="gone" />
+
+                    <ProgressBar
+                        android:id="@+id/magisk_update_progress"
+                        android:layout_width="25dp"
+                        android:layout_height="25dp"
+                        android:layout_centerVertical="true"
+                        android:layout_margin="15dp"
+                        android:layout_toStartOf="@+id/magisk_update_status" />
+
+                    <TextView
+                        android:id="@+id/magisk_update_status"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:layout_centerVertical="true"
+                        android:gravity="center"
+                        android:minWidth="225dp"
+                        android:padding="6dp"
+                        android:text="@string/checking_for_updates"
+                        android:textStyle="bold" />
+
+                </RelativeLayout>
+
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
+                style="?attr/cardStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="4dp"
+                app:cardCornerRadius="@dimen/card_corner_radius"
+                app:cardElevation="@dimen/card_elevation" >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="15dp"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/magisk_status_icon"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_centerVertical="true"
+                            android:layout_marginEnd="15dp"
+                            android:layout_marginStart="15dp"
+                            android:layout_toStartOf="@+id/magisk_version" />
+
+                        <TextView
+                            android:id="@+id/magisk_version"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerHorizontal="true"
+                            android:layout_centerVertical="true"
+                            android:gravity="center"
+                            android:minWidth="225dp"
+                            android:padding="6dp"
+                            android:textStyle="bold" />
+
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginBottom="15dp"
+                        android:layout_marginTop="5dp"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/root_status_icon"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_centerVertical="true"
+                            android:layout_marginEnd="15dp"
+                            android:layout_marginStart="15dp"
+                            android:layout_toStartOf="@+id/root_status" />
+
+                        <TextView
+                            android:id="@+id/root_status"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerHorizontal="true"
+                            android:layout_centerVertical="true"
+                            android:gravity="center"
+                            android:minWidth="225dp"
+                            android:padding="6dp"
+                            android:textStyle="bold" />
+
+                    </RelativeLayout>
+
+                </LinearLayout>
+
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
+                android:id="@+id/safetyNet_card"
+                style="?attr/cardStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="4dp"
+                app:cardCornerRadius="@dimen/card_corner_radius"
+                app:cardElevation="@dimen/card_elevation">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <RelativeLayout
+                        android:id="@+id/safetyNet_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <ImageView
+                            android:id="@+id/safetyNet_refresh"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_centerVertical="true"
+                            android:layout_margin="15dp"
+                            android:layout_toStartOf="@+id/safetyNet_status"
+                            android:src="@drawable/ic_refresh"
+                            android:tint="?attr/imageColorTint" />
+
+                        <ProgressBar
+                            android:id="@+id/safetyNet_check_progress"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_centerVertical="true"
+                            android:layout_margin="15dp"
+                            android:layout_toStartOf="@+id/safetyNet_status"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/safetyNet_status"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerHorizontal="true"
+                            android:layout_centerVertical="true"
+                            android:gravity="center"
+                            android:minWidth="175dp"
+                            android:padding="6dp"
+                            android:text="@string/safetyNet_check_text"
+                            android:textStyle="bold" />
+
+                    </RelativeLayout>
+
+                    <LinearLayout
+                        android:id="@+id/expand_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:paddingEnd="10dp"
+                        android:paddingStart="10dp">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:orientation="horizontal">
+
+                            <ImageView
+                                android:id="@+id/cts_status_icon"
+                                android:layout_width="25dp"
+                                android:layout_height="25dp"
+                                android:layout_marginBottom="5dp"
+                                android:layout_marginEnd="10dp"
+                                android:layout_marginStart="10dp"
+                                android:layout_marginTop="5dp" />
+
+                            <TextView
+                                android:id="@+id/cts_status"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:minWidth="150dp"
+                                android:padding="6dp"
+                                android:textStyle="bold" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:orientation="horizontal">
+
+                            <ImageView
+                                android:id="@+id/basic_status_icon"
+                                android:layout_width="25dp"
+                                android:layout_height="25dp"
+                                android:layout_margin="10dp" />
+
+                            <TextView
+                                android:id="@+id/basic_status"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:minWidth="150dp"
+                                android:padding="6dp"
+                                android:textStyle="bold" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
+                android:id="@+id/bootimage_card"
+                style="?attr/cardStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="4dp"
+                app:cardCornerRadius="@dimen/card_corner_radius"
+                app:cardElevation="@dimen/card_elevation" >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="15dp"
+                    android:layout_marginTop="15dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:paddingBottom="10dp"
+                        android:text="@string/boot_image_title"
+                        android:textStyle="bold" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginEnd="25dp"
+                        android:layout_marginStart="25dp"
+                        android:minHeight="35dp"
+                        android:orientation="horizontal">
+
+                        <Spinner
+                            android:id="@+id/block_spinner"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1" />
+
+                        <Button
+                            android:id="@+id/detect_bootimage"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/detect_button"
+                            android:visibility="gone" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
+                android:id="@+id/install_option_card"
+                style="?attr/cardStyle"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="4dp"
+                app:cardCornerRadius="@dimen/card_corner_radius"
+                app:cardElevation="@dimen/card_elevation">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="15dp"
+                    android:layout_marginTop="15dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:paddingBottom="10dp"
+                        android:text="@string/advanced_settings_title"
+                        android:textStyle="bold" />
+
+                    <CheckBox
+                        android:id="@+id/keep_force_enc"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="50dp"
+                        android:layout_marginStart="50dp"
+                        android:text="@string/keep_force_encryption" />
+
+                    <CheckBox
+                        android:id="@+id/keep_verity"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="50dp"
+                        android:layout_marginStart="50dp"
+                        android:text="@string/keep_dm_verity" />
+
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
+                android:id="@+id/install_button"
+                style="?attr/cardStyle"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="4dp"
+                android:clickable="true"
+                android:foreground="?android:attr/selectableItemBackground"
+                app:cardCornerRadius="@dimen/card_corner_radius"
+                app:cardElevation="@dimen/card_elevation">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="25dp"
+                    android:layout_marginStart="25dp"
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/imageView"
+                        android:layout_width="50dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="20dp"
+                        android:layout_weight="0"
+                        app:srcCompat="@mipmap/ic_launcher" />
+
+                    <TextView
+                        android:id="@+id/install_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:ems="10"
+                        android:fontFamily="sans-serif"
+                        android:gravity="center"
+                        android:textAllCaps="false"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
+
+                    <FrameLayout
+                        android:layout_width="50dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="20dp"
+                        android:layout_weight="0">
+
+                    </FrameLayout>
+
+                </LinearLayout>
+
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
+                android:id="@+id/uninstall_button"
+                style="?attr/cardStyle"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="4dp"
+                android:clickable="true"
+                android:foreground="?android:attr/selectableItemBackground"
+                app:cardCornerRadius="@dimen/card_corner_radius"
+                app:cardElevation="@dimen/card_elevation">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginTop="10dp"
+                    android:ems="10"
+                    android:fontFamily="sans-serif"
+                    android:gravity="center"
+                    android:text="@string/uninstall"
+                    android:textAllCaps="false"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+            </android.support.v7.widget.CardView>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</android.support.v4.widget.SwipeRefreshLayout>

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

@@ -20,8 +20,10 @@
                 android:id="@+id/txtLog"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:fontFamily="monospace"
                 android:padding="8dp"
-                android:textIsSelectable="true"/>
+                android:textIsSelectable="true"
+                android:textSize="10sp" />
 
             <ProgressBar
                 android:id="@+id/progressBar"

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:fab="http://schemas.android.com/apk/res-auto"
+<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/swipeRefreshLayout"
     android:layout_width="match_parent"
     android:layout_height="fill_parent"
@@ -22,7 +22,8 @@
             android:layout_height="match_parent"
             android:clipToPadding="false"
             android:dividerHeight="@dimen/card_divider_space"
-            fab:layoutManager="android.support.v7.widget.LinearLayoutManager" />
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
 
         <TextView
             android:id="@+id/empty_rv"
@@ -36,38 +37,16 @@
             android:textStyle="italic"
             android:visibility="gone" />
 
-
-        <com.github.clans.fab.FloatingActionMenu
-            android:id="@+id/fabmenu"
-            android:layout_width="500dp"
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center_horizontal"
-            android:layout_marginEnd="113dp"
-            android:layout_marginBottom="10dp"
-            fab:layout_behavior=".utils.FABBehavior"
-            fab:menu_fab_size="normal"
-            fab:menu_showShadow="true"
-            fab:menu_shadowColor="#66000000"
-            fab:menu_shadowRadius="4dp"
-            fab:menu_shadowXOffset="1dp"
-            fab:menu_shadowYOffset="3dp"
-            fab:menu_colorNormal="#cddc39"
-            fab:menu_colorPressed="#9e9d24"
-            fab:menu_colorRipple="#99FFFFFF"
-            fab:menu_animationDelayPerItem="50"
-            fab:menu_icon="@drawable/ic_add"
-            fab:menu_buttonSpacing="0dp"
-            fab:menu_labels_position="left" >
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/fab"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:src="@drawable/ic_archive"
-                fab:fab_size="mini"
-                fab:fab_label="@string/fab_flash_zip" />
-
-        </com.github.clans.fab.FloatingActionMenu>
+            android:layout_margin="@dimen/fab_padding"
+            android:elevation="6dp"
+            android:src="@drawable/ic_add"
+            tools:fabSize="normal"
+            tools:pressedTranslationZ="12dp" />
 
     </android.support.design.widget.CoordinatorLayout>
 

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

@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/swipeRefreshLayout"
-    android:layout_width="match_parent"
-    android:layout_height="fill_parent"
-    android:layout_marginTop="?attr/actionBarSize"
-    android:orientation="vertical">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="8dp"
-        android:layout_marginTop="?attr/actionBarSize"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <android.support.v7.widget.CardView
-                android:id="@+id/magiskStatusView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="5dip"
-                android:layout_marginRight="5dip"
-                android:layout_marginTop="6dp"
-                style="?attr/cardStyle"
-                app:cardUseCompatPadding="true">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/magisk_version"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:padding="6dp"
-                        android:textStyle="bold"/>
-
-                    <FrameLayout
-                        android:id="@+id/magisk_status_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="100dp"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:foregroundGravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/magisk_status_icon"
-                            android:layout_width="84dp"
-                            android:layout_height="84dp"
-                            android:layout_gravity="center"/>
-
-                        <ProgressBar
-                            android:id="@+id/magisk_check_updates_progress"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"/>
-
-                    </FrameLayout>
-
-                    <TextView
-                        android:id="@+id/magisk_update_status"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:padding="6dp"
-                        android:textStyle="bold"
-                        android:text="@string/checking_for_updates" />
-
-                </LinearLayout>
-
-            </android.support.v7.widget.CardView>
-
-            <android.support.v7.widget.CardView
-                android:id="@+id/rootStatusView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="5dip"
-                android:layout_marginRight="5dip"
-                android:layout_marginTop="6dp"
-                style="?attr/cardStyle"
-                app:cardUseCompatPadding="true">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/root_status"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:padding="6dp"
-                        android:textStyle="bold"/>
-
-                    <FrameLayout
-                        android:id="@+id/root_status_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="100dp"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:foregroundGravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/root_status_icon"
-                            android:layout_width="84dp"
-                            android:layout_height="84dp"
-                            android:layout_gravity="center" />
-
-                    </FrameLayout>
-
-                    <TextView
-                        android:id="@+id/root_info"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:padding="6dp"
-                        android:textStyle="bold"/>
-
-                </LinearLayout>
-
-            </android.support.v7.widget.CardView>
-
-            <android.support.v7.widget.CardView
-                android:id="@+id/safetyNetView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="5dip"
-                android:layout_marginRight="5dip"
-                android:layout_marginTop="6dp"
-                style="?attr/cardStyle"
-                app:cardUseCompatPadding="true">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <FrameLayout
-                        android:id="@+id/safetyNet_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="100dp"
-                        android:foregroundGravity="center"
-                        android:orientation="vertical"
-                        android:background="@color/grey500">
-
-                        <ImageView
-                            android:id="@+id/safetyNet_icon"
-                            android:layout_width="84dp"
-                            android:layout_height="84dp"
-                            android:layout_gravity="center"
-                            android:src="@drawable/ic_safetynet"/>
-
-                        <ProgressBar
-                            android:id="@+id/safetyNet_check_progress"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:visibility="gone"/>
-
-                    </FrameLayout>
-
-                    <TextView
-                        android:id="@+id/safetyNet_status"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:padding="6dp"
-                        android:textStyle="bold"
-                        android:text="@string/safetyNet_check_text" />
-
-                </LinearLayout>
-
-            </android.support.v7.widget.CardView>
-
-        </LinearLayout>
-
-    </ScrollView>
-
-</android.support.v4.widget.SwipeRefreshLayout>

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

@@ -14,135 +14,74 @@
     card_view:cardCornerRadius="@dimen/card_corner_radius"
     card_view:cardElevation="@dimen/card_elevation">
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
+        android:orientation="horizontal"
         android:padding="@dimen/card_layout_padding">
 
         <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
+            android:id="@+id/info_layout"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:id="@+id/info_layout">
-
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/title"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="0dp"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textIsSelectable="false"/>
-
-                    <TextView
-                        android:id="@+id/version_name"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/no_info_provided"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@android:color/tertiary_text_dark"
-                        android:textIsSelectable="false"
-                        android:textStyle="bold|italic"/>
-
-                    <TextView
-                        android:id="@+id/author"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/no_info_provided"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@android:color/tertiary_text_dark"
-                        android:textIsSelectable="false"
-                        android:textStyle="bold|italic"/>
-
-                    <TextView
-                        android:id="@+id/description"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/no_info_provided"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textIsSelectable="false" />
-
-                </LinearLayout>
-
-                <ImageView
-                    android:id="@+id/update"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/ic_file_download_black"
-                    android:backgroundTint="@color/icon_grey"
-                    android:focusable="false"
-                    android:gravity="end" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/expand_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_below="@id/info_layout"
+            android:layout_weight="1"
+            android:clickable="true"
+            android:foreground="?android:attr/selectableItemBackground"
             android:orientation="vertical">
 
-            <LinearLayout
-                android:layout_width="wrap_content"
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:orientation="horizontal">
+                android:layout_marginTop="0dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textIsSelectable="false" />
 
-                <ImageView
-                    android:id="@+id/changeLog"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/card_imageview_margin"
-                    android:layout_marginStart="@dimen/card_imageview_margin"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:padding="15dp"
-                    android:src="@drawable/ic_changelog"
-                    android:tint="@color/icon_grey"/>
+            <TextView
+                android:id="@+id/version_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/no_info_provided"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@android:color/tertiary_text_dark"
+                android:textIsSelectable="false"
+                android:textStyle="bold|italic" />
 
-                <ImageView
-                    android:id="@+id/authorLink"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/card_imageview_margin"
-                    android:layout_marginStart="@dimen/card_imageview_margin"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:padding="15dp"
-                    android:src="@drawable/ic_person"
-                    android:tint="@color/icon_grey"/>
+            <TextView
+                android:id="@+id/author"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/no_info_provided"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@android:color/tertiary_text_dark"
+                android:textIsSelectable="false"
+                android:textStyle="bold|italic" />
 
-                <ImageView
-                    android:id="@+id/supportLink"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/card_imageview_margin"
-                    android:layout_marginStart="@dimen/card_imageview_margin"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:padding="15dp"
-                    android:src="@drawable/ic_help"
-                    android:tint="@color/icon_grey"/>
-
-            </LinearLayout>
+            <TextView
+                android:id="@+id/description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/no_info_provided"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textIsSelectable="false" />
 
         </LinearLayout>
 
-    </RelativeLayout>
+        <ImageView
+            android:id="@+id/download"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/ic_file_download_black"
+            android:backgroundTint="@color/icon_grey"
+            android:clickable="true"
+            android:foreground="?android:attr/selectableItemBackground"
+            android:focusable="false"
+            android:gravity="end" />
+
+    </LinearLayout>
 
 
 </android.support.v7.widget.CardView>

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

@@ -6,7 +6,7 @@
     android:gravity="center_vertical"
     android:paddingStart="16dp"
     android:textAllCaps="true"
-    android:textColor="@color/accent"
+    android:textColor="?android:colorAccent"
     android:background="@android:color/transparent"
     android:textSize="16sp"
     android:id="@+id/section_text"

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

@@ -6,15 +6,9 @@
         android:id="@+id/main_group">
 
         <item
-            android:id="@+id/status"
-            android:icon="@drawable/ic_device_information"
-            android:title="@string/status"/>
-
-        <item
-            android:id="@+id/install"
+            android:id="@+id/magisk"
             android:icon="@drawable/ic_magisk"
-            android:title="@string/install"
-            android:visible="false"/>
+            android:title="@string/magisk"/>
 
         <item
             android:id="@+id/superuser"