Add 7.0.0 changelog

Close #1032, courtesy of @vvb2060

.gitignore

@@ -3,9 +3,7 @@ out
 *.jks
 *.apk
 config.prop
-
-# Manually dumped jars
-snet/libs
+update.sh
 
 # Built binaries
 native/out

README.MD

@@ -1,26 +1,34 @@
 # Magisk
+[Downloads](https://github.com/topjohnwu/Magisk/releases) | [Documentation](https://topjohnwu.github.io/Magisk/) | [XDA Thread](https://forum.xda-developers.com/apps/magisk/official-magisk-v7-universal-systemless-t3473445)
+
+## Introduction
+Magisk is a suite of open source tools for customizing Android, supporting devices higher than Android 4.2 (API 17). It covers the fundamental parts for Android customization: root, boot scripts, SELinux patches, AVB2.0 / dm-verity / forceencrypt removals etc.
+
+Furthermore, Magisk provides a **Systemless Interface** to alter the system (or vendor) arbitrarily while the actual partitions stay completely intact. With its systemless nature along with several other hacks, Magisk can hide modifications from nearly any system integrity verifications used in banking apps, corporation monitoring apps, game cheat detections, and most importantly [Google's SafetyNet API](https://developer.android.com/training/safetynet/index.html).
+
+## Bug Reports
+**Make sure to install the latest [Canary Build](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337) before reporting any bugs!** **DO NOT** report bugs that is already fixed upstream. Follow the instructions in the [Canary Channel XDA Thread](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337), and report a bug either by opening an issue on GitHub or directly in the thread.
 
 ## Building Environment Requirements
-
-1. Python 3.5+: run `build.py` script
+1. Python 3: run `build.py` script
 2. Java Development Kit (JDK) 8: Compile Magisk Manager and sign zips
 3. Latest Android SDK: set `ANDROID_HOME` environment variable to the path to Android SDK
 4. Android NDK: Install NDK along with SDK (`$ANDROID_HOME/ndk-bundle`), or optionally specify a custom path `ANDROID_NDK_HOME`
 5. (Windows Only) Python package Colorama: Install with `pip install colorama`, used for ANSI color codes
 
 ## Building Notes and Instructions
-1. Building is tested on macOS, Ubuntu, and Windows 10 using the latest stable NDK and NDK r10e. Officially released binaries were built with NDK r10e.
-2. Set configurations in `config.prop`. A sample file `config.prop.sample` is provided as an example.
-3. Run `build.py` with argument `-h` to see the built-in help message. The `-h` option also works for each supported actions, e.g. `./build.py binary -h`
-4. By default, `build.py` build binaries and Magisk Manager in debug mode. If you want to build Magisk Manager in release mode (via the `--release` flag), you need a Java Keystore file `release-key.jks` to sign Magisk Manager's APK. For more information, check out [Google's Official Documentation](https://developer.android.com/studio/publish/app-signing.html#signing-manually).
-5. The SafetyNet extension pack requires the full Magisk Manager as a `compileOnly` dependency. Build the **release** APK, convert it back to Java `.class` files (I use [dex2jar](https://github.com/pxb1988/dex2jar)), and place the converted JAR under `snet/libs` before compiling.
+1. Clone sources with submodules: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git`
+2. Building is supported on macOS, Linux, and Windows. Official releases are built and tested with [FrankeNDK](https://github.com/topjohnwu/FrankeNDK); point `ANDROID_NDK_HOME` to FrankeNDK if you want to use it for compiling.
+3. Set configurations in `config.prop`. A sample file `config.prop.sample` is provided as an example.
+4. Run `build.py` with argument `-h` to see the built-in help message. The `-h` option also works for each supported actions, e.g. `./build.py binary -h`
+5. By default, `build.py` build binaries and Magisk Manager in debug mode. If you want to build Magisk Manager in release mode (via the `-r, --release` flag), you need a Java Keystore file `release-key.jks` (only `JKS` format is supported) to sign APKs and zips. For more information, check out [Google's Official Documentation](https://developer.android.com/studio/publish/app-signing.html#signing-manually).
 
 ## License
 
 ```
 Magisk, including all git submodules are free software:
-you can redistribute it and/or modify it under the terms of the 
-GNU General Public License as published by the Free Software Foundation, 
+you can redistribute it and/or modify it under the terms of the
+GNU General Public License as published by the Free Software Foundation,
 either version 3 of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
@@ -31,44 +39,3 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ```
-
-## Credits
-
-**MagiskManager** (`app`)
-
-* Copyright 2016-2018, John Wu (@topjohnwu)
-* All contributors and translators on Github
-
-**MagiskSU** (`native/jni/su`)
-
-* Copyright 2016-2018, John Wu (@topjohnwu)
-* Copyright 2015, Pierre-Hugues Husson (phh@phh.me)
-* Copyright 2013, Koushik Dutta (@koush)
-* Copyright 2010, Adam Shanks (@ChainsDD)
-* Copyright 2008, Zinx Verituse (@zinxv)
-
-**MagiskPolicy** (`native/jni/magiskpolicy`)
-
-* Copyright 2016-2018, John Wu (@topjohnwu)
-* Copyright 2015, Pierre-Hugues Husson (phh@phh.me)
-* Copyright 2015, Joshua Brindle (@joshua_brindle)
-
-**MagiskHide** (`native/jni/magiskhide`)
-
-* Copyright 2016-2018, John Wu (@topjohnwu)
-* Copyright 2016, Pierre-Hugues Husson (phh@phh.me)
-
-**resetprop** (`native/jni/resetprop`)
-
- * Copyright 2016-2018 John Wu (@topjohnwu)
- * Copyright 2016 nkk71 (nkk71x@gmail.com)
-
-**External Dependencies** (`native/jni/external`)
-
-* Makefile for busybox, generated by [ndk-busybox-kitchen](https://github.com/topjohnwu/ndk-busybox-kitchen)
-* Each dependencies has its own license/copyright information in each subdirectory.  
-All of them are either GPL or GPL compatible.
-
-**Others Not Mentioned**
-
-* Copyright 2016-2018, John Wu (@topjohnwu)

app-core/.gitignore

@@ -0,0 +1,2 @@
+/build
+src/main/res/raw/util_functions.sh

app-core/build.gradle

@@ -0,0 +1,21 @@
+apply plugin: 'com.android.library'
+
+android {
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    api project(':net')
+    api project(':signing')
+    api 'org.kamranzafar:jtar:2.3'
+
+    def libsuVersion = '2.3.0'
+    api "com.github.topjohnwu.libsu:core:${libsuVersion}"
+    api "com.github.topjohnwu.libsu:io:${libsuVersion}"
+}

app-core/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

app-core/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.topjohnwu.magisk.core" >
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+</manifest>

app-core/src/main/java/com/topjohnwu/magisk/App.java

@@ -0,0 +1,61 @@
+package com.topjohnwu.magisk;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.preference.PreferenceManager;
+
+import com.topjohnwu.magisk.core.BuildConfig;
+import com.topjohnwu.magisk.database.MagiskDB;
+import com.topjohnwu.magisk.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+public class App extends Application {
+
+    public static App self;
+    public static ThreadPoolExecutor THREAD_POOL;
+
+    // Global resources
+    public SharedPreferences prefs;
+    public MagiskDB mDB;
+    public RepoDatabaseHelper repoDB;
+
+    static {
+        Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER | Shell.FLAG_USE_MAGISK_BUSYBOX);
+        Shell.Config.verboseLogging(BuildConfig.DEBUG);
+        Shell.Config.addInitializers(RootUtils.class);
+        Shell.Config.setTimeout(2);
+        THREAD_POOL = (ThreadPoolExecutor) AsyncTask.THREAD_POOL_EXECUTOR;
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        self = this;
+
+        Context de = this;
+        if (Build.VERSION.SDK_INT >= 24) {
+            de = createDeviceProtectedStorageContext();
+            de.moveSharedPreferencesFrom(this, PreferenceManager.getDefaultSharedPreferencesName(base));
+        }
+        prefs = PreferenceManager.getDefaultSharedPreferences(de);
+        mDB = new MagiskDB(this);
+
+        Networking.init(this);
+        LocaleManager.setLocale(this);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        LocaleManager.setLocale(this);
+    }
+}

app-core/src/main/java/com/topjohnwu/magisk/Config.java

@@ -0,0 +1,372 @@
+package com.topjohnwu.magisk;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Xml;
+
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileInputStream;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.File;
+import java.io.IOException;
+
+public class Config {
+
+    // Current status
+    public static String magiskVersionString;
+    public static int magiskVersionCode = -1;
+    private static boolean magiskHide;
+
+    // Update Info
+    public static String remoteMagiskVersionString;
+    public static int remoteMagiskVersionCode = -1;
+    public static String magiskLink;
+    public static String magiskNoteLink;
+    public static String magiskMD5;
+    public static String remoteManagerVersionString;
+    public static int remoteManagerVersionCode = -1;
+    public static String managerLink;
+    public static String managerNoteLink;
+    public static String uninstallerLink;
+
+    // Install flags
+    public static boolean keepVerity = false;
+    public static boolean keepEnc = false;
+    public static boolean recovery = false;
+
+    public static int suLogTimeout = 14;
+
+    public static class Key {
+        // su configs
+        public static final String ROOT_ACCESS = "root_access";
+        public static final String SU_MULTIUSER_MODE = "multiuser_mode";
+        public static final String SU_MNT_NS = "mnt_ns";
+        public static final String SU_MANAGER = "requester";
+        public static final String SU_REQUEST_TIMEOUT = "su_request_timeout";
+        public static final String SU_AUTO_RESPONSE = "su_auto_response";
+        public static final String SU_NOTIFICATION = "su_notification";
+        public static final String SU_REAUTH = "su_reauth";
+        public static final String SU_FINGERPRINT = "su_fingerprint";
+
+        // prefs
+        public static final String CHECK_UPDATES = "check_update";
+        public static final String UPDATE_CHANNEL = "update_channel";
+        public static final String CUSTOM_CHANNEL = "custom_channel";
+        public static final String BOOT_FORMAT = "boot_format";
+        public static final String UPDATE_SERVICE_VER = "update_service_version";
+        public static final String MAGISKHIDE = "magiskhide";
+        public static final String COREONLY = "disable";
+        public static final String LOCALE = "locale";
+        public static final String DARK_THEME = "dark_theme";
+        public static final String ETAG_KEY = "ETag";
+        public static final String REPO_ORDER = "repo_order";
+        public static final String SHOW_SYSTEM_APP = "show_system";
+    }
+
+    public static class Value {
+        public static final int STABLE_CHANNEL = 0;
+        public static final int BETA_CHANNEL = 1;
+        public static final int CUSTOM_CHANNEL = 2;
+        public static final int ROOT_ACCESS_DISABLED = 0;
+        public static final int ROOT_ACCESS_APPS_ONLY = 1;
+        public static final int ROOT_ACCESS_ADB_ONLY = 2;
+        public static final int ROOT_ACCESS_APPS_AND_ADB = 3;
+        public static final int MULTIUSER_MODE_OWNER_ONLY = 0;
+        public static final int MULTIUSER_MODE_OWNER_MANAGED = 1;
+        public static final int MULTIUSER_MODE_USER = 2;
+        public static final int NAMESPACE_MODE_GLOBAL = 0;
+        public static final int NAMESPACE_MODE_REQUESTER = 1;
+        public static final int NAMESPACE_MODE_ISOLATE = 2;
+        public static final int NO_NOTIFICATION = 0;
+        public static final int NOTIFICATION_TOAST = 1;
+        public static final int SU_PROMPT = 0;
+        public static final int SU_AUTO_DENY = 1;
+        public static final int SU_AUTO_ALLOW = 2;
+        public static final int[] TIMEOUT_LIST = {0, -1, 10, 20, 30, 60};
+        public static final int ORDER_NAME = 0;
+        public static final int ORDER_DATE = 1;
+    }
+
+    private static Bundle defs = new Bundle();
+
+    static {
+        /* Set default configurations */
+
+        // prefs int
+        defs.putInt(Key.REPO_ORDER, Value.ORDER_DATE);
+
+        // prefs string int
+        defs.putInt(Key.SU_REQUEST_TIMEOUT, 10);
+        defs.putInt(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT);
+        defs.putInt(Key.SU_NOTIFICATION, Value.NOTIFICATION_TOAST);
+        defs.putInt(Key.UPDATE_CHANNEL, Value.STABLE_CHANNEL);
+
+        // prefs bool
+        defs.putBoolean(Key.CHECK_UPDATES, true);
+        // defs.putBoolean(Key.DARK_THEME, false);
+        // defs.putBoolean(Key.SU_REAUTH, false);
+        // defs.putBoolean(Key.MAGISKHIDE, false);
+        // defs.putBoolean(Key.COREONLY, false);
+        // defs.putBoolean(Key.SHOW_SYSTEM_APP, false);
+
+        // prefs string
+        defs.putString(Key.CUSTOM_CHANNEL, "");
+        defs.putString(Key.BOOT_FORMAT, ".img");
+        defs.putString(Key.LOCALE, "");
+        // defs.putString(Key.ETAG_KEY, null);
+
+        // db int
+        defs.putInt(Key.ROOT_ACCESS, Value.ROOT_ACCESS_APPS_AND_ADB);
+        defs.putInt(Key.SU_MNT_NS, Value.NAMESPACE_MODE_REQUESTER);
+        defs.putInt(Key.SU_MULTIUSER_MODE, Value.MULTIUSER_MODE_OWNER_ONLY);
+
+        // db bool
+        // defs.putBoolean(Key.SU_FINGERPRINT, false);
+
+        // db strings
+        // defs.putString(Key.SU_MANAGER, null);
+    }
+
+    public static void loadMagiskInfo() {
+        try {
+            magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":")[0];
+            magiskVersionCode = Integer.parseInt(ShellUtils.fastCmd("magisk -V"));
+            magiskHide = Shell.su("magiskhide --status").exec().isSuccess();
+        } catch (NumberFormatException ignored) {}
+    }
+
+    public static void export() {
+        // Flush prefs to disk
+        App app = App.self;
+        app.prefs.edit().commit();
+        File xml = new File(app.getFilesDir().getParent() + "/shared_prefs",
+                app.getPackageName() + "_preferences.xml");
+        Shell.su(Utils.fmt("cat %s > /data/user/0/%s", xml, Const.MANAGER_CONFIGS)).exec();
+    }
+
+    public static void initialize() {
+        SharedPreferences pref = App.self.prefs;
+        SharedPreferences.Editor editor = pref.edit();
+        SuFile config = new SuFile("/data/user/0/" + Const.MANAGER_CONFIGS);
+        if (config.exists()) {
+            try {
+                SuFileInputStream is = new SuFileInputStream(config);
+                XmlPullParser parser = Xml.newPullParser();
+                parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
+                parser.setInput(is, "UTF-8");
+                parser.nextTag();
+                parser.require(XmlPullParser.START_TAG, null, "map");
+                while (parser.next() != XmlPullParser.END_TAG) {
+                    if (parser.getEventType() != XmlPullParser.START_TAG)
+                        continue;
+                    String key = parser.getAttributeValue(null, "name");
+                    String value = parser.getAttributeValue(null, "value");
+                    switch (parser.getName()) {
+                        case "string":
+                            parser.require(XmlPullParser.START_TAG, null, "string");
+                            editor.putString(key, parser.nextText());
+                            parser.require(XmlPullParser.END_TAG, null, "string");
+                            break;
+                        case "boolean":
+                            parser.require(XmlPullParser.START_TAG, null, "boolean");
+                            editor.putBoolean(key, Boolean.parseBoolean(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "boolean");
+                            break;
+                        case "int":
+                            parser.require(XmlPullParser.START_TAG, null, "int");
+                            editor.putInt(key, Integer.parseInt(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "int");
+                            break;
+                        case "long":
+                            parser.require(XmlPullParser.START_TAG, null, "long");
+                            editor.putLong(key, Long.parseLong(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "long");
+                            break;
+                        case "float":
+                            parser.require(XmlPullParser.START_TAG, null, "int");
+                            editor.putFloat(key, Float.parseFloat(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "int");
+                            break;
+                        default:
+                            parser.next();
+                    }
+                }
+            } catch (IOException | XmlPullParserException e) {
+                e.printStackTrace();
+            }
+            editor.remove(Key.ETAG_KEY);
+            editor.apply();
+            editor = pref.edit();
+            config.delete();
+        }
+
+        // Set to defaults if not set
+        setDefs(pref, editor,
+                Key.SU_REQUEST_TIMEOUT, Key.SU_AUTO_RESPONSE, Key.ROOT_ACCESS,
+                Key.SU_MNT_NS, Key.SU_NOTIFICATION, Key.DARK_THEME,
+                Key.CHECK_UPDATES, Key.UPDATE_CHANNEL, Key.REPO_ORDER);
+
+        // These settings are from actual device state
+        editor.putBoolean(Key.MAGISKHIDE, magiskHide)
+                .putBoolean(Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
+                .putInt(Key.UPDATE_SERVICE_VER, Const.UPDATE_SERVICE_VER)
+                .apply();
+    }
+
+    private static final int PREF_INT = 0;
+    private static final int PREF_STR_INT = 1;
+    private static final int PREF_BOOL = 2;
+    private static final int PREF_STR = 3;
+    private static final int DB_INT = 4;
+    private static final int DB_BOOL = 5;
+    private static final int DB_STR = 6;
+
+    private static int getConfigType(String key) {
+        switch (key) {
+            case Key.REPO_ORDER:
+                return PREF_INT;
+
+            case Key.SU_REQUEST_TIMEOUT:
+            case Key.SU_AUTO_RESPONSE:
+            case Key.SU_NOTIFICATION:
+            case Key.UPDATE_CHANNEL:
+                return PREF_STR_INT;
+
+            case Key.DARK_THEME:
+            case Key.SU_REAUTH:
+            case Key.CHECK_UPDATES:
+            case Key.MAGISKHIDE:
+            case Key.COREONLY:
+            case Key.SHOW_SYSTEM_APP:
+                return PREF_BOOL;
+
+            case Key.CUSTOM_CHANNEL:
+            case Key.BOOT_FORMAT:
+            case Key.LOCALE:
+            case Key.ETAG_KEY:
+                return PREF_STR;
+
+            case Key.ROOT_ACCESS:
+            case Key.SU_MNT_NS:
+            case Key.SU_MULTIUSER_MODE:
+                return DB_INT;
+
+            case Key.SU_FINGERPRINT:
+                return DB_BOOL;
+
+            case Key.SU_MANAGER:
+                return DB_STR;
+
+            default:
+                throw new IllegalArgumentException();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T get(String key) {
+        App app = App.self;
+        switch (getConfigType(key)) {
+            case PREF_INT:
+                return (T) (Integer) app.prefs.getInt(key, defs.getInt(key));
+            case PREF_STR_INT:
+                return (T) (Integer) Utils.getPrefsInt(app.prefs, key, defs.getInt(key));
+            case PREF_BOOL:
+                return (T) (Boolean) app.prefs.getBoolean(key, defs.getBoolean(key));
+            case PREF_STR:
+                return (T) app.prefs.getString(key, defs.getString(key));
+            case DB_INT:
+                return (T) (Integer) app.mDB.getSettings(key, defs.getInt(key));
+            case DB_BOOL:
+                return (T) (Boolean) (app.mDB.getSettings(key, defs.getBoolean(key) ? 1 : 0) != 0);
+            case DB_STR:
+                return (T) app.mDB.getStrings(key, defs.getString(key));
+        }
+        /* Will never get here (IllegalArgumentException in getConfigType) */
+        return (T) new Object();
+    }
+
+    public static void set(String key, Object val) {
+        App app = App.self;
+        switch (getConfigType(key)) {
+            case PREF_INT:
+                app.prefs.edit().putInt(key, (int) val).apply();
+                break;
+            case PREF_STR_INT:
+                app.prefs.edit().putString(key, String.valueOf(val)).apply();
+                break;
+            case PREF_BOOL:
+                app.prefs.edit().putBoolean(key, (boolean) val).apply();
+                break;
+            case PREF_STR:
+                app.prefs.edit().putString(key, (String) val).apply();
+                break;
+            case DB_INT:
+                app.mDB.setSettings(key, (int) val);
+                break;
+            case DB_BOOL:
+                app.mDB.setSettings(key, (boolean) val ? 1 : 0);
+                break;
+            case DB_STR:
+                app.mDB.setStrings(key, (String) val);
+                break;
+        }
+    }
+
+    public static void remove(String key) {
+        App app = App.self;
+        int def;
+        switch (getConfigType(key)) {
+            case PREF_INT:
+            case PREF_STR_INT:
+            case PREF_BOOL:
+            case PREF_STR:
+                app.prefs.edit().remove(key).apply();
+                break;
+            case DB_INT:
+                def = defs.getInt(key);
+                app.mDB.setSettings(key, def);
+                break;
+            case DB_BOOL:
+                def = defs.getBoolean(key) ? 1 : 0;
+                app.mDB.setSettings(key, def);
+                break;
+            case DB_STR:
+                app.mDB.setStrings(key, null);
+                break;
+        }
+    }
+
+    private static void setDefs(SharedPreferences pref, SharedPreferences.Editor editor, String... keys) {
+        for (String key : keys) {
+            if (pref.contains(key))
+                continue;
+            switch (getConfigType(key)) {
+                case PREF_INT:
+                    editor.putInt(key, defs.getInt(key));
+                    break;
+                case DB_INT:
+                case PREF_STR_INT:
+                    editor.putString(key, String.valueOf(defs.getInt(key)));
+                    break;
+                case PREF_STR:
+                case DB_STR:
+                    editor.putString(key, defs.getString(key));
+                    break;
+                case PREF_BOOL:
+                case DB_BOOL:
+                    editor.putBoolean(key, defs.getBoolean(key));
+                    break;
+            }
+        }
+    }
+}

app-core/src/main/java/com/topjohnwu/magisk/Const.java

@@ -0,0 +1,110 @@
+package com.topjohnwu.magisk;
+
+import android.os.Environment;
+import android.os.Process;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+public class Const {
+
+    public static final String DEBUG_TAG = "MagiskManager";
+
+    // APK content
+    public static final String ANDROID_MANIFEST = "AndroidManifest.xml";
+
+    public static final String SU_KEYSTORE_KEY = "su_key";
+
+    // Paths
+    public static final String MAGISK_PATH = "/sbin/.magisk/img";
+    public static final File EXTERNAL_PATH;
+    public static File MAGISK_DISABLE_FILE;
+
+    static {
+        MAGISK_DISABLE_FILE = new File("xxx");
+        EXTERNAL_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+        EXTERNAL_PATH.mkdirs();
+    }
+
+    public static final String BUSYBOX_PATH = "/sbin/.magisk/busybox";
+    public static final String TMP_FOLDER_PATH = "/dev/tmp";
+    public static final String MAGISK_LOG = "/cache/magisk.log";
+    public static final String MANAGER_CONFIGS = ".tmp.magisk.config";
+
+    // Versions
+    public static final int UPDATE_SERVICE_VER = 1;
+    public static final int MIN_MODULE_VER = 1500;
+    public static final int SNET_EXT_VER = 12;
+
+    /* A list of apps that should not be shown as hide-able */
+    public static final List<String> HIDE_BLACKLIST =  Arrays.asList(
+            App.self.getPackageName(),
+            "com.google.android.gms"
+    );
+
+    public static final int USER_ID = Process.myUid() / 100000;
+
+    public static final class MAGISK_VER {
+        public static final int MIN_SUPPORT = 18000;
+    }
+
+    public static class ID {
+        public static final int UPDATE_SERVICE_ID = 1;
+        public static final int FETCH_ZIP = 2;
+        public static final int SELECT_BOOT = 3;
+        public static final int ONBOOT_SERVICE_ID = 6;
+
+        // notifications
+        public static final int MAGISK_UPDATE_NOTIFICATION_ID = 4;
+        public static final int APK_UPDATE_NOTIFICATION_ID = 5;
+        public static final int DTBO_NOTIFICATION_ID = 7;
+        public static final int HIDE_MANAGER_NOTIFICATION_ID = 8;
+        public static final String UPDATE_NOTIFICATION_CHANNEL = "update";
+        public static final String PROGRESS_NOTIFICATION_CHANNEL = "progress";
+        public static final String CHECK_MAGISK_UPDATE_WORKER_ID = "magisk_update";
+    }
+
+    public static class Url {
+        private static String getRaw(String where, String name) {
+            return String.format("https://raw.githubusercontent.com/topjohnwu/magisk_files/%s/%s", where, name);
+        }
+        public static final String STABLE_URL = getRaw("master", "stable.json");
+        public static final String BETA_URL = getRaw("master", "beta.json");
+        public static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&sort=pushed&page=%d";
+        public static final String FILE_URL = "https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s";
+        public static final String ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip";
+        public static final String PAYPAL_URL = "https://www.paypal.me/topjohnwu";
+        public static final String PATREON_URL = "https://www.patreon.com/topjohnwu";
+        public static final String TWITTER_URL = "https://twitter.com/topjohnwu";
+        public static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382";
+        public static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk";
+        public static final String SNET_URL = getRaw("b66b1a914978e5f4c4bbfd74a59f4ad371bac107", "snet.apk");
+        public static final String BOOTCTL_URL = getRaw("9c5dfc1b8245c0b5b524901ef0ff0f8335757b77", "bootctl");
+    }
+
+    public static class Key {
+        // others
+        public static final String LINK_KEY = "Link";
+        public static final String IF_NONE_MATCH = "If-None-Match";
+        // intents
+        public static final String FROM_SPLASH = "splash";
+        public static final String OPEN_SECTION = "section";
+        public static final String INTENT_SET_NAME = "filename";
+        public static final String INTENT_SET_LINK = "link";
+        public static final String FLASH_ACTION = "action";
+        public static final String FLASH_SET_BOOT = "boot";
+        public static final String BROADCAST_MANAGER_UPDATE = "manager_update";
+        public static final String BROADCAST_REBOOT = "reboot";
+    }
+
+    public static class Value {
+        public static final String FLASH_ZIP = "flash";
+        public static final String PATCH_BOOT = "patch";
+        public static final String FLASH_MAGISK = "magisk";
+        public static final String FLASH_INACTIVE_SLOT = "slot";
+        public static final String UNINSTALL = "uninstall";
+    }
+
+
+}

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

@@ -1,29 +1,68 @@
 package com.topjohnwu.magisk.container;
 
-
 import android.content.ContentValues;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import android.os.Parcel;
+import android.os.Parcelable;
 
 import java.util.List;
 
-public abstract class BaseModule implements Comparable<BaseModule> {
+import androidx.annotation.NonNull;
 
-    private String mId = null, mName, mVersion, mAuthor, mDescription;
+public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
+
+    private String mId, mName, mVersion, mAuthor, mDescription;
     private int mVersionCode = -1, minMagiskVersion = -1;
 
-    protected BaseModule() {}
+    protected BaseModule() {
+        mId = mName = mVersion = mAuthor = mDescription = "";
+    }
 
     protected BaseModule(Cursor c) {
-        mId = c.getString(c.getColumnIndex("id"));
-        mName = c.getString(c.getColumnIndex("name"));
-        mVersion = c.getString(c.getColumnIndex("version"));
+        mId = nonNull(c.getString(c.getColumnIndex("id")));
+        mName = nonNull(c.getString(c.getColumnIndex("name")));
+        mVersion = nonNull(c.getString(c.getColumnIndex("version")));
         mVersionCode = c.getInt(c.getColumnIndex("versionCode"));
-        mAuthor = c.getString(c.getColumnIndex("author"));
-        mDescription = c.getString(c.getColumnIndex("description"));
+        mAuthor = nonNull(c.getString(c.getColumnIndex("author")));
+        mDescription = nonNull(c.getString(c.getColumnIndex("description")));
         minMagiskVersion = c.getInt(c.getColumnIndex("minMagisk"));
     }
 
+    protected BaseModule(Parcel p) {
+        mId = p.readString();
+        mName = p.readString();
+        mVersion = p.readString();
+        mAuthor = p.readString();
+        mDescription = p.readString();
+        mVersionCode = p.readInt();
+        minMagiskVersion = p.readInt();
+    }
+
+    @Override
+    public int compareTo(@NonNull BaseModule module) {
+        return this.getName().toLowerCase().compareTo(module.getName().toLowerCase());
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(mId);
+        dest.writeString(mName);
+        dest.writeString(mVersion);
+        dest.writeString(mAuthor);
+        dest.writeString(mDescription);
+        dest.writeInt(mVersionCode);
+        dest.writeInt(minMagiskVersion);
+    }
+
+    private String nonNull(String s) {
+        return s == null ? "" : s;
+    }
+
     public ContentValues getContentValues() {
         ContentValues values = new ContentValues();
         values.put("id", mId);
@@ -113,9 +152,4 @@ public abstract class BaseModule implements Comparable<BaseModule> {
     public int getMinMagiskVersion() {
         return minMagiskVersion;
     }
-
-    @Override
-    public int compareTo(@NonNull BaseModule module) {
-        return this.getName().toLowerCase().compareTo(module.getName().toLowerCase());
-    }
 }

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

@@ -1,5 +1,8 @@
 package com.topjohnwu.magisk.container;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.io.SuFile;
 
@@ -11,19 +14,19 @@ public class Module extends BaseModule {
     public Module(String path) {
 
         try {
-            parseProps(Shell.Sync.su("dos2unix <  " + path + "/module.prop"));
+            parseProps(Shell.su("dos2unix <  " + path + "/module.prop").exec().getOut());
         } catch (NumberFormatException ignored) {}
 
-        mRemoveFile = new SuFile(path + "/remove");
-        mDisableFile = new SuFile(path + "/disable");
-        mUpdateFile = new SuFile(path + "/update");
+        mRemoveFile = new SuFile(path, "remove");
+        mDisableFile = new SuFile(path, "disable");
+        mUpdateFile = new SuFile(path, "update");
 
-        if (getId() == null) {
+        if (getId().isEmpty()) {
             int sep = path.lastIndexOf('/');
             setId(path.substring(sep + 1));
         }
 
-        if (getName() == null) {
+        if (getName().isEmpty()) {
             setName(getId());
         }
 
@@ -32,14 +35,25 @@ public class Module extends BaseModule {
         mUpdated = mUpdateFile.exists();
     }
 
+    public static final Parcelable.Creator<Module> CREATOR = new Creator<Module>() {
+        /* It won't be used at any place */
+        @Override
+        public Module createFromParcel(Parcel source) {
+            return null;
+        }
+
+        @Override
+        public Module[] newArray(int size) {
+            return null;
+        }
+    };
+
     public void createDisableFile() {
-        mEnable = false;
-        mDisableFile.createNewFile();
+        mEnable = !mDisableFile.createNewFile();
     }
 
     public void removeDisableFile() {
-        mEnable = true;
-        mDisableFile.delete();
+        mEnable = mDisableFile.delete();
     }
 
     public boolean isEnabled() {
@@ -47,13 +61,11 @@ public class Module extends BaseModule {
     }
 
     public void createRemoveFile() {
-        mRemove = true;
-        mRemoveFile.createNewFile();
+        mRemove = mRemoveFile.createNewFile();
     }
 
     public void deleteRemoveFile() {
-        mRemove = false;
-        mRemoveFile.delete();
+        mRemove = !mRemoveFile.delete();
     }
 
     public boolean willBeRemoved() {

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

@@ -3,8 +3,10 @@ package com.topjohnwu.magisk.container;
 import android.content.ContentValues;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.support.annotation.NonNull;
+
+import com.topjohnwu.magisk.utils.Utils;
+
+import androidx.annotation.NonNull;
 
 
 public class Policy implements Comparable<Policy>{
@@ -25,22 +27,22 @@ public class Policy implements Comparable<Policy>{
         this.uid = uid;
         packageName = pkgs[0];
         info = pm.getApplicationInfo(packageName, 0);
-        appName = info.loadLabel(pm).toString();
+        appName = Utils.getAppLabel(info, pm);
     }
 
-    public Policy(Cursor c, PackageManager pm) throws PackageManager.NameNotFoundException {
-        uid = c.getInt(c.getColumnIndex("uid"));
-        packageName = c.getString(c.getColumnIndex("package_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;
+    public Policy(ContentValues values, PackageManager pm) throws PackageManager.NameNotFoundException {
+        uid = values.getAsInteger("uid");
+        packageName = values.getAsString("package_name");
+        policy = values.getAsInteger("policy");
+        until = values.getAsInteger("until");
+        logging = values.getAsInteger("logging") != 0;
+        notification = values.getAsInteger("notification") != 0;
         info = pm.getApplicationInfo(packageName, 0);
         if (info.uid != uid)
             throw new PackageManager.NameNotFoundException();
         appName = info.loadLabel(pm).toString();
     }
-    
+
     public ContentValues getContentValues() {
         ContentValues values = new ContentValues();
         values.put("uid", uid);

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

@@ -0,0 +1,109 @@
+package com.topjohnwu.magisk.container;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.utils.Utils;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+public class Repo extends BaseModule {
+
+    private Date mLastUpdate;
+
+    public Repo(String id) {
+        setId(id);
+    }
+
+    public Repo(Cursor c) {
+        super(c);
+        mLastUpdate = new Date(c.getLong(c.getColumnIndex("last_update")));
+    }
+
+    public Repo(Parcel p) {
+        super(p);
+        mLastUpdate = new Date(p.readLong());
+    }
+
+    public static final Parcelable.Creator<Repo> CREATOR = new Parcelable.Creator<Repo>() {
+
+        @Override
+        public Repo createFromParcel(Parcel source) {
+            return new Repo(source);
+        }
+
+        @Override
+        public Repo[] newArray(int size) {
+            return new Repo[size];
+        }
+    };
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeLong(mLastUpdate.getTime());
+    }
+
+    public void update() throws IllegalRepoException {
+        String props[] = Utils.dlString(getPropUrl()).split("\\n");
+        try {
+            parseProps(props);
+        } catch (NumberFormatException e) {
+            throw new IllegalRepoException("Repo [" + getId() + "] parse error: " + e.getMessage());
+        }
+
+        if (getVersionCode() < 0) {
+            throw new IllegalRepoException("Repo [" + getId() + "] does not contain versionCode");
+        }
+        if (getMinMagiskVersion() < Const.MIN_MODULE_VER) {
+            Logger.debug("Repo [" + getId() + "] is outdated");
+        }
+    }
+
+    public void update(Date lastUpdate) throws IllegalRepoException {
+        mLastUpdate = lastUpdate;
+        update();
+    }
+
+    @Override
+    public ContentValues getContentValues() {
+        ContentValues values = super.getContentValues();
+        values.put("last_update", mLastUpdate.getTime());
+        return values;
+    }
+
+    public String getZipUrl() {
+        return String.format(Const.Url.ZIP_URL, getId());
+    }
+
+    public String getPropUrl() {
+        return String.format(Const.Url.FILE_URL, getId(), "module.prop");
+    }
+
+    public String getDetailUrl() {
+        return String.format(Const.Url.FILE_URL, getId(), "README.md");
+    }
+
+    public String getLastUpdateString() {
+        return DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM).format(mLastUpdate);
+    }
+
+    public Date getLastUpdate() {
+        return mLastUpdate;
+    }
+
+    public String getDownloadFilename() {
+        return Utils.getLegalFilename(getName() + "-" + getVersion() + ".zip");
+    }
+
+    public class IllegalRepoException extends Exception {
+        IllegalRepoException(String message) {
+            super(message);
+        }
+    }
+}

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

@@ -1,9 +1,8 @@
 package com.topjohnwu.magisk.container;
 
 import android.content.ContentValues;
-import android.database.Cursor;
 
-import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.LocaleManager;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -20,17 +19,18 @@ public class SuLogEntry {
         fromUid = policy.uid;
         packageName = policy.packageName;
         appName = policy.appName;
+        action = policy.policy == Policy.ALLOW;
     }
 
-    public SuLogEntry(Cursor c) {
-        fromUid = c.getInt(c.getColumnIndex("from_uid"));
-        fromPid = c.getInt(c.getColumnIndex("from_pid"));
-        toUid = c.getInt(c.getColumnIndex("to_uid"));
-        packageName = c.getString(c.getColumnIndex("package_name"));
-        appName = c.getString(c.getColumnIndex("app_name"));
-        command = c.getString(c.getColumnIndex("command"));
-        action = c.getInt(c.getColumnIndex("action")) != 0;
-        date = new Date(c.getLong(c.getColumnIndex("time")));
+    public SuLogEntry(ContentValues values) {
+        fromUid = values.getAsInteger("from_uid");
+        packageName = values.getAsString("package_name");
+        appName = values.getAsString("app_name");
+        fromPid = values.getAsInteger("from_pid");
+        command = values.getAsString("command");
+        toUid = values.getAsInteger("to_uid");
+        action = values.getAsInteger("action") != 0;
+        date = new Date(values.getAsLong("time"));
     }
 
     public ContentValues getContentValues() {
@@ -47,10 +47,10 @@ public class SuLogEntry {
     }
 
     public String getDateString() {
-        return DateFormat.getDateInstance(DateFormat.MEDIUM, MagiskManager.locale).format(date);
+        return DateFormat.getDateInstance(DateFormat.MEDIUM, LocaleManager.locale).format(date);
     }
 
     public String getTimeString() {
-        return new SimpleDateFormat("h:mm a", MagiskManager.locale).format(date);
+        return new SimpleDateFormat("h:mm a", LocaleManager.locale).format(date);
     }
 }

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

@@ -1,7 +1,5 @@
 package com.topjohnwu.magisk.container;
 
-import android.support.annotation.NonNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -9,6 +7,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+
 public class ValueSortedMap<K, V extends Comparable<? super V>> extends HashMap<K, V> {
 
     private List<V> sorted = new ArrayList<>();

app-core/src/main/java/com/topjohnwu/magisk/database/MagiskDB.java

@@ -0,0 +1,186 @@
+package com.topjohnwu.magisk.database;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.text.TextUtils;
+
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.container.Policy;
+import com.topjohnwu.magisk.container.SuLogEntry;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public class MagiskDB {
+
+    private static final String POLICY_TABLE = "policies";
+    private static final String LOG_TABLE = "logs";
+    private static final String SETTINGS_TABLE = "settings";
+    private static final String STRINGS_TABLE = "strings";
+
+    private PackageManager pm;
+
+    public MagiskDB(Context context) {
+        pm = context.getPackageManager();
+    }
+
+    public void deletePolicy(Policy policy) {
+        deletePolicy(policy.uid);
+    }
+
+    private List<String> rawSQL(String fmt, Object... args) {
+        return Shell.su("magisk --sqlite '" + Utils.fmt(fmt, args) + "'").exec().getOut();
+    }
+
+    private List<ContentValues> SQL(String fmt, Object... args) {
+        List<ContentValues> list = new ArrayList<>();
+        for (String raw : rawSQL(fmt, args)) {
+            ContentValues values = new ContentValues();
+            String[] cols = raw.split("\\|");
+            for (String col : cols) {
+                String[] pair = col.split("=", 2);
+                if (pair.length != 2)
+                    continue;
+                values.put(pair[0], pair[1]);
+            }
+            list.add(values);
+        }
+        return list;
+    }
+
+    private String toSQL(ContentValues values) {
+        StringBuilder keys = new StringBuilder(), vals = new StringBuilder();
+        keys.append('(');
+        vals.append("VALUES(");
+        boolean first = true;
+        for (Map.Entry<String, Object> entry : values.valueSet()) {
+            if (!first) {
+                keys.append(',');
+                vals.append(',');
+            } else {
+                first = false;
+            }
+            keys.append(entry.getKey());
+            vals.append('"');
+            vals.append(entry.getValue());
+            vals.append('"');
+        }
+        keys.append(')');
+        vals.append(')');
+        keys.append(vals);
+        return keys.toString();
+    }
+
+    public void clearOutdated() {
+        rawSQL(
+                "DELETE FROM %s WHERE until > 0 AND until < %d;" +
+                        "DELETE FROM %s WHERE time < %d",
+                POLICY_TABLE, System.currentTimeMillis() / 1000,
+                LOG_TABLE, System.currentTimeMillis() - Config.suLogTimeout * 86400000
+        );
+    }
+
+    public void deletePolicy(String pkg) {
+        rawSQL("DELETE FROM %s WHERE package_name=\"%s\"", POLICY_TABLE, pkg);
+    }
+
+    public void deletePolicy(int uid) {
+        rawSQL("DELETE FROM %s WHERE uid=%d", POLICY_TABLE, uid);
+    }
+
+    public Policy getPolicy(int uid) {
+        List<ContentValues> res =
+                SQL("SELECT * FROM %s WHERE uid=%d", POLICY_TABLE, uid);
+        if (!res.isEmpty()) {
+            try {
+                return new Policy(res.get(0), pm);
+            } catch (PackageManager.NameNotFoundException e) {
+                deletePolicy(uid);
+            }
+        }
+        return null;
+    }
+
+    public void updatePolicy(Policy policy) {
+        rawSQL("REPLACE INTO %s %s", POLICY_TABLE, toSQL(policy.getContentValues()));
+    }
+
+    public List<Policy> getPolicyList() {
+        List<Policy> list = new ArrayList<>();
+        for (ContentValues values : SQL("SELECT * FROM %s WHERE uid/100000=%d", POLICY_TABLE, Const.USER_ID)) {
+            try {
+                list.add(new Policy(values, pm));
+            } catch (PackageManager.NameNotFoundException e) {
+                deletePolicy(values.getAsInteger("uid"));
+            }
+        }
+        Collections.sort(list);
+        return list;
+    }
+
+    public List<List<SuLogEntry>> getLogs() {
+        List<List<SuLogEntry>> ret = new ArrayList<>();
+        List<SuLogEntry> list = null;
+        String dateString = null, newString;
+        for (ContentValues values : SQL("SELECT * FROM %s ORDER BY time DESC", LOG_TABLE)) {
+            Date date = new Date(values.getAsLong("time"));
+            newString = DateFormat.getDateInstance(DateFormat.MEDIUM, LocaleManager.locale).format(date);
+            if (!TextUtils.equals(dateString, newString)) {
+                dateString = newString;
+                list = new ArrayList<>();
+                ret.add(list);
+            }
+            list.add(new SuLogEntry(values));
+        }
+        return ret;
+    }
+
+    public void addLog(SuLogEntry log) {
+        rawSQL("INSERT INTO %s %s", LOG_TABLE, toSQL(log.getContentValues()));
+    }
+
+    public void clearLogs() {
+        rawSQL("DELETE FROM %s", LOG_TABLE);
+    }
+
+    public void setSettings(String key, int value) {
+        ContentValues data = new ContentValues();
+        data.put("key", key);
+        data.put("value", value);
+        rawSQL("REPLACE INTO %s %s", SETTINGS_TABLE, toSQL(data));
+    }
+
+    public int getSettings(String key, int defaultValue) {
+        List<ContentValues> res = SQL("SELECT value FROM %s WHERE key=\"%s\"", SETTINGS_TABLE, key);
+        if (res.isEmpty())
+            return defaultValue;
+        return res.get(0).getAsInteger("value");
+    }
+
+    public void setStrings(String key, String value) {
+        if (value == null) {
+            rawSQL("DELETE FROM %s WHERE key=\"%s\"", STRINGS_TABLE, key);
+            return;
+        }
+        ContentValues data = new ContentValues();
+        data.put("key", key);
+        data.put("value", value);
+        rawSQL("REPLACE INTO %s %s", STRINGS_TABLE, toSQL(data));
+    }
+
+    public String getStrings(String key, String defaultValue) {
+        List<ContentValues> res = SQL("SELECT value FROM %s WHERE key=\"%s\"", STRINGS_TABLE, key);
+        if (res.isEmpty())
+            return defaultValue;
+        return res.get(0).getAsString("value");
+    }
+}

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

@@ -5,30 +5,26 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.container.Repo;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.HashSet;
 import java.util.Set;
 
 public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VER = 3;
+    private static final int DATABASE_VER = 4;
     private static final String TABLE_NAME = "repos";
 
     private SQLiteDatabase mDb;
-    private MagiskManager mm;
 
     public RepoDatabaseHelper(Context context) {
         super(context, "repo.db", null, DATABASE_VER);
-        mm = Utils.getMagiskManager(context);
         mDb = getWritableDatabase();
 
         // Remove outdated repos
-        mDb.delete(TABLE_NAME, "minMagisk<?",
-                new String[] { String.valueOf(Const.MIN_MODULE_VER()) });
+        mDb.delete(TABLE_NAME, "minMagisk<?", new String[] { String.valueOf(Const.MIN_MODULE_VER) });
     }
 
     @Override
@@ -38,21 +34,14 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        try {
-            if (oldVersion < 3) {
-                db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
-                db.execSQL(
-                        "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
-                                "(id TEXT, name TEXT, version TEXT, versionCode INT, minMagisk INT, " +
-                                "author TEXT, description TEXT, repo_name TEXT, last_update INT, " +
-                                "PRIMARY KEY(id))");
-                mm.prefs.edit().remove(Const.Key.ETAG_KEY).apply();
-                oldVersion = 3;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            // Reset database
-            onDowngrade(db, DATABASE_VER, 0);
+        if (oldVersion != newVersion) {
+            // Nuke old DB and create new table
+            db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+            db.execSQL(
+                    "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
+                            "(id TEXT, name TEXT, version TEXT, versionCode INT, minMagisk INT, " +
+                            "author TEXT, description TEXT, last_update INT, PRIMARY KEY(id))");
+            Config.remove(Config.Key.ETAG_KEY);
         }
     }
 
@@ -71,7 +60,7 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
     }
 
     public void removeRepo(Repo repo) {
-        mDb.delete(TABLE_NAME, "repo_name=?", new String[] { repo.getRepoName() });
+        removeRepo(repo.getId());
     }
 
     public void removeRepo(Iterable<String> list) {
@@ -100,15 +89,15 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
     public Cursor getRepoCursor() {
         String orderBy = null;
-        switch (mm.repoOrder) {
-            case Const.Value.ORDER_NAME:
+        switch ((int) Config.get(Config.Key.REPO_ORDER)) {
+            case Config.Value.ORDER_NAME:
                 orderBy = "name COLLATE NOCASE";
                 break;
-            case Const.Value.ORDER_DATE:
+            case Config.Value.ORDER_DATE:
                 orderBy = "last_update DESC";
         }
         return mDb.query(TABLE_NAME, null, "minMagisk<=? AND minMagisk>=?",
-                new String[] { String.valueOf(mm.magiskVersionCode), String.valueOf(Const.MIN_MODULE_VER()) },
+                new String[] { String.valueOf(Config.magiskVersionCode), String.valueOf(Const.MIN_MODULE_VER) },
                 null, null, orderBy);
     }
 

app-core/src/main/java/com/topjohnwu/magisk/tasks/CheckUpdates.java

@@ -0,0 +1,108 @@
+package com.topjohnwu.magisk.tasks;
+
+import android.os.SystemClock;
+
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.net.Request;
+import com.topjohnwu.net.ResponseListener;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class CheckUpdates {
+
+    private static Request getRequest() {
+        String url;
+        switch ((int) Config.get(Config.Key.UPDATE_CHANNEL)) {
+            case Config.Value.BETA_CHANNEL:
+                url = Const.Url.BETA_URL;
+                break;
+            case Config.Value.CUSTOM_CHANNEL:
+                url = Config.get(Config.Key.CUSTOM_CHANNEL);
+                break;
+            case Config.Value.STABLE_CHANNEL:
+            default:
+                url = Const.Url.STABLE_URL;
+                break;
+        }
+        return Networking.get(url);
+    }
+
+    public static void check() {
+        getRequest().getAsJSONObject(new UpdateListener(null));
+    }
+
+    public static void checkNow(Runnable cb) {
+        JSONObject json = getRequest().execForJSONObject().getResult();
+        if (json != null)
+            new UpdateListener(cb).onResponse(json);
+    }
+
+    private static class UpdateListener implements ResponseListener<JSONObject> {
+
+        private Runnable cb;
+        private long start;
+
+        UpdateListener(Runnable callback) {
+            cb = callback;
+            start = SystemClock.uptimeMillis();
+        }
+
+        private int getInt(JSONObject json, String name, int defValue) {
+            if (json == null)
+                return defValue;
+            try {
+                return json.getInt(name);
+            } catch (JSONException e) {
+                return defValue;
+            }
+        }
+
+        private String getString(JSONObject json, String name, String defValue) {
+            if (json == null)
+                return defValue;
+            try {
+                return json.getString(name);
+            } catch (JSONException e) {
+                return defValue;
+            }
+        }
+
+        private JSONObject getJson(JSONObject json, String name) {
+            try {
+                return json.getJSONObject(name);
+            } catch (JSONException e) {
+                return null;
+            }
+        }
+
+        @Override
+        public void onResponse(JSONObject json) {
+            JSONObject magisk = getJson(json, "magisk");
+            Config.remoteMagiskVersionString = getString(magisk, "version", null);
+            Config.remoteMagiskVersionCode = getInt(magisk, "versionCode", -1);
+            Config.magiskLink = getString(magisk, "link", null);
+            Config.magiskNoteLink = getString(magisk, "note", null);
+            Config.magiskMD5 = getString(magisk, "md5", null);
+
+            JSONObject manager = getJson(json, "app");
+            Config.remoteManagerVersionString = getString(manager, "version", null);
+            Config.remoteManagerVersionCode = getInt(manager, "versionCode", -1);
+            Config.managerLink = getString(manager, "link", null);
+            Config.managerNoteLink = getString(manager, "note", null);
+
+            JSONObject uninstaller = getJson(json, "uninstaller");
+            Config.uninstallerLink = getString(uninstaller, "link", null);
+
+            UiThreadHandler.handler.postAtTime(() -> Topic.publish(Topic.UPDATE_CHECK_DONE),
+                    start + 1000  /* Add artificial delay to let UI behave correctly */);
+
+            if (cb != null)
+                cb.run();
+        }
+    }
+}

app-core/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.java

@@ -0,0 +1,85 @@
+package com.topjohnwu.magisk.tasks;
+
+import android.net.Uri;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.ZipUtils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+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 abstract class FlashZip {
+
+    private Uri mUri;
+    private File tmpFile;
+    private List<String> console, logs;
+
+    public FlashZip(Uri uri, List<String> out, List<String> err) {
+        mUri = uri;
+        console = out;
+        logs = err;
+        tmpFile = new File(App.self.getCacheDir(), "install.zip");
+    }
+
+    private boolean unzipAndCheck() throws IOException {
+        ZipUtils.unzip(tmpFile, tmpFile.getParentFile(), "META-INF/com/google/android", true);
+        return Shell.su("grep -q '#MAGISK' " + new File(tmpFile.getParentFile(), "updater-script"))
+                .exec().isSuccess();
+    }
+
+    private boolean flash() throws IOException {
+        console.add("- Copying zip to temp directory");
+        try (InputStream in = App.self.getContentResolver().openInputStream(mUri);
+             OutputStream out = new BufferedOutputStream(new FileOutputStream(tmpFile))) {
+            if (in == null) throw new FileNotFoundException();
+            InputStream buf= new BufferedInputStream(in);
+            ShellUtils.pump(buf, out);
+        } catch (FileNotFoundException e) {
+            console.add("! Invalid Uri");
+            throw e;
+        } catch (IOException e) {
+            console.add("! Cannot copy to cache");
+            throw e;
+        }
+        try {
+            if (!unzipAndCheck()) {
+                console.add("! This zip is not a Magisk Module!");
+                return false;
+            }
+        } catch (IOException e) {
+            console.add("! Unzip error");
+            throw e;
+        }
+        console.add("- Installing " + Utils.getNameFromUri(App.self, mUri));
+        return Shell.su("cd " + tmpFile.getParent(),
+                "BOOTMODE=true sh update-binary dummy 1 " + tmpFile)
+                .to(console, logs)
+                .exec().isSuccess();
+    }
+
+    public void exec() {
+        App.THREAD_POOL.execute(() -> {
+            boolean success = false;
+            try {
+                success = flash();
+            } catch (IOException ignored) {}
+            Shell.su("cd /", "rm -rf " + tmpFile.getParent() + " " + Const.TMP_FOLDER_PATH).submit();
+            boolean finalSuccess = success;
+            UiThreadHandler.run(() -> onResult(finalSuccess));
+        });
+    }
+
+    protected abstract void onResult(boolean success);
+}

app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java

@@ -0,0 +1,315 @@
+package com.topjohnwu.magisk.tasks;
+
+import android.net.Uri;
+import android.os.Build;
+import android.text.TextUtils;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.container.TarEntry;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.net.DownloadProgressListener;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.signing.SignBoot;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.internal.NOPList;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileInputStream;
+import com.topjohnwu.superuser.io.SuFileOutputStream;
+
+import org.kamranzafar.jtar.TarInputStream;
+import org.kamranzafar.jtar.TarOutputStream;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import androidx.annotation.MainThread;
+import androidx.annotation.WorkerThread;
+
+public abstract class MagiskInstaller {
+
+    private List<String> console, logs;
+    protected String srcBoot;
+    protected File installDir;
+
+    private class ProgressLog implements DownloadProgressListener {
+
+        private int prev = -1;
+        private int location;
+
+        @Override
+        public void onProgress(long bytesDownloaded, long totalBytes) {
+            if (prev < 0) {
+                location = console.size();
+                console.add("... 0%");
+            }
+            int curr = (int) (100 * bytesDownloaded / totalBytes);
+            if (prev != curr) {
+                prev = curr;
+                console.set(location, "... " + prev + "%");
+            }
+        }
+    }
+
+    protected MagiskInstaller() {
+        console = NOPList.getInstance();
+        logs = NOPList.getInstance();
+    }
+
+    public MagiskInstaller(List<String> out, List<String> err) {
+        console = out;
+        logs = err;
+        installDir = new File(Utils.getDEContext().getFilesDir().getParent(), "install");
+        Shell.sh("rm -rf " + installDir).exec();
+        installDir.mkdirs();
+    }
+
+    protected boolean findImage() {
+        console.add("- Detecting target image");
+        srcBoot = ShellUtils.fastCmd("find_boot_image", "echo \"$BOOTIMAGE\"");
+        if (srcBoot.isEmpty()) {
+            console.add("! Unable to detect target image");
+            return false;
+        }
+        return true;
+    }
+
+    protected boolean findSecondaryImage() {
+        String slot = ShellUtils.fastCmd("echo $SLOT");
+        String target = (TextUtils.equals(slot, "_a") ? "_b" : "_a");
+        console.add("- Target slot: " + target);
+        console.add("- Detecting target image");
+        srcBoot = ShellUtils.fastCmd(
+                "SLOT=" + target,
+                "find_boot_image",
+                "SLOT=" + slot,
+                "echo \"$BOOTIMAGE\""
+        );
+        if (srcBoot.isEmpty()) {
+            console.add("! Unable to detect target image");
+            return false;
+        }
+        return true;
+    }
+
+    protected boolean extractZip() {
+        String arch;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            List<String> abis = Arrays.asList(Build.SUPPORTED_ABIS);
+            arch = abis.contains("x86") ? "x86" : "arm";
+        } else {
+            arch = TextUtils.equals(Build.CPU_ABI, "x86") ? "x86" : "arm";
+        }
+
+        console.add("- Device platform: " + Build.CPU_ABI);
+
+        File zip = new File(App.self.getCacheDir(), "magisk.zip");
+
+        if (!ShellUtils.checkSum("MD5", zip, Config.magiskMD5)) {
+            console.add("- Downloading zip");
+            Networking.get(Config.magiskLink)
+                    .setDownloadProgressListener(new ProgressLog())
+                    .execForFile(zip);
+        } else {
+            console.add("- Existing zip found");
+        }
+
+        try {
+            ZipInputStream zi = new ZipInputStream(new BufferedInputStream(
+                    new FileInputStream(zip), (int) zip.length()));
+            ZipEntry ze;
+            while ((ze = zi.getNextEntry()) != null) {
+                if (ze.isDirectory())
+                    continue;
+                String name = null;
+                String[] names = { arch + "/", "common/", "META-INF/com/google/android/update-binary" };
+                for (String n : names) {
+                    if (ze.getName().startsWith(n)) {
+                        name = ze.getName().substring(ze.getName().lastIndexOf('/') + 1);
+                        break;
+                    }
+                }
+                if (name == null && ze.getName().startsWith("chromeos/"))
+                    name = ze.getName();
+                if (name == null)
+                    continue;
+                File dest;
+                if (installDir instanceof SuFile) {
+                    dest = new SuFile(installDir, name);
+                } else {
+                    dest = new File(installDir, name);
+                }
+                dest.getParentFile().mkdirs();
+                try (OutputStream out = new SuFileOutputStream(dest)) {
+                    ShellUtils.pump(zi, out);
+                }
+            }
+        } catch (IOException e) {
+            console.add("! Cannot unzip zip");
+            return false;
+        }
+        Shell.sh(Utils.fmt("chmod -R 755 %s/*; %s/magiskinit -x magisk %s/magisk",
+                installDir, installDir, installDir)).exec();
+        return true;
+    }
+
+    protected boolean copyBoot(Uri bootUri) {
+        srcBoot = new File(installDir, "boot.img").getPath();
+        console.add("- Copying image to cache");
+        // Copy boot image to local
+        try (InputStream in = App.self.getContentResolver().openInputStream(bootUri);
+             OutputStream out = new FileOutputStream(srcBoot)) {
+            if (in == null)
+                throw new FileNotFoundException();
+
+            InputStream src;
+            if (Utils.getNameFromUri(App.self, bootUri).endsWith(".tar")) {
+                // Extract boot.img from tar
+                TarInputStream tar = new TarInputStream(new BufferedInputStream(in));
+                org.kamranzafar.jtar.TarEntry entry;
+                while ((entry = tar.getNextEntry()) != null) {
+                    if (entry.getName().equals("boot.img"))
+                        break;
+                }
+                src = tar;
+            } else {
+                // Direct copy raw image
+                src = new BufferedInputStream(in);
+            }
+            ShellUtils.pump(src, out);
+        } catch (FileNotFoundException e) {
+            console.add("! Invalid Uri");
+            return false;
+        } catch (IOException e) {
+            console.add("! Copy failed");
+            return false;
+        }
+        return true;
+    }
+
+    protected boolean patchBoot() {
+        boolean isSigned;
+        try (InputStream in = new SuFileInputStream(srcBoot)) {
+            isSigned = SignBoot.verifySignature(in, null);
+            if (isSigned) {
+                console.add("- Boot image is signed with AVB 1.0");
+            }
+        } catch (IOException e) {
+            console.add("! Unable to check signature");
+            return false;
+        }
+
+        // Patch boot image
+        if (!Shell.sh(Utils.fmt("cd %s; KEEPFORCEENCRYPT=%b KEEPVERITY=%b " +
+                        "sh update-binary indep boot_patch.sh %s",
+                installDir, Config.keepEnc, Config.keepVerity, srcBoot))
+                .to(console, logs).exec().isSuccess())
+            return false;
+
+        Shell.Job job = Shell.sh("mv bin/busybox busybox",
+                "rm -rf magisk.apk bin boot.img update-binary",
+                "cd /");
+
+        File patched = new File(installDir, "new-boot.img");
+        if (isSigned) {
+            console.add("- Signing boot image with test keys");
+            File signed = new File(installDir, "signed.img");
+            try (InputStream in = new SuFileInputStream(patched);
+                 OutputStream out = new BufferedOutputStream(new FileOutputStream(signed))) {
+                SignBoot.doSignature("/boot", in, out, null, null);
+            } catch (IOException e) {
+                return false;
+            }
+            job.add("mv -f " + signed + " " + patched);
+        }
+        job.exec();
+        return true;
+    }
+
+    protected boolean flashBoot() {
+        if (!Shell.su(Utils.fmt("direct_install %s %s", installDir, srcBoot))
+                .to(console, logs).exec().isSuccess())
+            return false;
+        if (!Config.keepVerity)
+            Shell.su("find_dtbo_image", "patch_dtbo_image").to(console, logs).exec();
+        return true;
+    }
+
+    protected boolean storeBoot() {
+        File patched = new File(installDir, "new-boot.img");
+        String fmt = Config.get(Config.Key.BOOT_FORMAT);
+        File dest = new File(Const.EXTERNAL_PATH, "patched_boot" + fmt);
+        dest.getParentFile().mkdirs();
+        OutputStream os;
+        try {
+            switch (fmt) {
+                case ".img.tar":
+                    os = new TarOutputStream(new BufferedOutputStream(new FileOutputStream(dest)));
+                    ((TarOutputStream) os).putNextEntry(new TarEntry(patched, "boot.img"));
+                    break;
+                default:
+                case ".img":
+                    os = new BufferedOutputStream(new FileOutputStream(dest));
+                    break;
+            }
+            try (InputStream in = new SuFileInputStream(patched)) {
+                ShellUtils.pump(in, os);
+                os.close();
+            }
+        } catch (IOException e) {
+            console.add("! Failed to store boot to " + dest);
+            return false;
+        }
+        Shell.sh("rm -f " + patched).exec();
+        console.add("");
+        console.add("****************************");
+        console.add(" Patched image is placed in ");
+        console.add(" " + dest + " ");
+        console.add("****************************");
+        return true;
+    }
+
+    protected boolean postOTA() {
+        SuFile bootctl = new SuFile("/data/adb/bootctl");
+        try (InputStream in = Networking.get(Const.Url.BOOTCTL_URL).execForInputStream().getResult();
+             OutputStream out = new SuFileOutputStream(bootctl)) {
+            ShellUtils.pump(in, out);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+        Shell.su("post_ota " + bootctl.getParent()).exec();
+        console.add("***************************************");
+        console.add(" Next reboot will boot to second slot!");
+        console.add("***************************************");
+        return true;
+    }
+
+    @WorkerThread
+    protected abstract boolean operations();
+
+    @MainThread
+    protected abstract void onResult(boolean success);
+
+    public void exec() {
+        App.THREAD_POOL.execute(() -> {
+            boolean b = operations();
+            UiThreadHandler.run(() -> onResult(b));
+        });
+    }
+
+}

app-core/src/main/java/com/topjohnwu/magisk/tasks/UpdateRepos.java

@@ -0,0 +1,176 @@
+package com.topjohnwu.magisk.tasks;
+
+import android.database.Cursor;
+import android.util.Pair;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.container.Repo;
+import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.net.Request;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.net.HttpURLConnection;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Queue;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+public class UpdateRepos {
+    private static final DateFormat DATE_FORMAT;
+
+    private App app = App.self;
+    private Set<String> cached;
+    private Queue<Pair<String, Date>> moduleQueue;
+
+    static {
+        DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+        DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
+    }
+
+    private void runTasks(Runnable task) {
+        Future[] futures = new Future[App.THREAD_POOL.getMaximumPoolSize() - 1];
+        for (int i = 0; i < futures.length; ++i) {
+            futures[i] = App.THREAD_POOL.submit(task);
+        }
+        for (Future f : futures) {
+            while (true) {
+                try {
+                    f.get();
+                } catch (InterruptedException e) {
+                    continue;
+                } catch (ExecutionException ignored) {}
+                break;
+            }
+        }
+    }
+
+    /* We sort repos by last push, which means that we only need to check whether the
+     * first page is updated to determine whether the online repo database is changed
+     */
+    private boolean parsePage(int page) {
+        Request req = Networking.get(Utils.fmt(Const.Url.REPO_URL, page + 1));
+        if (page == 0) {
+            String etag = Config.get(Config.Key.ETAG_KEY);
+            if (etag != null)
+                req.addHeaders(Const.Key.IF_NONE_MATCH, etag);
+        }
+        Request.Result<JSONArray> res = req.execForJSONArray();
+        // JSON not updated
+        if (res.getCode() == HttpURLConnection.HTTP_NOT_MODIFIED)
+            return false;
+        // Network error
+        if (res.getResult() == null) {
+            cached.clear();
+            return true;
+        }
+        // Current page is the last page
+        if (res.getResult().length() == 0)
+            return true;
+
+        try {
+            for (int i = 0; i < res.getResult().length(); i++) {
+                JSONObject rawRepo = res.getResult().getJSONObject(i);
+                String id = rawRepo.getString("name");
+                Date date = DATE_FORMAT.parse(rawRepo.getString("pushed_at"));
+                moduleQueue.offer(new Pair<>(id, date));
+            }
+        } catch (JSONException | ParseException e) {
+            // Should not happen, but if exception occurs, page load fails
+            return false;
+        }
+
+        // Update ETAG
+        if (page == 0) {
+            String etag = res.getConnection().getHeaderField(Config.Key.ETAG_KEY);
+            if (etag != null) {
+                etag = etag.substring(etag.indexOf('\"'), etag.lastIndexOf('\"') + 1);
+                Config.set(Config.Key.ETAG_KEY, etag);
+            }
+        }
+
+        String links = res.getConnection().getHeaderField(Const.Key.LINK_KEY);
+        return links == null || !links.contains("next") || parsePage(page + 1);
+    }
+
+    private boolean loadPages() {
+        if (!parsePage(0))
+            return false;
+        runTasks(() -> {
+            while (true) {
+                Pair<String, Date> pair = moduleQueue.poll();
+                if (pair == null)
+                    return;
+                Repo repo = app.repoDB.getRepo(pair.first);
+                try {
+                    if (repo == null)
+                        repo = new Repo(pair.first);
+                    else
+                        cached.remove(pair.first);
+                    repo.update(pair.second);
+                    app.repoDB.addRepo(repo);
+                } catch (Repo.IllegalRepoException e) {
+                    Logger.debug(e.getMessage());
+                    app.repoDB.removeRepo(pair.first);
+                }
+            }
+        });
+        return true;
+    }
+
+    private void fullReload() {
+        Cursor c = app.repoDB.getRawCursor();
+        runTasks(() -> {
+            while (true) {
+                Repo repo;
+                synchronized (c) {
+                    if (!c.moveToNext())
+                        return;
+                    repo = new Repo(c);
+                }
+                try {
+                    repo.update();
+                    app.repoDB.addRepo(repo);
+                } catch (Repo.IllegalRepoException e) {
+                    Logger.debug(e.getMessage());
+                    app.repoDB.removeRepo(repo);
+                }
+            }
+        });
+    }
+
+    public void exec(boolean force) {
+        Topic.reset(Topic.REPO_LOAD_DONE);
+        App.THREAD_POOL.execute(() -> {
+            cached = Collections.synchronizedSet(app.repoDB.getRepoIDSet());
+            moduleQueue = new ConcurrentLinkedQueue<>();
+
+            if (loadPages()) {
+                // The leftover cached means they are removed from online repo
+                app.repoDB.removeRepo(cached);
+            } else if (force) {
+                fullReload();
+            }
+            Topic.publish(Topic.REPO_LOAD_DONE);
+        });
+    }
+
+    public void exec() {
+        exec(false);
+    }
+}

app-core/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.java

@@ -9,7 +9,9 @@ import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyPermanentlyInvalidatedException;
 import android.security.keystore.KeyProperties;
 
-import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
 
 import java.security.KeyStore;
 
@@ -24,19 +26,26 @@ public abstract class FingerprintHelper {
     private Cipher cipher;
     private CancellationSignal cancel;
 
+    public static boolean useFingerprint() {
+        boolean fp = Config.get(Config.Key.SU_FINGERPRINT);
+        if (fp && !canUseFingerprint()) {
+            Config.set(Config.Key.SU_FINGERPRINT, false);
+            fp = false;
+        }
+        return fp;
+    }
+
     public static boolean canUseFingerprint() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
             return false;
-        MagiskManager mm = MagiskManager.get();
-        KeyguardManager km = mm.getSystemService(KeyguardManager.class);
-        FingerprintManager fm = mm.getSystemService(FingerprintManager.class);
+        KeyguardManager km = App.self.getSystemService(KeyguardManager.class);
+        FingerprintManager fm = App.self.getSystemService(FingerprintManager.class);
         return km.isKeyguardSecure() && fm != null && fm.isHardwareDetected() && fm.hasEnrolledFingerprints();
     }
 
     protected FingerprintHelper() throws Exception {
-        MagiskManager mm = MagiskManager.get();
         KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore");
-        manager = mm.getSystemService(FingerprintManager.class);
+        manager = App.self.getSystemService(FingerprintManager.class);
         cipher = Cipher.getInstance(KeyProperties.KEY_ALGORITHM_AES + "/"
                 + KeyProperties.BLOCK_MODE_CBC + "/"
                 + KeyProperties.ENCRYPTION_PADDING_PKCS7);
@@ -62,30 +71,10 @@ public abstract class FingerprintHelper {
 
     public abstract void onAuthenticationFailed();
 
-    public void startAuth() {
+    public void authenticate() {
         cancel = new CancellationSignal();
         FingerprintManager.CryptoObject cryptoObject = new FingerprintManager.CryptoObject(cipher);
-        manager.authenticate(cryptoObject, cancel, 0, new FingerprintManager.AuthenticationCallback() {
-            @Override
-            public void onAuthenticationError(int errorCode, CharSequence errString) {
-                FingerprintHelper.this.onAuthenticationError(errorCode, errString);
-            }
-
-            @Override
-            public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
-                FingerprintHelper.this.onAuthenticationHelp(helpCode, helpString);
-            }
-
-            @Override
-            public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
-                FingerprintHelper.this.onAuthenticationSucceeded(result);
-            }
-
-            @Override
-            public void onAuthenticationFailed() {
-                FingerprintHelper.this.onAuthenticationFailed();
-            }
-        }, null);
+        manager.authenticate(cryptoObject, cancel, 0, new Callback(), null);
     }
 
     public void cancel() {
@@ -109,4 +98,26 @@ public abstract class FingerprintHelper {
         keygen.init(builder.build());
         return keygen.generateKey();
     }
+
+    private class Callback extends FingerprintManager.AuthenticationCallback {
+        @Override
+        public void onAuthenticationError(int errorCode, CharSequence errString) {
+            FingerprintHelper.this.onAuthenticationError(errorCode, errString);
+        }
+
+        @Override
+        public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
+            FingerprintHelper.this.onAuthenticationHelp(helpCode, helpString);
+        }
+
+        @Override
+        public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+            FingerprintHelper.this.onAuthenticationSucceeded(result);
+        }
+
+        @Override
+        public void onAuthenticationFailed() {
+            FingerprintHelper.this.onAuthenticationFailed();
+        }
+    }
 }

app-core/src/main/java/com/topjohnwu/magisk/utils/ISafetyNetHelper.java

@@ -1,22 +1,18 @@
 package com.topjohnwu.magisk.utils;
 
-import android.support.annotation.Keep;
-
 public interface ISafetyNetHelper {
 
-    int CAUSE_SERVICE_DISCONNECTED = 0x01;
-    int CAUSE_NETWORK_LOST = 0x02;
-    int RESPONSE_ERR = 0x04;
-    int CONNECTION_FAIL = 0x08;
+    int RESPONSE_ERR = 0x01;
+    int CONNECTION_FAIL = 0x02;
 
     int BASIC_PASS = 0x10;
     int CTS_PASS = 0x20;
 
     void attest();
+
     int getVersion();
 
     interface Callback {
-        @Keep
         void onResponse(int responseCode);
     }
 }

app-core/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java

@@ -0,0 +1,152 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.internal.InternalUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+
+import androidx.annotation.StringRes;
+
+public class LocaleManager {
+    public static Locale locale = Locale.getDefault();
+    public final static Locale defaultLocale = Locale.getDefault();
+    public static List<Locale> locales;
+
+    public static Locale forLanguageTag(String tag) {
+        if (Build.VERSION.SDK_INT >= 21) {
+            return Locale.forLanguageTag(tag);
+        } else {
+            String[] tok = tag.split("-");
+            if (tok.length == 0) {
+                return new Locale("");
+            }
+            String language;
+            switch (tok[0]) {
+                case "und":
+                    language = ""; // Undefined
+                    break;
+                case "fil":
+                    language = "tl"; // Filipino
+                    break;
+                default:
+                    language = tok[0];
+            }
+            if ((language.length() != 2 && language.length() != 3))
+                return new Locale("");
+            if (tok.length == 1)
+                return new Locale(language);
+            String country = tok[1];
+            if (country.length() != 2 && country.length() != 3)
+                return new Locale(language);
+            return new Locale(language, country);
+        }
+    }
+
+    public static String toLanguageTag(Locale loc) {
+        if (Build.VERSION.SDK_INT >= 21) {
+            return loc.toLanguageTag();
+        } else {
+            String language = loc.getLanguage();
+            String country = loc.getCountry();
+            String variant = loc.getVariant();
+            if (language.isEmpty() || !language.matches("\\p{Alpha}{2,8}")) {
+                language = "und";       // Follow the Locale#toLanguageTag() implementation
+            } else if (language.equals("iw")) {
+                language = "he";        // correct deprecated "Hebrew"
+            } else if (language.equals("in")) {
+                language = "id";        // correct deprecated "Indonesian"
+            } else if (language.equals("ji")) {
+                language = "yi";        // correct deprecated "Yiddish"
+            }
+            // ensure valid country code, if not well formed, it's omitted
+            if (!country.matches("\\p{Alpha}{2}|\\p{Digit}{3}")) {
+                country = "";
+            }
+
+            // variant subtags that begin with a letter must be at least 5 characters long
+            if (!variant.matches("\\p{Alnum}{5,8}|\\p{Digit}\\p{Alnum}{3}")) {
+                variant = "";
+            }
+            StringBuilder tag = new StringBuilder(language);
+            if (!country.isEmpty())
+                tag.append('-').append(country);
+            if (!variant.isEmpty())
+                tag.append('-').append(variant);
+            return tag.toString();
+        }
+    }
+
+    public static void setLocale(ContextWrapper wrapper) {
+        String localeConfig = Config.get(Config.Key.LOCALE);
+        if (localeConfig.isEmpty()) {
+            locale = defaultLocale;
+        } else {
+            locale = forLanguageTag(localeConfig);
+        }
+        Locale.setDefault(locale);
+        InternalUtils.replaceBaseContext(wrapper, getLocaleContext(locale));
+    }
+
+    public static Context getLocaleContext(Context context, Locale locale) {
+        if (Build.VERSION.SDK_INT >= 17) {
+            Configuration config = new Configuration(context.getResources().getConfiguration());
+            config.setLocale(locale);
+            return context.createConfigurationContext(config);
+        } else {
+            return context;
+        }
+    }
+
+    public static Context getLocaleContext(Locale locale) {
+        return getLocaleContext(App.self.getBaseContext(), locale);
+    }
+
+    public static String getString(Locale locale, @StringRes int id) {
+        return getLocaleContext(locale).getString(id);
+    }
+
+    public static void loadAvailableLocales(@StringRes int compareId) {
+        if (Build.VERSION.SDK_INT < 17)
+            return;
+        Shell.EXECUTOR.execute(() -> {
+            locales = new ArrayList<>();
+            HashSet<String> set = new HashSet<>();
+            Resources res = App.self.getResources();
+            Locale locale;
+
+            // Add default locale
+            locales.add(Locale.ENGLISH);
+            set.add(getString(Locale.ENGLISH, compareId));
+
+            // Add some special locales
+            locales.add(Locale.TAIWAN);
+            set.add(getString(Locale.TAIWAN, compareId));
+            locale = new Locale("pt", "BR");
+            locales.add(locale);
+            set.add(getString(locale, compareId));
+
+            // Other locales
+            for (String s : res.getAssets().getLocales()) {
+                locale = forLanguageTag(s);
+                if (set.add(getString(locale, compareId))) {
+                    locales.add(locale);
+                }
+            }
+
+            Collections.sort(locales, (a, b) -> a.getDisplayName(a).compareTo(b.getDisplayName(b)));
+            Topic.publish(Topic.LOCALE_FETCH_DONE);
+        });
+    }
+}

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

@@ -2,9 +2,8 @@ package com.topjohnwu.magisk.utils;
 
 import android.util.Log;
 
-import com.topjohnwu.magisk.BuildConfig;
-
-import java.util.Locale;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.core.BuildConfig;
 
 public class Logger {
 

app-core/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java

@@ -0,0 +1,42 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.Context;
+
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.core.R;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFile;
+
+import java.io.InputStream;
+
+import androidx.annotation.NonNull;
+
+public class RootUtils extends Shell.Initializer {
+
+    public static void rmAndLaunch(String rm, String launch) {
+        Shell.su(Utils.fmt("(rm_launch %d %s %s)&", Const.USER_ID, rm, launch)).exec();
+    }
+
+    @Override
+    public boolean onInit(Context context, @NonNull Shell shell) {
+        Shell.Job job = shell.newJob();
+        if (shell.isRoot()) {
+            job.add(context.getResources().openRawResource(R.raw.util_functions))
+                .add(context.getResources().openRawResource(R.raw.utils));
+            Const.MAGISK_DISABLE_FILE = new SuFile("/cache/.disable_magisk");
+            Config.loadMagiskInfo();
+        } else {
+            InputStream nonroot = context.getResources().openRawResource(R.raw.nonroot_utils);
+            job.add(nonroot);
+        }
+
+        job.add("mount_partitions", "get_flags", "run_migrations", "export BOOTMODE=true").exec();
+
+        Config.keepVerity = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPVERITY"));
+        Config.keepEnc = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPFORCEENCRYPT"));
+        Config.recovery = Boolean.parseBoolean(ShellUtils.fastCmd("echo $RECOVERYMODE"));
+        return true;
+    }
+}

app-core/src/main/java/com/topjohnwu/magisk/utils/SuConnector.java

@@ -0,0 +1,61 @@
+package com.topjohnwu.magisk.utils;
+
+import android.net.LocalSocket;
+import android.net.LocalSocketAddress;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public abstract class SuConnector {
+
+    private LocalSocket socket;
+    protected DataOutputStream out;
+    protected DataInputStream in;
+
+    protected SuConnector(String name) throws IOException {
+        socket = new LocalSocket();
+        socket.connect(new LocalSocketAddress(name, LocalSocketAddress.Namespace.ABSTRACT));
+        out = new DataOutputStream(new BufferedOutputStream(socket.getOutputStream()));
+        in = new DataInputStream(new BufferedInputStream(socket.getInputStream()));
+    }
+
+    private String readString() throws IOException {
+        int len = in.readInt();
+        byte[] buf = new byte[len];
+        in.readFully(buf);
+        return new String(buf, "UTF-8");
+    }
+
+    public Bundle readSocketInput() throws IOException {
+        Bundle bundle = new Bundle();
+        while (true) {
+            String name = readString();
+            if (TextUtils.equals(name, "eof"))
+                break;
+            bundle.putString(name, readString());
+        }
+        return bundle;
+    }
+
+    public void response() {
+        try {
+            onResponse();
+            out.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        try {
+            in.close();
+            out.close();
+            socket.close();
+        } catch (IOException ignored) { }
+    }
+
+    protected abstract void onResponse() throws IOException;
+
+}

app-core/src/main/java/com/topjohnwu/magisk/utils/SuLogger.java

@@ -0,0 +1,86 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Process;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.container.Policy;
+import com.topjohnwu.magisk.container.SuLogEntry;
+
+import java.util.Date;
+
+public abstract class SuLogger {
+
+    public void handleLogs(Intent intent) {
+
+        int fromUid = intent.getIntExtra("from.uid", -1);
+        if (fromUid < 0) return;
+        if (fromUid == Process.myUid()) return;
+
+        App app = App.self;
+        PackageManager pm = app.getPackageManager();
+        Policy policy;
+
+        boolean notify;
+        Bundle data = intent.getExtras();
+        if (data.containsKey("notify")) {
+            notify = data.getBoolean("notify");
+            try {
+                policy = new Policy(fromUid, pm);
+            } catch (PackageManager.NameNotFoundException e) {
+                return;
+            }
+        } else {
+            // Doesn't report whether notify or not, check database ourselves
+            policy = app.mDB.getPolicy(fromUid);
+            if (policy == null)
+                return;
+            notify = policy.notification;
+        }
+
+        policy.policy = data.getInt("policy", -1);
+        if (policy.policy < 0)
+            return;
+
+        if (notify)
+            handleNotify(policy);
+
+        SuLogEntry log = new SuLogEntry(policy);
+
+        int toUid = intent.getIntExtra("to.uid", -1);
+        if (toUid < 0) return;
+        int pid = intent.getIntExtra("pid", -1);
+        if (pid < 0) return;
+        String command = intent.getStringExtra("command");
+        if (command == null) return;
+        log.toUid = toUid;
+        log.fromPid = pid;
+        log.command = command;
+        log.date = new Date();
+        app.mDB.addLog(log);
+    }
+
+    private void handleNotify(Policy policy) {
+        if (policy.notification &&
+                (int) Config.get(Config.Key.SU_NOTIFICATION) == Config.Value.NOTIFICATION_TOAST)
+            Utils.toast(getMessage(policy), Toast.LENGTH_SHORT);
+    }
+
+    public void handleNotify(Intent intent) {
+        int fromUid = intent.getIntExtra("from.uid", -1);
+        if (fromUid < 0) return;
+        if (fromUid == Process.myUid()) return;
+        try {
+            Policy policy = new Policy(fromUid, App.self.getPackageManager());
+            policy.policy = intent.getIntExtra("policy", -1);
+            if (policy.policy >= 0)
+                handleNotify(policy);
+        } catch (PackageManager.NameNotFoundException ignored) {}
+    }
+
+    public abstract String getMessage(Policy policy);
+}

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

@@ -0,0 +1,108 @@
+package com.topjohnwu.magisk.utils;
+
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.HashSet;
+import java.util.Set;
+
+import androidx.annotation.IntDef;
+
+public class Topic {
+
+    public static final int MAGISK_HIDE_DONE = 0;
+    public static final int MODULE_LOAD_DONE = 1;
+    public static final int REPO_LOAD_DONE = 2;
+    public static final int UPDATE_CHECK_DONE = 3;
+    public static final int LOCALE_FETCH_DONE = 4;
+
+    @IntDef({MAGISK_HIDE_DONE, MODULE_LOAD_DONE, REPO_LOAD_DONE,
+            UPDATE_CHECK_DONE, LOCALE_FETCH_DONE})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface TopicID {}
+
+    // We will not dynamically add topics, so use arrays instead of hash tables
+    private static Store[] topicList = new Store[5];
+
+    public static void subscribe(Subscriber sub, @TopicID int... topics) {
+        for (int topic : topics) {
+            if (topicList[topic] == null)
+                topicList[topic] = new Store();
+            topicList[topic].subscribers.add(sub);
+            if (topicList[topic].published) {
+                sub.onPublish(topic, topicList[topic].results);
+            }
+        }
+    }
+
+    public static void subscribe(AutoSubscriber sub) {
+        subscribe(sub, sub.getSubscribedTopics());
+    }
+
+    public static void unsubscribe(Subscriber sub, @TopicID int... topics) {
+        for (int topic : topics) {
+            if (topicList[topic] == null)
+                continue;
+            topicList[topic].subscribers.remove(sub);
+        }
+    }
+
+    public static void unsubscribe(AutoSubscriber sub) {
+        unsubscribe(sub, sub.getSubscribedTopics());
+    }
+
+    public static void publish(@TopicID int topic, Object... results) {
+        publish(true, topic, results);
+    }
+
+    public static void publish(boolean persist, @TopicID int topic, Object... results) {
+        if (topicList[topic] == null)
+            topicList[topic] = new Store();
+        if (persist) {
+            topicList[topic].results = results;
+            topicList[topic].published = true;
+        }
+        for (Subscriber sub : topicList[topic].subscribers) {
+            UiThreadHandler.run(() -> sub.onPublish(topic, results));
+        }
+    }
+
+    public static void reset(@TopicID int... topics) {
+        for (int topic : topics) {
+            if (topicList[topic] == null)
+                continue;
+            topicList[topic].published = false;
+            topicList[topic].results = null;
+        }
+    }
+
+    public static boolean isPublished(@TopicID int... topics) {
+        for (int topic : topics) {
+            if (topicList[topic] == null)
+                return false;
+            if (!topicList[topic].published)
+                return false;
+        }
+        return true;
+    }
+
+    public static boolean isPublished(AutoSubscriber sub) {
+        return isPublished(sub.getSubscribedTopics());
+    }
+
+    private static class Store {
+        boolean published = false;
+        Set<Subscriber> subscribers = new HashSet<>();
+        Object[] results;
+    }
+
+    public interface Subscriber {
+        void onPublish(int topic, Object[] result);
+    }
+
+    public interface AutoSubscriber extends Subscriber {
+        @TopicID
+        int[] getSubscribedTopics();
+    }
+}

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

@@ -0,0 +1,127 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.OpenableColumns;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.container.ValueSortedMap;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+import com.topjohnwu.superuser.io.SuFile;
+
+import java.util.Locale;
+import java.util.Map;
+
+public class Utils {
+
+    public static void toast(CharSequence msg, int duration) {
+        UiThreadHandler.run(() -> Toast.makeText(App.self, msg, duration).show());
+    }
+
+    public static void toast(int resId, int duration) {
+        UiThreadHandler.run(() -> Toast.makeText(App.self, resId, duration).show());
+    }
+
+    public static String dlString(String url) {
+        String s = Networking.get(url).execForString().getResult();
+        return s == null ? "" : s;
+    }
+
+    public static int getPrefsInt(SharedPreferences prefs, String key, int def) {
+        return Integer.parseInt(prefs.getString(key, String.valueOf(def)));
+    }
+
+    public static int getPrefsInt(SharedPreferences prefs, String key) {
+        return getPrefsInt(prefs, key, 0);
+    }
+
+    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 int dpInPx(int dp) {
+        float scale = App.self.getResources().getDisplayMetrics().density;
+        return (int) (dp * scale + 0.5);
+    }
+
+    public static String fmt(String fmt, Object... args) {
+        return String.format(Locale.US, fmt, args);
+    }
+
+    public static String getAppLabel(ApplicationInfo info, PackageManager pm) {
+        try {
+            if (info.labelRes > 0 && Build.VERSION.SDK_INT >= 17) {
+                Resources res = pm.getResourcesForApplication(info);
+                Configuration config = new Configuration();
+                config.setLocale(LocaleManager.locale);
+                res.updateConfiguration(config, res.getDisplayMetrics());
+                return res.getString(info.labelRes);
+            }
+        } catch (Exception ignored) {}
+        return info.loadLabel(pm).toString();
+    }
+
+    public static String getLegalFilename(CharSequence filename) {
+        return filename.toString().replace(" ", "_").replace("'", "").replace("\"", "")
+                .replace("$", "").replace("`", "").replace("*", "").replace("/", "_")
+                .replace("#", "").replace("@", "").replace("\\", "_");
+    }
+
+    public static void loadModules() {
+        Topic.reset(Topic.MODULE_LOAD_DONE);
+        App.THREAD_POOL.execute(() -> {
+            Map<String, Module> moduleMap = new ValueSortedMap<>();
+            SuFile path = new SuFile(Const.MAGISK_PATH);
+            SuFile[] modules = path.listFiles(
+                    (file, name) -> !name.equals("lost+found") && !name.equals(".core"));
+            for (SuFile file : modules) {
+                if (file.isFile()) continue;
+                Module module = new Module(Const.MAGISK_PATH + "/" + file.getName());
+                moduleMap.put(module.getId(), module);
+            }
+            Topic.publish(Topic.MODULE_LOAD_DONE, moduleMap);
+        });
+    }
+
+    public static boolean showSuperUser() {
+        return Shell.rootAccess() && (Const.USER_ID == 0 ||
+                (int) Config.get(Config.Key.SU_MULTIUSER_MODE) !=
+                        Config.Value.MULTIUSER_MODE_OWNER_MANAGED);
+    }
+
+    public static Context getDEContext() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ?
+                App.self.createDeviceProtectedStorageContext() : App.self;
+    }
+
+    public static void reboot() {
+        Shell.su("/system/bin/reboot" + (Config.recovery ? " recovery" : "")).submit();
+    }
+}

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

@@ -1,10 +1,10 @@
 package com.topjohnwu.magisk.utils;
 
+import com.topjohnwu.signing.JarMap;
+import com.topjohnwu.signing.SignAPK;
 import com.topjohnwu.superuser.ShellUtils;
 import com.topjohnwu.superuser.io.SuFile;
 import com.topjohnwu.superuser.io.SuFileOutputStream;
-import com.topjohnwu.utils.JarMap;
-import com.topjohnwu.utils.SignAPK;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -59,11 +59,7 @@ public class ZipUtils {
     public static void signZip(File input, File output) throws Exception {
         try (JarMap map = new JarMap(input, false);
              BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(output))) {
-            signZip(map, out);
+            SignAPK.sign(map, out);
         }
     }
-
-    public static void signZip(JarMap input, OutputStream output) throws Exception {
-        SignAPK.signZip(null, null, input, output);
-    }
 }

app-core/src/main/res/raw/nonroot_utils.sh

@@ -0,0 +1,13 @@
+mount_partitions() {
+  [ "`getprop ro.build.ab_update`" = "true" ] && SLOT=`getprop ro.boot.slot_suffix` || SLOT=
+  [ "`getprop ro.build.system_root_image`" = "true" ] && SYSTEM_ROOT=true || SYSTEM_ROOT=false
+}
+
+get_flags() {
+  $SYSTEM_ROOT && KEEPVERITY=true || KEEPVERITY=false
+  [ "`getprop ro.crypto.state`" = "encrypted" ] && KEEPFORCEENCRYPT=true || KEEPFORCEENCRYPT=false
+}
+
+run_migrations() {
+  # NOP
+}

app-core/src/main/res/raw/utils.sh

@@ -0,0 +1,108 @@
+env_check() {
+  for file in busybox magisk magiskboot magiskinit util_functions.sh boot_patch.sh; do
+    [ -f /data/adb/magisk/$file ] || return 1
+  done
+  return 0
+}
+
+fix_env() {
+  cd /data/adb/magisk
+  local OLDPATH="$PATH"
+  PATH=/sbin:/system/bin:/vendor/bin
+  sh update-binary extract
+  PATH="$OLDPATH"
+  ./busybox rm -f /sbin/.magisk/busybox/*
+  /sbin/.magisk/mirror/bin/busybox --install -s /sbin/.magisk/busybox
+  rm -f update-binary magisk.apk
+  cd /
+}
+
+direct_install() {
+  rm -rf /data/adb/magisk/* 2>/dev/null
+  mkdir -p /data/adb/magisk 2>/dev/null
+  chmod 700 /data/adb
+  cp -rf $1/* /data/adb/magisk
+  rm -rf /data/adb/magisk/new-boot.img
+  echo "- Flashing new boot image"
+  flash_image $1/new-boot.img $2
+  if [ $? -ne 0 ]; then
+    echo "! Insufficient partition size"
+    return 1
+  fi
+  rm -rf $1
+  return 0
+}
+
+mm_patch_dtbo() {
+  if $KEEPVERITY; then
+    return 1
+  else
+    find_dtbo_image
+    patch_dtbo_image
+  fi
+}
+
+restore_imgs() {
+  local SHA1=`grep_prop SHA1 /sbin/.magisk/config`
+  [ -z $SHA1 ] && local SHA1=`cat /.backup/.sha1`
+  [ -z $SHA1 ] && return 1
+  local STOCKBOOT=/data/stock_boot_${SHA1}.img.gz
+  local STOCKDTBO=/data/stock_dtbo.img.gz
+  [ -f $STOCKBOOT ] || return 1
+
+  find_boot_image
+  find_dtbo_image
+
+  if [ -f $STOCKDTBO -a -b "$DTBOIMAGE" ]; then
+    flash_image $STOCKDTBO $DTBOIMAGE
+  fi
+  if [ -f $STOCKBOOT -a -b "$BOOTIMAGE" ]; then
+    flash_image $STOCKBOOT $BOOTIMAGE
+    return 0
+  fi
+  return 1
+}
+
+post_ota() {
+  cd $1
+  chmod 755 bootctl
+  ./bootctl hal-info || return
+  [ `./bootctl get-current-slot` -eq 0 ] && SLOT_NUM=1 || SLOT_NUM=0
+  ./bootctl set-active-boot-slot $SLOT_NUM
+  echo "BCTRL=${1}/bootctl;\$BCTRL mark-boot-successful;rm -f \$BCTRL \$0" > post-fs-data.d/post_ota.sh
+  chmod 755 post-fs-data.d/post_ota.sh
+  cd /
+}
+
+add_hosts_module() {
+  # Do not touch existing hosts module
+  [ -d /sbin/.magisk/img/hosts ] && return
+  cd /sbin/.magisk/img
+  mkdir -p hosts/system/etc
+  cat << EOF > hosts/module.prop
+id=hosts
+name=Systemless Hosts
+version=1.0
+versionCode=1
+author=Magisk Manager
+description=Magisk Manager built-in systemless hosts module
+minMagisk=17000
+EOF
+  if [ -f .core/hosts ]; then
+    # Migrate old hosts file to new module
+    mv -f .core/hosts hosts/system/etc/hosts
+  else
+    cp -f /system/etc/hosts hosts/system/etc/hosts
+  fi
+  magisk --clone-attr /system/etc/hosts hosts/system/etc/hosts
+  touch hosts/update
+  touch hosts/auto_mount
+  cd /
+}
+
+rm_launch() {
+  db_clean $1
+  pm uninstall $2
+  am start -n ${3}/a.c
+  exit
+}

app/.gitignore

@@ -6,7 +6,6 @@
 app/release
 *.hprof
 .externalNativeBuild/
-src/full/res/raw/util_functions.sh
 public.certificate.x509.pem
 private.key.pk8
 *.apk

app/README.md

@@ -1,7 +1,7 @@
 # Magisk Manager
-This repo is no longer an independent component. It is a submodule of the [Magisk Project](https://github.com/topjohnwu/Magisk).
+This repo is no longer an independent component. It is merged into the [Magisk Project](https://github.com/topjohnwu/Magisk).
 
 # Translations
-The default (English) string resources are scattered in these files: `src/full/res/values/strings.xml`, `src/main/res/values/strings.xml`, `src/stub/res/values/strings.xml`.  
-Place the translated XMLs in the corresponding folder to the locale.  
-Translations are highly appreciated via pull requests here on Github.
+The default (English) strings are mainly in `src/full/res/values/strings.xml`; some are scattered in `src/main/res/values/strings.xml` and `src/stub/res/values/strings.xml`.  
+Translations are highly appreciated via pull requests here on Github.  
+Place translated XMLs in the corresponding locale folder.

app/build.gradle

@@ -1,49 +1,56 @@
 apply plugin: 'com.android.application'
 
-android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+def configProps = new Properties()
+def configPath = project.hasProperty('configPath') ? project.configPath : rootProject.file('config.prop')
+configProps.load(new FileInputStream(configPath))
 
+android {
     defaultConfig {
-        applicationId "com.topjohnwu.magisk"
-        minSdkVersion 21
-        targetSdkVersion rootProject.ext.compileSdkVersion
-        javaCompileOptions {
-            annotationProcessorOptions {
-                argument('butterknife.debuggable', 'false')
-            }
+        applicationId 'com.topjohnwu.magisk'
+        vectorDrawables.useSupportLibrary = true
+    }
+
+    signingConfigs {
+        config {
+            storeFile rootProject.file('release-key.jks')
+            storePassword configProps['keyStorePass']
+            keyAlias configProps['keyAlias']
+            keyPassword configProps['keyPass']
         }
     }
 
     buildTypes {
+        debug {
+            // If keystore exists, sign the APK with custom signature
+            if (signingConfigs.config.storeFile.exists())
+                signingConfig signingConfigs.config
+        }
         release {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.config
         }
     }
 
-    flavorDimensions "mode"
+    flavorDimensions 'mode'
 
     productFlavors {
         full {
-            versionCode 129
-            versionName "5.8.3"
+            versionName configProps['appVersion']
+            versionCode configProps['appVersionCode'] as Integer
+            javaCompileOptions {
+                annotationProcessorOptions {
+                    argument('butterknife.debuggable', 'false')
+                }
+            }
         }
         stub {
             versionCode 1
-            versionName "stub"
+            versionName 'stub'
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    dexOptions {
-        preDexLibraries true
-        javaMaxHeapSize "2g"
-    }
     lintOptions {
         disable 'MissingTranslation'
     }
@@ -51,15 +58,24 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    fullImplementation project(':utils')
-    implementation "com.android.support:support-core-utils:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:preference-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
-    fullImplementation 'com.github.topjohnwu:libsu:1.3.0'
-    fullImplementation 'com.atlassian.commonmark:commonmark:0.11.0'
-    fullImplementation 'org.kamranzafar:jtar:2.3'
-    fullImplementation 'com.jakewharton:butterknife:8.8.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    implementation project(':net')
+    fullImplementation project(':app-core')
+    fullImplementation 'ru.noties:markwon:2.0.1'
+    fullImplementation 'com.caverock:androidsvg-aar:1.3'
+
+    def androidXVersion = "1.0.0"
+    implementation 'androidx.core:core:1.0.1'
+    fullImplementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    fullImplementation 'androidx.appcompat:appcompat:1.0.2'
+    fullImplementation "androidx.preference:preference:${androidXVersion}"
+    fullImplementation "androidx.recyclerview:recyclerview:${androidXVersion}"
+    fullImplementation "androidx.cardview:cardview:${androidXVersion}"
+    fullImplementation "com.google.android.material:material:${androidXVersion}"
+    fullImplementation 'android.arch.work:work-runtime:1.0.0-beta03'
+    fullImplementation 'androidx.room:room-runtime:2.0.0'
+    fullImplementation 'androidx.transition:transition:1.0.1'
+
+    def butterKnifeVersion = '10.0.0'
+    fullImplementation "com.jakewharton:butterknife-runtime:${butterKnifeVersion}"
+    fullAnnotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
 }

app/proguard-rules.pro

@@ -16,14 +16,31 @@
 #   public *;
 #}
 
-# Keep all names, we are open source anyway :)
--keepnames class ** { *; }
-
 # BouncyCastle
--keep class org.bouncycastle.jcajce.provider.asymmetric.rsa.**SHA1** { *; }
--keep class org.bouncycastle.jcajce.provider.asymmetric.RSA** { *; }
--keep class org.bouncycastle.jcajce.provider.digest.SHA1** { *; }
+-keep,allowoptimization class org.bouncycastle.jcajce.provider.asymmetric.rsa.**SHA1** { *; }
+-keep,allowoptimization class org.bouncycastle.jcajce.provider.asymmetric.RSA** { *; }
+-keep,allowoptimization class org.bouncycastle.jcajce.provider.digest.SHA1** { *; }
 -dontwarn javax.naming.**
 
-# Gson
--keepattributes Signature
+# Snet
+-keepclassmembers class com.topjohnwu.magisk.utils.ISafetyNetHelper { *; }
+-keep,allowobfuscation interface com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback
+-keepclassmembers class * implements com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback {
+  void onResponse(int);
+}
+
+# BootSigner
+-keepclassmembers class com.topjohnwu.signer.BootSigner { *; }
+
+# SVG
+-dontwarn com.caverock.androidsvg.SVGAndroidRenderer
+
+# Strip logging
+-assumenosideeffects class com.topjohnwu.magisk.utils.Logger {
+  public *** debug(...);
+}
+
+# Excessive obfuscation
+-repackageclasses 'a'
+-allowaccessmodification
+-optimizationpasses 6

app/src/full/AndroidManifest.xml

@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
     <application
-        android:name=".MagiskManager"
-        android:theme="@style/AppTheme">
+        android:name="a.e"
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true"
+        tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
+
+        <!-- Activities -->
 
         <activity
-            android:name=".MainActivity"
+            android:name="a.b"
             android:configChanges="orientation|screenSize"
             android:exported="true" />
         <activity
-            android:name=".SplashActivity"
+            android:name="a.c"
             android:configChanges="orientation|screenSize"
             android:exported="true"
             android:theme="@style/SplashTheme">
@@ -25,57 +29,46 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".AboutActivity"
-            android:theme="@style/AppTheme.StatusBar" />
-        <activity
-            android:name=".SettingsActivity"
-            android:theme="@style/AppTheme.StatusBar" />
-        <activity
-            android:name=".FlashActivity"
+            android:name="a.f"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="nosensor"
-            android:theme="@style/AppTheme.StatusBar" />
+            android:theme="@style/AppTheme.NoDrawer" />
+
+        <!-- Superuser -->
+
         <activity
-            android:name=".NoUIActivity"
-            android:theme="@style/AppTheme.Translucent" />
-        <activity
-            android:name=".superuser.RequestActivity"
+            android:name="a.m"
+            android:directBootAware="true"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
-            android:taskAffinity="internal.superuser"
+            android:taskAffinity="a.m"
             android:theme="@style/SuRequest" />
 
-        <receiver android:name=".superuser.SuReceiver" />
-        <receiver android:name=".receivers.BootReceiver">
+        <!-- Receiver -->
+
+        <receiver
+            android:name="a.h"
+            android:directBootAware="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.LOCALE_CHANGED" />
             </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" />
-        <receiver android:name=".receivers.RebootReceiver" />
-        <receiver android:name=".receivers.ShortcutReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.LOCALE_CHANGED" />
-            </intent-filter>
-        </receiver>
 
-        <service android:name=".services.OnBootIntentService" />
-        <service
-            android:name=".services.UpdateCheckService"
-            android:exported="true"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <!-- Service -->
+
+        <service android:name="a.j" />
 
         <!-- Hardcode GMS version -->
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="7095000" />
+            android:value="12451000" />
 
     </application>
 

app/src/full/java/a/a.java

@@ -0,0 +1,13 @@
+package a;
+
+import com.topjohnwu.magisk.utils.PatchAPK;
+import com.topjohnwu.signing.BootSigner;
+
+import androidx.annotation.Keep;
+
+@Keep
+public class a extends BootSigner {
+    public static boolean patchAPK(String in, String out, String pkg) {
+        return PatchAPK.patch(in, out, pkg);
+    }
+}

app/src/full/java/a/b.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.MainActivity;
+
+public class b extends MainActivity {
+    /* stub */
+}

app/src/full/java/a/c.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.SplashActivity;
+
+public class c extends SplashActivity {
+    /* stub */
+}

app/src/full/java/a/e.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.App;
+
+public class e extends App {
+    /* stub */
+}

app/src/full/java/a/f.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.FlashActivity;
+
+public class f extends FlashActivity {
+    /* stub */
+}

app/src/full/java/a/g.java

@@ -0,0 +1,15 @@
+package a;
+
+import android.content.Context;
+
+import com.topjohnwu.magisk.components.UpdateCheckService;
+
+import androidx.annotation.NonNull;
+import androidx.work.WorkerParameters;
+
+public class g extends w<UpdateCheckService> {
+    /* Stub */
+    public g(@NonNull Context context, @NonNull WorkerParameters workerParams) {
+        super(context, workerParams);
+    }
+}

app/src/full/java/a/h.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.components.GeneralReceiver;
+
+public class h extends GeneralReceiver {
+    /* stub */
+}

app/src/full/java/a/j.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.components.DownloadModuleService;
+
+public class j extends DownloadModuleService {
+    /* stub */
+}

app/src/full/java/a/m.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.SuRequestActivity;
+
+public class m extends SuRequestActivity {
+    /* stub */
+}

app/src/full/java/a/w.java

@@ -0,0 +1,42 @@
+package a;
+
+import android.content.Context;
+
+import com.topjohnwu.magisk.components.DelegateWorker;
+
+import java.lang.reflect.ParameterizedType;
+
+import androidx.annotation.NonNull;
+import androidx.work.Worker;
+import androidx.work.WorkerParameters;
+
+public abstract class w<T extends DelegateWorker> extends Worker {
+
+    /* Wrapper class to workaround Proguard -keep class * extends Worker */
+
+    private T base;
+
+    @SuppressWarnings("unchecked")
+    w(@NonNull Context context, @NonNull WorkerParameters workerParams) {
+        super(context, workerParams);
+        try {
+            base = ((Class<T>) ((ParameterizedType) getClass().getGenericSuperclass())
+                    .getActualTypeArguments()[0]).newInstance();
+            base.setActualWorker(this);
+        } catch (Exception ignored) {}
+    }
+
+    @NonNull
+    @Override
+    public Result doWork() {
+        if (base == null)
+            return Result.failure();
+        return base.doWork();
+    }
+
+    @Override
+    public void onStopped() {
+        if (base != null)
+            base.onStopped();
+    }
+}

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

@@ -1,80 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
-import android.view.View;
-
-import com.topjohnwu.magisk.asyncs.MarkDownWindow;
-import com.topjohnwu.magisk.components.AboutCardRow;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Const;
-
-import java.util.Locale;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class AboutActivity extends Activity {
-
-    @BindView(R.id.toolbar) Toolbar toolbar;
-    @BindView(R.id.app_version_info) AboutCardRow appVersionInfo;
-    @BindView(R.id.app_changelog) AboutCardRow appChangelog;
-    @BindView(R.id.app_translators) AboutCardRow appTranslators;
-    @BindView(R.id.app_source_code) AboutCardRow appSourceCode;
-    @BindView(R.id.support_thread) AboutCardRow supportThread;
-    @BindView(R.id.donation) AboutCardRow donation;
-
-    @Override
-    public int getDarkTheme() {
-        return R.style.AppTheme_StatusBar_Dark;
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
-        ButterKnife.bind(this);
-
-        setSupportActionBar(toolbar);
-        toolbar.setNavigationOnClickListener(view -> finish());
-
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setTitle(R.string.about);
-            ab.setDisplayHomeAsUpEnabled(true);
-        }
-
-        appVersionInfo.setSummary(String.format(Locale.US, "%s (%d) (%s)",
-                BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, getPackageName()));
-
-        appChangelog.removeSummary();
-        appChangelog.setOnClickListener(v -> {
-            new MarkDownWindow(this, getString(R.string.app_changelog),
-                    getResources().openRawResource(R.raw.changelog)).exec();
-        });
-
-        String translators = getString(R.string.translators);
-        if (TextUtils.isEmpty(translators)) {
-            appTranslators.setVisibility(View.GONE);
-        } else {
-            appTranslators.setSummary(translators);
-        }
-
-        appSourceCode.removeSummary();
-        appSourceCode.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.SOURCE_CODE_URL))));
-
-        supportThread.removeSummary();
-        supportThread.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.XDA_THREAD))));
-
-        donation.removeSummary();
-        donation.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.DONATION_URL))));
-
-        setFloating();
-    }
-
-}

app/src/full/java/com/topjohnwu/magisk/ClassMap.java

@@ -0,0 +1,27 @@
+package com.topjohnwu.magisk;
+
+import com.topjohnwu.magisk.components.DownloadModuleService;
+import com.topjohnwu.magisk.components.GeneralReceiver;
+import com.topjohnwu.magisk.components.UpdateCheckService;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ClassMap {
+    private static Map<Class, Class> classMap = new HashMap<>();
+
+    static {
+        classMap.put(App.class, a.e.class);
+        classMap.put(MainActivity.class, a.b.class);
+        classMap.put(SplashActivity.class, a.c.class);
+        classMap.put(FlashActivity.class, a.f.class);
+        classMap.put(UpdateCheckService.class, a.g.class);
+        classMap.put(GeneralReceiver.class, a.h.class);
+        classMap.put(DownloadModuleService.class, a.j.class);
+        classMap.put(SuRequestActivity.class, a.m.class);
+    }
+    
+    public static <T> Class<T> get(Class c) {
+        return classMap.get(c);
+    }
+}

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

@@ -3,90 +3,97 @@ package com.topjohnwu.magisk;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
 import android.widget.Toast;
 
-import com.topjohnwu.magisk.asyncs.FlashZip;
-import com.topjohnwu.magisk.asyncs.InstallMagisk;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.magisk.adapters.StringListAdapter;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.tasks.FlashZip;
+import com.topjohnwu.magisk.tasks.MagiskInstaller;
+import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.CallbackList;
 import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindColor;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-public class FlashActivity extends Activity {
+public class FlashActivity extends BaseActivity {
 
     @BindView(R.id.toolbar) Toolbar toolbar;
-    @BindView(R.id.txtLog) TextView flashLogs;
-    @BindView(R.id.button_panel) public LinearLayout buttonPanel;
-    @BindView(R.id.reboot) public Button reboot;
-    @BindView(R.id.scrollView) ScrollView sv;
+    @BindView(R.id.button_panel) LinearLayout buttonPanel;
+    @BindView(R.id.reboot) Button reboot;
+    @BindView(R.id.recyclerView) RecyclerView rv;
+    @BindColor(android.R.color.white) int white;
 
-    private List<String> logs;
-
-    @OnClick(R.id.no_thanks)
-    void dismiss() {
-        finish();
-    }
+    private List<String> console, logs;
 
     @OnClick(R.id.reboot)
     void reboot() {
-        Shell.Async.su("/system/bin/reboot");
+        Utils.reboot();
     }
 
     @OnClick(R.id.save_logs)
     void saveLogs() {
-        Calendar now = Calendar.getInstance();
-        String filename = String.format(Locale.US,
-                "install_log_%04d%02d%02d_%02d%02d%02d.log",
-                now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
-                now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
-                now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
+        runWithExternalRW(() -> {
+            Calendar now = Calendar.getInstance();
+            String filename = String.format(Locale.US,
+                    "magisk_install_log_%04d%02d%02d_%02d%02d%02d.log",
+                    now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
+                    now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
+                    now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
 
-        File logFile = new File(Const.EXTERNAL_PATH + "/logs", filename);
-        logFile.getParentFile().mkdirs();
-        try (FileWriter writer = new FileWriter(logFile)) {
-            for (String s : logs) {
-                writer.write(s);
-                writer.write('\n');
+            File logFile = new File(Const.EXTERNAL_PATH, filename);
+            try (FileWriter writer = new FileWriter(logFile)) {
+                for (String s : logs) {
+                    writer.write(s);
+                    writer.write('\n');
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+                return;
             }
-        } catch (IOException e) {
-            e.printStackTrace();
-            return;
-        }
-        MagiskManager.toast(logFile.getPath(), Toast.LENGTH_LONG);
+            Utils.toast(logFile.getPath(), Toast.LENGTH_LONG);
+        });
+    }
+
+    @OnClick(R.id.close)
+    public void close() {
+        finish();
+    }
+
+    @Override
+    public void onBackPressed() {
+        // Prevent user accidentally press back button
     }
 
     @Override
     public int getDarkTheme() {
-        return R.style.AppTheme_StatusBar_Dark;
+        return R.style.AppTheme_NoDrawer_Dark;
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_flash);
-        ButterKnife.bind(this);
+        new FlashActivity_ViewBinding(this);
+
         setSupportActionBar(toolbar);
         ActionBar ab = getSupportActionBar();
         if (ab != null) {
@@ -97,59 +104,167 @@ public class FlashActivity extends Activity {
         if (!Shell.rootAccess())
             reboot.setVisibility(View.GONE);
 
-        logs = new ArrayList<>();
-        CallbackList<String> console = new CallbackList<String>(new ArrayList<>()) {
-            @Override
-            public void onAddElement(String s) {
-                logs.add(s);
-                flashLogs.setText(TextUtils.join("\n", this));
-                sv.postDelayed(() -> sv.fullScroll(ScrollView.FOCUS_DOWN), 10);
-            }
-        };
+        logs = Collections.synchronizedList(new ArrayList<>());
+        console = new ConsoleList();
+        rv.setAdapter(new ConsoleAdapter());
 
-        // We must receive a Uri of the target zip
         Intent intent = getIntent();
         Uri uri = intent.getData();
 
         switch (intent.getStringExtra(Const.Key.FLASH_ACTION)) {
             case Const.Value.FLASH_ZIP:
-                new FlashZip(this, uri, console, logs).exec();
+                new FlashModule(uri).exec();
                 break;
             case Const.Value.UNINSTALL:
-                new UninstallMagisk(this, uri, console, logs).exec();
+                new Uninstall(uri).exec();
                 break;
             case Const.Value.FLASH_MAGISK:
-                new InstallMagisk(this, console, logs, uri, InstallMagisk.DIRECT_MODE).exec();
+                new DirectInstall().exec();
                 break;
-            case Const.Value.FLASH_SECOND_SLOT:
-                new InstallMagisk(this, console, logs, uri, InstallMagisk.SECOND_SLOT_MODE).exec();
+            case Const.Value.FLASH_INACTIVE_SLOT:
+                new SecondSlot().exec();
                 break;
             case Const.Value.PATCH_BOOT:
-                new InstallMagisk(this, console, logs, uri,
-                        intent.getParcelableExtra(Const.Key.FLASH_SET_BOOT)).exec();
+                new PatchBoot(uri).exec();
                 break;
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        // Prevent user accidentally press back button
-    }
+    private class ConsoleAdapter extends StringListAdapter<ConsoleAdapter.ViewHolder> {
 
-    private static class UninstallMagisk extends FlashZip {
-
-        private UninstallMagisk(Activity context, Uri uri, List<String> console, List<String> logs) {
-            super(context, uri, console, logs);
+        ConsoleAdapter() {
+            super(console, true);
         }
 
         @Override
-        protected void onPostExecute(Integer result) {
-            if (result == 1) {
-                new Handler().postDelayed(() ->
-                        RootUtils.uninstallPkg(getActivity().getPackageName()), 3000);
-            } else {
-                super.onPostExecute(result);
+        protected int itemLayoutRes() {
+            return R.layout.list_item_console;
+        }
+
+        @NonNull
+        @Override
+        public ViewHolder createViewHolder(@NonNull View v) {
+            return new ViewHolder(v);
+        }
+
+        class ViewHolder extends StringListAdapter.ViewHolder {
+
+            public ViewHolder(@NonNull View itemView) {
+                super(itemView);
+                txt.setTextColor(white);
+            }
+
+            @Override
+            protected int textViewResId() {
+                return R.id.txt;
             }
         }
     }
+
+    private class ConsoleList extends CallbackList<String> {
+
+        ConsoleList() {
+            super(new ArrayList<>());
+        }
+
+        private void updateUI() {
+            rv.getAdapter().notifyItemChanged(size() - 1);
+            rv.postDelayed(() -> rv.smoothScrollToPosition(size() - 1), 10);
+        }
+
+        @Override
+        public void onAddElement(String s) {
+            logs.add(s);
+            updateUI();
+        }
+
+        @Override
+        public String set(int i, String s) {
+            String ret = super.set(i, s);
+            UiThreadHandler.run(this::updateUI);
+            return ret;
+        }
+    }
+
+    private class FlashModule extends FlashZip {
+
+        FlashModule(Uri uri) {
+            super(uri, console, logs);
+        }
+
+        @Override
+        protected void onResult(boolean success) {
+            if (success) {
+                Utils.loadModules();
+            } else {
+                console.add("! Installation failed");
+                reboot.setVisibility(View.GONE);
+            }
+            buttonPanel.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private class Uninstall extends FlashModule {
+
+        Uninstall(Uri uri) {
+            super(uri);
+        }
+
+        @Override
+        protected void onResult(boolean success) {
+            if (success)
+                UiThreadHandler.handler.postDelayed(Shell.su("pm uninstall " + getPackageName())::exec, 3000);
+            else
+                super.onResult(false);
+        }
+    }
+
+    private abstract class BaseInstaller extends MagiskInstaller {
+        BaseInstaller() {
+            super(console, logs);
+        }
+
+        @Override
+        protected void onResult(boolean success) {
+            if (success) {
+                console.add("- All done!");
+            } else {
+                Shell.sh("rm -rf " + installDir).submit();
+                console.add("! Installation failed");
+                reboot.setVisibility(View.GONE);
+            }
+            buttonPanel.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private class DirectInstall extends BaseInstaller {
+
+        @Override
+        protected boolean operations() {
+            return findImage() && extractZip() && patchBoot() && flashBoot();
+        }
+    }
+
+    private class SecondSlot extends BaseInstaller {
+
+        @Override
+        protected boolean operations() {
+            return findSecondaryImage() && extractZip() && patchBoot() && flashBoot() && postOTA();
+        }
+    }
+
+    private class PatchBoot extends BaseInstaller {
+
+        private Uri uri;
+
+        PatchBoot(Uri u) {
+            uri = u;
+        }
+
+        @Override
+        protected boolean operations() {
+            return copyBoot(uri) && extractZip() && patchBoot() && storeBoot();
+        }
+    }
+
 }

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

@@ -1,313 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.NotificationManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.CardView;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.asyncs.CheckSafetyNet;
-import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
-import com.topjohnwu.magisk.components.ExpandableView;
-import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.ISafetyNetHelper;
-import com.topjohnwu.magisk.utils.ShowUI;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-import butterknife.BindColor;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-
-public class MagiskFragment extends Fragment
-        implements Topic.Subscriber, SwipeRefreshLayout.OnRefreshListener, ExpandableView {
-
-    private Container expandableContainer = new Container();
-
-    private MagiskManager mm;
-    private Unbinder unbinder;
-    private static boolean shownDialog = false;
-
-    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
-
-    @BindView(R.id.magisk_update) RelativeLayout magiskUpdate;
-    @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.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.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)
-    void safetyNet() {
-        Runnable task = () -> {
-            safetyNetProgress.setVisibility(View.VISIBLE);
-            safetyNetRefreshIcon.setVisibility(View.GONE);
-            safetyNetStatusText.setText(R.string.checking_safetyNet_status);
-            new CheckSafetyNet(getActivity()).exec();
-            collapse();
-        };
-        if (!TextUtils.equals(mm.getPackageName(), Const.ORIG_PKG_NAME)) {
-            new AlertDialogBuilder(getActivity())
-                    .setTitle(R.string.cannot_check_sn_title)
-                    .setMessage(R.string.cannot_check_sn_notice)
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.ok, null)
-                    .show();
-        } else if (!CheckSafetyNet.dexPath.exists()) {
-            // Show dialog
-            new AlertDialogBuilder(getActivity())
-                    .setTitle(R.string.proprietary_title)
-                    .setMessage(R.string.proprietary_notice)
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.yes, (d, i) -> task.run())
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
-        } else {
-            task.run();
-        }
-
-    }
-
-    @OnClick(R.id.install_button)
-    void install() {
-        shownDialog = true;
-
-        // Show Manager update first
-        if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-            ShowUI.managerInstallDialog(getActivity());
-            return;
-        }
-
-        ((NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE)).cancelAll();
-        ShowUI.magiskInstallDialog(getActivity());
-    }
-
-    @OnClick(R.id.uninstall_button)
-    void uninstall() {
-        ShowUI.uninstallDialog(getActivity());
-    }
-
-    @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);
-        getActivity().setTitle(R.string.magisk);
-
-        mm = getApplication();
-
-        expandableContainer.expandLayout = expandLayout;
-        setupExpandable();
-
-        keepVerityChkbox.setChecked(mm.keepVerity);
-        keepVerityChkbox.setOnCheckedChangeListener((view, checked) -> mm.keepVerity = checked);
-        keepEncChkbox.setChecked(mm.keepEnc);
-        keepEncChkbox.setOnCheckedChangeListener((view, checked) -> mm.keepEnc = checked);
-
-        mSwipeRefreshLayout.setOnRefreshListener(this);
-        updateUI();
-
-        return v;
-    }
-
-    @Override
-    public void onRefresh() {
-        mm.loadMagiskInfo();
-        updateUI();
-
-        magiskUpdateText.setText(R.string.checking_for_updates);
-        magiskUpdateProgress.setVisibility(View.VISIBLE);
-        magiskUpdateIcon.setVisibility(View.GONE);
-
-        safetyNetStatusText.setText(R.string.safetyNet_check_text);
-
-        mm.safetyNetDone.reset();
-        mm.updateCheckDone.reset();
-        mm.remoteMagiskVersionString = null;
-        mm.remoteMagiskVersionCode = -1;
-        collapse();
-
-        shownDialog = false;
-
-        // Trigger state check
-        if (Utils.checkNetworkStatus()) {
-            new CheckUpdates().exec();
-        } else {
-            mSwipeRefreshLayout.setRefreshing(false);
-        }
-    }
-
-    @Override
-    public void onTopicPublished(Topic topic) {
-        if (topic == mm.updateCheckDone) {
-            updateCheckUI();
-        } else if (topic == mm.safetyNetDone) {
-            updateSafetyNetUI((int) topic.getResults()[0]);
-        }
-    }
-
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { mm.updateCheckDone, mm.safetyNetDone };
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
-    @Override
-    public Container getContainer() {
-        return expandableContainer;
-    }
-
-    private void updateUI() {
-        ((MainActivity) getActivity()).checkHideSection();
-
-        boolean hasNetwork = Utils.checkNetworkStatus();
-        boolean hasRoot = Shell.rootAccess();
-        boolean isUpToDate = mm.magiskVersionCode > Const.MAGISK_VER.UNIFIED;
-
-        magiskUpdate.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
-        safetyNetCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
-        installOptionCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
-        uninstallButton.setVisibility(isUpToDate && hasRoot ? View.VISIBLE : View.GONE);
-
-        int image, color;
-
-        if (mm.magiskVersionCode < 0) {
-            color = colorBad;
-            image = R.drawable.ic_cancel;
-            magiskVersionText.setText(R.string.magisk_version_error);
-        } else {
-            color = colorOK;
-            image = R.drawable.ic_check_circle;
-            magiskVersionText.setText(getString(R.string.current_magisk_title, "v" + mm.magiskVersionString));
-        }
-
-        magiskStatusIcon.setImageResource(image);
-        magiskStatusIcon.setColorFilter(color);
-    }
-
-    private void updateCheckUI() {
-        int image, color;
-
-        if (mm.remoteMagiskVersionCode < 0) {
-            color = colorNeutral;
-            image = R.drawable.ic_help;
-            magiskUpdateText.setText(R.string.invalid_update_channel);
-            installButton.setVisibility(View.GONE);
-        } else {
-            color = colorOK;
-            image = R.drawable.ic_check_circle;
-            magiskUpdateText.setText(getString(R.string.install_magisk_title, "v" + mm.remoteMagiskVersionString));
-            installButton.setVisibility(View.VISIBLE);
-            if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-                installText.setText(getString(R.string.update, getString(R.string.app_name)));
-            } else if (mm.magiskVersionCode > 0 && mm.remoteMagiskVersionCode > mm.magiskVersionCode) {
-                installText.setText(getString(R.string.update, getString(R.string.magisk)));
-            } else {
-                installText.setText(R.string.install);
-            }
-        }
-
-        magiskUpdateIcon.setImageResource(image);
-        magiskUpdateIcon.setColorFilter(color);
-        magiskUpdateIcon.setVisibility(View.VISIBLE);
-
-        magiskUpdateProgress.setVisibility(View.GONE);
-        mSwipeRefreshLayout.setRefreshing(false);
-
-        if (!shownDialog) {
-            if (mm.remoteMagiskVersionCode > mm.magiskVersionCode
-                    || mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-                install();
-            } else if (mm.remoteMagiskVersionCode >= Const.MAGISK_VER.FIX_ENV &&
-                    !ShellUtils.fastCmdResult("env_check")) {
-                ShowUI.envFixDialog(getActivity());
-            }
-        }
-    }
-
-    private void updateSafetyNetUI(int response) {
-        safetyNetProgress.setVisibility(View.GONE);
-        safetyNetRefreshIcon.setVisibility(View.VISIBLE);
-        if ((response & 0x0F) == 0) {
-            safetyNetStatusText.setText(R.string.safetyNet_check_success);
-
-            boolean b;
-            b = (response & ISafetyNetHelper.CTS_PASS) != 0;
-            ctsStatusText.setText("ctsProfile: " + b);
-            ctsStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
-            ctsStatusIcon.setColorFilter(b ? colorOK : colorBad);
-
-            b = (response & ISafetyNetHelper.BASIC_PASS) != 0;
-            basicStatusText.setText("basicIntegrity: " + b);
-            basicStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
-            basicStatusIcon.setColorFilter(b ? colorOK : colorBad);
-
-            expand();
-        } else {
-            @StringRes int resid;
-            switch (response) {
-                case ISafetyNetHelper.CAUSE_SERVICE_DISCONNECTED:
-                    resid = R.string.safetyNet_network_loss;
-                    break;
-                case ISafetyNetHelper.CAUSE_NETWORK_LOST:
-                    resid = R.string.safetyNet_service_disconnected;
-                    break;
-                case ISafetyNetHelper.RESPONSE_ERR:
-                    resid = R.string.safetyNet_res_invalid;
-                    break;
-                case ISafetyNetHelper.CONNECTION_FAIL:
-                default:
-                    resid = R.string.safetyNet_api_error;
-                    break;
-            }
-            safetyNetStatusText.setText(resid);
-        }
-    }
-}
-

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

@@ -1,92 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.SearchView;
-
-import com.topjohnwu.magisk.adapters.ApplicationAdapter;
-import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.utils.Topic;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-
-public class MagiskHideFragment extends Fragment implements Topic.Subscriber {
-
-    private Unbinder unbinder;
-    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
-    @BindView(R.id.recyclerView) RecyclerView recyclerView;
-
-    private ApplicationAdapter appAdapter;
-
-    private SearchView.OnQueryTextListener searchListener;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_magisk_hide, container, false);
-        unbinder = ButterKnife.bind(this, view);
-
-        mSwipeRefreshLayout.setRefreshing(true);
-        mSwipeRefreshLayout.setOnRefreshListener(() -> appAdapter.refresh());
-
-        appAdapter = new ApplicationAdapter();
-        recyclerView.setAdapter(appAdapter);
-
-        searchListener = new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                appAdapter.filter(query);
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                appAdapter.filter(newText);
-                return false;
-            }
-        };
-
-        getActivity().setTitle(R.string.magiskhide);
-
-        return view;
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_magiskhide, menu);
-        SearchView search = (SearchView) menu.findItem(R.id.app_search).getActionView();
-        search.setOnQueryTextListener(searchListener);
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
-    @Override
-    public void onTopicPublished(Topic topic) {
-        mSwipeRefreshLayout.setRefreshing(false);
-        appAdapter.filter(null);
-    }
-
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { getApplication().magiskHideDone };
-    }
-}

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

@@ -1,145 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.Manifest;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.HorizontalScrollView;
-import android.widget.ProgressBar;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-
-public class MagiskLogFragment extends Fragment {
-
-    private Unbinder unbinder;
-
-    @BindView(R.id.txtLog) TextView txtLog;
-    @BindView(R.id.svLog) ScrollView svLog;
-    @BindView(R.id.hsvLog) HorizontalScrollView hsvLog;
-    @BindView(R.id.progressBar) ProgressBar progressBar;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_magisk_log, container, false);
-        unbinder = ButterKnife.bind(this, view);
-        setHasOptionsMenu(true);
-        txtLog.setTextIsSelectable(true);
-        return view;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        getActivity().setTitle(R.string.log);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        readLogs();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_log, menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_refresh:
-                readLogs();
-                return true;
-            case R.id.menu_save:
-                runWithPermission(new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, this::saveLogs);
-                return true;
-            case R.id.menu_clear:
-                clearLogs();
-                return true;
-            default:
-                return true;
-        }
-    }
-
-    public void readLogs() {
-        Shell.Async.su(new Shell.Async.Callback() {
-            @Override
-            public void onTaskResult(@Nullable List<String> out, @Nullable List<String> err) {
-                progressBar.setVisibility(View.GONE);
-                if (ShellUtils.isValidOutput(out)) {
-                    txtLog.setText(TextUtils.join("\n", out));
-                } else {
-                    txtLog.setText(R.string.log_is_empty);
-                }
-                svLog.postDelayed(() -> svLog.fullScroll(ScrollView.FOCUS_DOWN), 100);
-                hsvLog.postDelayed(() -> hsvLog.fullScroll(ScrollView.FOCUS_LEFT), 100);
-            }
-
-            @Override
-            public void onTaskError(@NonNull Throwable throwable) {
-                txtLog.setText(R.string.log_is_empty);
-            }
-        }, "cat " + Const.MAGISK_LOG + " | tail -n 5000");
-    }
-
-    public void saveLogs() {
-        Calendar now = Calendar.getInstance();
-        String filename = Utils.fmt("magisk_log_%04d%02d%02d_%02d%02d%02d.log",
-                now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
-                now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
-                now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
-
-        File targetFile = new File(Const.EXTERNAL_PATH + "/logs", filename);
-        targetFile.getParentFile().mkdirs();
-        try {
-            targetFile.createNewFile();
-        } catch (IOException e) {
-            return;
-        }
-        Shell.Async.su(new Shell.Async.Callback() {
-            @Override
-            public void onTaskResult(@Nullable List<String> out, @Nullable List<String> err) {
-                SnackbarMaker.make(txtLog, targetFile.getPath(), Snackbar.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void onTaskError(@NonNull Throwable throwable) {}
-        }, "cat " + Const.MAGISK_LOG + " > " + targetFile);
-    }
-
-    public void clearLogs() {
-        Shell.Async.su("echo -n > " + Const.MAGISK_LOG);
-        SnackbarMaker.make(txtLog, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
-    }
-}

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

@@ -1,292 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.job.JobInfo;
-import android.app.job.JobScheduler;
-import android.content.ComponentName;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.Xml;
-
-import com.topjohnwu.magisk.components.Application;
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.services.UpdateCheckService;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.RootUtils;
-import com.topjohnwu.magisk.utils.ShellInitializer;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.io.SuFile;
-import com.topjohnwu.superuser.io.SuFileInputStream;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-public class MagiskManager extends Application implements Shell.Container {
-
-    // Topics
-    public final Topic magiskHideDone = new Topic();
-    public final Topic reloadActivity = new Topic();
-    public final Topic moduleLoadDone = new Topic();
-    public final Topic repoLoadDone = new Topic();
-    public final Topic updateCheckDone = new Topic();
-    public final Topic safetyNetDone = new Topic();
-    public final Topic localeDone = new Topic();
-
-    // Info
-    public boolean hasInit = false;
-    public String magiskVersionString;
-    public int magiskVersionCode = -1;
-    public String remoteMagiskVersionString;
-    public int remoteMagiskVersionCode = -1;
-    public String remoteManagerVersionString;
-    public int remoteManagerVersionCode = -1;
-
-    public String magiskLink;
-    public String magiskNoteLink;
-    public String managerLink;
-    public String managerNoteLink;
-    public String uninstallerLink;
-
-    public boolean keepVerity = false;
-    public boolean keepEnc = false;
-
-    // Data
-    public Map<String, Module> moduleMap;
-    public List<Locale> locales;
-
-    public boolean magiskHide;
-    public boolean isDarkTheme;
-    public int suRequestTimeout;
-    public int suLogTimeout = 14;
-    public int suAccessState;
-    public int multiuserMode;
-    public int suResponseType;
-    public int suNotificationType;
-    public int suNamespaceMode;
-    public String localeConfig;
-    public int updateChannel;
-    public String bootFormat;
-    public int repoOrder;
-
-    // Global resources
-    public SharedPreferences prefs;
-    public MagiskDatabaseHelper mDB;
-    public RepoDatabaseHelper repoDB;
-
-    private volatile Shell mShell;
-
-    public MagiskManager() {
-        weakSelf = new WeakReference<>(this);
-        Shell.setContainer(this);
-    }
-
-    @Nullable
-    @Override
-    public Shell getShell() {
-        return mShell;
-    }
-
-    @Override
-    public void setShell(@Nullable Shell shell) {
-        mShell = shell;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        Shell.setFlags(Shell.FLAG_MOUNT_MASTER);
-        Shell.verboseLogging(BuildConfig.DEBUG);
-        Shell.setInitializer(ShellInitializer.class);
-
-        prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        mDB = MagiskDatabaseHelper.getInstance(this);
-
-        String pkg = mDB.getStrings(Const.Key.SU_MANAGER, null);
-        if (pkg != null && getPackageName().equals(Const.ORIG_PKG_NAME)) {
-            mDB.setStrings(Const.Key.SU_MANAGER, null);
-            RootUtils.uninstallPkg(pkg);
-        }
-        if (TextUtils.equals(pkg, getPackageName())) {
-            try {
-                // We are the manager, remove com.topjohnwu.magisk as it could be malware
-                getPackageManager().getApplicationInfo(Const.ORIG_PKG_NAME, 0);
-                RootUtils.uninstallPkg(Const.ORIG_PKG_NAME);
-            } catch (PackageManager.NameNotFoundException ignored) {}
-        }
-
-        setLocale();
-        loadConfig();
-    }
-
-    public static MagiskManager get() {
-        return (MagiskManager) weakSelf.get();
-    }
-
-    public void setLocale() {
-        localeConfig = prefs.getString(Const.Key.LOCALE, "");
-        if (localeConfig.isEmpty()) {
-            locale = defaultLocale;
-        } else {
-            locale = Locale.forLanguageTag(localeConfig);
-        }
-        Resources res = getBaseContext().getResources();
-        Configuration config = new Configuration(res.getConfiguration());
-        config.setLocale(locale);
-        res.updateConfiguration(config, res.getDisplayMetrics());
-    }
-
-    public void loadConfig() {
-        // su
-        suRequestTimeout = Utils.getPrefsInt(prefs, Const.Key.SU_REQUEST_TIMEOUT, Const.Value.timeoutList[2]);
-        suResponseType = Utils.getPrefsInt(prefs, Const.Key.SU_AUTO_RESPONSE, Const.Value.SU_PROMPT);
-        suNotificationType = Utils.getPrefsInt(prefs, Const.Key.SU_NOTIFICATION, Const.Value.NOTIFICATION_TOAST);
-        suAccessState = mDB.getSettings(Const.Key.ROOT_ACCESS, Const.Value.ROOT_ACCESS_APPS_AND_ADB);
-        multiuserMode = mDB.getSettings(Const.Key.SU_MULTIUSER_MODE, Const.Value.MULTIUSER_MODE_OWNER_ONLY);
-        suNamespaceMode = mDB.getSettings(Const.Key.SU_MNT_NS, Const.Value.NAMESPACE_MODE_REQUESTER);
-
-        // config
-        isDarkTheme = prefs.getBoolean(Const.Key.DARK_THEME, false);
-        updateChannel = Utils.getPrefsInt(prefs, Const.Key.UPDATE_CHANNEL, Const.Value.STABLE_CHANNEL);
-        bootFormat = prefs.getString(Const.Key.BOOT_FORMAT, ".img");
-        repoOrder = prefs.getInt(Const.Key.REPO_ORDER, Const.Value.ORDER_NAME);
-    }
-
-    public void writeConfig() {
-        prefs.edit()
-                .putBoolean(Const.Key.DARK_THEME, isDarkTheme)
-                .putBoolean(Const.Key.MAGISKHIDE, magiskHide)
-                .putBoolean(Const.Key.HOSTS, Const.MAGISK_HOST_FILE.exists())
-                .putBoolean(Const.Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
-                .putString(Const.Key.SU_REQUEST_TIMEOUT, String.valueOf(suRequestTimeout))
-                .putString(Const.Key.SU_AUTO_RESPONSE, String.valueOf(suResponseType))
-                .putString(Const.Key.SU_NOTIFICATION, String.valueOf(suNotificationType))
-                .putString(Const.Key.ROOT_ACCESS, String.valueOf(suAccessState))
-                .putString(Const.Key.SU_MULTIUSER_MODE, String.valueOf(multiuserMode))
-                .putString(Const.Key.SU_MNT_NS, String.valueOf(suNamespaceMode))
-                .putString(Const.Key.UPDATE_CHANNEL, String.valueOf(updateChannel))
-                .putString(Const.Key.LOCALE, localeConfig)
-                .putString(Const.Key.BOOT_FORMAT, bootFormat)
-                .putInt(Const.Key.UPDATE_SERVICE_VER, Const.UPDATE_SERVICE_VER)
-                .putInt(Const.Key.REPO_ORDER, repoOrder)
-                .apply();
-    }
-
-    public void loadMagiskInfo() {
-        try {
-            magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":")[0];
-            magiskVersionCode = Integer.parseInt(ShellUtils.fastCmd("magisk -V"));
-            String s = ShellUtils.fastCmd((magiskVersionCode >= Const.MAGISK_VER.RESETPROP_PERSIST ?
-                    "resetprop -p " : "getprop ") + Const.MAGISKHIDE_PROP);
-            magiskHide = s == null || Integer.parseInt(s) != 0;
-        } catch (Exception ignored) {}
-    }
-
-    public void getDefaultInstallFlags() {
-        keepVerity = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPVERITY"));
-        keepEnc = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPFORCEENCRYPT"));
-    }
-
-    public void setupUpdateCheck() {
-        JobScheduler scheduler = (JobScheduler) getSystemService(JOB_SCHEDULER_SERVICE);
-
-        if (prefs.getBoolean(Const.Key.CHECK_UPDATES, true)) {
-            if (scheduler.getAllPendingJobs().isEmpty() ||
-                    Const.UPDATE_SERVICE_VER > prefs.getInt(Const.Key.UPDATE_SERVICE_VER, -1)) {
-                ComponentName service = new ComponentName(this, UpdateCheckService.class);
-                JobInfo info = new JobInfo.Builder(Const.ID.UPDATE_SERVICE_ID, service)
-                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-                        .setPersisted(true)
-                        .setPeriodic(8 * 60 * 60 * 1000)
-                        .build();
-                scheduler.schedule(info);
-            }
-        } else {
-            scheduler.cancel(Const.UPDATE_SERVICE_VER);
-        }
-    }
-
-    public void dumpPrefs() {
-        // Flush prefs to disk
-        prefs.edit().commit();
-        File xml = new File(getFilesDir().getParent() + "/shared_prefs",
-                getPackageName() + "_preferences.xml");
-        Shell.Sync.su(Utils.fmt("for usr in /data/user/*; do cat %s > ${usr}/%s; done", xml, Const.MANAGER_CONFIGS));
-    }
-
-    public void loadPrefs() {
-        SuFile config = new SuFile(Utils.fmt("/data/user/%d/%s", Const.USER_ID, Const.MANAGER_CONFIGS));
-        if (config.exists()) {
-            SharedPreferences.Editor editor = prefs.edit();
-            try {
-                SuFileInputStream is = new SuFileInputStream(config);
-                XmlPullParser parser = Xml.newPullParser();
-                parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
-                parser.setInput(is, "UTF-8");
-                parser.nextTag();
-                parser.require(XmlPullParser.START_TAG, null, "map");
-                while (parser.next() != XmlPullParser.END_TAG) {
-                    if (parser.getEventType() != XmlPullParser.START_TAG)
-                        continue;
-                    String key = parser.getAttributeValue(null, "name");
-                    String value = parser.getAttributeValue(null, "value");
-                    switch (parser.getName()) {
-                        case "string":
-                            parser.require(XmlPullParser.START_TAG, null, "string");
-                            editor.putString(key, parser.nextText());
-                            parser.require(XmlPullParser.END_TAG, null, "string");
-                            break;
-                        case "boolean":
-                            parser.require(XmlPullParser.START_TAG, null, "boolean");
-                            editor.putBoolean(key, Boolean.parseBoolean(value));
-                            parser.nextTag();
-                            parser.require(XmlPullParser.END_TAG, null, "boolean");
-                            break;
-                        case "int":
-                            parser.require(XmlPullParser.START_TAG, null, "int");
-                            editor.putInt(key, Integer.parseInt(value));
-                            parser.nextTag();
-                            parser.require(XmlPullParser.END_TAG, null, "int");
-                            break;
-                        case "long":
-                            parser.require(XmlPullParser.START_TAG, null, "long");
-                            editor.putLong(key, Long.parseLong(value));
-                            parser.nextTag();
-                            parser.require(XmlPullParser.END_TAG, null, "long");
-                            break;
-                        case "float":
-                            parser.require(XmlPullParser.START_TAG, null, "int");
-                            editor.putFloat(key, Float.parseFloat(value));
-                            parser.nextTag();
-                            parser.require(XmlPullParser.END_TAG, null, "int");
-                            break;
-                        default:
-                            parser.next();
-                    }
-                }
-            } catch (IOException | XmlPullParserException e) {
-                e.printStackTrace();
-            }
-            editor.remove(Const.Key.ETAG_KEY);
-            editor.apply();
-            loadConfig();
-            config.delete();
-        }
-    }
-}

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

@@ -1,39 +1,45 @@
 package com.topjohnwu.magisk;
 
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Const;
+import com.google.android.material.navigation.NavigationView;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.fragments.LogFragment;
+import com.topjohnwu.magisk.fragments.MagiskFragment;
+import com.topjohnwu.magisk.fragments.MagiskHideFragment;
+import com.topjohnwu.magisk.fragments.ModulesFragment;
+import com.topjohnwu.magisk.fragments.ReposFragment;
+import com.topjohnwu.magisk.fragments.SettingsFragment;
+import com.topjohnwu.magisk.fragments.SuperuserFragment;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.net.Networking;
 import com.topjohnwu.superuser.Shell;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
-public class MainActivity extends Activity
+public class MainActivity extends BaseActivity
         implements NavigationView.OnNavigationItemSelectedListener, Topic.Subscriber {
 
     private final Handler mDrawerHandler = new Handler();
     private int mDrawerItem;
-    private boolean fromShortcut = true;
+    private static boolean fromShortcut = false;
 
-    @BindView(R.id.toolbar) Toolbar toolbar;
+    @BindView(R.id.toolbar) public Toolbar toolbar;
     @BindView(R.id.drawer_layout) DrawerLayout drawer;
-    @BindView(R.id.nav_view) public NavigationView navigationView;
+    @BindView(R.id.nav_view) NavigationView navigationView;
 
     private float toolbarElevation;
 
@@ -44,27 +50,14 @@ public class MainActivity extends Activity
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
-
-        MagiskManager mm = getMagiskManager();
-
-        if (!mm.hasInit) {
-            Intent intent = new Intent(this, SplashActivity.class);
-            String section = getIntent().getStringExtra(Const.Key.OPEN_SECTION);
-            if (section != null) {
-                intent.putExtra(Const.Key.OPEN_SECTION, section);
-            }
-            startActivity(intent);
+        if (!getIntent().getBooleanExtra(Const.Key.FROM_SPLASH, false)) {
+            startActivity(new Intent(this, ClassMap.get(SplashActivity.class)));
             finish();
         }
 
-        String perm = getIntent().getStringExtra(Const.Key.INTENT_PERM);
-        if (perm != null) {
-            ActivityCompat.requestPermissions(this, new String[] { perm }, 0);
-        }
-
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ButterKnife.bind(this);
+        new MainActivity_ViewBinding(this);
 
         setSupportActionBar(toolbar);
 
@@ -81,13 +74,18 @@ public class MainActivity extends Activity
             }
         };
 
-        toolbarElevation = toolbar.getElevation();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            toolbarElevation = toolbar.getElevation();
+        }
 
         drawer.addDrawerListener(toggle);
         toggle.syncState();
 
-        if (savedInstanceState == null)
-            navigate(getIntent().getStringExtra(Const.Key.OPEN_SECTION));
+        if (savedInstanceState == null) {
+            String section = getIntent().getStringExtra(Const.Key.OPEN_SECTION);
+            fromShortcut = section != null;
+            navigate(section);
+        }
 
         navigationView.setNavigationItemSelectedListener(this);
     }
@@ -118,28 +116,19 @@ public class MainActivity extends Activity
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
+    public void onPublish(int topic, Object[] result) {
         recreate();
     }
 
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { getMagiskManager().reloadActivity };
-    }
-
     public void checkHideSection() {
-        MagiskManager mm = getMagiskManager();
         Menu menu = navigationView.getMenu();
-        menu.findItem(R.id.magiskhide).setVisible(
-                Shell.rootAccess() && mm.magiskVersionCode >= Const.MAGISK_VER.UNIFIED
-                        && mm.prefs.getBoolean(Const.Key.MAGISKHIDE, false));
-        menu.findItem(R.id.modules).setVisible(!mm.prefs.getBoolean(Const.Key.COREONLY, false) &&
-                Shell.rootAccess() && mm.magiskVersionCode >= 0);
-        menu.findItem(R.id.downloads).setVisible(!mm.prefs.getBoolean(Const.Key.COREONLY, false)
-                && Utils.checkNetworkStatus() && Shell.rootAccess() && mm.magiskVersionCode >= 0);
+        menu.findItem(R.id.magiskhide).setVisible(Shell.rootAccess() &&
+                (boolean) Config.get(Config.Key.MAGISKHIDE));
+        menu.findItem(R.id.modules).setVisible(Shell.rootAccess() && Config.magiskVersionCode >= 0);
+        menu.findItem(R.id.downloads).setVisible(Networking.checkNetworkStatus(this)
+                && Shell.rootAccess() && Config.magiskVersionCode >= 0);
         menu.findItem(R.id.log).setVisible(Shell.rootAccess());
-        menu.findItem(R.id.superuser).setVisible(Shell.rootAccess() &&
-                !(Const.USER_ID > 0 && mm.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED));
+        menu.findItem(R.id.superuser).setVisible(Utils.showSuperUser());
     }
 
     public void navigate(String item) {
@@ -164,16 +153,12 @@ public class MainActivity extends Activity
                 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) {
@@ -197,12 +182,7 @@ public class MainActivity extends Activity
                 displayFragment(new LogFragment(), false);
                 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;
+                displayFragment(new SettingsFragment(), true);
                 break;
         }
     }
@@ -214,6 +194,8 @@ public class MainActivity extends Activity
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
                 .replace(R.id.content_frame, navFragment)
                 .commitNow();
-        toolbar.setElevation(setElevation ? toolbarElevation : 0);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            toolbar.setElevation(setElevation ? toolbarElevation : 0);
+        }
     }
 }

app/src/full/java/com/topjohnwu/magisk/NoUIActivity.java

@@ -1,26 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Const;
-
-public class NoUIActivity extends Activity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        String[] perms = getIntent().getStringArrayExtra(Const.Key.INTENT_PERM);
-        if (perms != null) {
-            ActivityCompat.requestPermissions(this, perms, 0);
-        }
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        finish();
-    }
-}

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

@@ -1,126 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.AlertDialog;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.SearchView;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.adapters.ReposAdapter;
-import com.topjohnwu.magisk.asyncs.UpdateRepos;
-import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Topic;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-
-public class ReposFragment extends Fragment implements Topic.Subscriber {
-
-    private Unbinder unbinder;
-    private MagiskManager mm;
-    @BindView(R.id.recyclerView) RecyclerView recyclerView;
-    @BindView(R.id.empty_rv) TextView emptyRv;
-    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
-
-    public static ReposAdapter adapter;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_repos, container, false);
-        unbinder = ButterKnife.bind(this, view);
-        mm = getApplication();
-
-        mSwipeRefreshLayout.setRefreshing(mm.repoLoadDone.isPending());
-
-        mSwipeRefreshLayout.setOnRefreshListener(() -> {
-            recyclerView.setVisibility(View.VISIBLE);
-            emptyRv.setVisibility(View.GONE);
-            new UpdateRepos(true).exec();
-        });
-
-        getActivity().setTitle(R.string.downloads);
-
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        adapter = new ReposAdapter(mm.repoDB, mm.moduleMap);
-        recyclerView.setAdapter(adapter);
-        super.onResume();
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        adapter = null;
-    }
-
-    @Override
-    public void onTopicPublished(Topic topic) {
-        mSwipeRefreshLayout.setRefreshing(false);
-        recyclerView.setVisibility(adapter.getItemCount() == 0 ? View.GONE : View.VISIBLE);
-        emptyRv.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
-    }
-
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { mm.repoLoadDone };
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_repo, menu);
-        SearchView search = (SearchView) menu.findItem(R.id.repo_search).getActionView();
-        search.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                adapter.filter(newText);
-                return false;
-            }
-        });
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.repo_sort) {
-            new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.sorting_order)
-                .setSingleChoiceItems(R.array.sorting_orders, mm.repoOrder, (d, which) -> {
-                    mm.repoOrder = which;
-                    mm.prefs.edit().putInt(Const.Key.REPO_ORDER, mm.repoOrder).apply();
-                    adapter.notifyDBChanged();
-                    d.dismiss();
-                }).show();
-        }
-        return true;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-}

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

@@ -1,321 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.widget.Toolbar;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.asyncs.HideManager;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.receivers.DownloadReceiver;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.FingerprintHelper;
-import com.topjohnwu.magisk.utils.RootUtils;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-import java.io.IOException;
-import java.util.Locale;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class SettingsActivity extends Activity implements Topic.Subscriber {
-
-    @BindView(R.id.toolbar) Toolbar toolbar;
-
-    @Override
-    public int getDarkTheme() {
-        return R.style.AppTheme_StatusBar_Dark;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_settings);
-        ButterKnife.bind(this);
-
-        setSupportActionBar(toolbar);
-
-        toolbar.setNavigationOnClickListener(view -> finish());
-
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setTitle(R.string.settings);
-            ab.setDisplayHomeAsUpEnabled(true);
-        }
-
-        setFloating();
-
-        if (savedInstanceState == null) {
-            getSupportFragmentManager().beginTransaction().add(R.id.container, new SettingsFragment()).commit();
-        }
-
-    }
-
-    @Override
-    public void onTopicPublished(Topic topic) {
-        recreate();
-    }
-
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { getMagiskManager().reloadActivity };
-    }
-
-    public static class SettingsFragment extends PreferenceFragmentCompat
-            implements SharedPreferences.OnSharedPreferenceChangeListener, Topic.Subscriber {
-
-        private SharedPreferences prefs;
-        private PreferenceScreen prefScreen;
-
-        private ListPreference updateChannel, suAccess, autoRes, suNotification,
-                requestTimeout, multiuserMode, namespaceMode;
-        private MagiskManager mm;
-        private PreferenceCategory generalCatagory;
-
-        @Override
-        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-            setPreferencesFromResource(R.xml.app_settings, rootKey);
-            mm = Utils.getMagiskManager(getActivity());
-            prefs = mm.prefs;
-            prefScreen = getPreferenceScreen();
-
-            generalCatagory = (PreferenceCategory) findPreference("general");
-            PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
-            PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
-            Preference hideManager = findPreference("hide");
-            Preference restoreManager = findPreference("restore");
-            findPreference("clear").setOnPreferenceClickListener((pref) -> {
-                prefs.edit().remove(Const.Key.ETAG_KEY).apply();
-                mm.repoDB.clearRepo();
-                MagiskManager.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT);
-                return true;
-            });
-
-            updateChannel = (ListPreference) findPreference(Const.Key.UPDATE_CHANNEL);
-            suAccess = (ListPreference) findPreference(Const.Key.ROOT_ACCESS);
-            autoRes = (ListPreference) findPreference(Const.Key.SU_AUTO_RESPONSE);
-            requestTimeout = (ListPreference) findPreference(Const.Key.SU_REQUEST_TIMEOUT);
-            suNotification = (ListPreference) findPreference(Const.Key.SU_NOTIFICATION);
-            multiuserMode = (ListPreference) findPreference(Const.Key.SU_MULTIUSER_MODE);
-            namespaceMode = (ListPreference) findPreference(Const.Key.SU_MNT_NS);
-            SwitchPreference reauth = (SwitchPreference) findPreference(Const.Key.SU_REAUTH);
-            SwitchPreference fingerprint = (SwitchPreference) findPreference(Const.Key.SU_FINGERPRINT);
-
-            updateChannel.setOnPreferenceChangeListener((pref, o) -> {
-                mm.updateChannel = Integer.parseInt((String) o);
-                if (mm.updateChannel == Const.Value.CUSTOM_CHANNEL) {
-                    View v = LayoutInflater.from(getActivity()).inflate(R.layout.custom_channel_dialog, null);
-                    EditText url = v.findViewById(R.id.custom_url);
-                    url.setText(mm.prefs.getString(Const.Key.CUSTOM_CHANNEL, ""));
-                    new AlertDialog.Builder(getActivity())
-                            .setTitle(R.string.settings_update_custom)
-                            .setView(v)
-                            .setPositiveButton(R.string.ok, (d, i) ->
-                                    prefs.edit().putString(Const.Key.CUSTOM_CHANNEL,
-                                            url.getText().toString()).apply())
-                            .setNegativeButton(R.string.close, null)
-                            .show();
-                }
-                return true;
-            });
-
-            setSummary();
-
-            // Disable dangerous settings in secondary user
-            if (Const.USER_ID > 0) {
-                suCategory.removePreference(multiuserMode);
-            }
-
-            // Disable re-authentication option on Android O, it will not work
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                reauth.setEnabled(false);
-                reauth.setSummary(R.string.android_o_not_support);
-            }
-
-            // Disable fingerprint option if not possible
-            if (!FingerprintHelper.canUseFingerprint()) {
-                fingerprint.setEnabled(false);
-                fingerprint.setSummary(R.string.disable_fingerprint);
-            }
-
-            if (mm.magiskVersionCode >= Const.MAGISK_VER.MANAGER_HIDE) {
-                if (mm.getPackageName().equals(Const.ORIG_PKG_NAME)) {
-                    hideManager.setOnPreferenceClickListener((pref) -> {
-                        new HideManager(getActivity()).exec();
-                        return true;
-                    });
-                    generalCatagory.removePreference(restoreManager);
-                } else {
-                    if (Utils.checkNetworkStatus()) {
-                        restoreManager.setOnPreferenceClickListener((pref) -> {
-                            Utils.dlAndReceive(
-                                getActivity(), new DownloadReceiver() {
-                                    @Override
-                                    public void onDownloadDone(Context context, Uri uri) {
-                                        mm.dumpPrefs();
-                                        if (ShellUtils.fastCmdResult("pm install " + uri.getPath()))
-                                            RootUtils.uninstallPkg(context.getPackageName());
-                                    }
-                                },
-                                mm.managerLink,
-                                Utils.fmt("MagiskManager-v%s.apk", mm.remoteManagerVersionString)
-                            );
-                            return true;
-                        });
-                    } else {
-                        generalCatagory.removePreference(restoreManager);
-                    }
-                    generalCatagory.removePreference(hideManager);
-                }
-            } else {
-                generalCatagory.removePreference(restoreManager);
-                generalCatagory.removePreference(hideManager);
-            }
-
-            if (!Shell.rootAccess() || (Const.USER_ID > 0 &&
-                    mm.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
-                prefScreen.removePreference(suCategory);
-            }
-
-            if (!Shell.rootAccess()) {
-                prefScreen.removePreference(magiskCategory);
-                generalCatagory.removePreference(hideManager);
-            } else if (mm.magiskVersionCode < Const.MAGISK_VER.UNIFIED) {
-                prefScreen.removePreference(magiskCategory);
-            }
-        }
-
-        private void setLocalePreference(ListPreference lp) {
-            CharSequence[] entries = new CharSequence[mm.locales.size() + 1];
-            CharSequence[] entryValues = new CharSequence[mm.locales.size() + 1];
-            entries[0] = Utils.getLocaleString(MagiskManager.defaultLocale, R.string.system_default);
-            entryValues[0] = "";
-            int i = 1;
-            for (Locale locale : mm.locales) {
-                entries[i] = locale.getDisplayName(locale);
-                entryValues[i++] = locale.toLanguageTag();
-            }
-            lp.setEntries(entries);
-            lp.setEntryValues(entryValues);
-            lp.setSummary(MagiskManager.locale.getDisplayName(MagiskManager.locale));
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-            prefs.registerOnSharedPreferenceChangeListener(this);
-            subscribeTopics();
-            return super.onCreateView(inflater, container, savedInstanceState);
-        }
-
-        @Override
-        public void onDestroyView() {
-            prefs.unregisterOnSharedPreferenceChangeListener(this);
-            unsubscribeTopics();
-            super.onDestroyView();
-        }
-
-        @Override
-        public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
-
-            switch (key) {
-                case Const.Key.DARK_THEME:
-                    mm.isDarkTheme = prefs.getBoolean(key, false);
-                    mm.reloadActivity.publish(false);
-                    return;
-                case Const.Key.COREONLY:
-                    if (prefs.getBoolean(key, false)) {
-                        try {
-                            Const.MAGISK_DISABLE_FILE.createNewFile();
-                        } catch (IOException ignored) {}
-                    } else {
-                        Const.MAGISK_DISABLE_FILE.delete();
-                    }
-                    Toast.makeText(getActivity(), R.string.settings_reboot_toast, Toast.LENGTH_LONG).show();
-                    break;
-                case Const.Key.MAGISKHIDE:
-                    if (prefs.getBoolean(key, false)) {
-                        Shell.Async.su("magiskhide --enable");
-                    } else {
-                        Shell.Async.su("magiskhide --disable");
-                    }
-                    break;
-                case Const.Key.HOSTS:
-                    if (prefs.getBoolean(key, false)) {
-                        Shell.Async.su(
-                                "cp -af /system/etc/hosts " + Const.MAGISK_HOST_FILE,
-                                "mount -o bind " + Const.MAGISK_HOST_FILE + " /system/etc/hosts");
-                    } else {
-                        Shell.Async.su(
-                                "umount -l /system/etc/hosts",
-                                "rm -f " + Const.MAGISK_HOST_FILE);
-                    }
-                    break;
-                case Const.Key.ROOT_ACCESS:
-                case Const.Key.SU_MULTIUSER_MODE:
-                case Const.Key.SU_MNT_NS:
-                    mm.mDB.setSettings(key, Utils.getPrefsInt(prefs, key));
-                    break;
-                case Const.Key.LOCALE:
-                    mm.setLocale();
-                    mm.reloadActivity.publish(false);
-                    break;
-                case Const.Key.UPDATE_CHANNEL:
-                    new CheckUpdates().exec();
-                    break;
-                case Const.Key.CHECK_UPDATES:
-                    mm.setupUpdateCheck();
-                    break;
-            }
-            mm.loadConfig();
-            setSummary();
-        }
-
-        private void setSummary() {
-            updateChannel.setSummary(getResources()
-                    .getStringArray(R.array.update_channel)[mm.updateChannel]);
-            suAccess.setSummary(getResources()
-                    .getStringArray(R.array.su_access)[mm.suAccessState]);
-            autoRes.setSummary(getResources()
-                    .getStringArray(R.array.auto_response)[mm.suResponseType]);
-            suNotification.setSummary(getResources()
-                    .getStringArray(R.array.su_notification)[mm.suNotificationType]);
-            requestTimeout.setSummary(
-                    getString(R.string.request_timeout_summary, prefs.getString(Const.Key.SU_REQUEST_TIMEOUT, "10")));
-            multiuserMode.setSummary(getResources()
-                    .getStringArray(R.array.multiuser_summary)[mm.multiuserMode]);
-            namespaceMode.setSummary(getResources()
-                    .getStringArray(R.array.namespace_summary)[mm.suNamespaceMode]);
-        }
-
-        @Override
-        public void onTopicPublished(Topic topic) {
-            setLocalePreference((ListPreference) findPreference(Const.Key.LOCALE));
-        }
-
-        @Override
-        public Topic[] getSubscription() {
-            return new Topic[] { mm.localeDone };
-        }
-    }
-
-}

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

@@ -1,88 +1,90 @@
 package com.topjohnwu.magisk;
 
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
 import android.content.Intent;
-import android.os.Build;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.text.TextUtils;
 
-import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.asyncs.LoadModules;
-import com.topjohnwu.magisk.asyncs.ParallelTask;
-import com.topjohnwu.magisk.asyncs.UpdateRepos;
-import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.receivers.ShortcutReceiver;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.magisk.tasks.UpdateRepos;
+import com.topjohnwu.magisk.uicomponents.Notifications;
+import com.topjohnwu.magisk.uicomponents.Shortcuts;
+import com.topjohnwu.magisk.utils.AppUtils;
+import com.topjohnwu.magisk.utils.LocaleManager;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.net.Networking;
 import com.topjohnwu.superuser.Shell;
 
-public class SplashActivity extends Activity {
+import androidx.appcompat.app.AlertDialog;
+
+public class SplashActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        RootUtils.init();
-        MagiskManager mm = getMagiskManager();
+        Shell.getShell(shell -> {
+            if (Config.magiskVersionCode > 0 &&
+                    Config.magiskVersionCode < Const.MAGISK_VER.MIN_SUPPORT) {
+                new AlertDialog.Builder(this)
+                        .setTitle(R.string.unsupport_magisk_title)
+                        .setMessage(R.string.unsupport_magisk_message)
+                        .setNegativeButton(R.string.ok, null)
+                        .setOnDismissListener(dialog -> finish())
+                        .show();
+            } else {
+                initAndStart();
+            }
+        });
+    }
 
-        mm.repoDB = new RepoDatabaseHelper(this);
-        mm.loadMagiskInfo();
-        mm.getDefaultInstallFlags();
-        mm.loadPrefs();
+    private void initAndStart() {
+        String pkg = Config.get(Config.Key.SU_MANAGER);
+        if (pkg != null && getPackageName().equals(BuildConfig.APPLICATION_ID)) {
+            Config.remove(Config.Key.SU_MANAGER);
+            Shell.su("pm uninstall " + pkg).submit();
+        }
+        if (TextUtils.equals(pkg, getPackageName())) {
+            try {
+                // We are the manager, remove com.topjohnwu.magisk as it could be malware
+                getPackageManager().getApplicationInfo(BuildConfig.APPLICATION_ID, 0);
+                Shell.su("pm uninstall " + BuildConfig.APPLICATION_ID).submit();
+            } catch (PackageManager.NameNotFoundException ignored) {}
+        }
 
         // Dynamic detect all locales
-        new LoadLocale().exec();
+        LocaleManager.loadAvailableLocales(R.string.app_changelog);
+
+        // Set default configs
+        Config.initialize();
 
         // Create notification channel on Android O
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel(Const.ID.NOTIFICATION_CHANNEL,
-                    getString(R.string.magisk_updates), NotificationManager.IMPORTANCE_DEFAULT);
-            getSystemService(NotificationManager.class).createNotificationChannel(channel);
-        }
+        Notifications.setup(this);
+
+        // Schedule periodic update checks
+        AppUtils.scheduleUpdateCheck();
 
         // Setup shortcuts
-        sendBroadcast(new Intent(this, ShortcutReceiver.class));
+        Shortcuts.setup(this);
 
-        LoadModules loadModuleTask = new LoadModules();
-
-        if (Utils.checkNetworkStatus()) {
-            // Fire update check
-            new CheckUpdates().exec();
-            // Add repo update check
-            loadModuleTask.setCallBack(() -> new UpdateRepos(false).exec());
-        }
+        // Create repo database
+        app.repoDB = new RepoDatabaseHelper(this);
 
         // Magisk working as expected
-        if (Shell.rootAccess() && mm.magiskVersionCode > 0) {
-            // Update check service
-            mm.setupUpdateCheck();
-            // Fire asynctasks
-            loadModuleTask.exec();
+        if (Shell.rootAccess() && Config.magiskVersionCode > 0) {
+            // Load modules
+            Utils.loadModules();
+            // Load repos
+            if (Networking.checkNetworkStatus(this))
+                new UpdateRepos().exec();
         }
 
-        // Write back default values
-        mm.writeConfig();
-
-        mm.hasInit = true;
-
-        Intent intent = new Intent(this, MainActivity.class);
+        Intent intent = new Intent(this, ClassMap.get(MainActivity.class));
         intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION));
-        intent.putExtra(Const.Key.INTENT_PERM, getIntent().getStringExtra(Const.Key.INTENT_PERM));
+        intent.putExtra(Const.Key.FROM_SPLASH, true);
+        intent.putExtra(BaseActivity.INTENT_PERM, getIntent().getStringExtra(BaseActivity.INTENT_PERM));
         startActivity(intent);
         finish();
     }
-
-    static class LoadLocale extends ParallelTask<Void, Void, Void> {
-        @Override
-        protected Void doInBackground(Void... voids) {
-            MagiskManager.get().locales = Utils.getAvailableLocale();
-            return null;
-        }
-        @Override
-        protected void onPostExecute(Void aVoid) {
-            MagiskManager.get().localeDone.publish();
-        }
-    }
 }

app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java

@@ -1,14 +1,12 @@
-package com.topjohnwu.magisk.superuser;
+package com.topjohnwu.magisk;
 
-import android.content.ContentValues;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.hardware.fingerprint.FingerprintManager;
-import android.net.LocalSocket;
-import android.net.LocalSocketAddress;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.CountDownTimer;
-import android.os.FileObserver;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.Window;
@@ -19,23 +17,19 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.ParallelTask;
-import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.container.Policy;
-import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
+import com.topjohnwu.magisk.utils.SuConnector;
 import com.topjohnwu.magisk.utils.Utils;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class RequestActivity extends Activity {
 
+public class SuRequestActivity extends BaseActivity {
     @BindView(R.id.su_popup) LinearLayout suPopup;
     @BindView(R.id.timeout) Spinner timeout;
     @BindView(R.id.app_icon) ImageView appIcon;
@@ -46,46 +40,17 @@ public class RequestActivity extends Activity {
     @BindView(R.id.fingerprint) ImageView fingerprintImg;
     @BindView(R.id.warning) TextView warning;
 
-    private String socketPath;
-    private LocalSocket socket;
-    private PackageManager pm;
-    private MagiskManager mm;
-
-    private boolean hasTimeout;
+    private SuConnector connector;
     private Policy policy;
     private CountDownTimer timer;
     private FingerprintHelper fingerprintHelper;
+    private SharedPreferences timeoutPrefs;
 
     @Override
     public int getDarkTheme() {
         return R.style.SuRequest_Dark;
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        pm = getPackageManager();
-        mm = Utils.getMagiskManager(this);
-        mm.mDB.clearOutdated();
-
-        Intent intent = getIntent();
-        socketPath = intent.getStringExtra("socket");
-        hasTimeout = intent.getBooleanExtra("timeout", true);
-
-        new FileObserver(socketPath) {
-            @Override
-            public void onEvent(int fileEvent, String path) {
-                if (fileEvent == FileObserver.DELETE_SELF) {
-                    finish();
-                }
-            }
-        }.startWatching();
-
-        new SocketManager(this).exec();
-    }
-
     @Override
     public void finish() {
         if (timer != null)
@@ -95,21 +60,60 @@ public class RequestActivity extends Activity {
         super.finish();
     }
 
-    private boolean cancelTimeout() {
-        timer.cancel();
-        deny_btn.setText(getString(R.string.deny));
-        return false;
+    @Override
+    public void onBackPressed() {
+        if (policy != null) {
+            handleAction(Policy.DENY);
+        } else {
+            finish();
+        }
     }
 
-    private void showRequest() {
-        switch (mm.suResponseType) {
-            case Const.Value.SU_AUTO_DENY:
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        PackageManager pm = getPackageManager();
+        app.mDB.clearOutdated();
+        timeoutPrefs = Utils.getDEContext().getSharedPreferences("su_timeout", 0);
+
+        // Get policy
+        Intent intent = getIntent();
+        try {
+            String socketName = intent.getStringExtra("socket");
+            connector = new SuConnector(socketName) {
+                @Override
+                protected void onResponse() throws IOException {
+                    out.writeInt(policy.policy);
+                }
+            };
+            Bundle bundle = connector.readSocketInput();
+            int uid = Integer.parseInt(bundle.getString("uid"));
+            policy = app.mDB.getPolicy(uid);
+            if (policy == null) {
+                policy = new Policy(uid, pm);
+            }
+        } catch (IOException | PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+            finish();
+            return;
+        }
+
+        // Never allow com.topjohnwu.magisk (could be malware)
+        if (TextUtils.equals(policy.packageName, BuildConfig.APPLICATION_ID)) {
+            finish();
+            return;
+        }
+
+        switch ((int) Config.get(Config.Key.SU_AUTO_RESPONSE)) {
+            case Config.Value.SU_AUTO_DENY:
                 handleAction(Policy.DENY, 0);
                 return;
-            case Const.Value.SU_AUTO_ALLOW:
+            case Config.Value.SU_AUTO_ALLOW:
                 handleAction(Policy.ALLOW, 0);
                 return;
-            case Const.Value.SU_PROMPT:
+            case Config.Value.SU_PROMPT:
             default:
         }
 
@@ -120,18 +124,26 @@ public class RequestActivity extends Activity {
         }
 
         setContentView(R.layout.activity_request);
-        ButterKnife.bind(this);
+        new SuRequestActivity_ViewBinding(this);
 
         appIcon.setImageDrawable(policy.info.loadIcon(pm));
         appNameView.setText(policy.appName);
         packageNameView.setText(policy.packageName);
+        if (Build.VERSION.SDK_INT >= 17) {
+            warning.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                    AppCompatResources.getDrawable(this, R.drawable.ic_warning), null, null, null);
+        } else {
+            warning.setCompoundDrawablesWithIntrinsicBounds(
+                    AppCompatResources.getDrawable(this, R.drawable.ic_warning), null, null, null);
+        }
 
         ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
                 R.array.allow_timeout, android.R.layout.simple_spinner_item);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         timeout.setAdapter(adapter);
+        timeout.setSelection(timeoutPrefs.getInt(policy.packageName, 0));
 
-        timer = new CountDownTimer(mm.suRequestTimeout * 1000, 1000) {
+        timer = new CountDownTimer((int) Config.get(Config.Key.SU_REQUEST_TIMEOUT) * 1000, 1000) {
             @Override
             public void onTick(long millisUntilFinished) {
                 deny_btn.setText(getString(R.string.deny_with_str, "(" + millisUntilFinished / 1000 + ")"));
@@ -143,9 +155,9 @@ public class RequestActivity extends Activity {
             }
         };
 
-        boolean useFingerprint = mm.prefs.getBoolean(Const.Key.SU_FINGERPRINT, false) && FingerprintHelper.canUseFingerprint();
+        boolean useFP = FingerprintHelper.useFingerprint();
 
-        if (useFingerprint) {
+        if (useFP) {
             try {
                 fingerprintHelper = new FingerprintHelper() {
                     @Override
@@ -168,14 +180,14 @@ public class RequestActivity extends Activity {
                         warning.setText(R.string.auth_fail);
                     }
                 };
-                fingerprintHelper.startAuth();
+                fingerprintHelper.authenticate();
             } catch (Exception e) {
                 e.printStackTrace();
-                useFingerprint = false;
+                useFP = false;
             }
         }
 
-        if (!useFingerprint) {
+        if (!useFP) {
             grant_btn.setOnClickListener(v -> {
                 handleAction(Policy.ALLOW);
                 timer.cancel();
@@ -183,8 +195,8 @@ public class RequestActivity extends Activity {
             grant_btn.requestFocus();
         }
 
-        grant_btn.setVisibility(useFingerprint ? View.GONE : View.VISIBLE);
-        fingerprintImg.setVisibility(useFingerprint ? View.VISIBLE : View.GONE);
+        grant_btn.setVisibility(useFP ? View.GONE : View.VISIBLE);
+        fingerprintImg.setVisibility(useFP ? View.VISIBLE : View.GONE);
 
         deny_btn.setOnClickListener(v -> {
             handleAction(Policy.DENY);
@@ -192,109 +204,32 @@ public class RequestActivity extends Activity {
         });
         suPopup.setOnClickListener(v -> cancelTimeout());
         timeout.setOnTouchListener((v, event) -> cancelTimeout());
-
-        if (hasTimeout) {
-            timer.start();
-        } else {
-            cancelTimeout();
-        }
+        timer.start();
     }
 
-    @Override
-    public void onBackPressed() {
-        if (policy != null) {
-            handleAction(Policy.DENY);
-        } else {
-            finish();
-        }
+    private boolean cancelTimeout() {
+        timer.cancel();
+        deny_btn.setText(getString(R.string.deny));
+        return false;
     }
 
-    void handleAction() {
-        String response;
-        if (policy.policy == Policy.ALLOW) {
-            response = "socket:ALLOW";
-        } else {
-            response = "socket:DENY";
-        }
-        try {
-            socket.getOutputStream().write((response).getBytes());
-            socket.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+    private void handleAction() {
+        connector.response();
         finish();
     }
 
-    void handleAction(int action) {
-        handleAction(action, Const.Value.timeoutList[timeout.getSelectedItemPosition()]);
+    private void handleAction(int action) {
+        int pos = timeout.getSelectedItemPosition();
+        timeoutPrefs.edit().putInt(policy.packageName, pos).apply();
+        handleAction(action, Config.Value.TIMEOUT_LIST[pos]);
     }
 
-    void handleAction(int action, int time) {
+    private void handleAction(int action, int time) {
         policy.policy = action;
         if (time >= 0) {
             policy.until = (time == 0) ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
-            mm.mDB.addPolicy(policy);
+            app.mDB.updatePolicy(policy);
         }
         handleAction();
     }
-
-    private class SocketManager extends ParallelTask<Void, Void, Boolean> {
-
-        SocketManager(Activity context) {
-            super(context);
-        }
-
-        @Override
-        protected Boolean doInBackground(Void... params) {
-            try {
-                socket = new LocalSocket();
-                socket.connect(new LocalSocketAddress(socketPath, LocalSocketAddress.Namespace.FILESYSTEM));
-
-                DataInputStream is = new DataInputStream(socket.getInputStream());
-                ContentValues payload = new ContentValues();
-
-                while (true) {
-                    int nameLen = is.readInt();
-                    byte[] nameBytes = new byte[nameLen];
-                    is.readFully(nameBytes);
-                    String name = new String(nameBytes);
-                    if (TextUtils.equals(name, "eof"))
-                        break;
-
-                    int dataLen = is.readInt();
-                    byte[] dataBytes = new byte[dataLen];
-                    is.readFully(dataBytes);
-                    String data = new String(dataBytes);
-                    payload.put(name, data);
-                }
-
-                if (payload.getAsInteger("uid") == null) {
-                    return false;
-                }
-
-                int uid = payload.getAsInteger("uid");
-                policy = mm.mDB.getPolicy(uid);
-                if (policy == null) {
-                    policy = new Policy(uid, pm);
-                }
-
-                /* Never allow com.topjohnwu.magisk (could be malware) */
-                if (TextUtils.equals(policy.packageName, Const.ORIG_PKG_NAME))
-                    return false;
-            } catch (Exception e) {
-                e.printStackTrace();
-                return false;
-            }
-            return true;
-        }
-
-        @Override
-        protected void onPostExecute(Boolean result) {
-            if (result) {
-                showRequest();
-            } else {
-                finish();
-            }
-        }
-    }
 }

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

@@ -1,68 +1,112 @@
 package com.topjohnwu.magisk.adapters;
 
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
+import android.os.AsyncTask;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
-import android.widget.Filter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.ParallelTask;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.ViewHolder> {
 
-    private List<ApplicationInfo> fullList, showList;
+    private static PackageInfo PLATFORM;
+
+    private List<PackageInfo> fullList, showList;
     private List<String> hideList;
     private PackageManager pm;
-    private ApplicationFilter filter;
+    private boolean showSystem;
 
-    public ApplicationAdapter() {
+    public ApplicationAdapter(Context context) {
         fullList = showList = Collections.emptyList();
         hideList = Collections.emptyList();
-        filter = new ApplicationFilter();
-        pm = MagiskManager.get().getPackageManager();
-        new LoadApps().exec();
+        pm = context.getPackageManager();
+        showSystem = false;
+        if (PLATFORM == null) {
+            try {
+                PLATFORM = pm.getPackageInfo("android", PackageManager.GET_SIGNATURES);
+            } catch (PackageManager.NameNotFoundException ignored) {}
+        }
+        AsyncTask.SERIAL_EXECUTOR.execute(this::loadApps);
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_app, parent, false);
+        return new ViewHolder(v);
+    }
+
+    @WorkerThread
+    private void loadApps() {
+        fullList = pm.getInstalledPackages(PackageManager.GET_SIGNATURES);
+        hideList = Shell.su("magiskhide --ls").exec().getOut();
+        for (Iterator<PackageInfo> i = fullList.iterator(); i.hasNext(); ) {
+            PackageInfo info = i.next();
+            if (Const.HIDE_BLACKLIST.contains(info.packageName) ||
+                    /* Do not show disabled apps */
+                    !info.applicationInfo.enabled ||
+                    /* Never show platform apps */
+                    PLATFORM.signatures[0].equals(info.signatures[0])) {
+                i.remove();
+            }
+        }
+        Collections.sort(fullList, (a, b) -> {
+            boolean ah = hideList.contains(a.packageName);
+            boolean bh = hideList.contains(b.packageName);
+            if (ah == bh) {
+                return Utils.getAppLabel(a.applicationInfo, pm)
+                        .compareToIgnoreCase(Utils.getAppLabel(b.applicationInfo, pm));
+            } else if (ah) {
+                return -1;
+            } else {
+                return 1;
+            }
+        });
+        Topic.publish(false, Topic.MAGISK_HIDE_DONE);
+    }
+
+    public void setShowSystem(boolean b) {
+        showSystem = b;
     }
 
     @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View mView = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_app, parent, false);
-        return new ViewHolder(mView);
-    }
-
-    @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
-        ApplicationInfo info = showList.get(position);
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        ApplicationInfo info = showList.get(position).applicationInfo;
 
         holder.appIcon.setImageDrawable(info.loadIcon(pm));
-        holder.appName.setText(info.loadLabel(pm));
+        holder.appName.setText(Utils.getAppLabel(info, pm));
         holder.appPackage.setText(info.packageName);
 
         holder.checkBox.setOnCheckedChangeListener(null);
         holder.checkBox.setChecked(hideList.contains(info.packageName));
         holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
             if (isChecked) {
-                Shell.Async.su("magiskhide --add " + info.packageName);
+                Shell.su("magiskhide --add " + info.packageName).submit();
                 hideList.add(info.packageName);
             } else {
-                Shell.Async.su("magiskhide --rm " + info.packageName);
+                Shell.su("magiskhide --rm " + info.packageName).submit();
                 hideList.remove(info.packageName);
             }
         });
@@ -73,12 +117,41 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
         return showList.size();
     }
 
+    private boolean contains(String s, String filter) {
+        return s.toLowerCase().contains(filter);
+    }
+
+    // Show if have launch intent or not system app
+    private boolean systemFilter(PackageInfo info) {
+        if (showSystem)
+            return true;
+        return (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0 ||
+                pm.getLaunchIntentForPackage(info.packageName) != null;
+    }
+
     public void filter(String constraint) {
-        filter.filter(constraint);
+        AsyncTask.SERIAL_EXECUTOR.execute(() -> {
+            showList = new ArrayList<>();
+            if (constraint == null || constraint.length() == 0) {
+                for (PackageInfo info : fullList) {
+                    if (systemFilter(info))
+                        showList.add(info);
+                }
+            } else {
+                String filter = constraint.toLowerCase();
+                for (PackageInfo info : fullList) {
+                    if ((contains(Utils.getAppLabel(info.applicationInfo, pm), filter) ||
+                            contains(info.packageName, filter)) && systemFilter(info)) {
+                        showList.add(info);
+                    }
+                }
+            }
+            UiThreadHandler.run(this::notifyDataSetChanged);
+        });
     }
 
     public void refresh() {
-        new LoadApps().exec();
+        AsyncTask.SERIAL_EXECUTOR.execute(this::loadApps);
     }
 
     static class ViewHolder extends RecyclerView.ViewHolder {
@@ -90,69 +163,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
 
         ViewHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
-        }
-    }
-
-    private class ApplicationFilter extends Filter {
-
-        private boolean lowercaseContains(String s, CharSequence filter) {
-            return !TextUtils.isEmpty(s) && s.toLowerCase().contains(filter);
-        }
-
-        @Override
-        protected FilterResults performFiltering(CharSequence constraint) {
-            if (constraint == null || constraint.length() == 0) {
-                showList = fullList;
-            } else {
-                showList = new ArrayList<>();
-                String filter = constraint.toString().toLowerCase();
-                for (ApplicationInfo info : fullList) {
-                    if (lowercaseContains(info.loadLabel(pm).toString(), filter)
-                            || lowercaseContains(info.packageName, filter)) {
-                        showList.add(info);
-                    }
-                }
-            }
-            return null;
-        }
-
-        @Override
-        protected void publishResults(CharSequence constraint, FilterResults results) {
-            notifyDataSetChanged();
-        }
-    }
-
-    private class LoadApps extends ParallelTask<Void, Void, Void> {
-
-        @Override
-        protected Void doInBackground(Void... voids) {
-            fullList = pm.getInstalledApplications(0);
-            hideList = Shell.Sync.su("magiskhide --ls");
-            for (Iterator<ApplicationInfo> i = fullList.iterator(); i.hasNext(); ) {
-                ApplicationInfo info = i.next();
-                if (Const.HIDE_BLACKLIST.contains(info.packageName) || !info.enabled) {
-                    i.remove();
-                }
-            }
-            Collections.sort(fullList, (a, b) -> {
-                boolean ah = hideList.contains(a.packageName);
-                boolean bh = hideList.contains(b.packageName);
-                if (ah == bh) {
-                    return a.loadLabel(pm).toString().toLowerCase().compareTo(
-                            b.loadLabel(pm).toString().toLowerCase());
-                } else if (ah) {
-                    return -1;
-                } else {
-                    return 1;
-                }
-            });
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            MagiskManager.get().magiskHideDone.publish(false);
+            new ApplicationAdapter$ViewHolder_ViewBinding(this, itemView);
         }
     }
 }

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

@@ -1,8 +1,6 @@
 package com.topjohnwu.magisk.adapters;
 
 import android.content.Context;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,15 +9,17 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.google.android.material.snackbar.Snackbar;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.uicomponents.SnackbarMaker;
 import com.topjohnwu.superuser.Shell;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHolder> {
 
@@ -29,6 +29,7 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
         mList = list;
     }
 
+    @NonNull
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_module, parent, false);
@@ -46,9 +47,9 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
         String noInfo = context.getString(R.string.no_info_provided);
 
         holder.title.setText(module.getName());
-        holder.versionName.setText( TextUtils.isEmpty(version) ? noInfo : version);
-        holder.author.setText( TextUtils.isEmpty(author) ? noInfo : context.getString(R.string.author, author));
-        holder.description.setText( TextUtils.isEmpty(description) ? noInfo : description);
+        holder.versionName.setText(TextUtils.isEmpty(version) ? noInfo : version);
+        holder.author.setText(TextUtils.isEmpty(author) ? noInfo : context.getString(R.string.author, author));
+        holder.description.setText(TextUtils.isEmpty(description) ? noInfo : description);
 
         holder.checkBox.setOnCheckedChangeListener(null);
         holder.checkBox.setChecked(module.isEnabled());
@@ -114,7 +115,7 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
 
         ViewHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new ModulesAdapter$ViewHolder_ViewBinding(this, itemView);
 
             if (!Shell.rootAccess()) {
                 checkBox.setEnabled(false);

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

@@ -2,42 +2,45 @@ package com.topjohnwu.magisk.adapters;
 
 import android.app.Activity;
 import android.content.pm.PackageManager;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.Switch;
 import android.widget.TextView;
 
+import com.google.android.material.snackbar.Snackbar;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
-import com.topjohnwu.magisk.components.ExpandableView;
-import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.container.Policy;
-import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
+import com.topjohnwu.magisk.database.MagiskDB;
+import com.topjohnwu.magisk.dialogs.CustomAlertDialog;
+import com.topjohnwu.magisk.dialogs.FingerprintAuthDialog;
+import com.topjohnwu.magisk.uicomponents.ArrowExpandedViewHolder;
+import com.topjohnwu.magisk.uicomponents.ExpandableViewHolder;
+import com.topjohnwu.magisk.uicomponents.SnackbarMaker;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder> {
 
     private List<Policy> policyList;
-    private MagiskDatabaseHelper dbHelper;
+    private MagiskDB dbHelper;
     private PackageManager pm;
-    private Set<Policy> expandList = new HashSet<>();
+    private boolean[] expandList;
 
-    public PolicyAdapter(List<Policy> list, MagiskDatabaseHelper db, PackageManager pm) {
+    public PolicyAdapter(List<Policy> list, MagiskDB db, PackageManager pm) {
         policyList = list;
+        expandList = new boolean[policyList.size()];
         dbHelper = db;
         this.pm = pm;
     }
 
+    @NonNull
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_policy, parent, false);
@@ -48,29 +51,48 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
     public void onBindViewHolder(ViewHolder holder, int position) {
         Policy policy = policyList.get(position);
 
-        holder.setExpanded(expandList.contains(policy));
-
-        holder.itemView.setOnClickListener(view -> {
-            if (holder.isExpanded()) {
-                holder.collapse();
-                expandList.remove(policy);
+        holder.settings.setExpanded(expandList[position]);
+        holder.trigger.setOnClickListener(view -> {
+            if (holder.settings.isExpanded()) {
+                holder.settings.collapse();
+                expandList[position] = false;
             } else {
-                holder.expand();
-                expandList.add(policy);
+                holder.settings.expand();
+                expandList[position] = true;
             }
         });
 
         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(null);
+        holder.loggingSwitch.setOnCheckedChangeListener(null);
+
+        holder.masterSwitch.setChecked(policy.policy == Policy.ALLOW);
+        holder.notificationSwitch.setChecked(policy.notification);
+        holder.loggingSwitch.setChecked(policy.logging);
+
+        holder.masterSwitch.setOnClickListener(v -> {
+            boolean isChecked = holder.masterSwitch.isChecked();
+            Runnable r = () -> {
+                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);
+                }
+            };
+            if (FingerprintHelper.useFingerprint()) {
+                holder.masterSwitch.setChecked(!isChecked);
+                new FingerprintAuthDialog((Activity) v.getContext(), () -> {
+                    holder.masterSwitch.setChecked(isChecked);
+                    r.run();
+                }).show();
+            } else {
+                r.run();
             }
         });
         holder.notificationSwitch.setOnCheckedChangeListener((v, isChecked) -> {
@@ -93,7 +115,7 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
                 dbHelper.updatePolicy(policy);
             }
         });
-        holder.delete.setOnClickListener(v -> new AlertDialogBuilder((Activity) v.getContext())
+        holder.delete.setOnClickListener(v -> new CustomAlertDialog((Activity) v.getContext())
                 .setTitle(R.string.su_revoke_title)
                 .setMessage(v.getContext().getString(R.string.su_revoke_msg, policy.appName))
                 .setPositiveButton(R.string.yes, (dialog, which) -> {
@@ -107,12 +129,6 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
                 .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);
-
-        // Hide for now
-        holder.moreInfo.setVisibility(View.GONE);
     }
 
     @Override
@@ -120,31 +136,26 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
         return policyList.size();
     }
 
-    static class ViewHolder extends RecyclerView.ViewHolder implements ExpandableView {
+    static class ViewHolder extends RecyclerView.ViewHolder {
 
         @BindView(R.id.app_name) TextView appName;
         @BindView(R.id.package_name) TextView packageName;
         @BindView(R.id.app_icon) ImageView appIcon;
-        @BindView(R.id.master_switch) Switch masterSwitch;
-        @BindView(R.id.notification_switch) Switch notificationSwitch;
-        @BindView(R.id.logging_switch) Switch loggingSwitch;
+        @BindView(R.id.master_switch) SwitchCompat masterSwitch;
+        @BindView(R.id.notification_switch) SwitchCompat notificationSwitch;
+        @BindView(R.id.logging_switch) SwitchCompat loggingSwitch;
         @BindView(R.id.expand_layout) ViewGroup expandLayout;
-
+        @BindView(R.id.arrow) ImageView arrow;
+        @BindView(R.id.trigger) View trigger;
         @BindView(R.id.delete) ImageView delete;
         @BindView(R.id.more_info) ImageView moreInfo;
 
-        private Container container = new Container();
+        ExpandableViewHolder settings;
 
         public ViewHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
-            container.expandLayout = expandLayout;
-            setupExpandable();
-        }
-
-        @Override
-        public Container getContainer() {
-            return container;
+            new PolicyAdapter$ViewHolder_ViewBinding(this, itemView);
+            settings = new ArrowExpandedViewHolder(expandLayout, arrow);
         }
     }
 }

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

@@ -1,33 +1,33 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.database.Cursor;
-import android.support.v7.widget.RecyclerView;
+import android.os.Build;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.MarkDownWindow;
-import com.topjohnwu.magisk.asyncs.ProcessRepoZip;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.components.DownloadModuleService;
 import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.container.Repo;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.dialogs.CustomAlertDialog;
+import com.topjohnwu.magisk.uicomponents.MarkDownWindow;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, ReposAdapter.RepoHolder> {
 
@@ -90,31 +90,44 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
         Repo repo = repoPairs.get(section).second.get(position);
         Context context = holder.itemView.getContext();
 
-        holder.title.setText(repo.getName());
-        holder.versionName.setText(repo.getVersion());
+        String name = repo.getName();
+        String version = repo.getVersion();
         String author = repo.getAuthor();
-        holder.author.setText(TextUtils.isEmpty(author) ? null : context.getString(R.string.author, author));
-        holder.description.setText(repo.getDescription());
+        String description = repo.getDescription();
+        String noInfo = context.getString(R.string.no_info_provided);
+
+        holder.title.setText(TextUtils.isEmpty(name) ? noInfo : name);
+        holder.versionName.setText(TextUtils.isEmpty(version) ? noInfo : version);
+        holder.author.setText(TextUtils.isEmpty(author) ? noInfo : context.getString(R.string.author, author));
+        holder.description.setText(TextUtils.isEmpty(description) ? noInfo : description);
         holder.updateTime.setText(context.getString(R.string.updated_on, repo.getLastUpdateString()));
 
         holder.infoLayout.setOnClickListener(v ->
-                new MarkDownWindow((Activity) context, null, repo.getDetailUrl()).exec());
+                MarkDownWindow.show((BaseActivity) context, null, repo.getDetailUrl()));
 
         holder.downloadImage.setOnClickListener(v -> {
-            String filename = repo.getName() + "-" + repo.getVersion() + ".zip";
-            new AlertDialogBuilder((Activity) context)
-                    .setTitle(context.getString(R.string.repo_install_title, repo.getName()))
-                    .setMessage(context.getString(R.string.repo_install_msg, filename))
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.install, (d, i) ->
-                        new ProcessRepoZip((Activity) context, repo.getZipUrl(),
-                                Utils.getLegalFilename(filename), true).exec()
-                    )
-                    .setNeutralButton(R.string.download, (d, i) ->
-                        new ProcessRepoZip((Activity) context, repo.getZipUrl(),
-                                Utils.getLegalFilename(filename), false).exec())
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
+            new CustomAlertDialog((BaseActivity) context)
+                .setTitle(context.getString(R.string.repo_install_title, repo.getName()))
+                .setMessage(context.getString(R.string.repo_install_msg, repo.getDownloadFilename()))
+                .setCancelable(true)
+                .setPositiveButton(R.string.install, (d, i) ->
+                        startDownload((BaseActivity) context, repo, true))
+                .setNeutralButton(R.string.download, (d, i) ->
+                        startDownload((BaseActivity) context, repo, false))
+                .setNegativeButton(R.string.no_thanks, null)
+                .show();
+        });
+    }
+
+    private void startDownload(BaseActivity activity, Repo repo, Boolean install) {
+        activity.runWithExternalRW(() -> {
+            Intent intent = new Intent(activity, ClassMap.get(DownloadModuleService.class))
+                    .putExtra("repo", repo).putExtra("install", install);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                activity.startForegroundService(intent);
+            } else {
+                activity.startService(intent);
+            }
         });
     }
 
@@ -169,7 +182,7 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
 
         SectionHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new ReposAdapter$SectionHolder_ViewBinding(this, itemView);
         }
     }
 
@@ -179,13 +192,13 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
         @BindView(R.id.version_name) TextView versionName;
         @BindView(R.id.description) TextView description;
         @BindView(R.id.author) TextView author;
-        @BindView(R.id.info_layout) LinearLayout infoLayout;
+        @BindView(R.id.info_layout) View infoLayout;
         @BindView(R.id.download) ImageView downloadImage;
         @BindView(R.id.update_time) TextView updateTime;
 
         RepoHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new ReposAdapter$RepoHolder_ViewBinding(this, itemView);
         }
 
     }

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

@@ -1,15 +1,18 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 public abstract class SectionedAdapter<S extends RecyclerView.ViewHolder, C extends RecyclerView.ViewHolder>
         extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private static final int SECTION_TYPE = Integer.MIN_VALUE;
 
+    @NonNull
     @Override
-    final public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    final public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         if (viewType == SECTION_TYPE)
             return onCreateSectionViewHolder(parent);
         return onCreateItemViewHolder(parent, viewType);
@@ -17,7 +20,7 @@ public abstract class SectionedAdapter<S extends RecyclerView.ViewHolder, C exte
 
     @Override
     @SuppressWarnings("unchecked")
-    final public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+    final public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         PositionInfo info = getPositionInfo(position);
         if (info.position == -1)
             onBindSectionViewHolder((S) holder, info.section);

app/src/full/java/com/topjohnwu/magisk/adapters/StringListAdapter.java

@@ -0,0 +1,103 @@
+package com.topjohnwu.magisk.adapters;
+
+import android.app.Activity;
+import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.List;
+
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+public abstract class StringListAdapter<VH extends StringListAdapter.ViewHolder>
+        extends RecyclerView.Adapter<VH> {
+
+    private RecyclerView rv;
+    private boolean dynamic;
+    private int screenWidth;
+    private int txtWidth = -1;
+    private int padding;
+
+    protected List<String> mList;
+
+    public StringListAdapter(List<String> list) {
+        this(list, false);
+    }
+
+    public StringListAdapter(List<String> list, boolean isDynamic) {
+        mList = list;
+        dynamic = isDynamic;
+    }
+
+    @NonNull
+    @Override
+    public final VH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(itemLayoutRes(), parent, false);
+        VH vh = createViewHolder(v);
+        if (txtWidth < 0)
+            onUpdateTextWidth(vh);
+        return vh;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull VH holder, int position) {
+        holder.txt.setText(mList.get(position));
+        holder.txt.getLayoutParams().width = txtWidth;
+        if (dynamic)
+            onUpdateTextWidth(holder);
+    }
+
+    protected void onUpdateTextWidth(VH vh) {
+        if (txtWidth < 0) {
+            txtWidth = screenWidth - padding;
+        } else {
+            vh.txt.measure(0, 0);
+            int width = vh.txt.getMeasuredWidth();
+            if (width > txtWidth) {
+                txtWidth = width;
+                vh.txt.getLayoutParams().width = txtWidth;
+            }
+        }
+        if (rv.getWidth() != txtWidth + padding)
+            rv.requestLayout();
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(@NonNull RecyclerView rv) {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        ((Activity) rv.getContext()).getWindowManager()
+                .getDefaultDisplay().getMetrics(displayMetrics);
+        screenWidth = displayMetrics.widthPixels;
+        padding = rv.getPaddingLeft() + rv.getPaddingRight();
+        this.rv = rv;
+    }
+
+    @Override
+    public final int getItemCount() {
+        return mList.size();
+    }
+
+    @LayoutRes
+    protected abstract int itemLayoutRes();
+
+    @NonNull
+    public abstract VH createViewHolder(@NonNull View v);
+
+    public static abstract class ViewHolder extends RecyclerView.ViewHolder {
+
+        public TextView txt;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            txt = itemView.findViewById(textViewResId());
+        }
+
+        @IdRes
+        protected abstract int textViewResId();
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.database.Cursor;
-import android.support.v7.widget.RecyclerView;
+import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,40 +10,39 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.ExpandableView;
 import com.topjohnwu.magisk.container.SuLogEntry;
-import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
+import com.topjohnwu.magisk.database.MagiskDB;
+import com.topjohnwu.magisk.uicomponents.ExpandableViewHolder;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, SuLogAdapter.LogViewHolder> {
 
-    private List<List<Integer>> logEntryList;
+    private List<List<SuLogEntry>> logEntries;
     private Set<Integer> itemExpanded, sectionExpanded;
-    private MagiskDatabaseHelper suDB;
-    private Cursor suLogCursor = null;
+    private MagiskDB suDB;
 
-    public SuLogAdapter(MagiskDatabaseHelper db) {
+    public SuLogAdapter(MagiskDB db) {
         suDB = db;
-        logEntryList = Collections.emptyList();
+        logEntries = Collections.emptyList();
         sectionExpanded = new HashSet<>();
         itemExpanded = new HashSet<>();
     }
 
     @Override
     public int getSectionCount() {
-        return logEntryList.size();
+        return logEntries.size();
     }
 
     @Override
     public int getItemCount(int section) {
-        return sectionExpanded.contains(section) ? logEntryList.get(section).size() : 0;
+        return sectionExpanded.contains(section) ? logEntries.get(section).size() : 0;
     }
 
     @Override
@@ -61,8 +59,7 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
 
     @Override
     public void onBindSectionViewHolder(SectionHolder holder, int section) {
-        suLogCursor.moveToPosition(logEntryList.get(section).get(0));
-        SuLogEntry entry = new SuLogEntry(suLogCursor);
+        SuLogEntry entry = logEntries.get(section).get(0);
         holder.arrow.setRotation(sectionExpanded.contains(section) ? 180 : 0);
         holder.itemView.setOnClickListener(v -> {
             RotateAnimation rotate;
@@ -70,11 +67,11 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
                 holder.arrow.setRotation(0);
                 rotate = new RotateAnimation(180, 0, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
                 sectionExpanded.remove(section);
-                notifyItemRangeRemoved(getItemPosition(section, 0), logEntryList.get(section).size());
+                notifyItemRangeRemoved(getItemPosition(section, 0), logEntries.get(section).size());
             } else {
                 rotate = new RotateAnimation(0, 180, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
                 sectionExpanded.add(section);
-                notifyItemRangeInserted(getItemPosition(section, 0), logEntryList.get(section).size());
+                notifyItemRangeInserted(getItemPosition(section, 0), logEntries.get(section).size());
             }
             rotate.setDuration(300);
             rotate.setFillAfter(true);
@@ -85,32 +82,29 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
 
     @Override
     public void onBindItemViewHolder(LogViewHolder holder, int section, int position) {
-        int sqlPosition = logEntryList.get(section).get(position);
-        suLogCursor.moveToPosition(sqlPosition);
-        SuLogEntry entry = new SuLogEntry(suLogCursor);
-        holder.setExpanded(itemExpanded.contains(sqlPosition));
+        SuLogEntry entry = logEntries.get(section).get(position);
+        int realIdx = getItemPosition(section, position);
+        holder.expandable.setExpanded(itemExpanded.contains(realIdx));
         holder.itemView.setOnClickListener(view -> {
-            if (holder.isExpanded()) {
-                holder.collapse();
-                itemExpanded.remove(sqlPosition);
+            if (holder.expandable.isExpanded()) {
+                holder.expandable.collapse();
+                itemExpanded.remove(realIdx);
             } else {
-                holder.expand();
-                itemExpanded.add(sqlPosition);
+                holder.expandable.expand();
+                itemExpanded.add(realIdx);
             }
         });
+        Context context = holder.itemView.getContext();
         holder.appName.setText(entry.appName);
         holder.action.setText(entry.action ? R.string.grant : R.string.deny);
-        holder.command.setText(entry.command);
-        holder.fromPid.setText(String.valueOf(entry.fromPid));
-        holder.toUid.setText(String.valueOf(entry.toUid));
+        holder.pid.setText(context.getString(R.string.pid, entry.fromPid));
+        holder.uid.setText(context.getString(R.string.target_uid, entry.toUid));
+        holder.command.setText(context.getString(R.string.command, entry.command));
         holder.time.setText(entry.getTimeString());
     }
 
     public void notifyDBChanged() {
-        if (suLogCursor != null)
-            suLogCursor.close();
-        suLogCursor = suDB.getLogCursor();
-        logEntryList = suDB.getLogStructure();
+        logEntries = suDB.getLogs();
         itemExpanded.clear();
         sectionExpanded.clear();
         sectionExpanded.add(0);
@@ -124,32 +118,26 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
 
         SectionHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new SuLogAdapter$SectionHolder_ViewBinding(this, itemView);
         }
     }
 
-    static class LogViewHolder extends RecyclerView.ViewHolder implements ExpandableView {
+    static class LogViewHolder extends RecyclerView.ViewHolder {
 
         @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.pid) TextView pid;
+        @BindView(R.id.uid) TextView uid;
+        @BindView(R.id.cmd) TextView command;
         @BindView(R.id.expand_layout) ViewGroup expandLayout;
 
-        private Container container = new Container();
+        ExpandableViewHolder expandable;
 
         LogViewHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
-            container.expandLayout = expandLayout;
-            setupExpandable();
-        }
-
-        @Override
-        public Container getContainer() {
-            return container;
+            new SuLogAdapter$LogViewHolder_ViewBinding(this, itemView);
+            expandable = new ExpandableViewHolder(expandLayout);
         }
     }
 }

app/src/full/java/com/topjohnwu/magisk/adapters/TabFragmentAdapter.java

@@ -1,13 +1,13 @@
 package com.topjohnwu.magisk.adapters;
 
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
 public class TabFragmentAdapter extends FragmentPagerAdapter {
 
     private List<Fragment> fragmentList;

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

@@ -1,84 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.ISafetyNetHelper;
-import com.topjohnwu.magisk.utils.WebService;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-
-import dalvik.system.DexClassLoader;
-
-public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
-
-    public static final File dexPath =
-            new File(MagiskManager.get().getFilesDir().getParent() + "/snet", "snet.apk");
-    private ISafetyNetHelper helper;
-
-    public CheckSafetyNet(Activity activity) {
-        super(activity);
-    }
-
-    private void dlSnet() throws Exception {
-        Shell.Sync.sh("rm -rf " + dexPath.getParent());
-        dexPath.getParentFile().mkdir();
-        HttpURLConnection conn = WebService.request(Const.Url.SNET_URL, null);
-        try (
-                OutputStream out = new BufferedOutputStream(new FileOutputStream(dexPath));
-                InputStream in = new BufferedInputStream(conn.getInputStream())) {
-            ShellUtils.pump(in, out);
-        } finally {
-            conn.disconnect();
-        }
-    }
-
-    private void dyload() throws Exception {
-        DexClassLoader loader = new DexClassLoader(dexPath.getPath(), dexPath.getParent(),
-                null, ISafetyNetHelper.class.getClassLoader());
-        Class<?> clazz = loader.loadClass("com.topjohnwu.snet.SafetyNetHelper");
-        helper = (ISafetyNetHelper) clazz.getConstructors()[0]
-                .newInstance(getActivity(), (ISafetyNetHelper.Callback)
-                        code -> MagiskManager.get().safetyNetDone.publish(false, code));
-        if (helper.getVersion() != Const.SNET_VER) {
-            throw new Exception();
-        }
-    }
-
-    @Override
-    protected Exception doInBackground(Void... voids) {
-        try {
-            try {
-                dyload();
-            } catch (Exception e) {
-                // If dynamic load failed, try re-downloading and reload
-                dlSnet();
-                dyload();
-            }
-        } catch (Exception e) {
-            return e;
-        }
-
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Exception e) {
-        if (e == null) {
-            helper.attest();
-        } else {
-            e.printStackTrace();
-            MagiskManager.get().safetyNetDone.publish(false, -1);
-        }
-        super.onPostExecute(e);
-    }
-}

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

@@ -1,70 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import com.topjohnwu.magisk.BuildConfig;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.ShowUI;
-import com.topjohnwu.magisk.utils.WebService;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class CheckUpdates extends ParallelTask<Void, Void, Void> {
-
-    private boolean showNotification;
-
-    public CheckUpdates() {
-        this(false);
-    }
-
-    public CheckUpdates(boolean b) {
-        showNotification = b;
-    }
-
-    @Override
-    protected Void doInBackground(Void... voids) {
-        MagiskManager mm = MagiskManager.get();
-        String jsonStr = "";
-        switch (mm.updateChannel) {
-            case Const.Value.STABLE_CHANNEL:
-                jsonStr = WebService.getString(Const.Url.STABLE_URL);
-                break;
-            case Const.Value.BETA_CHANNEL:
-                jsonStr = WebService.getString(Const.Url.BETA_URL);
-                break;
-            case Const.Value.CUSTOM_CHANNEL:
-                jsonStr = WebService.getString(mm.prefs.getString(Const.Key.CUSTOM_CHANNEL, ""));
-                break;
-        }
-        try {
-            JSONObject json = new JSONObject(jsonStr);
-            JSONObject magisk = json.getJSONObject("magisk");
-            mm.remoteMagiskVersionString = magisk.getString("version");
-            mm.remoteMagiskVersionCode = magisk.getInt("versionCode");
-            mm.magiskLink = magisk.getString("link");
-            mm.magiskNoteLink = magisk.getString("note");
-            JSONObject manager = json.getJSONObject("app");
-            mm.remoteManagerVersionString = manager.getString("version");
-            mm.remoteManagerVersionCode = manager.getInt("versionCode");
-            mm.managerLink = manager.getString("link");
-            mm.managerNoteLink = manager.getString("note");
-            JSONObject uninstaller = json.getJSONObject("uninstaller");
-            mm.uninstallerLink = uninstaller.getString("link");
-        } catch (JSONException ignored) {}
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void v) {
-        MagiskManager mm = MagiskManager.get();
-        if (showNotification) {
-            if (BuildConfig.VERSION_CODE < mm.remoteManagerVersionCode) {
-                ShowUI.managerUpdateNotification();
-            } else if (mm.magiskVersionCode < mm.remoteMagiskVersionCode) {
-                ShowUI.magiskUpdateNotification();
-            }
-        }
-        mm.updateCheckDone.publish();
-        super.onPostExecute(v);
-    }
-}

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

@@ -1,109 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.view.View;
-
-import com.topjohnwu.magisk.FlashActivity;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ZipUtils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-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 ParallelTask<Void, Void, Integer> {
-
-    private Uri mUri;
-    private File mCachedFile;
-    private List<String> console, logs;
-
-    public FlashZip(Activity context, Uri uri, List<String> console, List<String> logs) {
-        super(context);
-        mUri = uri;
-        this.console = console;
-        this.logs = logs;
-        mCachedFile = new File(context.getCacheDir(), "install.zip");
-    }
-
-    private boolean unzipAndCheck() throws Exception {
-        ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android", true);
-        return ShellUtils.fastCmdResult("grep -q '#MAGISK' " + new File(mCachedFile.getParentFile(), "updater-script"));
-    }
-
-    @Override
-    protected Integer doInBackground(Void... voids) {
-        MagiskManager mm = MagiskManager.get();
-        try {
-            console.add("- Copying zip to temp directory");
-
-            mCachedFile.delete();
-            try (
-                InputStream in = mm.getContentResolver().openInputStream(mUri);
-                OutputStream out = new BufferedOutputStream(new FileOutputStream(mCachedFile))
-            ) {
-                if (in == null) throw new FileNotFoundException();
-                InputStream buf= new BufferedInputStream(in);
-                ShellUtils.pump(buf, out);
-            } catch (FileNotFoundException e) {
-                console.add("! Invalid Uri");
-                throw e;
-            } catch (IOException e) {
-                console.add("! Cannot copy to cache");
-                throw e;
-            }
-            if (!unzipAndCheck()) return 0;
-            console.add("- Installing " + Utils.getNameFromUri(mm, mUri));
-            Shell.Sync.su(console, logs,
-                    "cd " + mCachedFile.getParent(),
-                    "BOOTMODE=true sh update-binary dummy 1 " + mCachedFile + " || echo 'Failed!'"
-            );
-
-            if (TextUtils.equals(console.get(console.size() - 1), "Failed!"))
-                return -1;
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            return -1;
-        }
-        console.add("- All done!");
-        return 1;
-    }
-
-    // -1 = error, manual install; 0 = invalid zip; 1 = success
-    @Override
-    protected void onPostExecute(Integer result) {
-        FlashActivity activity = (FlashActivity) getActivity();
-        Shell.Async.su(
-                "rm -rf " + mCachedFile.getParent(),
-                "rm -rf " + Const.TMP_FOLDER_PATH
-        );
-        switch (result) {
-            case -1:
-                console.add("! Installation failed");
-                SnackbarMaker.showUri(getActivity(), mUri);
-                break;
-            case 0:
-                console.add("! This zip is not a Magisk Module!");
-                break;
-            case 1:
-                // Success
-                new LoadModules().exec();
-                break;
-        }
-        activity.reboot.setVisibility(result > 0 ? View.VISIBLE : View.GONE);
-        activity.buttonPanel.setVisibility(View.VISIBLE);
-    }
-}

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

@@ -1,95 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.PatchAPK;
-import com.topjohnwu.magisk.utils.RootUtils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.io.SuFile;
-import com.topjohnwu.superuser.io.SuFileOutputStream;
-
-import java.io.FileNotFoundException;
-import java.security.SecureRandom;
-
-public class HideManager extends ParallelTask<Void, Void, Boolean> {
-
-    private ProgressDialog dialog;
-
-    public HideManager(Activity activity) {
-        super(activity);
-    }
-
-    private String genPackageName(String prefix, int length) {
-        StringBuilder builder = new StringBuilder(length);
-        builder.append(prefix);
-        length -= prefix.length();
-        SecureRandom random = new SecureRandom();
-        String base = "abcdefghijklmnopqrstuvwxyz";
-        String alpha = base + base.toUpperCase();
-        String full = alpha + "0123456789..........";
-        char next, prev = '\0';
-        for (int i = 0; i < length; ++i) {
-            if (prev == '.' || i == length - 1 || i == 0) {
-                next = alpha.charAt(random.nextInt(alpha.length()));
-            } else {
-                next = full.charAt(random.nextInt(full.length()));
-            }
-            builder.append(next);
-            prev = next;
-        }
-        return builder.toString();
-    }
-
-    @Override
-    protected void onPreExecute() {
-        dialog = ProgressDialog.show(getActivity(),
-                getActivity().getString(R.string.hide_manager_toast),
-                getActivity().getString(R.string.hide_manager_toast2));
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... voids) {
-        MagiskManager mm = MagiskManager.get();
-
-        // Generate a new app with random package name
-        SuFile repack = new SuFile("/data/local/tmp/repack.apk");
-        String pkg = genPackageName("com.", Const.ORIG_PKG_NAME.length());
-
-        try {
-            if (!PatchAPK.patchPackageID(
-                    mm.getPackageCodePath(),
-                    new SuFileOutputStream(repack),
-                    Const.ORIG_PKG_NAME, pkg))
-                return false;
-        } catch (FileNotFoundException e) {
-            return false;
-        }
-
-        // Install the application
-        if (!ShellUtils.fastCmdResult(Shell.getShell(), "pm install " + repack))
-            return false;
-
-        repack.delete();
-
-        mm.mDB.setStrings(Const.Key.SU_MANAGER, pkg);
-        mm.dumpPrefs();
-        RootUtils.uninstallPkg(Const.ORIG_PKG_NAME);
-
-        return true;
-    }
-
-    @Override
-    protected void onPostExecute(Boolean b) {
-        dialog.dismiss();
-        if (!b) {
-            MagiskManager.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
-        }
-        super.onPostExecute(b);
-    }
-}

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

@@ -1,327 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.net.Uri;
-import android.os.Build;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.FlashActivity;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.container.TarEntry;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ZipUtils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.io.SuFileInputStream;
-import com.topjohnwu.utils.SignBoot;
-
-import org.kamranzafar.jtar.TarInputStream;
-import org.kamranzafar.jtar.TarOutputStream;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.AbstractList;
-import java.util.Arrays;
-import java.util.List;
-
-public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
-
-    private static final int PATCH_MODE = 0;
-    public static final int DIRECT_MODE = 1;
-    private static final int FIX_ENV_MODE = 2;
-    public static final int SECOND_SLOT_MODE = 3;
-
-    private Uri bootUri, mZip;
-    private List<String> console, logs;
-    private String mBoot;
-    private int mode;
-    private File installDir;
-    private ProgressDialog dialog;
-    private MagiskManager mm;
-
-    public InstallMagisk(Activity context, Uri zip) {
-        super(context);
-        mZip = zip;
-        mm = MagiskManager.get();
-        mode = FIX_ENV_MODE;
-    }
-
-    public InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip, int mode) {
-        this(context, zip);
-        this.console = console;
-        this.logs = logs;
-        this.mode = mode;
-    }
-
-    public InstallMagisk(FlashActivity context, List<String> console, List<String> logs, Uri zip, Uri boot) {
-        this(context, console, logs, zip, PATCH_MODE);
-        bootUri = boot;
-    }
-
-    @Override
-    protected void onPreExecute() {
-        if (mode == FIX_ENV_MODE) {
-            Activity a = getActivity();
-            dialog = ProgressDialog.show(a, a.getString(R.string.setup_title), a.getString(R.string.setup_msg));
-            console = new NOPList<>();
-        }
-    }
-
-    private void extractFiles(String arch) throws IOException {
-        console.add("- Extracting files");
-        try (InputStream in = mm.getContentResolver().openInputStream(mZip)) {
-            if (in == null) throw new FileNotFoundException();
-            BufferedInputStream buf = new BufferedInputStream(in);
-            buf.mark(Integer.MAX_VALUE);
-            ZipUtils.unzip(buf, installDir, arch + "/", true);
-            buf.reset();
-            ZipUtils.unzip(buf, installDir, "common/", true);
-            buf.reset();
-            ZipUtils.unzip(buf, installDir, "chromeos/", false);
-            buf.reset();
-            ZipUtils.unzip(buf, installDir, "META-INF/com/google/android/update-binary", true);
-            buf.close();
-        } catch (FileNotFoundException e) {
-            console.add("! Invalid Uri");
-            throw e;
-        } catch (IOException e) {
-            console.add("! Cannot unzip zip");
-            throw e;
-        }
-        Shell.Sync.sh(Utils.fmt("chmod -R 755 %s/*; %s/magiskinit -x magisk %s/magisk",
-                installDir, installDir, installDir));
-    }
-
-    private boolean dumpBoot() {
-        console.add("- Copying image locally");
-        // Copy boot image to local
-        try (InputStream in = mm.getContentResolver().openInputStream(bootUri);
-             OutputStream out = new FileOutputStream(mBoot)
-        ) {
-            if (in == null)
-                throw new FileNotFoundException();
-
-            InputStream src;
-            if (Utils.getNameFromUri(mm, bootUri).endsWith(".tar")) {
-                // Extract boot.img from tar
-                TarInputStream tar = new TarInputStream(new BufferedInputStream(in));
-                org.kamranzafar.jtar.TarEntry entry;
-                while ((entry = tar.getNextEntry()) != null) {
-                    if (entry.getName().equals("boot.img"))
-                        break;
-                }
-                src = tar;
-            } else {
-                // Direct copy raw image
-                src = new BufferedInputStream(in);
-            }
-            ShellUtils.pump(src, out);
-        } catch (FileNotFoundException e) {
-            console.add("! Invalid Uri");
-            return false;
-        } catch (IOException e) {
-            console.add("! Copy failed");
-            return false;
-        }
-        return true;
-    }
-
-    private File patchBoot() throws IOException {
-        boolean isSigned;
-        try (InputStream in = new SuFileInputStream(mBoot)) {
-            isSigned = SignBoot.verifySignature(in, null);
-            if (isSigned) {
-                console.add("- Boot image is signed with AVB 1.0");
-            }
-        } catch (IOException e) {
-            console.add("! Unable to check signature");
-            throw e;
-        }
-
-        // Patch boot image
-        Shell.Sync.sh(console, logs,
-                "cd " + installDir,
-                Utils.fmt("KEEPFORCEENCRYPT=%b KEEPVERITY=%b sh update-binary indep " +
-                                "boot_patch.sh %s || echo 'Failed!'",
-                        mm.keepEnc, mm.keepVerity, mBoot));
-
-        if (TextUtils.equals(console.get(console.size() - 1), "Failed!"))
-            return null;
-
-        Shell.Sync.sh("mv bin/busybox busybox",
-                "rm -rf magisk.apk bin boot.img update-binary",
-                "cd /");
-
-        File patched = new File(installDir, "new-boot.img");
-        if (isSigned) {
-            console.add("- Signing boot image with test keys");
-            File signed = new File(installDir, "signed.img");
-            try (InputStream in = new SuFileInputStream(patched);
-                 OutputStream out = new BufferedOutputStream(new FileOutputStream(signed))
-            ) {
-                SignBoot.doSignature("/boot", in, out, null, null);
-            }
-            Shell.Sync.su("mv -f " + signed + " " + patched);
-        }
-        return patched;
-    }
-
-    private void outputBoot(File patched) throws IOException {
-        switch (mode) {
-            case PATCH_MODE:
-                File dest = new File(Const.EXTERNAL_PATH, "patched_boot" + mm.bootFormat);
-                dest.getParentFile().mkdirs();
-                OutputStream out;
-                switch (mm.bootFormat) {
-                    case ".img.tar":
-                        out = new TarOutputStream(new BufferedOutputStream(new FileOutputStream(dest)));
-                        ((TarOutputStream) out).putNextEntry(new TarEntry(patched, "boot.img"));
-                        break;
-                    default:
-                    case ".img":
-                        out = new BufferedOutputStream(new FileOutputStream(dest));
-                        break;
-                }
-                try (InputStream in = new SuFileInputStream(patched)) {
-                    ShellUtils.pump(in, out);
-                    out.close();
-                }
-                Shell.Sync.su("rm -f " + patched);
-                console.add("");
-                console.add("****************************");
-                console.add(" Patched image is placed in ");
-                console.add(" " + dest + " ");
-                console.add("****************************");
-                break;
-            case SECOND_SLOT_MODE:
-            case DIRECT_MODE:
-                Shell.Sync.sh(console, logs,
-                        Utils.fmt("direct_install %s %s %s", patched, mBoot, installDir));
-                if (!mm.keepVerity)
-                    Shell.Sync.sh(console, logs, "find_dtbo_image", "patch_dtbo_image");
-                break;
-        }
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... voids) {
-        if (mode == FIX_ENV_MODE) {
-            installDir = new File("/data/adb/magisk");
-            Shell.Sync.sh("rm -rf /data/adb/magisk/*");
-        } else {
-            installDir = new File(
-                    (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ?
-                            mm.createDeviceProtectedStorageContext() : mm)
-                            .getFilesDir().getParent()
-                    , "install");
-            Shell.Sync.sh("rm -rf " + installDir);
-            installDir.mkdirs();
-        }
-
-        switch (mode) {
-            case PATCH_MODE:
-                mBoot = new File(installDir, "boot.img").getAbsolutePath();
-                if (!dumpBoot())
-                    return false;
-                break;
-            case DIRECT_MODE:
-                console.add("- Detecting target image");
-                mBoot = ShellUtils.fastCmd("find_boot_image", "echo \"$BOOTIMAGE\"");
-                break;
-            case SECOND_SLOT_MODE:
-                console.add("- Detecting target image");
-                char slot[] = ShellUtils.fastCmd("echo $SLOT").toCharArray();
-                if (slot[1] == 'a') slot[1] = 'b';
-                else slot[1] = 'a';
-                mBoot = ShellUtils.fastCmd("SLOT=" + String.valueOf(slot),
-                        "find_boot_image", "echo \"$BOOTIMAGE\"");
-                Shell.Async.su("mount_partitions");
-                break;
-            case FIX_ENV_MODE:
-                mBoot = "";
-                break;
-        }
-        if (mBoot == null) {
-            console.add("! Unable to detect target image");
-            return false;
-        }
-
-        console.add("- Target image: " + mBoot);
-
-        List<String> abis = Arrays.asList(Build.SUPPORTED_ABIS);
-        String arch;
-
-        if (mm.remoteMagiskVersionCode >= Const.MAGISK_VER.SEPOL_REFACTOR) {
-            // 32-bit only
-            if (abis.contains("x86")) arch = "x86";
-            else arch = "arm";
-        } else {
-            if (abis.contains("x86_64")) arch = "x64";
-            else if (abis.contains("arm64-v8a")) arch = "arm64";
-            else if (abis.contains("x86")) arch = "x86";
-            else arch = "arm";
-        }
-
-        console.add("- Device platform: " + Build.SUPPORTED_ABIS[0]);
-
-        try {
-            extractFiles(arch);
-            if (mode == FIX_ENV_MODE) {
-                Shell.Sync.sh("fix_env");
-            } else {
-                File patched = patchBoot();
-                if (patched == null)
-                    return false;
-                outputBoot(patched);
-                console.add("- All done!");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        if (mode == FIX_ENV_MODE) {
-            dialog.dismiss();
-            MagiskManager.toast(result ? R.string.setup_done : R.string.setup_fail, Toast.LENGTH_LONG);
-        } else {
-            // Running in FlashActivity
-            FlashActivity activity = (FlashActivity) getActivity();
-            if (!result) {
-                Shell.Async.sh("rm -rf " + installDir);
-                console.add("! Installation failed");
-                activity.reboot.setVisibility(View.GONE);
-            }
-            activity.buttonPanel.setVisibility(View.VISIBLE);
-        }
-    }
-
-    private static class NOPList<E> extends AbstractList<E> {
-        @Override
-        public E get(int index) {
-            return null;
-        }
-
-        @Override
-        public int size() {
-            return 0;
-        }
-
-        @Override
-        public void add(int index, E element) {}
-    }
-}

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

@@ -1,36 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.container.ValueSortedMap;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.superuser.Shell;
-
-import java.util.List;
-
-public class LoadModules extends ParallelTask<Void, Void, Void> {
-
-    private List<String> getModList() {
-        String command = "ls -d " + Const.MAGISK_PATH + "/* | grep -v lost+found";
-        return Shell.Sync.su(command);
-    }
-
-    @Override
-    protected Void doInBackground(Void... voids) {
-        MagiskManager mm = MagiskManager.get();
-        mm.moduleMap = new ValueSortedMap<>();
-
-        for (String path : getModList()) {
-            Module module = new Module(path);
-            mm.moduleMap.put(module.getId(), module);
-        }
-
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void v) {
-        MagiskManager.get().moduleLoadDone.publish();
-        super.onPostExecute(v);
-    }
-}

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

@@ -1,86 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.support.v7.app.AlertDialog;
-import android.webkit.WebView;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.WebService;
-import com.topjohnwu.superuser.ShellUtils;
-
-import org.commonmark.node.Node;
-import org.commonmark.parser.Parser;
-import org.commonmark.renderer.html.HtmlRenderer;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class MarkDownWindow extends ParallelTask<Void, Void, String> {
-
-    private String mTitle;
-    private String mUrl;
-    private InputStream is;
-
-
-    public MarkDownWindow(Activity context, String title, String url) {
-        super(context);
-        mTitle = title;
-        mUrl = url;
-    }
-
-    public MarkDownWindow(Activity context, String title, InputStream in) {
-        super(context);
-        mTitle = title;
-        is = in;
-    }
-
-    @Override
-    protected String doInBackground(Void... voids) {
-        MagiskManager mm = MagiskManager.get();
-        String md;
-        if (mUrl != null) {
-            md = WebService.getString(mUrl);
-        } else {
-            try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-                ShellUtils.pump(is, out);
-                md = out.toString();
-                is.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-                return "";
-            }
-        }
-        String css;
-        try (
-            InputStream in = mm.getResources().openRawResource(
-                    mm.isDarkTheme ? R.raw.dark : R.raw.light);
-            ByteArrayOutputStream out = new ByteArrayOutputStream()
-        ) {
-            ShellUtils.pump(in, out);
-            css = out.toString();
-            in.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return "";
-        }
-        Parser parser = Parser.builder().build();
-        HtmlRenderer renderer = HtmlRenderer.builder().build();
-        Node doc = parser.parse(md);
-        return String.format("<style>%s</style>%s", css, renderer.render(doc));
-    }
-
-    @Override
-    protected void onPostExecute(String html) {
-        AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
-        alert.setTitle(mTitle);
-
-        WebView wv = new WebView(getActivity());
-        wv.loadDataWithBaseURL("fake://", html, "text/html", "UTF-8", null);
-
-        alert.setView(wv);
-        alert.setNegativeButton(R.string.close, (dialog, id) -> dialog.dismiss());
-        alert.show();
-    }
-}

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

@@ -1,39 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.os.AsyncTask;
-
-import java.lang.ref.WeakReference;
-
-public abstract class ParallelTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
-
-    private WeakReference<Activity> weakActivity;
-
-    private Runnable callback = null;
-
-    public ParallelTask() {}
-
-    public ParallelTask(Activity context) {
-        weakActivity = new WeakReference<>(context);
-    }
-
-    protected Activity getActivity() {
-        return weakActivity.get();
-    }
-
-    @SuppressWarnings("unchecked")
-    public ParallelTask<Params, Progress, Result> exec(Params... params) {
-        executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, params);
-        return this;
-    }
-
-    @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/full/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java

@@ -1,199 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.Manifest;
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.FlashActivity;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.WebService;
-import com.topjohnwu.magisk.utils.ZipUtils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-import java.util.jar.JarOutputStream;
-
-public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
-
-    private ProgressDialog progressDialog;
-    private boolean mInstall;
-    private String mLink;
-    private File mFile;
-    private int progress = 0, total = -1;
-    private Handler mHandler;
-
-    public ProcessRepoZip(Activity context, String link, String filename, boolean install) {
-        super(context);
-        mLink = link;
-        mFile = new File(Const.EXTERNAL_PATH, filename);
-        mInstall = install;
-        mHandler = new Handler();
-    }
-
-    private void removeTopFolder(File input, File output) throws IOException {
-        JarEntry entry;
-        try (
-            JarInputStream in = new JarInputStream(new BufferedInputStream(new FileInputStream(input)));
-            JarOutputStream out = new JarOutputStream(new BufferedOutputStream(new FileOutputStream(output)))
-        ) {
-            String path;
-            while ((entry = in.getNextJarEntry()) != null) {
-                // Remove the top directory from the path
-                path = entry.getName().substring(entry.getName().indexOf("/") + 1);
-                // If it's the top folder, ignore it
-                if (path.isEmpty()) {
-                    continue;
-                }
-                // Don't include placeholder
-                if (path.equals("system/placeholder")) {
-                    continue;
-                }
-                out.putNextEntry(new JarEntry(path));
-                ShellUtils.pump(in, out);
-            }
-        }
-    }
-
-    @Override
-    protected void onPreExecute() {
-        Activity activity = getActivity();
-        mFile.getParentFile().mkdirs();
-        progressDialog = ProgressDialog.show(activity, activity.getString(R.string.zip_download_title), activity.getString(R.string.zip_download_msg, 0));
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... params) {
-        Activity activity = getActivity();
-        if (activity == null) return null;
-        try {
-            // Request zip from Internet
-            HttpURLConnection conn;
-            do {
-                conn = WebService.request(mLink, null);
-                total = conn.getContentLength();
-                if (total < 0)
-                    conn.disconnect();
-                else
-                    break;
-            } while (true);
-
-            // Temp files
-            File temp1 = new File(activity.getCacheDir(), "1.zip");
-            File temp2 = new File(temp1.getParentFile(), "2.zip");
-            temp1.getParentFile().mkdir();
-
-            // First download the zip, Web -> temp1
-            try (
-                InputStream in = new BufferedInputStream(new ProgressInputStream(conn.getInputStream()));
-                OutputStream out = new BufferedOutputStream(new FileOutputStream(temp1))
-            ) {
-                ShellUtils.pump(in, out);
-                in.close();
-            }
-            conn.disconnect();
-
-            mHandler.post(() -> {
-                progressDialog.setTitle(R.string.zip_process_title);
-                progressDialog.setMessage(getActivity().getString(R.string.zip_process_msg));
-            });
-
-            // First remove top folder in Github source zip, temp1 -> temp2
-            removeTopFolder(temp1, temp2);
-
-            // Then sign the zip
-            ZipUtils.signZip(temp2, mFile);
-
-            // Delete temp files
-            temp1.delete();
-            temp2.delete();
-
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        Activity activity = getActivity();
-        if (activity == null) return;
-        progressDialog.dismiss();
-        if (result) {
-            Uri uri = Uri.fromFile(mFile);
-            if (Shell.rootAccess() && mInstall) {
-                Intent intent = new Intent(activity, FlashActivity.class);
-                intent.setData(uri).putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP);
-                activity.startActivity(intent);
-            } else {
-                SnackbarMaker.showUri(activity, uri);
-            }
-        } else {
-            MagiskManager.toast(R.string.process_error, Toast.LENGTH_LONG);
-        }
-        super.onPostExecute(result);
-    }
-
-    @Override
-    public ParallelTask<Void, Object, Boolean> exec(Void... voids) {
-        com.topjohnwu.magisk.components.Activity.runWithPermission(
-                getActivity(), new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE },
-                () -> super.exec(voids));
-        return this;
-    }
-
-    private class ProgressInputStream extends FilterInputStream {
-
-        ProgressInputStream(InputStream in) {
-            super(in);
-        }
-
-        private void updateDlProgress(int step) {
-            progress += step;
-            progressDialog.setMessage(getActivity().getString(R.string.zip_download_msg, (int) (100 * (double) progress / total + 0.5)));
-        }
-
-        @Override
-        public synchronized int read() throws IOException {
-            int b = super.read();
-            if (b > 0) {
-                mHandler.post(() -> updateDlProgress(1));
-            }
-            return b;
-        }
-
-        @Override
-        public int read(@NonNull byte[] b) throws IOException {
-            return read(b, 0, b.length);
-        }
-
-        @Override
-        public synchronized int read(@NonNull byte[] b, int off, int len) throws IOException {
-            int read = super.read(b, off, len);
-            if (read > 0) {
-                mHandler.post(() -> updateDlProgress(read));
-            }
-            return read;
-        }
-    }
-}

app/src/full/java/com/topjohnwu/magisk/asyncs/RestoreImages.java

@@ -1,39 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.superuser.ShellUtils;
-
-public class RestoreImages extends ParallelTask<Void, Void, Boolean> {
-
-    private ProgressDialog dialog;
-
-    public RestoreImages(Activity activity) {
-        super(activity);
-    }
-
-    @Override
-    protected void onPreExecute() {
-        Activity a = getActivity();
-        dialog = ProgressDialog.show(a, a.getString(R.string.restore_img), a.getString(R.string.restore_img_msg));
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... voids) {
-        return ShellUtils.fastCmdResult("restore_imgs");
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        dialog.cancel();
-        if (result) {
-            MagiskManager.toast(R.string.restore_done, Toast.LENGTH_SHORT);
-        } else {
-            MagiskManager.toast(R.string.restore_fail, Toast.LENGTH_LONG);
-        }
-    }
-}

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

@@ -1,210 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.database.Cursor;
-import android.os.AsyncTask;
-import android.text.TextUtils;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.ReposFragment;
-import com.topjohnwu.magisk.container.Repo;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.WebService;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.net.HttpURLConnection;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class UpdateRepos extends ParallelTask<Void, Void, Void> {
-
-    private static final int CHECK_ETAG = 0;
-    private static final int LOAD_NEXT = 1;
-    private static final int LOAD_PREV = 2;
-    private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
-
-    private MagiskManager mm;
-    private List<String> etags, newEtags = new LinkedList<>();
-    private Set<String> cached;
-    private boolean forceUpdate;
-    private AtomicInteger taskCount = new AtomicInteger(0);
-    final private Object allDone = new Object();
-
-    public UpdateRepos(boolean force) {
-        mm = MagiskManager.get();
-        mm.repoLoadDone.reset();
-        forceUpdate = force;
-    }
-
-    private void queueTask(Runnable task) {
-        // Thread pool's queue has an upper bound, batch it with 64 tasks
-        while (taskCount.get() >= 64) {
-            waitTasks();
-        }
-        taskCount.incrementAndGet();
-        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
-            task.run();
-            if (taskCount.decrementAndGet() == 0) {
-                synchronized (allDone) {
-                    allDone.notify();
-                }
-            }
-        });
-    }
-
-    private void waitTasks() {
-        if (taskCount.get() == 0)
-            return;
-        synchronized (allDone) {
-            try {
-                allDone.wait();
-            } catch (InterruptedException e) {
-                // Wait again
-                waitTasks();
-            }
-        }
-    }
-
-    private boolean loadJSON(String jsonString) throws JSONException, ParseException {
-        JSONArray jsonArray = new JSONArray(jsonString);
-
-        // Empty page, halt
-        if (jsonArray.length() == 0)
-            return false;
-
-        for (int i = 0; i < jsonArray.length(); i++) {
-            JSONObject rawRepo = jsonArray.getJSONObject(i);
-            String id = rawRepo.getString("description");
-            String name = rawRepo.getString("name");
-            Date date = dateFormat.parse(rawRepo.getString("pushed_at"));
-            Set<String> set = Collections.synchronizedSet(cached);
-            queueTask(() -> {
-                Repo repo = mm.repoDB.getRepo(id);
-                try {
-                    if (repo == null)
-                        repo = new Repo(name);
-                    else
-                        set.remove(id);
-                    repo.update(date);
-                    mm.repoDB.addRepo(repo);
-                    publishProgress();
-                } catch (Repo.IllegalRepoException e) {
-                    Logger.debug(e.getMessage());
-                    mm.repoDB.removeRepo(id);
-                }
-            });
-        }
-        return true;
-    }
-
-    private boolean loadPage(int page, int mode) {
-        Map<String, String> header = new HashMap<>();
-        if (mode == CHECK_ETAG && page < etags.size())
-            header.put(Const.Key.IF_NONE_MATCH, etags.get(page));
-        String url = Utils.fmt(Const.Url.REPO_URL, page + 1);
-
-        try {
-            HttpURLConnection conn = WebService.request(url, header);
-            if (conn.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {
-                // Current page is not updated, check the next page
-                return loadPage(page + 1, CHECK_ETAG);
-            }
-            if (!loadJSON(WebService.getString(conn)))
-                return mode != CHECK_ETAG;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-
-        /* If one page is updated, we force update all pages */
-
-        // Update ETAG
-        String etag = header.get(Const.Key.ETAG_KEY);
-        etag = etag.substring(etag.indexOf('\"'), etag.lastIndexOf('\"') + 1);
-        if (mode == LOAD_PREV) {
-            // We are loading a previous page, push the new tag to the front
-            newEtags.add(0, etag);
-        } else {
-            newEtags.add(etag);
-        }
-
-        String links = header.get(Const.Key.LINK_KEY);
-        if (links != null) {
-            for (String s : links.split(", ")) {
-                if (mode != LOAD_PREV && s.contains("next")) {
-                    // Force load all next pages
-                    loadPage(page + 1, LOAD_NEXT);
-                }
-                if (mode != LOAD_NEXT && s.contains("prev")) {
-                    // Back propagation
-                    loadPage(page - 1, LOAD_PREV);
-                }
-            }
-        }
-        return true;
-    }
-
-    @Override
-    protected void onProgressUpdate(Void... values) {
-        if (ReposFragment.adapter != null)
-            ReposFragment.adapter.notifyDBChanged();
-    }
-
-    @Override
-    protected void onPreExecute() {
-        mm.repoLoadDone.setPending();
-    }
-
-    @Override
-    protected Void doInBackground(Void... voids) {
-        etags = Arrays.asList(mm.prefs.getString(Const.Key.ETAG_KEY, "").split(","));
-        cached = mm.repoDB.getRepoIDSet();
-
-        if (loadPage(0, CHECK_ETAG)) {
-            waitTasks();
-
-            // The leftover cached means they are removed from online repo
-            mm.repoDB.removeRepo(cached);
-
-            // Update ETag
-            mm.prefs.edit().putString(Const.Key.ETAG_KEY, TextUtils.join(",", newEtags)).apply();
-        } else if (forceUpdate) {
-            Cursor c = mm.repoDB.getRawCursor();
-            while (c.moveToNext()) {
-                Repo repo = new Repo(c);
-                queueTask(() -> {
-                    try {
-                        repo.update();
-                        mm.repoDB.addRepo(repo);
-                    } catch (Repo.IllegalRepoException e) {
-                        Logger.debug(e.getMessage());
-                        mm.repoDB.removeRepo(repo);
-                    }
-                });
-            }
-            waitTasks();
-        }
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void v) {
-        mm.repoLoadDone.publish();
-        super.onPostExecute(v);
-    }
-}

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

@@ -1,89 +0,0 @@
-/*
- * Copyright 2016 dvdandroid
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.topjohnwu.magisk.components;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.R;
-
-/**
- * @author dvdandroid
- */
-public class AboutCardRow extends LinearLayout {
-
-    private final String title;
-    private final Drawable icon;
-
-    private final TextView mTitle;
-    private final TextView mSummary;
-    private final ImageView mIcon;
-
-    private final View mView;
-
-    public AboutCardRow(Context context) {
-        this(context, null);
-    }
-
-    public AboutCardRow(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public AboutCardRow(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        LayoutInflater.from(context).inflate(R.layout.info_item_row, this);
-        TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AboutCardRow, 0, 0);
-
-        try {
-            title = a.getString(R.styleable.AboutCardRow_text);
-            icon = a.getDrawable(R.styleable.AboutCardRow_icon);
-        } finally {
-            a.recycle();
-        }
-
-        mView = findViewById(R.id.container);
-
-        mTitle = (TextView) findViewById(android.R.id.title);
-        mSummary = (TextView) findViewById(android.R.id.summary);
-        mIcon = (ImageView) findViewById(android.R.id.icon);
-
-        mTitle.setText(title);
-        mIcon.setImageDrawable(icon);
-    }
-
-    @Override
-    public void setOnClickListener(OnClickListener l) {
-        super.setOnClickListener(l);
-
-        mView.setOnClickListener(l);
-    }
-
-    public void setSummary(String s) {
-        mSummary.setText(s);
-    }
-
-    public void removeSummary() {
-        mSummary.setVisibility(GONE);
-    }
-}

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

@@ -1,153 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.app.Activity;
-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.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;
-
-    private DialogInterface.OnClickListener positiveListener;
-    private DialogInterface.OnClickListener negativeListener;
-    private DialogInterface.OnClickListener neutralListener;
-
-    private AlertDialog dialog;
-
-    public AlertDialogBuilder(@NonNull Activity context) {
-        super(context);
-        setup();
-    }
-
-    public AlertDialogBuilder(@NonNull Activity 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 setTitle(int titleId) {
-        return super.setTitle(titleId);
-    }
-
-    @Override
-    public AlertDialog.Builder setView(int layoutResId) { return this; }
-
-    @Override
-    public AlertDialog.Builder setView(View view) { 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/full/java/com/topjohnwu/magisk/components/BaseActivity.java

@@ -0,0 +1,157 @@
+package com.topjohnwu.magisk.components;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.WindowManager;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.Topic;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+public abstract class BaseActivity extends AppCompatActivity implements Topic.AutoSubscriber {
+
+    public static final String INTENT_PERM = "perm_dialog";
+    private static Runnable grantCallback;
+
+    static int[] EMPTY_INT_ARRAY = new int[0];
+
+    private ActivityResultListener activityResultListener;
+    public App app = App.self;
+
+    static {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+    }
+
+    @Override
+    public int[] getSubscribedTopics() {
+        return EMPTY_INT_ARRAY;
+    }
+
+    @Override
+    public void onPublish(int topic, Object[] result) {}
+
+    @StyleRes
+    public int getDarkTheme() {
+        return -1;
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleManager.getLocaleContext(base, LocaleManager.locale));
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        Topic.subscribe(this);
+        if (getDarkTheme() != -1 && (boolean) Config.get(Config.Key.DARK_THEME)) {
+            setTheme(getDarkTheme());
+        }
+        super.onCreate(savedInstanceState);
+        String[] perms = getIntent().getStringArrayExtra(INTENT_PERM);
+        if (perms != null)
+            ActivityCompat.requestPermissions(this, perms, 0);
+    }
+
+    @Override
+    protected void onDestroy() {
+        Topic.unsubscribe(this);
+        super.onDestroy();
+    }
+
+    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);
+        }
+    }
+
+    public void runWithExternalRW(Runnable callback) {
+        runWithPermission(new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, callback);
+    }
+
+    public void runWithPermission(String[] permissions, Runnable callback) {
+        runWithPermission(this, permissions, callback);
+    }
+
+    public static void runWithPermission(Context context, String[] permissions, Runnable callback) {
+        boolean granted = true;
+        for (String perm : permissions) {
+            if (ContextCompat.checkSelfPermission(context, perm) != PackageManager.PERMISSION_GRANTED)
+                granted = false;
+        }
+        if (granted) {
+            Const.EXTERNAL_PATH.mkdirs();
+            callback.run();
+        } else {
+            // Passed in context should be an activity if not granted, need to show dialog!
+            if (context instanceof BaseActivity) {
+                grantCallback = callback;
+                ActivityCompat.requestPermissions((BaseActivity) context, permissions, 0);
+            }
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (activityResultListener != null)
+            activityResultListener.onActivityResult(requestCode, resultCode, data);
+        activityResultListener = null;
+    }
+
+    public void startActivityForResult(Intent intent, int requestCode, ActivityResultListener listener) {
+        activityResultListener = listener;
+        super.startActivityForResult(intent, requestCode);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        boolean grant = true;
+        for (int result : grantResults) {
+            if (result != PackageManager.PERMISSION_GRANTED)
+                grant = false;
+        }
+        if (grant) {
+            if (grantCallback != null) {
+                grantCallback.run();
+            }
+        } else {
+            Toast.makeText(this, R.string.no_rw_storage, Toast.LENGTH_LONG).show();
+        }
+        grantCallback = null;
+    }
+
+    public interface ActivityResultListener {
+        void onActivityResult(int requestCode, int resultCode, Intent data);
+    }
+
+    @Override
+    public SharedPreferences getSharedPreferences(String name, int mode) {
+        if (TextUtils.equals(name, getPackageName() + "_preferences"))
+            return app.prefs;
+        return super.getSharedPreferences(name, mode);
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java

@@ -0,0 +1,55 @@
+package com.topjohnwu.magisk.components;
+
+import android.content.Intent;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.utils.Topic;
+
+import androidx.fragment.app.Fragment;
+import butterknife.Unbinder;
+
+public abstract class BaseFragment extends Fragment implements Topic.AutoSubscriber {
+
+    public App app = App.self;
+    protected Unbinder unbinder = null;
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Topic.subscribe(this);
+    }
+
+    @Override
+    public void onPause() {
+        Topic.unsubscribe(this);
+        super.onPause();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if (unbinder != null)
+            unbinder.unbind();
+    }
+
+    @Override
+    public void startActivityForResult(Intent intent, int requestCode) {
+        startActivityForResult(intent, requestCode, this::onActivityResult);
+    }
+
+    public void startActivityForResult(Intent intent, int requestCode, BaseActivity.ActivityResultListener listener) {
+        ((BaseActivity) requireActivity()).startActivityForResult(intent, requestCode, listener);
+    }
+
+    public void runWithPermission(String[] permissions, Runnable callback) {
+        ((BaseActivity) requireActivity()).runWithPermission(permissions,callback);
+    }
+
+    @Override
+    public int[] getSubscribedTopics() {
+        return BaseActivity.EMPTY_INT_ARRAY;
+    }
+
+    @Override
+    public void onPublish(int topic, Object[] result) {}
+}

app/src/full/java/com/topjohnwu/magisk/components/BasePreferenceFragment.java

@@ -0,0 +1,81 @@
+package com.topjohnwu.magisk.components;
+
+import android.annotation.SuppressLint;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Topic;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceGroupAdapter;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+import androidx.recyclerview.widget.RecyclerView;
+
+public abstract class BasePreferenceFragment extends PreferenceFragmentCompat
+        implements SharedPreferences.OnSharedPreferenceChangeListener, Topic.AutoSubscriber {
+
+    public App app = App.self;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View v = super.onCreateView(inflater, container, savedInstanceState);
+        app.prefs.registerOnSharedPreferenceChangeListener(this);
+        Topic.subscribe(this);
+        return v;
+    }
+
+    @Override
+    public void onDestroyView() {
+        app.prefs.unregisterOnSharedPreferenceChangeListener(this);
+        Topic.unsubscribe(this);
+        super.onDestroyView();
+    }
+
+    @Override
+    public int[] getSubscribedTopics() {
+        return BaseActivity.EMPTY_INT_ARRAY;
+    }
+
+    @Override
+    protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {
+        return new PreferenceGroupAdapter(preferenceScreen) {
+            @SuppressLint("RestrictedApi")
+            @Override
+            public void onBindViewHolder(PreferenceViewHolder holder, int position) {
+                super.onBindViewHolder(holder, position);
+                Preference preference = getItem(position);
+                if (preference instanceof PreferenceCategory)
+                    setZeroPaddingToLayoutChildren(holder.itemView);
+                else {
+                    View iconFrame = holder.itemView.findViewById(R.id.icon_frame);
+                    if (iconFrame != null) {
+                        iconFrame.setVisibility(preference.getIcon() == null ? View.GONE : View.VISIBLE);
+                    }
+                }
+            }
+        };
+    }
+
+    private void setZeroPaddingToLayoutChildren(View view) {
+        if (!(view instanceof ViewGroup))
+            return;
+        ViewGroup viewGroup = (ViewGroup) view;
+        int childCount = viewGroup.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            setZeroPaddingToLayoutChildren(viewGroup.getChildAt(i));
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+                viewGroup.setPaddingRelative(0, viewGroup.getPaddingTop(), viewGroup.getPaddingEnd(), viewGroup.getPaddingBottom());
+            else
+                viewGroup.setPadding(0, viewGroup.getPaddingTop(), viewGroup.getPaddingRight(), viewGroup.getPaddingBottom());
+        }
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/DelegateWorker.java

@@ -0,0 +1,84 @@
+package com.topjohnwu.magisk.components;
+
+import android.content.Context;
+import android.net.Network;
+import android.net.Uri;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.work.Data;
+import androidx.work.ListenableWorker;
+
+public abstract class DelegateWorker {
+
+    private ListenableWorker worker;
+
+    @NonNull
+    public abstract ListenableWorker.Result doWork();
+
+    public void onStopped() {}
+
+    public void setActualWorker(ListenableWorker w) {
+        worker = w;
+    }
+
+    @NonNull
+    public Context getApplicationContext() {
+        return worker.getApplicationContext();
+    }
+
+    @NonNull
+    public UUID getId() {
+        return worker.getId();
+    }
+
+    @NonNull
+    public Data getInputData() {
+        return worker.getInputData();
+    }
+
+    @NonNull
+    public Set<String> getTags() {
+        return worker.getTags();
+    }
+
+    @NonNull
+    @RequiresApi(24)
+    public List<Uri> getTriggeredContentUris() {
+        return worker.getTriggeredContentUris();
+    }
+
+    @NonNull
+    @RequiresApi(24)
+    public List<String> getTriggeredContentAuthorities() {
+        return worker.getTriggeredContentAuthorities();
+    }
+
+    @Nullable
+    @RequiresApi(28)
+    public Network getNetwork() {
+        return worker.getNetwork();
+    }
+
+    public int getRunAttemptCount() {
+        return worker.getRunAttemptCount();
+    }
+
+    @NonNull
+    @MainThread
+    public ListenableFuture<ListenableWorker.Result> startWork() {
+        return worker.startWork();
+    }
+
+    public boolean isStopped() {
+        return worker.isStopped();
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/DownloadModuleService.java

@@ -0,0 +1,100 @@
+package com.topjohnwu.magisk.components;
+
+import android.app.Service;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.IBinder;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.FlashActivity;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.container.Repo;
+import com.topjohnwu.magisk.uicomponents.ProgressNotification;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+import androidx.annotation.Nullable;
+
+public class DownloadModuleService extends Service {
+
+    private boolean running = false;
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (flags == 0 && running) {
+            Utils.toast(R.string.dl_one_module, Toast.LENGTH_LONG);
+        } else {
+            running = true;
+            Shell.EXECUTOR.execute(() -> {
+                Repo repo = intent.getParcelableExtra("repo");
+                boolean install = intent.getBooleanExtra("install", false);
+                dlProcessInstall(repo, install);
+                stopSelf();
+            });
+        }
+        return START_REDELIVER_INTENT;
+    }
+
+    private void dlProcessInstall(Repo repo, boolean install) {
+        File output = new File(Const.EXTERNAL_PATH, repo.getDownloadFilename());
+        ProgressNotification progress = new ProgressNotification(output.getName());
+        startForeground(progress.hashCode(), progress.getNotification());
+        try {
+            InputStream in = Networking.get(repo.getZipUrl())
+                    .setDownloadProgressListener(progress)
+                    .execForInputStream().getResult();
+            removeTopFolder(in, new BufferedOutputStream(new FileOutputStream(output)));
+            if (install) {
+                progress.dismiss();
+                Intent intent = new Intent(this, ClassMap.get(FlashActivity.class));
+                intent.setData(Uri.fromFile(output))
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP);
+                startActivity(intent);
+            } else {
+                progress.dlDone();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            progress.dlFail();
+        }
+    }
+
+    private void removeTopFolder(InputStream in, OutputStream out) throws IOException {
+        try (ZipInputStream zin = new ZipInputStream(in);
+             ZipOutputStream zout = new ZipOutputStream(out)) {
+            ZipEntry entry;
+            int off = -1;
+            while ((entry = zin.getNextEntry()) != null) {
+                if (off < 0)
+                    off = entry.getName().indexOf('/') + 1;
+                String path = entry.getName().substring(off);
+                if (path.isEmpty())
+                    continue;
+                zout.putNextEntry(new ZipEntry(path));
+                if (!entry.isDirectory())
+                    ShellUtils.pump(zin, zout);
+            }
+        }
+    }
+}

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

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

app/src/full/java/com/topjohnwu/magisk/components/FlavorActivity.java

@@ -1,108 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.content.res.AssetManager;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.Nullable;
-import android.support.annotation.StyleRes;
-import android.support.v7.app.AppCompatActivity;
-import android.view.WindowManager;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Topic;
-
-public abstract class FlavorActivity extends AppCompatActivity {
-
-    private AssetManager swappedAssetManager = null;
-    private Resources swappedResources = null;
-    private Resources.Theme backupTheme = null;
-
-    @StyleRes
-    public int getDarkTheme() {
-        return -1;
-    }
-
-    public MagiskManager getMagiskManager() {
-        return (MagiskManager) super.getApplication();
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (this instanceof Topic.Subscriber) {
-            ((Topic.Subscriber) this).subscribeTopics();
-        }
-
-        if (getMagiskManager().isDarkTheme && getDarkTheme() != -1) {
-            setTheme(getDarkTheme());
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (this instanceof Topic.Subscriber) {
-            ((Topic.Subscriber) this).unsubscribeTopics();
-        }
-        super.onDestroy();
-    }
-
-    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);
-        }
-    }
-
-    @Override
-    public Resources.Theme getTheme() {
-        return backupTheme == null ? super.getTheme() : backupTheme;
-    }
-
-    @Override
-    public AssetManager getAssets() {
-        return swappedAssetManager == null ? super.getAssets() : swappedAssetManager;
-    }
-
-    private AssetManager getAssets(String apk) {
-        try {
-            AssetManager asset = AssetManager.class.newInstance();
-            AssetManager.class.getMethod("addAssetPath", String.class).invoke(asset, apk);
-            return asset;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    @Override
-    public Resources getResources() {
-        return swappedResources == null ? super.getResources() : swappedResources;
-    }
-
-    @Keep
-    public void swapResources(String dexPath) {
-        AssetManager asset = getAssets(dexPath);
-        if (asset != null) {
-            backupTheme = super.getTheme();
-            Resources res = super.getResources();
-            swappedResources = new Resources(asset, res.getDisplayMetrics(), res.getConfiguration());
-            swappedAssetManager = asset;
-        }
-    }
-
-    @Keep
-    public void restoreResources() {
-        swappedAssetManager = null;
-        swappedResources = null;
-        backupTheme = null;
-    }
-}

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

@@ -1,43 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.content.Intent;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
-
-public class Fragment extends android.support.v4.app.Fragment {
-
-    public MagiskManager getApplication() {
-        return Utils.getMagiskManager(getActivity());
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (this instanceof Topic.Subscriber) {
-            ((Topic.Subscriber) this).subscribeTopics();
-        }
-    }
-
-    @Override
-    public void onPause() {
-        if (this instanceof Topic.Subscriber) {
-            ((Topic.Subscriber) this).unsubscribeTopics();
-        }
-        super.onPause();
-    }
-
-    @Override
-    public void startActivityForResult(Intent intent, int requestCode) {
-        startActivityForResult(intent, requestCode, this::onActivityResult);
-    }
-
-    public void startActivityForResult(Intent intent, int requestCode, Activity.ActivityResultListener listener) {
-        ((Activity) getActivity()).startActivityForResult(intent, requestCode, listener);
-    }
-
-    public void runWithPermission(String[] permissions, Runnable callback) {
-        Activity.runWithPermission(getActivity(), permissions, callback);
-    }
-}

app/src/full/java/com/topjohnwu/magisk/components/GeneralReceiver.java

@@ -0,0 +1,99 @@
+package com.topjohnwu.magisk.components;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.SuRequestActivity;
+import com.topjohnwu.magisk.container.Policy;
+import com.topjohnwu.magisk.uicomponents.Notifications;
+import com.topjohnwu.magisk.uicomponents.Shortcuts;
+import com.topjohnwu.magisk.utils.DownloadApp;
+import com.topjohnwu.magisk.utils.SuLogger;
+import com.topjohnwu.superuser.Shell;
+
+public class GeneralReceiver extends BroadcastReceiver {
+
+    private static SuLogger SU_LOGGER = new SuLogger() {
+        @Override
+        public String getMessage(Policy policy) {
+            return App.self.getString(policy.policy == Policy.ALLOW ?
+                    R.string.su_allow_toast : R.string.su_deny_toast, policy.appName);
+        }
+    };
+
+    private String getPkg(Intent i) {
+        return i.getData() == null ? "" : i.getData().getEncodedSchemeSpecificPart();
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        App app = App.self;
+        if (intent == null)
+            return;
+        String action = intent.getAction();
+        if (action == null)
+            return;
+        switch (action) {
+            case Intent.ACTION_BOOT_COMPLETED:
+                String bootAction = intent.getStringExtra("action");
+                if (bootAction == null)
+                    bootAction = "boot";
+                switch (bootAction) {
+                    case "request":
+                        Intent i = new Intent(app, ClassMap.get(SuRequestActivity.class))
+                                .putExtra("socket", intent.getStringExtra("socket"))
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        app.startActivity(i);
+                        break;
+                    case "log":
+                        SU_LOGGER.handleLogs(intent);
+                        break;
+                    case "notify":
+                        SU_LOGGER.handleNotify(intent);
+                        break;
+                    case "boot":
+                    default:
+                        /* Devices with DTBO might want to patch dtbo.img.
+                         * However, that is not possible if Magisk is installed by
+                         * patching boot image with Magisk Manager and flashed via
+                         * fastboot, since at that time we do not have root.
+                         * Check for dtbo status every boot time, and prompt user
+                         * to reboot if dtbo wasn't patched and patched by Magisk Manager.
+                         * */
+                        Shell.su("mm_patch_dtbo").submit(result -> {
+                            if (result.isSuccess())
+                                Notifications.dtboPatched();
+                        });
+                        break;
+                }
+                break;
+            case Intent.ACTION_PACKAGE_REPLACED:
+                // This will only work pre-O
+                if (Config.get(Config.Key.SU_REAUTH)) {
+                    app.mDB.deletePolicy(getPkg(intent));
+                }
+                break;
+            case Intent.ACTION_PACKAGE_FULLY_REMOVED:
+                String pkg = getPkg(intent);
+                app.mDB.deletePolicy(pkg);
+                Shell.su("magiskhide --rm " + pkg).submit();
+                break;
+            case Intent.ACTION_LOCALE_CHANGED:
+                Shortcuts.setup(context);
+                break;
+            case Const.Key.BROADCAST_MANAGER_UPDATE:
+                Config.managerLink = intent.getStringExtra(Const.Key.INTENT_SET_LINK);
+                DownloadApp.upgrade(intent.getStringExtra(Const.Key.INTENT_SET_NAME));
+                break;
+            case Const.Key.BROADCAST_REBOOT:
+                Shell.su("/system/bin/reboot").submit();
+                break;
+        }
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/UpdateCheckService.java

@@ -0,0 +1,29 @@
+package com.topjohnwu.magisk.components;
+
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.tasks.CheckUpdates;
+import com.topjohnwu.magisk.uicomponents.Notifications;
+import com.topjohnwu.superuser.Shell;
+
+import androidx.annotation.NonNull;
+import androidx.work.ListenableWorker;
+
+public class UpdateCheckService extends DelegateWorker {
+
+    @NonNull
+    @Override
+    public ListenableWorker.Result doWork() {
+        Shell.getShell();
+        CheckUpdates.checkNow(this::onCheckDone);
+        return ListenableWorker.Result.success();
+    }
+
+    private void onCheckDone() {
+        if (BuildConfig.VERSION_CODE < Config.remoteManagerVersionCode) {
+            Notifications.managerUpdate();
+        } else if (Config.magiskVersionCode < Config.remoteMagiskVersionCode) {
+            Notifications.magiskUpdate();
+        }
+    }
+}

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

@@ -1,92 +0,0 @@
-package com.topjohnwu.magisk.container;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.WebService;
-
-import java.text.DateFormat;
-import java.util.Date;
-
-public class Repo extends BaseModule {
-
-    private String repoName;
-    private Date mLastUpdate;
-
-    public Repo(String name) {
-        repoName = name;
-    }
-
-    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 IllegalRepoException {
-        String props[] = Utils.dos2unix(WebService.getString(getManifestUrl())).split("\\n");
-        try {
-            parseProps(props);
-        } catch (NumberFormatException e) {
-            throw new IllegalRepoException("Repo [" + repoName + "] parse error: " + e.getMessage());
-        }
-
-        if (getId() == null) {
-            throw new IllegalRepoException("Repo [" + repoName + "] does not contain id");
-        }
-        if (getVersionCode() < 0) {
-            throw new IllegalRepoException("Repo [" + repoName + "] does not contain versionCode");
-        }
-        if (getMinMagiskVersion() < Const.MIN_MODULE_VER()) {
-            Logger.debug("Repo [" + repoName + "] is outdated");
-        }
-    }
-
-    public void update(Date lastUpdate) throws IllegalRepoException {
-        mLastUpdate = lastUpdate;
-        update();
-    }
-
-    @Override
-    public ContentValues getContentValues() {
-        ContentValues values = super.getContentValues();
-        values.put("repo_name", repoName);
-        values.put("last_update", mLastUpdate.getTime());
-        return values;
-    }
-
-    public String getRepoName() {
-        return repoName;
-    }
-
-    public String getZipUrl() {
-        return String.format(Const.Url.ZIP_URL, repoName);
-    }
-
-    public String getManifestUrl() {
-        return String.format(Const.Url.FILE_URL, repoName, "module.prop");
-    }
-
-    public String getDetailUrl() {
-        return String.format(Const.Url.FILE_URL, repoName, "README.md");
-    }
-
-    public String getLastUpdateString() {
-        return DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM,
-                MagiskManager.locale).format(mLastUpdate);
-    }
-
-    public Date getLastUpdate() {
-        return mLastUpdate;
-    }
-
-    public class IllegalRepoException extends Exception {
-        IllegalRepoException(String message) {
-            super(message);
-        }
-    }
-}

app/src/full/java/com/topjohnwu/magisk/database/MagiskDatabaseHelper.java

@@ -1,301 +0,0 @@
-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.os.Build;
-import android.os.Process;
-import android.support.annotation.NonNull;
-import android.text.TextUtils;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.container.Policy;
-import com.topjohnwu.magisk.container.SuLogEntry;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.io.SuFile;
-
-import java.io.File;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-public class MagiskDatabaseHelper {
-
-    private static final int DATABASE_VER = 5;
-    private static final String POLICY_TABLE = "policies";
-    private static final String LOG_TABLE = "logs";
-    private static final String SETTINGS_TABLE = "settings";
-    private static final String STRINGS_TABLE = "strings";
-
-    private PackageManager pm;
-    private SQLiteDatabase db;
-
-    @NonNull
-    public static MagiskDatabaseHelper getInstance(MagiskManager mm) {
-        try {
-            return new MagiskDatabaseHelper(mm);
-        } catch (Exception e) {
-            // Let's cleanup everything and try again
-            Shell.Sync.su("db_clean '*'");
-            return new MagiskDatabaseHelper(mm);
-        }
-    }
-
-    private MagiskDatabaseHelper(MagiskManager mm) {
-        pm = mm.getPackageManager();
-        db = openDatabase(mm);
-        db.disableWriteAheadLogging();
-        int version = db.getVersion();
-        if (version < DATABASE_VER) {
-            onUpgrade(db, version);
-        } else if (version > DATABASE_VER) {
-            onDowngrade(db);
-        }
-        db.setVersion(DATABASE_VER);
-        clearOutdated();
-    }
-
-    private SQLiteDatabase openDatabase(MagiskManager mm) {
-        final File DB_FILE = new File(Utils.fmt("/sbin/.core/db-%d/magisk.db", Const.USER_ID));
-        Context de = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-                ? mm.createDeviceProtectedStorageContext() : mm;
-        if (!DB_FILE.canWrite()) {
-            if (!Shell.rootAccess()) {
-                // We don't want the app to crash, create a db and return
-                return mm.openOrCreateDatabase("su.db", Context.MODE_PRIVATE, null);
-            }
-            mm.loadMagiskInfo();
-            // Cleanup
-            Shell.Sync.su("db_clean " + Const.USER_ID);
-            if (mm.magiskVersionCode < Const.MAGISK_VER.FBE_AWARE) {
-                // Super old legacy mode
-                return mm.openOrCreateDatabase("su.db", Context.MODE_PRIVATE, null);
-            } else if (mm.magiskVersionCode < Const.MAGISK_VER.HIDDEN_PATH) {
-                // Legacy mode with FBE aware
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    de.moveDatabaseFrom(mm, "su.db");
-                }
-                return de.openOrCreateDatabase("su.db", Context.MODE_PRIVATE, null);
-            } else {
-                // Global database
-                final SuFile GLOBAL_DB = new SuFile("/data/adb/magisk.db");
-                mm.deleteDatabase("su.db");
-                de.deleteDatabase("su.db");
-                if (mm.magiskVersionCode < Const.MAGISK_VER.SEPOL_REFACTOR) {
-                    // We need some additional policies on old versions
-                    Shell.Sync.su("db_sepatch");
-                }
-                if (!GLOBAL_DB.exists()) {
-                    Shell.Sync.su("db_init");
-                    SQLiteDatabase.openOrCreateDatabase(GLOBAL_DB, null).close();
-                    Shell.Sync.su("db_restore");
-                }
-            }
-            Shell.Sync.su("db_setup " + Process.myUid());
-        }
-        // Not using legacy mode, open the mounted global DB
-        return SQLiteDatabase.openOrCreateDatabase(DB_FILE, null);
-    }
-
-    public void onUpgrade(SQLiteDatabase db, int oldVersion) {
-        if (oldVersion == 0) {
-            createTables(db);
-            oldVersion = 3;
-        }
-        if (oldVersion == 1) {
-            // We're dropping column app_name, rename and re-construct table
-            db.execSQL(Utils.fmt("ALTER TABLE %s RENAME TO %s_old", POLICY_TABLE));
-
-            // Create the new tables
-            createTables(db);
-
-            // Migrate old data to new tables
-            db.execSQL(Utils.fmt("INSERT INTO %s SELECT " +
-                            "uid, package_name, policy, until, logging, notification FROM %s_old",
-                    POLICY_TABLE, POLICY_TABLE));
-            db.execSQL(Utils.fmt("DROP TABLE %s_old", POLICY_TABLE));
-
-            MagiskManager.get().deleteDatabase("sulog.db");
-            ++oldVersion;
-        }
-        if (oldVersion == 2) {
-            db.execSQL(Utils.fmt("UPDATE %s SET time=time*1000", LOG_TABLE));
-            ++oldVersion;
-        }
-        if (oldVersion == 3) {
-            db.execSQL(Utils.fmt("CREATE TABLE IF NOT EXISTS %s (key TEXT, value TEXT, PRIMARY KEY(key))", STRINGS_TABLE));
-            ++oldVersion;
-        }
-        if (oldVersion == 4) {
-            db.execSQL(Utils.fmt("UPDATE %s SET uid=uid%%100000", POLICY_TABLE));
-            ++oldVersion;
-        }
-    }
-
-    // Remove everything, we do not support downgrade
-    public void onDowngrade(SQLiteDatabase db) {
-        MagiskManager.toast(R.string.su_db_corrupt, Toast.LENGTH_LONG);
-        db.execSQL("DROP TABLE IF EXISTS " + POLICY_TABLE);
-        db.execSQL("DROP TABLE IF EXISTS " + LOG_TABLE);
-        db.execSQL("DROP TABLE IF EXISTS " + SETTINGS_TABLE);
-        db.execSQL("DROP TABLE IF EXISTS " + STRINGS_TABLE);
-        onUpgrade(db, 0);
-    }
-
-    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))");
-    }
-
-    public void clearOutdated() {
-        // Clear outdated policies
-        db.delete(POLICY_TABLE, Utils.fmt("until > 0 AND until < %d", System.currentTimeMillis() / 1000), null);
-        // Clear outdated logs
-        db.delete(LOG_TABLE, Utils.fmt("time < %d", System.currentTimeMillis() - MagiskManager.get().suLogTimeout * 86400000), null);
-    }
-
-    public void deletePolicy(Policy policy) {
-        deletePolicy(policy.uid);
-    }
-
-    public void deletePolicy(String pkg) {
-        db.delete(POLICY_TABLE, "package_name=?", new String[] { pkg });
-    }
-
-    public void deletePolicy(int uid) {
-        db.delete(POLICY_TABLE, Utils.fmt("uid=%d", uid), null);
-    }
-
-    public Policy getPolicy(int uid) {
-        Policy policy = null;
-        try (Cursor c = db.query(POLICY_TABLE, null, Utils.fmt("uid=%d", uid), null, null, null, null)) {
-            if (c.moveToNext()) {
-                policy = new Policy(c, pm);
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            deletePolicy(uid);
-            return null;
-        }
-        return policy;
-    }
-
-    public void addPolicy(Policy policy) {
-        db.replace(POLICY_TABLE, null, policy.getContentValues());
-    }
-
-    public void updatePolicy(Policy policy) {
-        db.update(POLICY_TABLE, policy.getContentValues(), Utils.fmt("uid=%d", policy.uid), null);
-    }
-
-    public List<Policy> getPolicyList(PackageManager pm) {
-        try (Cursor c = db.query(POLICY_TABLE, null, Utils.fmt("uid/100000=%d", Const.USER_ID),
-                null, null, null, null)) {
-            List<Policy> ret = new ArrayList<>(c.getCount());
-            while (c.moveToNext()) {
-                try {
-                    Policy policy = new Policy(c, pm);
-                    ret.add(policy);
-                } catch (PackageManager.NameNotFoundException e) {
-                    // The app no longer exist, remove from DB
-                    deletePolicy(c.getInt(c.getColumnIndex("uid")));
-                }
-            }
-            Collections.sort(ret);
-            return ret;
-        }
-    }
-
-    public List<List<Integer>> getLogStructure() {
-        try (Cursor c = db.query(LOG_TABLE, new String[] { "time" }, Utils.fmt("from_uid/100000=%d", Const.USER_ID),
-                null, null, null, "time DESC")) {
-            List<List<Integer>> ret = new ArrayList<>();
-            List<Integer> list = null;
-            String dateString = null, newString;
-            while (c.moveToNext()) {
-                Date date = new Date(c.getLong(c.getColumnIndex("time")));
-                newString = DateFormat.getDateInstance(DateFormat.MEDIUM, MagiskManager.locale).format(date);
-                if (!TextUtils.equals(dateString, newString)) {
-                    dateString = newString;
-                    list = new ArrayList<>();
-                    ret.add(list);
-                }
-                list.add(c.getPosition());
-            }
-            return ret;
-        }
-    }
-
-    public Cursor getLogCursor() {
-        return db.query(LOG_TABLE, null, Utils.fmt("from_uid/100000=%d", Const.USER_ID),
-                null, null, null, "time DESC");
-    }
-
-    public void addLog(SuLogEntry log) {
-        db.insert(LOG_TABLE, null, log.getContentValues());
-    }
-
-    public void clearLogs() {
-        db.delete(LOG_TABLE, null, null);
-    }
-
-    public void setSettings(String key, int value) {
-        ContentValues data = new ContentValues();
-        data.put("key", key);
-        data.put("value", value);
-        db.replace(SETTINGS_TABLE, null, data);
-    }
-
-    public int getSettings(String key, int defaultValue) {
-        int value = defaultValue;
-        try (Cursor c = db.query(SETTINGS_TABLE, null, "key=?",new String[] { key }, null, null, null)) {
-            if (c.moveToNext()) {
-                value = c.getInt(c.getColumnIndex("value"));
-            }
-        }
-        return value;
-    }
-
-    public void setStrings(String key, String value) {
-        if (value == null) {
-            db.delete(STRINGS_TABLE, "key=?", new String[] { key });
-        } else {
-            ContentValues data = new ContentValues();
-            data.put("key", key);
-            data.put("value", value);
-            db.replace(STRINGS_TABLE, null, data);
-        }
-    }
-
-    public String getStrings(String key, String defaultValue) {
-        String value = defaultValue;
-        try (Cursor c = db.query(STRINGS_TABLE, null, "key=?",new String[] { key }, null, null, null)) {
-            if (c.moveToNext()) {
-                value = c.getString(c.getColumnIndex("value"));
-            }
-        }
-        return value;
-    }
-}

app/src/full/java/com/topjohnwu/magisk/dialogs/CustomAlertDialog.java

@@ -0,0 +1,161 @@
+package com.topjohnwu.magisk.dialogs;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.topjohnwu.magisk.R;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AlertDialog;
+import butterknife.BindView;
+
+public class CustomAlertDialog extends AlertDialog.Builder {
+
+    private DialogInterface.OnClickListener positiveListener;
+    private DialogInterface.OnClickListener negativeListener;
+    private DialogInterface.OnClickListener neutralListener;
+
+    protected AlertDialog dialog;
+    protected ViewHolder vh;
+
+    public class ViewHolder {
+        @BindView(R.id.dialog_layout) public LinearLayout dialogLayout;
+        @BindView(R.id.button_panel) public LinearLayout buttons;
+
+        @BindView(R.id.message) public TextView messageView;
+        @BindView(R.id.negative) public Button negative;
+        @BindView(R.id.positive) public Button positive;
+        @BindView(R.id.neutral) public Button neutral;
+
+        ViewHolder(View v) {
+            new CustomAlertDialog$ViewHolder_ViewBinding(this, v);
+            messageView.setVisibility(View.GONE);
+            negative.setVisibility(View.GONE);
+            positive.setVisibility(View.GONE);
+            neutral.setVisibility(View.GONE);
+            buttons.setVisibility(View.GONE);
+        }
+    }
+
+    {
+        View v = LayoutInflater.from(getContext()).inflate(R.layout.alert_dialog, null);
+        vh = new ViewHolder(v);
+        super.setView(v);
+
+    }
+
+    public CustomAlertDialog(@NonNull Activity context) {
+        super(context);
+    }
+
+    public CustomAlertDialog(@NonNull Activity context, @StyleRes int themeResId) {
+        super(context, themeResId);
+    }
+
+    public ViewHolder getViewHolder() {
+        return vh;
+    }
+
+    @Override
+    public CustomAlertDialog setView(int layoutResId) { return this; }
+
+    @Override
+    public CustomAlertDialog setView(View view) { return this; }
+
+    @Override
+    public CustomAlertDialog setMessage(@Nullable CharSequence message) {
+        vh.messageView.setVisibility(View.VISIBLE);
+        vh.messageView.setText(message);
+        return this;
+    }
+
+    @Override
+    public CustomAlertDialog setMessage(@StringRes int messageId) {
+        return setMessage(getContext().getString(messageId));
+    }
+
+    @Override
+    public CustomAlertDialog setPositiveButton(CharSequence text, DialogInterface.OnClickListener listener) {
+        vh.buttons.setVisibility(View.VISIBLE);
+        vh.positive.setVisibility(View.VISIBLE);
+        vh.positive.setText(text);
+        positiveListener = listener;
+        vh.positive.setOnClickListener((v) -> {
+            if (positiveListener != null) {
+                positiveListener.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
+            }
+            dialog.dismiss();
+        });
+        return this;
+    }
+
+    @Override
+    public CustomAlertDialog setPositiveButton(@StringRes int textId, DialogInterface.OnClickListener listener) {
+        return setPositiveButton(getContext().getString(textId), listener);
+    }
+
+    @Override
+    public CustomAlertDialog setNegativeButton(CharSequence text, DialogInterface.OnClickListener listener) {
+        vh.buttons.setVisibility(View.VISIBLE);
+        vh.negative.setVisibility(View.VISIBLE);
+        vh.negative.setText(text);
+        negativeListener = listener;
+        vh.negative.setOnClickListener((v) -> {
+            if (negativeListener != null) {
+                negativeListener.onClick(dialog, DialogInterface.BUTTON_NEGATIVE);
+            }
+            dialog.dismiss();
+        });
+        return this;
+    }
+
+    @Override
+    public CustomAlertDialog setNegativeButton(@StringRes int textId, DialogInterface.OnClickListener listener) {
+        return setNegativeButton(getContext().getString(textId), listener);
+    }
+
+    @Override
+    public CustomAlertDialog setNeutralButton(CharSequence text, DialogInterface.OnClickListener listener) {
+        vh.buttons.setVisibility(View.VISIBLE);
+        vh.neutral.setVisibility(View.VISIBLE);
+        vh.neutral.setText(text);
+        neutralListener = listener;
+        vh.neutral.setOnClickListener((v) -> {
+            if (neutralListener != null) {
+                neutralListener.onClick(dialog, DialogInterface.BUTTON_NEUTRAL);
+            }
+            dialog.dismiss();
+        });
+        return this;
+    }
+
+    @Override
+    public CustomAlertDialog 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;
+    }
+
+    public void dismiss() {
+        dialog.dismiss();
+    }
+}

app/src/full/java/com/topjohnwu/magisk/dialogs/EnvFixDialog.java

@@ -0,0 +1,59 @@
+package com.topjohnwu.magisk.dialogs;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.SplashActivity;
+import com.topjohnwu.magisk.tasks.MagiskInstaller;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.io.SuFile;
+
+import java.io.IOException;
+
+import androidx.annotation.NonNull;
+
+public class EnvFixDialog extends CustomAlertDialog {
+
+    public EnvFixDialog(@NonNull Activity activity) {
+        super(activity);
+        setTitle(R.string.env_fix_title);
+        setMessage(R.string.env_fix_msg);
+        setCancelable(true);
+        setPositiveButton(R.string.yes, (d, i) -> {
+            ProgressDialog pd = ProgressDialog.show(activity,
+                    activity.getString(R.string.setup_title),
+                    activity.getString(R.string.setup_msg));
+            new MagiskInstaller() {
+                @Override
+                protected boolean operations() {
+                    installDir = new SuFile("/data/adb/magisk");
+                    Shell.su("rm -rf /data/adb/magisk/*").exec();
+                    return extractZip() && Shell.su("fix_env").exec().isSuccess();
+                }
+
+                @Override
+                protected void onResult(boolean success) {
+                    pd.dismiss();
+                    Utils.toast(success ? R.string.setup_done : R.string.setup_fail, Toast.LENGTH_LONG);
+                    if (success) {
+                        // Relaunch the app
+                        try {
+                            Shell.getShell().close();
+                        } catch (IOException ignored) {}
+                        Intent intent = new Intent(activity, ClassMap.get(SplashActivity.class));
+                        intent.addFlags(Intent.FLAG_ACTIVITY_TASK_ON_HOME | Intent.FLAG_ACTIVITY_NEW_TASK);
+                        activity.startActivity(intent);
+                        activity.finish();
+                    }
+
+                }
+            }.exec();
+        });
+        setNegativeButton(R.string.no_thanks, null);
+    }
+}

app/src/full/java/com/topjohnwu/magisk/dialogs/FingerprintAuthDialog.java

@@ -0,0 +1,88 @@
+package com.topjohnwu.magisk.dialogs;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.Build;
+import android.view.Gravity;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
+import com.topjohnwu.magisk.utils.Utils;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
+@TargetApi(Build.VERSION_CODES.M)
+public class FingerprintAuthDialog extends CustomAlertDialog {
+
+    private Runnable callback;
+    private DialogFingerprintHelper helper;
+
+    public FingerprintAuthDialog(@NonNull Activity activity, Runnable onSuccess) {
+        super(activity);
+        callback = onSuccess;
+        Drawable fingerprint = activity.getResources().getDrawable(R.drawable.ic_fingerprint);
+        fingerprint.setBounds(0, 0, Utils.dpInPx(50), Utils.dpInPx(50));
+        Resources.Theme theme = activity.getTheme();
+        TypedArray ta = theme.obtainStyledAttributes(new int[] {R.attr.imageColorTint});
+        fingerprint.setTint(ta.getColor(0, Color.GRAY));
+        ta.recycle();
+        vh.messageView.setCompoundDrawables(null, null, null, fingerprint);
+        vh.messageView.setCompoundDrawablePadding(Utils.dpInPx(20));
+        vh.messageView.setGravity(Gravity.CENTER);
+        setMessage(R.string.auth_fingerprint);
+        setNegativeButton(R.string.close, (d, w) -> helper.cancel());
+        setOnCancelListener(d -> helper.cancel());
+        try {
+            helper = new DialogFingerprintHelper();
+        } catch (Exception ignored) {}
+    }
+
+    @Override
+    public AlertDialog show() {
+        create();
+        if (helper == null) {
+            dialog.dismiss();
+            Utils.toast(R.string.auth_fail, Toast.LENGTH_SHORT);
+        } else {
+            helper.authenticate();
+            dialog.show();
+        }
+        return dialog;
+    }
+
+    class DialogFingerprintHelper extends FingerprintHelper {
+
+        DialogFingerprintHelper() throws Exception {}
+
+        @Override
+        public void onAuthenticationError(int errorCode, CharSequence errString) {
+            vh.messageView.setTextColor(Color.RED);
+            vh.messageView.setText(errString);
+        }
+
+        @Override
+        public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
+            vh.messageView.setTextColor(Color.RED);
+            vh.messageView.setText(helpString);
+        }
+
+        @Override
+        public void onAuthenticationFailed() {
+            vh.messageView.setTextColor(Color.RED);
+            vh.messageView.setText(R.string.auth_fail);
+        }
+
+        @Override
+        public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+            dismiss();
+            callback.run();
+        }
+    }
+}

app/src/full/java/com/topjohnwu/magisk/dialogs/InstallMethodDialog.java

@@ -0,0 +1,99 @@
+package com.topjohnwu.magisk.dialogs;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.widget.Toast;
+
+import com.google.android.material.snackbar.Snackbar;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.FlashActivity;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.uicomponents.ProgressNotification;
+import com.topjohnwu.magisk.uicomponents.SnackbarMaker;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.net.Networking;
+
+import java.io.File;
+import java.util.List;
+
+import androidx.appcompat.app.AlertDialog;
+
+class InstallMethodDialog extends AlertDialog.Builder {
+
+    InstallMethodDialog(BaseActivity activity, List<String> options) {
+        super(activity);
+        setTitle(R.string.select_method);
+        setItems(options.toArray(new String [0]), (dialog, idx) -> {
+            Intent intent;
+            switch (idx) {
+                case 1:
+                    patchBoot(activity);
+                    break;
+                case 0:
+                    downloadOnly(activity);
+                    break;
+                case 2:
+                    intent = new Intent(activity, ClassMap.get(FlashActivity.class))
+                            .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_MAGISK);
+                    activity.startActivity(intent);
+                    break;
+                case 3:
+                    installInactiveSlot(activity);
+                    break;
+                default:
+            }
+        });
+    }
+
+    private void patchBoot(BaseActivity a) {
+        Utils.toast(R.string.boot_file_patch_msg, Toast.LENGTH_LONG);
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT).setType("*/*");
+        a.runWithExternalRW(() ->
+                a.startActivityForResult(intent, Const.ID.SELECT_BOOT,
+                        (requestCode, resultCode, data) -> {
+                            if (requestCode == Const.ID.SELECT_BOOT &&
+                                    resultCode == Activity.RESULT_OK && data != null) {
+                                Intent i = new Intent(a, ClassMap.get(FlashActivity.class))
+                                        .setData(data.getData())
+                                        .putExtra(Const.Key.FLASH_ACTION, Const.Value.PATCH_BOOT);
+                                a.startActivity(i);
+                            }
+                        })
+        );
+    }
+
+    private void downloadOnly(BaseActivity a) {
+        a.runWithExternalRW(() -> {
+            String filename = Utils.fmt("Magisk-v%s(%d).zip",
+                    Config.remoteMagiskVersionString, Config.remoteMagiskVersionCode);
+            File zip = new File(Const.EXTERNAL_PATH, filename);
+            ProgressNotification progress = new ProgressNotification(filename);
+            Networking.get(Config.magiskLink)
+                    .setDownloadProgressListener(progress)
+                    .setErrorHandler(((conn, e) -> progress.dlFail()))
+                    .getAsFile(zip, f -> {
+                        progress.dlDone();
+                        SnackbarMaker.make(a,
+                                a.getString(R.string.internal_storage, "/Download/" + filename),
+                                Snackbar.LENGTH_LONG).show();
+                    });
+        });
+    }
+
+    private void installInactiveSlot(BaseActivity activity) {
+        new CustomAlertDialog(activity)
+                .setTitle(R.string.warning)
+                .setMessage(R.string.install_inactive_slot_msg)
+                .setCancelable(true)
+                .setPositiveButton(R.string.yes, (d, i) -> {
+                    Intent intent = new Intent(activity, ClassMap.get(FlashActivity.class))
+                            .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_INACTIVE_SLOT);
+                    activity.startActivity(intent);
+                })
+                .setNegativeButton(R.string.no_thanks, null)
+                .show();
+    }
+}

app/src/full/java/com/topjohnwu/magisk/dialogs/MagiskInstallDialog.java

@@ -0,0 +1,50 @@
+package com.topjohnwu.magisk.dialogs;
+
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.uicomponents.MarkDownWindow;
+import com.topjohnwu.magisk.utils.AppUtils;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MagiskInstallDialog extends CustomAlertDialog {
+    public MagiskInstallDialog(BaseActivity a) {
+        super(a);
+        String filename = Utils.fmt("Magisk-v%s(%d).zip",
+                Config.remoteMagiskVersionString, Config.remoteMagiskVersionCode);
+        setTitle(a.getString(R.string.repo_install_title, a.getString(R.string.magisk)));
+        setMessage(a.getString(R.string.repo_install_msg, filename));
+        setCancelable(true);
+        setPositiveButton(R.string.install, (d, i) -> {
+            List<String> options = new ArrayList<>();
+            options.add(a.getString(R.string.download_zip_only));
+            options.add(a.getString(R.string.patch_boot_file));
+            if (Shell.rootAccess()) {
+                options.add(a.getString(R.string.direct_install));
+                String s = ShellUtils.fastCmd("grep_prop ro.build.ab_update");
+                if (!s.isEmpty() && Boolean.parseBoolean(s)) {
+                    options.add(a.getString(R.string.install_inactive_slot));
+                }
+            }
+            new InstallMethodDialog(a, options).show();
+        });
+        if (!TextUtils.isEmpty(Config.magiskNoteLink)) {
+            setNeutralButton(R.string.release_notes, (d, i) -> {
+                if (Config.magiskNoteLink.contains("forum.xda-developers")) {
+                    // Open forum links in browser
+                    AppUtils.openLink(a, Uri.parse(Config.magiskNoteLink));
+                } else {
+                    MarkDownWindow.show(a, null, Config.magiskNoteLink);
+                }
+            });
+        }
+    }
+}