Fix stub strings

In commit 8d4c407, native Magisk always launches an activity for
communicating with Magisk Manager. While this works extremely well,
since it also workaround stupid OEMs that blocks broadcasts, it has a
problem: launching an activity will claim the focus of the device,
which could be super annoying in some circumstances.

This commit adds a new feature to run a broadcast test on boot complete.
If Magisk Manager successfully receives the broadcast, it will toggle
a setting in magiskd so all future su loggings and notifies will always
use broadcasts instead of launching activities.

Fix #1412

.gitattributes

@@ -16,3 +16,4 @@ chromeos/** binary
 *.exe binary
 *.apk binary
 *.png binary
+*.jpg binary

README.MD

@@ -38,6 +38,27 @@ Default string resources for Magisk Manager are scattered throughout
 
 Translate each and place them in the respective locations (`<module>/src/main/res/values-<lang>/strings.xml`).
 
+## Signature Verification
+
+Official release zips and APKs are signed with my personal private key. You can verify the key certificate to make sure the binaries you downloaded are not manipulated in anyway.
+
+``` bash
+# Use the keytool command from JDK to print certificates
+keytool -printcert -jarfile <APK or Magisk zip>
+
+# The output should contain the following signature
+Owner: CN=John Wu, L=Taipei, C=TW
+Issuer: CN=John Wu, L=Taipei, C=TW
+Serial number: 50514879
+Valid from: Sun Aug 14 13:23:44 EDT 2016 until: Tue Jul 21 13:23:44 EDT 2116
+Certificate fingerprints:
+	 MD5:  CE:DA:68:C1:E1:74:71:0A:EF:58:89:7D:AE:6E:AB:4F
+	 SHA1: DC:0F:2B:61:CB:D7:E9:D3:DB:BE:06:0B:2B:87:0D:46:BB:06:02:11
+	 SHA256: B4:CB:83:B4:DA:D9:9F:99:7D:BE:87:2F:01:3A:A1:6C:14:EE:C4:1D:16:70:21:F3:71:F7:E1:33:0F:27:3E:E6
+	 Signature algorithm name: SHA256withRSA
+	 Version: 3
+```
+
 ## License
 
     Magisk, including all git submodules are free software:

app/build.gradle

@@ -1,11 +1,24 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+kapt {
+    correctErrorTypes = true
+    useBuildCache = true
+    mapDiagnosticLocations = true
+    javacOptions {
+        option("-Xmaxerrs", 1000)
+    }
+}
 
 android {
     defaultConfig {
         applicationId 'com.topjohnwu.magisk'
         vectorDrawables.useSupportLibrary = true
-        versionName rootProject.ext.configProps['appVersion']
-        versionCode rootProject.ext.configProps['appVersionCode'] as Integer
+        multiDexEnabled true
+        versionName configProps['appVersion']
+        versionCode configProps['appVersionCode'] as Integer
         javaCompileOptions {
             annotationProcessorOptions {
                 argument('butterknife.debuggable', 'false')
@@ -18,6 +31,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    dataBinding {
+        enabled = true
+    }
+
+    packagingOptions {
+        exclude '/META-INF/*.version'
+        exclude '/META-INF/*.kotlin_module'
+        exclude '/META-INF/rxkotlin.properties'
+        exclude '/androidsupportmultidexversion.txt'
+        exclude '/org/**'
+        exclude '/kotlin/**'
+        exclude '/kotlinx/**'
+    }
 }
 
 dependencies {
@@ -25,27 +52,32 @@ dependencies {
     implementation project(':net')
     implementation project(':shared')
     implementation project(':signing')
-    implementation 'ru.noties:markwon:2.0.1'
-    implementation 'com.caverock:androidsvg-aar:1.3'
-    implementation 'org.kamranzafar:jtar:2.3'
-    implementation 'net.sourceforge.streamsupport:android-retrostreams:1.7.0'
-    implementation 'com.github.sevar83:indeterminate-checkbox:1.0.5'
 
-    def androidXVersion = "1.0.0"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation "androidx.preference:preference:${androidXVersion}"
-    implementation "androidx.recyclerview:recyclerview:${androidXVersion}"
-    implementation "androidx.cardview:cardview:${androidXVersion}"
-    implementation "com.google.android.material:material:${androidXVersion}"
-    implementation 'androidx.work:work-runtime:2.0.0'
-    implementation 'androidx.transition:transition:1.1.0-alpha02'
+    implementation 'com.github.topjohnwu:jtar:1.0.0'
+    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'com.github.skoumalcz:teanity:0.3.3'
+    implementation 'com.ncapdevi:frag-nav:3.2.0'
 
-    def libsuVersion = '2.3.2'
+    def markwonVersion = '3.0.1'
+    implementation "ru.noties.markwon:core:${markwonVersion}"
+    implementation "ru.noties.markwon:html:${markwonVersion}"
+    implementation "ru.noties.markwon:image-svg:${markwonVersion}"
+
+    def libsuVersion = '2.5.0'
     implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
     implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
 
-    def butterKnifeVersion = '10.1.0'
-    implementation "com.jakewharton:butterknife-runtime:${butterKnifeVersion}"
-    annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
+    def koin = "2.0.0-rc-2"
+    implementation "org.koin:koin-core:${koin}"
+    implementation "org.koin:koin-android:${koin}"
+    implementation "org.koin:koin-androidx-viewmodel:${koin}"
+
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha05'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha06'
+    implementation 'androidx.work:work-runtime:2.0.1'
+    implementation 'androidx.transition:transition:1.2.0-alpha01'
+    implementation 'androidx.multidex:multidex:2.0.1'
 }

app/proguard-rules.pro

@@ -16,12 +16,6 @@
 #   public *;
 #}
 
-# BouncyCastle
--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.**
-
 # Snet
 -keepclassmembers class com.topjohnwu.magisk.utils.ISafetyNetHelper { *; }
 -keep,allowobfuscation interface com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback
@@ -29,15 +23,17 @@
   void onResponse(int);
 }
 
+# Keep all fragment constructors
+-keepclassmembers class * extends androidx.fragment.app.Fragment {
+  public <init>(...);
+}
+
+# DelegateWorker
+-keep,allowobfuscation class * extends com.topjohnwu.magisk.model.worker.DelegateWorker
+
 # BootSigner
 -keepclassmembers class com.topjohnwu.signing.BootSigner { *; }
 
-# SVG
--dontwarn com.caverock.androidsvg.SVGAndroidRenderer
-
-# RetroStreams
--dontwarn java9.**
-
 # Strip logging
 -assumenosideeffects class com.topjohnwu.magisk.utils.Logger {
   public *** debug(...);
@@ -46,4 +42,8 @@
 # Excessive obfuscation
 -repackageclasses 'a'
 -allowaccessmodification
--optimizationpasses 6
+
+# QOL
+-dontnote **
+-dontwarn com.caverock.androidsvg.**
+-dontwarn ru.noties.markwon.**

app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <application
         android:allowBackup="true"
         android:name="a.e"
-        android:theme="@style/AppTheme"
+        android:theme="@style/MagiskTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
 
@@ -35,17 +35,16 @@
             android:name="a.f"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="nosensor"
-            android:theme="@style/AppTheme.NoDrawer" />
+            android:theme="@style/MagiskTheme.Flashing" />
 
         <!-- Superuser -->
 
         <activity
             android:name="a.m"
+            android:exported="false"
             android:directBootAware="true"
             android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity="a.m"
-            android:theme="@style/SuRequest" />
+            android:theme="@style/MagiskTheme.SU" />
 
         <!-- Receiver -->
 
@@ -75,4 +74,4 @@
 
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/a/b.java

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

app/src/main/java/a/c.java

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

app/src/main/java/a/f.java

@@ -1,6 +1,6 @@
 package a;
 
-import com.topjohnwu.magisk.FlashActivity;
+import com.topjohnwu.magisk.ui.flash.FlashActivity;
 
 public class f extends FlashActivity {
     /* stub */

app/src/main/java/a/g.java

@@ -2,7 +2,7 @@ package a;
 
 import android.content.Context;
 
-import com.topjohnwu.magisk.components.UpdateCheckService;
+import com.topjohnwu.magisk.model.update.UpdateCheckService;
 
 import androidx.annotation.NonNull;
 import androidx.work.WorkerParameters;

app/src/main/java/a/h.java

@@ -1,6 +1,6 @@
 package a;
 
-import com.topjohnwu.magisk.components.GeneralReceiver;
+import com.topjohnwu.magisk.model.receiver.GeneralReceiver;
 
 public class h extends GeneralReceiver {
     /* stub */

app/src/main/java/a/j.java

@@ -1,6 +1,6 @@
 package a;
 
-import com.topjohnwu.magisk.components.DownloadModuleService;
+import com.topjohnwu.magisk.model.download.DownloadModuleService;
 
 public class j extends DownloadModuleService {
     /* stub */

app/src/main/java/a/m.java

@@ -1,6 +1,6 @@
 package a;
 
-import com.topjohnwu.magisk.SuRequestActivity;
+import com.topjohnwu.magisk.ui.surequest.SuRequestActivity;
 
 public class m extends SuRequestActivity {
     /* stub */

app/src/main/java/a/w.java

@@ -2,7 +2,7 @@ package a;
 
 import android.content.Context;
 
-import com.topjohnwu.magisk.components.DelegateWorker;
+import com.topjohnwu.magisk.model.worker.DelegateWorker;
 
 import java.lang.reflect.ParameterizedType;
 

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

@@ -1,62 +0,0 @@
-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.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 Context deContext;
-    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;
-        deContext = base;
-
-        if (Build.VERSION.SDK_INT >= 24) {
-            deContext = base.createDeviceProtectedStorageContext();
-            deContext.moveSharedPreferencesFrom(base,
-                    PreferenceManager.getDefaultSharedPreferencesName(base));
-        }
-        prefs = PreferenceManager.getDefaultSharedPreferences(deContext);
-        mDB = new MagiskDB(base);
-
-        Networking.init(base);
-        LocaleManager.setLocale(this);
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        LocaleManager.setLocale(this);
-    }
-}

app/src/main/java/com/topjohnwu/magisk/App.kt

@@ -0,0 +1,130 @@
+package com.topjohnwu.magisk
+
+import android.annotation.SuppressLint
+import android.app.Activity
+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.os.Bundle
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.multidex.MultiDex
+import com.topjohnwu.magisk.data.database.MagiskDB
+import com.topjohnwu.magisk.data.database.RepoDatabaseHelper
+import com.topjohnwu.magisk.di.koinModules
+import com.topjohnwu.magisk.utils.LocaleManager
+import com.topjohnwu.magisk.utils.RootUtils
+import com.topjohnwu.magisk.utils.inject
+import com.topjohnwu.net.Networking
+import com.topjohnwu.superuser.Shell
+import org.koin.android.ext.android.inject
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
+import timber.log.Timber
+import java.util.concurrent.ThreadPoolExecutor
+
+open class App : Application(), Application.ActivityLifecycleCallbacks {
+
+    lateinit var protectedContext: Context
+
+    @Deprecated("Use dependency injection")
+    val prefs: SharedPreferences by inject()
+    @Deprecated("Use dependency injection")
+    val DB: MagiskDB by inject()
+    @Deprecated("Use dependency injection")
+    val repoDB: RepoDatabaseHelper by inject()
+
+    @Volatile
+    private var foreground: Activity? = null
+
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base)
+        if (BuildConfig.DEBUG)
+            MultiDex.install(base)
+        Timber.plant(Timber.DebugTree())
+
+        startKoin {
+            androidContext(this@App)
+            modules(koinModules)
+        }
+
+        protectedContext = baseContext
+        self = this
+        deContext = base
+
+        if (Build.VERSION.SDK_INT >= 24) {
+            protectedContext = base.createDeviceProtectedStorageContext()
+            deContext = protectedContext
+            deContext.moveSharedPreferencesFrom(base, base.defaultPrefsName)
+        }
+
+        registerActivityLifecycleCallbacks(this)
+
+        Networking.init(base)
+        LocaleManager.setLocale(this)
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        LocaleManager.setLocale(this)
+    }
+
+    //region ActivityLifecycleCallbacks
+    override fun onActivityCreated(activity: Activity, bundle: Bundle?) {}
+
+    override fun onActivityStarted(activity: Activity) {}
+
+    @Synchronized
+    override fun onActivityResumed(activity: Activity) {
+        foreground = activity
+    }
+
+    @Synchronized
+    override fun onActivityPaused(activity: Activity) {
+        foreground = null
+    }
+
+    override fun onActivityStopped(activity: Activity) {}
+
+    override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {}
+
+    override fun onActivityDestroyed(activity: Activity) {}
+    //endregion
+
+    private val Context.defaultPrefsName get() = "${packageName}_preferences"
+
+    companion object {
+
+        @SuppressLint("StaticFieldLeak")
+        @Deprecated("Use dependency injection")
+        @JvmStatic
+        lateinit var self: App
+
+        @SuppressLint("StaticFieldLeak")
+        @Deprecated("Use dependency injection; replace with protectedContext")
+        @JvmStatic
+        lateinit var deContext: Context
+
+        @Deprecated("Use Rx or similar")
+        @JvmField
+        var THREAD_POOL: ThreadPoolExecutor
+
+        init {
+            AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+            Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER or Shell.FLAG_USE_MAGISK_BUSYBOX)
+            Shell.Config.verboseLogging(BuildConfig.DEBUG)
+            Shell.Config.addInitializers(RootUtils::class.java)
+            Shell.Config.setTimeout(2)
+            THREAD_POOL = AsyncTask.THREAD_POOL_EXECUTOR as ThreadPoolExecutor
+        }
+
+        @Deprecated("")
+        @JvmStatic
+        fun foreground(): Activity? {
+            val app: App by inject()
+            return app.foreground
+        }
+    }
+}

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

@@ -1,8 +1,12 @@
 package com.topjohnwu.magisk;
 
-import com.topjohnwu.magisk.components.DownloadModuleService;
-import com.topjohnwu.magisk.components.GeneralReceiver;
-import com.topjohnwu.magisk.components.UpdateCheckService;
+import com.topjohnwu.magisk.model.download.DownloadModuleService;
+import com.topjohnwu.magisk.model.receiver.GeneralReceiver;
+import com.topjohnwu.magisk.model.update.UpdateCheckService;
+import com.topjohnwu.magisk.ui.MainActivity;
+import com.topjohnwu.magisk.ui.SplashActivity;
+import com.topjohnwu.magisk.ui.flash.FlashActivity;
+import com.topjohnwu.magisk.ui.surequest.SuRequestActivity;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -3,8 +3,6 @@ package com.topjohnwu.magisk;
 import android.content.SharedPreferences;
 import android.util.Xml;
 
-import androidx.collection.ArrayMap;
-
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.ShellUtils;
@@ -17,6 +15,8 @@ import org.xmlpull.v1.XmlPullParserException;
 import java.io.File;
 import java.io.IOException;
 
+import androidx.collection.ArrayMap;
+
 public class Config {
 
     // Current status
@@ -59,7 +59,6 @@ public class Config {
         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 LOCALE = "locale";
         public static final String DARK_THEME = "dark_theme";
         public static final String ETAG_KEY = "ETag";
@@ -73,6 +72,7 @@ public class Config {
     }
 
     public static class Value {
+        public static final int DEFAULT_CHANNEL = -1;
         public static final int STABLE_CHANNEL = 0;
         public static final int BETA_CHANNEL = 1;
         public static final int CUSTOM_CHANNEL = 2;
@@ -109,16 +109,16 @@ public class Config {
     public static void export() {
         // Flush prefs to disk
         App app = App.self;
-        app.prefs.edit().commit();
+        app.getPrefs().edit().commit();
         File xml = new File(App.deContext.getFilesDir().getParent() + "/shared_prefs",
                 app.getPackageName() + "_preferences.xml");
         Shell.su(Utils.fmt("cat %s > /data/adb/%s", xml, Const.MANAGER_CONFIGS)).exec();
     }
 
     public static void initialize() {
-        SharedPreferences pref = App.self.prefs;
+        SharedPreferences pref = App.self.getPrefs();
         SharedPreferences.Editor editor = pref.edit();
-        SuFile config = new SuFile("/data/adb/" + Const.MANAGER_CONFIGS);
+        File config = SuFile.open("/data/adb", Const.MANAGER_CONFIGS);
         if (config.exists()) {
             try {
                 SuFileInputStream is = new SuFileInputStream(config);
@@ -213,7 +213,6 @@ public class Config {
                 return PREF_BOOL;
 
             case Key.CUSTOM_CHANNEL:
-            case Key.BOOT_FORMAT:
             case Key.LOCALE:
             case Key.ETAG_KEY:
                 return PREF_STR;
@@ -239,19 +238,19 @@ public class Config {
         App app = App.self;
         switch (getConfigType(key)) {
             case PREF_INT:
-                return (T) (Integer) app.prefs.getInt(key, getDef(key));
+                return (T) (Integer) app.getPrefs().getInt(key, getDef(key));
             case PREF_STR_INT:
-                return (T) (Integer) Utils.getPrefsInt(app.prefs, key, getDef(key));
+                return (T) (Integer) Utils.getPrefsInt(app.getPrefs(), key, getDef(key));
             case PREF_BOOL:
-                return (T) (Boolean) app.prefs.getBoolean(key, getDef(key));
+                return (T) (Boolean) app.getPrefs().getBoolean(key, getDef(key));
             case PREF_STR:
-                return (T) app.prefs.getString(key, getDef(key));
+                return (T) app.getPrefs().getString(key, getDef(key));
             case DB_INT:
-                return (T) (Integer) app.mDB.getSettings(key, getDef(key));
+                return (T) (Integer) app.getDB().getSettings(key, getDef(key));
             case DB_BOOL:
-                return (T) (Boolean) (app.mDB.getSettings(key, getDef(key) ? 1 : 0) != 0);
+                return (T) (Boolean) (app.getDB().getSettings(key, getDef(key) ? 1 : 0) != 0);
             case DB_STR:
-                return (T) app.mDB.getStrings(key, getDef(key));
+                return (T) app.getDB().getStrings(key, getDef(key));
         }
         /* Will never get here (IllegalArgumentException in getConfigType) */
         return null;
@@ -261,25 +260,25 @@ public class Config {
         App app = App.self;
         switch (getConfigType(key)) {
             case PREF_INT:
-                app.prefs.edit().putInt(key, (int) val).apply();
+                app.getPrefs().edit().putInt(key, (int) val).apply();
                 break;
             case PREF_STR_INT:
-                app.prefs.edit().putString(key, String.valueOf(val)).apply();
+                app.getPrefs().edit().putString(key, String.valueOf(val)).apply();
                 break;
             case PREF_BOOL:
-                app.prefs.edit().putBoolean(key, (boolean) val).apply();
+                app.getPrefs().edit().putBoolean(key, (boolean) val).apply();
                 break;
             case PREF_STR:
-                app.prefs.edit().putString(key, (String) val).apply();
+                app.getPrefs().edit().putString(key, (String) val).apply();
                 break;
             case DB_INT:
-                app.mDB.setSettings(key, (int) val);
+                app.getDB().setSettings(key, (int) val);
                 break;
             case DB_BOOL:
-                app.mDB.setSettings(key, (boolean) val ? 1 : 0);
+                app.getDB().setSettings(key, (boolean) val ? 1 : 0);
                 break;
             case DB_STR:
-                app.mDB.setStrings(key, (String) val);
+                app.getDB().setStrings(key, (String) val);
                 break;
         }
     }
@@ -291,14 +290,14 @@ public class Config {
             case PREF_STR_INT:
             case PREF_BOOL:
             case PREF_STR:
-                app.prefs.edit().remove(key).apply();
+                app.getPrefs().edit().remove(key).apply();
                 break;
             case DB_BOOL:
             case DB_INT:
-                app.mDB.rmSettings(key);
+                app.getDB().rmSettings(key);
                 break;
             case DB_STR:
-                app.mDB.setStrings(key, null);
+                app.getDB().setStrings(key, null);
                 break;
         }
     }
@@ -316,7 +315,7 @@ public class Config {
         defs.put(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT);
         defs.put(Key.SU_NOTIFICATION, Value.NOTIFICATION_TOAST);
         defs.put(Key.UPDATE_CHANNEL, Utils.isCanary() ?
-                Value.CANARY_DEBUG_CHANNEL : Value.STABLE_CHANNEL);
+                Value.CANARY_DEBUG_CHANNEL : Value.DEFAULT_CHANNEL);
 
         // prefs bool
         defs.put(Key.CHECK_UPDATES, true);
@@ -326,7 +325,6 @@ public class Config {
 
         // prefs string
         defs.put(Key.CUSTOM_CHANNEL, "");
-        defs.put(Key.BOOT_FORMAT, ".img");
         defs.put(Key.LOCALE, "");
         //defs.put(Key.ETAG_KEY, null);
 
@@ -367,13 +365,13 @@ public class Config {
             switch (type) {
                 case DB_INT:
                     editor.putString(key, String.valueOf(
-                            app.mDB.getSettings(key, (Integer) defs.get(key))));
+                            app.getDB().getSettings(key, (Integer) defs.get(key))));
                     continue;
                 case DB_STR:
-                    editor.putString(key, app.mDB.getStrings(key, (String) defs.get(key)));
+                    editor.putString(key, app.getDB().getStrings(key, (String) defs.get(key)));
                     continue;
                 case DB_BOOL:
-                    int bs = app.mDB.getSettings(key, -1);
+                    int bs = app.getDB().getSettings(key, -1);
                     editor.putBoolean(key, bs < 0 ? (Boolean) defs.get(key) : bs != 0);
                     continue;
             }

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

@@ -25,27 +25,26 @@ public class Const {
         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;
 
     public static final int USER_ID = Process.myUid() / 100000;
 
+    // Generic
+    public static final String MAGISK_INSTALL_LOG_FILENAME = "magisk_install_log_%s.log";
+
     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;
@@ -83,19 +82,17 @@ public class Const {
         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 PATCH_FILE = "patch";
         public static final String FLASH_MAGISK = "magisk";
         public static final String FLASH_INACTIVE_SLOT = "slot";
         public static final String UNINSTALL = "uninstall";

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

@@ -1,271 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.RecyclerView;
-
-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 butterknife.BindColor;
-import butterknife.BindView;
-import butterknife.OnClick;
-
-public class FlashActivity extends BaseActivity {
-
-    @BindView(R.id.toolbar) Toolbar toolbar;
-    @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> console, logs;
-
-    @OnClick(R.id.reboot)
-    void reboot() {
-        Utils.reboot();
-    }
-
-    @OnClick(R.id.save_logs)
-    void saveLogs() {
-        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, filename);
-            try (FileWriter writer = new FileWriter(logFile)) {
-                for (String s : logs) {
-                    writer.write(s);
-                    writer.write('\n');
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-            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_NoDrawer_Dark;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_flash);
-        new FlashActivity_ViewBinding(this);
-
-        setSupportActionBar(toolbar);
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setTitle(R.string.flashing);
-        }
-        setFloating();
-        setFinishOnTouchOutside(false);
-        if (!Shell.rootAccess())
-            reboot.setVisibility(View.GONE);
-
-        logs = Collections.synchronizedList(new ArrayList<>());
-        console = new ConsoleList();
-        rv.setAdapter(new ConsoleAdapter());
-
-        Intent intent = getIntent();
-        Uri uri = intent.getData();
-
-        switch (intent.getStringExtra(Const.Key.FLASH_ACTION)) {
-            case Const.Value.FLASH_ZIP:
-                new FlashModule(uri).exec();
-                break;
-            case Const.Value.UNINSTALL:
-                new Uninstall(uri).exec();
-                break;
-            case Const.Value.FLASH_MAGISK:
-                new DirectInstall().exec();
-                break;
-            case Const.Value.FLASH_INACTIVE_SLOT:
-                new SecondSlot().exec();
-                break;
-            case Const.Value.PATCH_BOOT:
-                new PatchBoot(uri).exec();
-                break;
-        }
-    }
-
-    private class ConsoleAdapter extends StringListAdapter<ConsoleAdapter.ViewHolder> {
-
-        ConsoleAdapter() {
-            super(console, true);
-        }
-
-        @Override
-        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/main/java/com/topjohnwu/magisk/MainActivity.java

@@ -1,190 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-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 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.Utils;
-import com.topjohnwu.net.Networking;
-import com.topjohnwu.superuser.Shell;
-
-import butterknife.BindView;
-
-public class MainActivity extends BaseActivity
-        implements NavigationView.OnNavigationItemSelectedListener {
-
-    private final Handler mDrawerHandler = new Handler();
-    private int mDrawerItem;
-    private static boolean fromShortcut = false;
-
-    @BindView(R.id.toolbar) public Toolbar toolbar;
-    @BindView(R.id.drawer_layout) DrawerLayout drawer;
-    @BindView(R.id.nav_view) NavigationView navigationView;
-
-    private float toolbarElevation;
-
-    @Override
-    public int getDarkTheme() {
-        return R.style.AppTheme_Dark;
-    }
-
-    @Override
-    protected void onCreate(final Bundle savedInstanceState) {
-        if (!getIntent().getBooleanExtra(Const.Key.FROM_SPLASH, false)) {
-            startActivity(new Intent(this, ClassMap.get(SplashActivity.class)));
-            finish();
-        }
-
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        new MainActivity_ViewBinding(this);
-        checkHideSection();
-        setSupportActionBar(toolbar);
-
-        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.magisk, R.string.magisk) {
-            @Override
-            public void onDrawerOpened(View drawerView) {
-                super.onDrawerOpened(drawerView);
-                super.onDrawerSlide(drawerView, 0); // this disables the arrow @ completed tate
-            }
-
-            @Override
-            public void onDrawerSlide(View drawerView, float slideOffset) {
-                super.onDrawerSlide(drawerView, 0); // this disables the animation
-            }
-        };
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            toolbarElevation = toolbar.getElevation();
-        }
-
-        drawer.addDrawerListener(toggle);
-        toggle.syncState();
-
-        if (savedInstanceState == null) {
-            String section = getIntent().getStringExtra(Const.Key.OPEN_SECTION);
-            fromShortcut = section != null;
-            navigate(section);
-        }
-
-        navigationView.setNavigationItemSelectedListener(this);
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (drawer.isDrawerOpen(navigationView)) {
-            drawer.closeDrawer(navigationView);
-        } else if (mDrawerItem != R.id.magisk && !fromShortcut) {
-            navigate(R.id.magisk);
-        } else {
-            finish();
-        }
-    }
-
-    @Override
-    public boolean onNavigationItemSelected(@NonNull final MenuItem menuItem) {
-        mDrawerHandler.removeCallbacksAndMessages(null);
-        mDrawerHandler.postDelayed(() -> navigate(menuItem.getItemId()), 250);
-        drawer.closeDrawer(navigationView);
-        return true;
-    }
-
-    public void checkHideSection() {
-        Menu menu = navigationView.getMenu();
-        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(Utils.showSuperUser());
-    }
-
-    public void navigate(String item) {
-        int itemId = R.id.magisk;
-        if (item != null) {
-            switch (item) {
-                case "superuser":
-                    itemId = R.id.superuser;
-                    break;
-                case "modules":
-                    itemId = R.id.modules;
-                    break;
-                case "downloads":
-                    itemId = R.id.downloads;
-                    break;
-                case "magiskhide":
-                    itemId = R.id.magiskhide;
-                    break;
-                case "log":
-                    itemId = R.id.log;
-                    break;
-                case "settings":
-                    itemId = R.id.settings;
-                    break;
-            }
-        }
-        navigate(itemId);
-    }
-
-    public void navigate(int itemId) {
-        mDrawerItem = itemId;
-        navigationView.setCheckedItem(itemId);
-        switch (itemId) {
-            case R.id.magisk:
-                fromShortcut = false;
-                displayFragment(new MagiskFragment(), true);
-                break;
-            case R.id.superuser:
-                displayFragment(new SuperuserFragment(), true);
-                break;
-            case R.id.modules:
-                displayFragment(new ModulesFragment(), true);
-                break;
-            case R.id.downloads:
-                displayFragment(new ReposFragment(), true);
-                break;
-            case R.id.magiskhide:
-                displayFragment(new MagiskHideFragment(), true);
-                break;
-            case R.id.log:
-                displayFragment(new LogFragment(), false);
-                break;
-            case R.id.settings:
-                displayFragment(new SettingsFragment(), true);
-                break;
-        }
-    }
-
-    private void displayFragment(@NonNull Fragment navFragment, boolean setElevation) {
-        supportInvalidateOptionsMenu();
-        getSupportFragmentManager()
-                .beginTransaction()
-                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
-                .replace(R.id.content_frame, navFragment)
-                .commitNow();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            toolbar.setElevation(setElevation ? toolbarElevation : 0);
-        }
-    }
-}

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

@@ -1,89 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.text.TextUtils;
-
-import androidx.appcompat.app.AlertDialog;
-
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.tasks.UpdateRepos;
-import com.topjohnwu.magisk.uicomponents.Notifications;
-import com.topjohnwu.magisk.uicomponents.Shortcuts;
-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 BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        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();
-            }
-        });
-    }
-
-    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
-        LocaleManager.loadAvailableLocales(R.string.app_changelog);
-
-        // Set default configs
-        Config.initialize();
-
-        // Create notification channel on Android O
-        Notifications.setup(this);
-
-        // Schedule periodic update checks
-        Utils.scheduleUpdateCheck();
-
-        // Setup shortcuts
-        Shortcuts.setup(this);
-
-        // Create repo database
-        app.repoDB = new RepoDatabaseHelper(this);
-
-        // Magisk working as expected
-        if (Shell.rootAccess() && Config.magiskVersionCode > 0) {
-            // Load modules
-            Utils.loadModules(false);
-            // Load repos
-            if (Networking.checkNetworkStatus(this))
-                new UpdateRepos().exec();
-        }
-
-        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.FROM_SPLASH, true);
-        intent.putExtra(BaseActivity.INTENT_PERM, getIntent().getStringExtra(BaseActivity.INTENT_PERM));
-        startActivity(intent);
-        finish();
-    }
-}

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

@@ -1,229 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.Bundle;
-import android.os.CountDownTimer;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.Window;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.content.res.AppCompatResources;
-
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.container.Policy;
-import com.topjohnwu.magisk.utils.FingerprintHelper;
-import com.topjohnwu.magisk.utils.SuConnector;
-
-import java.io.IOException;
-
-import butterknife.BindView;
-
-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;
-    @BindView(R.id.app_name) TextView appNameView;
-    @BindView(R.id.package_name) TextView packageNameView;
-    @BindView(R.id.grant_btn) Button grant_btn;
-    @BindView(R.id.deny_btn) Button deny_btn;
-    @BindView(R.id.fingerprint) ImageView fingerprintImg;
-    @BindView(R.id.warning) TextView warning;
-
-    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
-    public void finish() {
-        if (timer != null)
-            timer.cancel();
-        if (fingerprintHelper != null)
-            fingerprintHelper.cancel();
-        super.finish();
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (policy != null) {
-            handleAction(Policy.DENY);
-        } else {
-            finish();
-        }
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        PackageManager pm = getPackageManager();
-        app.mDB.clearOutdated();
-        timeoutPrefs = App.deContext.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 Config.Value.SU_AUTO_ALLOW:
-                handleAction(Policy.ALLOW, 0);
-                return;
-            case Config.Value.SU_PROMPT:
-            default:
-        }
-
-        // If not interactive, response directly
-        if (policy.policy != Policy.INTERACTIVE) {
-            handleAction();
-            return;
-        }
-
-        setContentView(R.layout.activity_request);
-        new SuRequestActivity_ViewBinding(this);
-
-        appIcon.setImageDrawable(policy.info.loadIcon(pm));
-        appNameView.setText(policy.appName);
-        packageNameView.setText(policy.packageName);
-        warning.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                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((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 + ")"));
-            }
-            @Override
-            public void onFinish() {
-                deny_btn.setText(getString(R.string.deny_with_str, "(0)"));
-                handleAction(Policy.DENY);
-            }
-        };
-
-        boolean useFP = FingerprintHelper.useFingerprint();
-
-        if (useFP) {
-            try {
-                fingerprintHelper = new FingerprintHelper() {
-                    @Override
-                    public void onAuthenticationError(int errorCode, CharSequence errString) {
-                        warning.setText(errString);
-                    }
-
-                    @Override
-                    public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
-                        warning.setText(helpString);
-                    }
-
-                    @Override
-                    public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
-                        handleAction(Policy.ALLOW);
-                    }
-
-                    @Override
-                    public void onAuthenticationFailed() {
-                        warning.setText(R.string.auth_fail);
-                    }
-                };
-                fingerprintHelper.authenticate();
-            } catch (Exception e) {
-                e.printStackTrace();
-                useFP = false;
-            }
-        }
-
-        if (!useFP) {
-            grant_btn.setOnClickListener(v -> {
-                handleAction(Policy.ALLOW);
-                timer.cancel();
-            });
-            grant_btn.requestFocus();
-        }
-
-        grant_btn.setVisibility(useFP ? View.GONE : View.VISIBLE);
-        fingerprintImg.setVisibility(useFP ? View.VISIBLE : View.GONE);
-
-        deny_btn.setOnClickListener(v -> {
-            handleAction(Policy.DENY);
-            timer.cancel();
-        });
-        suPopup.setOnClickListener(v -> cancelTimeout());
-        timeout.setOnTouchListener((v, event) -> cancelTimeout());
-        timer.start();
-    }
-
-    private boolean cancelTimeout() {
-        timer.cancel();
-        deny_btn.setText(getString(R.string.deny));
-        return false;
-    }
-
-    private void handleAction() {
-        connector.response();
-        finish();
-    }
-
-    private void handleAction(int action) {
-        int pos = timeout.getSelectedItemPosition();
-        timeoutPrefs.edit().putInt(policy.packageName, pos).apply();
-        handleAction(action, Config.Value.TIMEOUT_LIST[pos]);
-    }
-
-    private void handleAction(int action, int time) {
-        policy.policy = action;
-        if (time >= 0) {
-            policy.until = (time == 0) ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
-            app.mDB.updatePolicy(policy);
-        }
-        handleAction();
-    }
-}

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

@@ -1,427 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ComponentInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.AsyncTask;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-import androidx.collection.ArraySet;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.buildware.widget.indeterm.IndeterminateCheckBox;
-import com.topjohnwu.magisk.App;
-import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.uicomponents.ArrowExpandable;
-import com.topjohnwu.magisk.uicomponents.Expandable;
-import com.topjohnwu.magisk.utils.Event;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.internal.UiThreadHandler;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-
-import butterknife.BindView;
-import java9.util.Comparators;
-import java9.util.Lists;
-import java9.util.Objects;
-import java9.util.Sets;
-import java9.util.stream.Collectors;
-import java9.util.stream.Stream;
-import java9.util.stream.StreamSupport;
-
-public class ApplicationAdapter extends SectionedAdapter
-        <ApplicationAdapter.AppViewHolder, ApplicationAdapter.ProcessViewHolder> {
-
-    private static final String SAFETYNET_PROCESS = "com.google.android.gms.unstable";
-    private static final String GMS_PACKAGE = "com.google.android.gms";
-    private static boolean old_hide = false;
-
-    /* A list of apps that should not be shown as hide-able */
-    private static final List<String> HIDE_BLACKLIST = Lists.of(
-            App.self.getPackageName(),
-            "android",
-            "com.android.chrome",
-            "com.chrome.beta",
-            "com.chrome.dev",
-            "com.chrome.canary",
-            "com.android.webview",
-            "com.google.android.webview"
-    );
-    private static final List<String> DEFAULT_HIDELIST = Lists.of(
-            SAFETYNET_PROCESS
-    );
-
-    private static int BOTTOM_MARGIN = -1;
-
-    private List<HideAppInfo> fullList, showList;
-    private List<HideTarget> hideList;
-    private PackageManager pm;
-    private boolean showSystem;
-
-    public ApplicationAdapter(Context context) {
-        fullList = showList = Collections.emptyList();
-        hideList = Collections.emptyList();
-        pm = context.getPackageManager();
-        showSystem = Config.get(Config.Key.SHOW_SYSTEM_APP);
-        AsyncTask.SERIAL_EXECUTOR.execute(this::loadApps);
-    }
-
-    private static ViewGroup.MarginLayoutParams getMargins(RecyclerView.ViewHolder vh) {
-        return (ViewGroup.MarginLayoutParams) vh.itemView.getLayoutParams();
-    }
-
-    @Override
-    public int getSectionCount() {
-        return showList.size();
-    }
-
-    @Override
-    public int getItemCount(int section) {
-        HideAppInfo app = showList.get(section);
-        return app.expanded ? app.processList.size() : 0;
-    }
-
-    @Override
-    public AppViewHolder onCreateSectionViewHolder(ViewGroup parent) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_hide_app, parent, false);
-        AppViewHolder vh = new AppViewHolder(v);
-        if (BOTTOM_MARGIN < 0)
-            BOTTOM_MARGIN = getMargins(vh).bottomMargin;
-        return vh;
-    }
-
-    @Override
-    public ProcessViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_hide_process, parent, false);
-        return new ProcessViewHolder(v);
-    }
-
-    @Override
-    public void onBindSectionViewHolder(AppViewHolder holder, int section) {
-        HideAppInfo app = showList.get(section);
-        holder.app_name.setText(app.name);
-        holder.app_icon.setImageDrawable(app.info.loadIcon(pm));
-        holder.package_name.setText(app.info.packageName);
-        holder.checkBox.setOnStateChangedListener(null);
-        holder.checkBox.setState(app.getState());
-        holder.ex.setExpanded(app.expanded);
-
-        int index = getItemPosition(section, 0);
-        holder.checkBox.setOnStateChangedListener((IndeterminateCheckBox box, @Nullable Boolean status) -> {
-            if (status != null) {
-                setHide(status, app);
-                if (app.expanded)
-                    notifyItemRangeChanged(index, app.processList.size());
-            }
-        });
-
-        if (app.processList.size() > 1) {
-            holder.arrow.setVisibility(View.VISIBLE);
-
-            holder.trigger.setOnClickListener((v) -> {
-                if (app.expanded) {
-                    app.expanded = false;
-                    notifyItemRangeRemoved(index, app.processList.size());
-                    holder.ex.collapse();
-                } else {
-                    app.expanded = true;
-                    notifyItemRangeInserted(index, app.processList.size());
-                    holder.ex.expand();
-                }
-            });
-        } else {
-            holder.arrow.setVisibility(View.GONE);
-            holder.trigger.setOnClickListener(null);
-        }
-
-    }
-
-    @Override
-    public void onBindItemViewHolder(ProcessViewHolder holder, int section, int position) {
-        HideAppInfo app = showList.get(section);
-        HideProcessInfo target = app.processList.get(position);
-        holder.process.setText(target.name);
-        holder.checkbox.setOnCheckedChangeListener(null);
-        holder.checkbox.setChecked(target.hidden);
-        holder.checkbox.setOnCheckedChangeListener((v, checked) -> {
-            setHide(checked, app, target);
-            notifyItemChanged(getSectionPosition(section));
-        });
-        getMargins(holder).bottomMargin =
-                position == app.processList.size() - 1 ? BOTTOM_MARGIN : 0;
-    }
-
-    public void filter(String constraint) {
-        AsyncTask.SERIAL_EXECUTOR.execute(() -> {
-            Stream<HideAppInfo> s = StreamSupport.stream(fullList)
-                    .filter(this::systemFilter)
-                    .filter(t -> nameFilter(t, constraint));
-            UiThreadHandler.run(() -> {
-                showList = s.collect(Collectors.toList());
-                notifyDataSetChanged();
-            });
-        });
-    }
-
-    public void setShowSystem(boolean b) {
-        showSystem = b;
-    }
-
-    public void refresh() {
-        AsyncTask.SERIAL_EXECUTOR.execute(this::loadApps);
-    }
-
-    private void setHide(boolean add, HideAppInfo app) {
-        if (add) {
-            StreamSupport.stream(app.processList).forEach(p -> setHide(true, app, p));
-        } else {
-            if (StreamSupport.stream(app.processList)
-                    .anyMatch(p -> p.name.equals(SAFETYNET_PROCESS))) {
-                StreamSupport.stream(app.processList).forEach(p -> setHide(false, app, p));
-            } else {
-                // Quick removal
-                Shell.su("magiskhide --rm " + app.info.packageName).submit();
-                StreamSupport.stream(app.processList).forEach(p -> p.hidden = false);
-            }
-        }
-    }
-
-    private void setHide(boolean add, HideAppInfo app, HideProcessInfo process) {
-        // Don't remove SafetyNet
-        if (!add && DEFAULT_HIDELIST.contains(process.name))
-            return;
-        Shell.su(Utils.fmt("magiskhide --%s %s %s", add ? "add" : "rm",
-                app.info.packageName, process.name)).submit();
-        process.hidden = add;
-    }
-
-    private void addProcesses(Set<String> set, ComponentInfo[] infos) {
-        if (infos != null)
-            for (ComponentInfo info : infos)
-                set.add(info.processName);
-    }
-
-    private PackageInfo getPackageInfo(String pkg) {
-        // Try super hard to get as much info as possible
-        try {
-            return pm.getPackageInfo(pkg,
-                    PackageManager.GET_ACTIVITIES | PackageManager.GET_SERVICES |
-                            PackageManager.GET_RECEIVERS | PackageManager.GET_PROVIDERS);
-        } catch (Exception e1) {
-            try {
-                PackageInfo info = pm.getPackageInfo(pkg, PackageManager.GET_ACTIVITIES);
-                info.services = pm.getPackageInfo(pkg, PackageManager.GET_SERVICES).services;
-                info.receivers = pm.getPackageInfo(pkg, PackageManager.GET_RECEIVERS).receivers;
-                info.providers = pm.getPackageInfo(pkg, PackageManager.GET_PROVIDERS).providers;
-                return info;
-            } catch (Exception e2) {
-                return null;
-            }
-        }
-    }
-
-    @WorkerThread
-    private void loadApps() {
-        hideList = StreamSupport.stream(Shell.su("magiskhide --ls").exec().getOut())
-                .map(HideTarget::new)
-                .collect(Collectors.toList());
-
-        fullList = StreamSupport.stream(pm.getInstalledApplications(0))
-                .filter(info -> !HIDE_BLACKLIST.contains(info.packageName) && info.enabled)
-                .map(info -> {
-                    if (old_hide) {
-                        return new HideAppInfo(info, Sets.of(info.packageName));
-                    } else {
-                        Set<String> set = new ArraySet<>();
-                        PackageInfo pkg = getPackageInfo(info.packageName);
-                        if (pkg != null) {
-                            addProcesses(set, pkg.activities);
-                            addProcesses(set, pkg.services);
-                            addProcesses(set, pkg.receivers);
-                            addProcesses(set, pkg.providers);
-                        }
-                        if (set.isEmpty())
-                            return null;
-                        return new HideAppInfo(info, set);
-                    }
-                }).filter(Objects::nonNull).sorted()
-                .collect(Collectors.toList());
-
-        Event.trigger(false, Event.MAGISK_HIDE_DONE);
-    }
-
-    // True if not system app or user already hidden it
-    private boolean systemFilter(HideAppInfo target) {
-        return showSystem || target.haveHidden() ||
-                (target.info.flags & ApplicationInfo.FLAG_SYSTEM) == 0;
-    }
-
-    private boolean contains(String s, String filter) {
-        return s.toLowerCase().contains(filter);
-    }
-
-    private boolean nameFilter(HideAppInfo target, String filter) {
-        if (filter == null || filter.isEmpty())
-            return true;
-        filter = filter.toLowerCase();
-        if (contains(target.name, filter))
-            return true;
-        for (HideProcessInfo p : target.processList) {
-            if (contains(p.name, filter))
-                return true;
-        }
-        return contains(target.info.packageName, filter);
-    }
-
-    class HideAppInfo implements Comparable<HideAppInfo> {
-        String name;
-        ApplicationInfo info;
-        List<HideProcessInfo> processList;
-        boolean expanded;
-        IndeterminateCheckBox.OnStateChangedListener listener;
-
-        HideAppInfo(ApplicationInfo appInfo, Set<String> set) {
-            info = appInfo;
-            name = Utils.getAppLabel(info, pm);
-            expanded = false;
-            processList = StreamSupport.stream(set)
-                    .map(process -> new HideProcessInfo(info.packageName, process))
-                    .sorted().collect(Collectors.toList());
-            listener = (IndeterminateCheckBox box, @Nullable Boolean status) -> {
-                if (status != null) {
-                    for (HideProcessInfo p : processList) {
-                        String cmd = Utils.fmt("magiskhide --%s %s %s",
-                                status ? "add" : "rm", info.packageName, p.name);
-                        Shell.su(cmd).submit();
-                        p.hidden = status;
-                    }
-                }
-            };
-        }
-
-        @Override
-        public int compareTo(HideAppInfo o) {
-            Comparator<HideAppInfo> c;
-            c = Comparators.comparing(HideAppInfo::haveHidden);
-            c = Comparators.reversed(c);
-            c = Comparators.thenComparing(c, t -> t.name, String::compareToIgnoreCase);
-            c = Comparators.thenComparing(c, t -> t.info.packageName);
-            return c.compare(this, o);
-        }
-
-        Boolean getState() {
-            boolean all = true;
-            boolean hidden = false;
-            for (HideProcessInfo p : processList) {
-                if (!p.hidden)
-                    all = false;
-                else
-                    hidden = true;
-            }
-            if (all)
-                return true;
-            return hidden ? null : false;
-        }
-
-        boolean haveHidden() {
-            Boolean c = getState();
-            return c == null ? true : c;
-        }
-    }
-
-    class HideProcessInfo implements Comparable<HideProcessInfo> {
-        String name;
-        boolean hidden;
-
-        HideProcessInfo(String pkg, String process) {
-            this.name = process;
-            for (HideTarget t : hideList) {
-                if (t.pkg.equals(pkg) && t.process.equals(process)) {
-                    hidden = true;
-                    break;
-                }
-            }
-        }
-
-        @Override
-        public int compareTo(HideProcessInfo o) {
-            Comparator<HideProcessInfo> c;
-            c = Comparators.comparing((HideProcessInfo t) -> t.hidden);
-            c = Comparators.reversed(c);
-            c = Comparators.thenComparing(c, t -> t.name);
-            return c.compare(this, o);
-        }
-    }
-
-    class HideTarget {
-        String pkg;
-        String process;
-
-        HideTarget(String line) {
-            String[] split = line.split("\\|", 2);
-            pkg = split[0];
-            if (split.length == 2) {
-                process = split[1];
-            } else {
-                // Backwards compatibility
-                old_hide = true;
-                process = pkg;
-            }
-        }
-    }
-
-    class AppViewHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.app_icon) ImageView app_icon;
-        @BindView(R.id.app_name) TextView app_name;
-        @BindView(R.id.package_name) TextView package_name;
-        @BindView(R.id.checkbox) IndeterminateCheckBox checkBox;
-        @BindView(R.id.trigger) View trigger;
-        @BindView(R.id.arrow) ImageView arrow;
-
-        Expandable ex;
-
-        AppViewHolder(@NonNull View itemView) {
-            super(itemView);
-            new ApplicationAdapter$AppViewHolder_ViewBinding(this, itemView);
-            ex = new ArrowExpandable(new Expandable() {
-                @Override
-                protected void onExpand() {
-                    getMargins(AppViewHolder.this).bottomMargin = 0;
-                }
-
-                @Override
-                protected void onCollapse() {
-                    getMargins(AppViewHolder.this).bottomMargin = BOTTOM_MARGIN;
-                }
-            }, arrow);
-        }
-    }
-
-    class ProcessViewHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.process) TextView process;
-        @BindView(R.id.checkbox) CheckBox checkbox;
-
-        ProcessViewHolder(@NonNull View itemView) {
-            super(itemView);
-            new ApplicationAdapter$ProcessViewHolder_ViewBinding(this, itemView);
-        }
-    }
-
-}

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

@@ -1,127 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-import android.content.Context;
-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.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.snackbar.Snackbar;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.uicomponents.SnackbarMaker;
-import com.topjohnwu.superuser.Shell;
-
-import java.util.List;
-
-import butterknife.BindView;
-
-public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHolder> {
-
-    private final List<Module> mList;
-
-    public ModulesAdapter(List<Module> list) {
-        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);
-        return new ViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
-        Context context = holder.itemView.getContext();
-        final Module module = mList.get(position);
-
-        String version = module.getVersion();
-        String author = module.getAuthor();
-        String description = module.getDescription();
-        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.checkBox.setOnCheckedChangeListener(null);
-        holder.checkBox.setChecked(module.isEnabled());
-        holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
-            int snack;
-            if (isChecked) {
-                module.removeDisableFile();
-                snack = R.string.disable_file_removed;
-            } else {
-                module.createDisableFile();
-                snack = R.string.disable_file_created;
-            }
-            SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
-        });
-
-        holder.delete.setOnClickListener(v -> {
-            boolean removed = module.willBeRemoved();
-            int snack;
-            if (removed) {
-                module.deleteRemoveFile();
-                snack = R.string.remove_file_deleted;
-            } else {
-                module.createRemoveFile();
-                snack = R.string.remove_file_created;
-            }
-            SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
-            updateDeleteButton(holder, module);
-        });
-
-        if (module.isUpdated()) {
-            holder.notice.setVisibility(View.VISIBLE);
-            holder.notice.setText(R.string.update_file_created);
-            holder.delete.setEnabled(false);
-        } else {
-            updateDeleteButton(holder, module);
-        }
-    }
-
-    private void updateDeleteButton(ViewHolder holder, Module module) {
-        holder.notice.setVisibility(module.willBeRemoved() ? View.VISIBLE : View.GONE);
-
-        if (module.willBeRemoved()) {
-            holder.delete.setImageResource(R.drawable.ic_undelete);
-        } else {
-            holder.delete.setImageResource(R.drawable.ic_delete);
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return mList.size();
-    }
-
-    static class ViewHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.title) TextView title;
-        @BindView(R.id.version_name) TextView versionName;
-        @BindView(R.id.description) TextView description;
-        @BindView(R.id.notice) TextView notice;
-        @BindView(R.id.checkbox) CheckBox checkBox;
-        @BindView(R.id.author) TextView author;
-        @BindView(R.id.delete) ImageView delete;
-
-        ViewHolder(View itemView) {
-            super(itemView);
-            new ModulesAdapter$ViewHolder_ViewBinding(this, itemView);
-
-            if (!Shell.rootAccess()) {
-                checkBox.setEnabled(false);
-                delete.setEnabled(false);
-            }
-        }
-    }
-}

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

@@ -1,172 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.content.pm.PackageManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.SwitchCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.snackbar.Snackbar;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.container.Policy;
-import com.topjohnwu.magisk.database.MagiskDB;
-import com.topjohnwu.magisk.dialogs.CustomAlertDialog;
-import com.topjohnwu.magisk.dialogs.FingerprintAuthDialog;
-import com.topjohnwu.magisk.uicomponents.ArrowExpandable;
-import com.topjohnwu.magisk.uicomponents.Expandable;
-import com.topjohnwu.magisk.uicomponents.ExpandableViewHolder;
-import com.topjohnwu.magisk.uicomponents.SnackbarMaker;
-import com.topjohnwu.magisk.utils.FingerprintHelper;
-
-import java.util.List;
-
-import butterknife.BindView;
-
-public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder> {
-
-    private List<Policy> policyList;
-    private MagiskDB dbHelper;
-    private PackageManager pm;
-    private boolean[] expandList;
-
-    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(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_policy, parent, false);
-        return new ViewHolder(v);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        Policy policy = policyList.get(position);
-
-        holder.settings.setExpanded(expandList[position]);
-        holder.trigger.setOnClickListener(view -> {
-            if (holder.settings.isExpanded()) {
-                holder.settings.collapse();
-                expandList[position] = false;
-            } else {
-                holder.settings.expand();
-                expandList[position] = true;
-            }
-        });
-
-        holder.appName.setText(policy.appName);
-        holder.packageName.setText(policy.packageName);
-        holder.appIcon.setImageDrawable(policy.info.loadIcon(pm));
-
-        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) -> {
-            if ((isChecked && !policy.notification) ||
-                    (!isChecked && policy.notification)) {
-                policy.notification = isChecked;
-                String message = v.getContext().getString(
-                        isChecked ? R.string.su_snack_notif_on : R.string.su_snack_notif_off, policy.appName);
-                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                dbHelper.updatePolicy(policy);
-            }
-        });
-        holder.loggingSwitch.setOnCheckedChangeListener((v, isChecked) -> {
-            if ((isChecked && !policy.logging) ||
-                    (!isChecked && policy.logging)) {
-                policy.logging = isChecked;
-                String message = v.getContext().getString(
-                        isChecked ? R.string.su_snack_log_on : R.string.su_snack_log_off, policy.appName);
-                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                dbHelper.updatePolicy(policy);
-            }
-        });
-        holder.delete.setOnClickListener(v -> {
-            DialogInterface.OnClickListener l = (dialog, which) -> {
-                policyList.remove(position);
-                notifyItemRemoved(position);
-                notifyItemRangeChanged(position, policyList.size());
-                SnackbarMaker.make(holder.itemView, v.getContext().getString(R.string.su_snack_revoke, policy.appName),
-                        Snackbar.LENGTH_SHORT).show();
-                dbHelper.deletePolicy(policy);
-            };
-            if (FingerprintHelper.useFingerprint()) {
-                new FingerprintAuthDialog((Activity) v.getContext(),
-                        () -> l.onClick(null, 0)).show();
-            } else {
-                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, l)
-                        .setNegativeButton(R.string.no_thanks, null)
-                        .setCancelable(true)
-                        .show();
-            }
-        });
-    }
-
-    @Override
-    public int getItemCount() {
-        return policyList.size();
-    }
-
-    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) 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;
-
-        Expandable settings;
-
-        public ViewHolder(View itemView) {
-            super(itemView);
-            new PolicyAdapter$ViewHolder_ViewBinding(this, itemView);
-            settings = new ArrowExpandable(new ExpandableViewHolder(expandLayout), arrow);
-        }
-    }
-}

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

@@ -1,246 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-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.SearchView;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.topjohnwu.magisk.App;
-import com.topjohnwu.magisk.ClassMap;
-import com.topjohnwu.magisk.R;
-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.dialogs.CustomAlertDialog;
-import com.topjohnwu.magisk.uicomponents.MarkDownWindow;
-import com.topjohnwu.magisk.utils.Event;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import butterknife.BindView;
-import java9.util.stream.StreamSupport;
-
-public class ReposAdapter
-        extends SectionedAdapter<ReposAdapter.SectionHolder, ReposAdapter.RepoHolder>
-        implements Event.AutoListener, SearchView.OnQueryTextListener {
-
-    private static final int UPDATES = 0;
-    private static final int INSTALLED = 1;
-    private static final int OTHERS = 2;
-
-    private Map<String, Module> moduleMap;
-    private RepoDatabaseHelper repoDB;
-    private List<Pair<Integer, List<Repo>>> repoPairs;
-    private List<Repo> fullList;
-    private SearchView mSearch;
-
-    public ReposAdapter() {
-        repoDB = App.self.repoDB;
-        moduleMap = Collections.emptyMap();
-        fullList = Collections.emptyList();
-        repoPairs = new ArrayList<>();
-    }
-
-    @Override
-    public int getSectionCount() {
-        return repoPairs.size();
-    }
-
-    @Override
-    public int getItemCount(int section) {
-        return repoPairs.get(section).second.size();
-    }
-
-    @Override
-    public SectionHolder onCreateSectionViewHolder(ViewGroup parent) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.section, parent, false);
-        return new SectionHolder(v);
-    }
-
-    @Override
-    public RepoHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_repo, parent, false);
-        return new RepoHolder(v);
-    }
-
-    @Override
-    public void onBindSectionViewHolder(SectionHolder holder, int section) {
-        switch (repoPairs.get(section).first) {
-            case UPDATES:
-                holder.sectionText.setText(R.string.update_available);
-                break;
-            case INSTALLED:
-                holder.sectionText.setText(R.string.installed);
-                break;
-            case OTHERS:
-                holder.sectionText.setText(R.string.not_installed);
-                break;
-        }
-    }
-
-    @Override
-    public void onBindItemViewHolder(RepoHolder holder, int section, int position) {
-        Repo repo = repoPairs.get(section).second.get(position);
-        Context context = holder.itemView.getContext();
-
-        String name = repo.getName();
-        String version = repo.getVersion();
-        String author = repo.getAuthor();
-        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 ->
-                MarkDownWindow.show((BaseActivity) context, null, repo.getDetailUrl()));
-
-        holder.downloadImage.setOnClickListener(v -> {
-            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);
-            }
-        });
-    }
-
-    private void updateLists() {
-        if (mSearch != null)
-            onQueryTextChange(mSearch.getQuery().toString());
-        else
-            onQueryTextChange("");
-    }
-
-    private static boolean noCaseContain(String a, String b) {
-        return a.toLowerCase().contains(b.toLowerCase());
-    }
-
-    public void setSearchView(SearchView view) {
-        mSearch = view;
-        mSearch.setOnQueryTextListener(this);
-    }
-
-    public void notifyDBChanged(boolean refresh) {
-        try (Cursor c = repoDB.getRepoCursor()) {
-            fullList = new ArrayList<>(c.getCount());
-            while (c.moveToNext())
-                fullList.add(new Repo(c));
-        }
-        if (refresh)
-            updateLists();
-    }
-
-    @Override
-    public void onEvent(int event) {
-        moduleMap = Event.getResult(event);
-        updateLists();
-    }
-
-    @Override
-    public int[] getListeningEvents() {
-        return new int[] {Event.MODULE_LOAD_DONE};
-    }
-
-    @Override
-    public boolean onQueryTextSubmit(String query) {
-        return false;
-    }
-
-    @Override
-    public boolean onQueryTextChange(String s) {
-        List<Repo> updates = new ArrayList<>();
-        List<Repo> installed = new ArrayList<>();
-        List<Repo> others = new ArrayList<>();
-
-        StreamSupport.stream(fullList)
-                .filter(repo -> noCaseContain(repo.getName(), s)
-                        || noCaseContain(repo.getAuthor(), s)
-                        || noCaseContain(repo.getDescription(), s))
-                .forEach(repo -> {
-                    Module module = moduleMap.get(repo.getId());
-                    if (module != null) {
-                        if (repo.getVersionCode() > module.getVersionCode()) {
-                            // Updates
-                            updates.add(repo);
-                        } else {
-                            installed.add(repo);
-                        }
-                    } else {
-                        others.add(repo);
-                    }
-                });
-
-        repoPairs.clear();
-        if (!updates.isEmpty())
-            repoPairs.add(new Pair<>(UPDATES, updates));
-        if (!installed.isEmpty())
-            repoPairs.add(new Pair<>(INSTALLED, installed));
-        if (!others.isEmpty())
-            repoPairs.add(new Pair<>(OTHERS, others));
-
-        notifyDataSetChanged();
-        return false;
-    }
-
-    static class SectionHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.section_text) TextView sectionText;
-
-        SectionHolder(View itemView) {
-            super(itemView);
-            new ReposAdapter$SectionHolder_ViewBinding(this, itemView);
-        }
-    }
-
-    static class RepoHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.title) TextView title;
-        @BindView(R.id.version_name) TextView versionName;
-        @BindView(R.id.description) TextView description;
-        @BindView(R.id.author) TextView author;
-        @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);
-            new ReposAdapter$RepoHolder_ViewBinding(this, itemView);
-        }
-
-    }
-}

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

@@ -1,96 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-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(@NonNull ViewGroup parent, int viewType) {
-        if (viewType == SECTION_TYPE)
-            return onCreateSectionViewHolder(parent);
-        return onCreateItemViewHolder(parent, viewType);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    final public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        PositionInfo info = getPositionInfo(position);
-        if (info.position == -1)
-            onBindSectionViewHolder((S) holder, info.section);
-        else
-            onBindItemViewHolder((C) holder, info.section, info.position);
-    }
-
-    @Override
-    final public int getItemCount() {
-        int size, sec;
-        size = sec = getSectionCount();
-        for (int i = 0; i < sec; ++i){
-            size += getItemCount(i);
-        }
-        return size;
-    }
-
-    @Override
-    final public int getItemViewType(int position) {
-        PositionInfo info = getPositionInfo(position);
-        if (info.position == -1)
-            return SECTION_TYPE;
-        else
-            return getItemViewType(info.section, info.position);
-    }
-
-    public int getItemViewType(int section, int position) {
-        return 0;
-    }
-
-    protected int getSectionPosition(int section) {
-        return getItemPosition(section, -1);
-    }
-
-    protected int getItemPosition(int section, int position) {
-        int realPosition = 0;
-        // Previous sections
-        for (int i = 0; i < section; ++i) {
-            realPosition += getItemCount(i) + 1;
-        }
-        // Current section
-        realPosition += position + 1;
-        return realPosition;
-    }
-
-    private PositionInfo getPositionInfo(int position) {
-        int section = 0;
-        while (true) {
-            if (position == 0)
-                return new PositionInfo(section, -1);
-            position -= 1;
-            if (position < getItemCount(section))
-                return new PositionInfo(section, position);
-            position -= getItemCount(section++);
-        }
-    }
-
-    private static class PositionInfo {
-        int section;
-        int position;
-        PositionInfo(int section, int position) {
-            this.section = section;
-            this.position = position;
-        }
-    }
-
-    public abstract int getSectionCount();
-    public abstract int getItemCount(int section);
-    public abstract S onCreateSectionViewHolder(ViewGroup parent);
-    public abstract C onCreateItemViewHolder(ViewGroup parent, int viewType);
-    public abstract void onBindSectionViewHolder(S holder, int section);
-    public abstract void onBindItemViewHolder(C holder, int section, int position);
-}

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

@@ -1,103 +0,0 @@
-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 androidx.annotation.IdRes;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-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.getPaddingStart() + rv.getPaddingEnd();
-        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/main/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java

@@ -1,144 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.RotateAnimation;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.container.SuLogEntry;
-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 butterknife.BindView;
-
-public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, SuLogAdapter.LogViewHolder> {
-
-    private List<List<SuLogEntry>> logEntries;
-    private Set<Integer> itemExpanded, sectionExpanded;
-    private MagiskDB suDB;
-
-    public SuLogAdapter(MagiskDB db) {
-        suDB = db;
-        logEntries = Collections.emptyList();
-        sectionExpanded = new HashSet<>();
-        itemExpanded = new HashSet<>();
-    }
-
-    @Override
-    public int getSectionCount() {
-        return logEntries.size();
-    }
-
-    @Override
-    public int getItemCount(int section) {
-        return sectionExpanded.contains(section) ? logEntries.get(section).size() : 0;
-    }
-
-    @Override
-    public SectionHolder onCreateSectionViewHolder(ViewGroup parent) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_sulog_group, parent, false);
-        return new SectionHolder(v);
-    }
-
-    @Override
-    public LogViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_sulog, parent, false);
-        return new LogViewHolder(v);
-    }
-
-    @Override
-    public void onBindSectionViewHolder(SectionHolder holder, int section) {
-        SuLogEntry entry = logEntries.get(section).get(0);
-        holder.arrow.setRotation(sectionExpanded.contains(section) ? 180 : 0);
-        holder.itemView.setOnClickListener(v -> {
-            RotateAnimation rotate;
-            if (sectionExpanded.contains(section)) {
-                holder.arrow.setRotation(0);
-                rotate = new RotateAnimation(180, 0, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
-                sectionExpanded.remove(section);
-                notifyItemRangeRemoved(getItemPosition(section, 0), 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), logEntries.get(section).size());
-            }
-            rotate.setDuration(300);
-            rotate.setFillAfter(true);
-            holder.arrow.setAnimation(rotate);
-        });
-        holder.date.setText(entry.getDateString());
-    }
-
-    @Override
-    public void onBindItemViewHolder(LogViewHolder holder, int section, int position) {
-        SuLogEntry entry = logEntries.get(section).get(position);
-        int realIdx = getItemPosition(section, position);
-        holder.expandable.setExpanded(itemExpanded.contains(realIdx));
-        holder.itemView.setOnClickListener(view -> {
-            if (holder.expandable.isExpanded()) {
-                holder.expandable.collapse();
-                itemExpanded.remove(realIdx);
-            } else {
-                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.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() {
-        logEntries = suDB.getLogs();
-        itemExpanded.clear();
-        sectionExpanded.clear();
-        sectionExpanded.add(0);
-        notifyDataSetChanged();
-    }
-
-    static class SectionHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.date) TextView date;
-        @BindView(R.id.arrow) ImageView arrow;
-
-        SectionHolder(View itemView) {
-            super(itemView);
-            new SuLogAdapter$SectionHolder_ViewBinding(this, itemView);
-        }
-    }
-
-    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.pid) TextView pid;
-        @BindView(R.id.uid) TextView uid;
-        @BindView(R.id.cmd) TextView command;
-        @BindView(R.id.expand_layout) ViewGroup expandLayout;
-
-        ExpandableViewHolder expandable;
-
-        LogViewHolder(View itemView) {
-            super(itemView);
-            new SuLogAdapter$LogViewHolder_ViewBinding(this, itemView);
-            expandable = new ExpandableViewHolder(expandLayout);
-        }
-    }
-}

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

@@ -1,41 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TabFragmentAdapter extends FragmentPagerAdapter {
-
-    private List<Fragment> fragmentList;
-    private List<String> titleList;
-
-    public TabFragmentAdapter(FragmentManager fm) {
-        super(fm);
-        fragmentList = new ArrayList<>();
-        titleList = new ArrayList<>();
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        return fragmentList.get(position);
-    }
-
-    @Override
-    public int getCount() {
-        return fragmentList.size();
-    }
-
-    @Override
-    public CharSequence getPageTitle(int position) {
-        return titleList.get(position);
-    }
-
-    public void addTab(Fragment fragment, String title) {
-        fragmentList.add(fragment);
-        titleList.add(title);
-    }
-}

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

@@ -1,157 +0,0 @@
-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 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;
-
-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.Event;
-import com.topjohnwu.magisk.utils.LocaleManager;
-
-public abstract class BaseActivity extends AppCompatActivity implements Event.AutoListener {
-
-    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[] getListeningEvents() {
-        return EMPTY_INT_ARRAY;
-    }
-
-    @Override
-    public void onEvent(int event) {}
-
-    @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) {
-        Event.register(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() {
-        Event.unregister(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/main/java/com/topjohnwu/magisk/components/BaseFragment.java

@@ -1,56 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.content.Intent;
-
-import androidx.fragment.app.Fragment;
-
-import com.topjohnwu.magisk.App;
-import com.topjohnwu.magisk.utils.Event;
-
-import butterknife.Unbinder;
-
-public abstract class BaseFragment extends Fragment implements Event.AutoListener {
-
-    public App app = App.self;
-    protected Unbinder unbinder = null;
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        Event.register(this);
-    }
-
-    @Override
-    public void onPause() {
-        Event.unregister(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[] getListeningEvents() {
-        return BaseActivity.EMPTY_INT_ARRAY;
-    }
-
-    @Override
-    public void onEvent(int event) {}
-}

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

@@ -1,120 +0,0 @@
-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 androidx.annotation.Nullable;
-
-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;
-
-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();
-            OutputStream out = new BufferedOutputStream(new FileOutputStream(output));
-            processZip(in, out, repo.isNewInstaller());
-            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 processZip(InputStream in, OutputStream out, boolean inject)
-            throws IOException {
-        try (ZipInputStream zin = new ZipInputStream(in);
-             ZipOutputStream zout = new ZipOutputStream(out)) {
-
-            if (inject) {
-                // Inject latest module-installer.sh as update-binary
-                zout.putNextEntry(new ZipEntry("META-INF/"));
-                zout.putNextEntry(new ZipEntry("META-INF/com/"));
-                zout.putNextEntry(new ZipEntry("META-INF/com/google/"));
-                zout.putNextEntry(new ZipEntry("META-INF/com/google/android/"));
-                zout.putNextEntry(new ZipEntry("META-INF/com/google/android/update-binary"));
-                try (InputStream update_bin = Networking.get(Const.Url.MODULE_INSTALLER)
-                        .execForInputStream().getResult()) {
-                    ShellUtils.pump(update_bin, zout);
-                }
-                zout.putNextEntry(new ZipEntry("META-INF/com/google/android/updater-script"));
-                zout.write("#MAGISK\n".getBytes("UTF-8"));
-            }
-
-            int off = -1;
-            ZipEntry entry;
-            while ((entry = zin.getNextEntry()) != null) {
-                if (off < 0)
-                    off = entry.getName().indexOf('/') + 1;
-                String path = entry.getName().substring(off);
-                if (path.isEmpty())
-                    continue;
-                if (inject && path.startsWith("META-INF"))
-                    continue;
-                zout.putNextEntry(new ZipEntry(path));
-                if (!entry.isDirectory())
-                    ShellUtils.pump(zin, zout);
-            }
-        }
-    }
-}

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

@@ -1,100 +0,0 @@
-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_REBOOT:
-            case Intent.ACTION_BOOT_COMPLETED:
-                String realAction = intent.getStringExtra("action");
-                if (realAction == null)
-                    realAction = "boot_complete";
-                switch (realAction) {
-                    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_complete":
-                    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/main/java/com/topjohnwu/magisk/container/TarEntry.java

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

app/src/main/java/com/topjohnwu/magisk/data/database/MagiskDB.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.database;
+package com.topjohnwu.magisk.data.database;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -7,8 +7,8 @@ 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.model.entity.Policy;
+import com.topjohnwu.magisk.model.entity.SuLogEntry;
 import com.topjohnwu.magisk.utils.LocaleManager;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;

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

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.database;
+package com.topjohnwu.magisk.data.database;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -6,15 +6,14 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
 import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.container.Repo;
+import com.topjohnwu.magisk.model.entity.Repo;
 
 import java.util.HashSet;
 import java.util.Set;
 
 public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VER = 4;
+    private static final int DATABASE_VER = 5;
     private static final String TABLE_NAME = "repos";
 
     private SQLiteDatabase mDb;
@@ -22,9 +21,6 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
     public RepoDatabaseHelper(Context context) {
         super(context, "repo.db", null, DATABASE_VER);
         mDb = getWritableDatabase();
-
-        // Remove outdated repos
-        mDb.delete(TABLE_NAME, "minMagisk<?", new String[] { String.valueOf(Const.MIN_MODULE_VER) });
     }
 
     @Override
@@ -39,7 +35,7 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
             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, " +
+                            "(id TEXT, name TEXT, version TEXT, versionCode INT, " +
                             "author TEXT, description TEXT, last_update INT, PRIMARY KEY(id))");
             Config.remove(Config.Key.ETAG_KEY);
         }
@@ -96,9 +92,7 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
             case Config.Value.ORDER_DATE:
                 orderBy = "last_update DESC";
         }
-        return mDb.query(TABLE_NAME, null, "minMagisk<=? AND minMagisk>=?",
-                new String[] { String.valueOf(Config.magiskVersionCode), String.valueOf(Const.MIN_MODULE_VER) },
-                null, null, orderBy);
+        return mDb.query(TABLE_NAME, null, null, null, null, null, orderBy);
     }
 
     public Set<String> getRepoIDSet() {

app/src/main/java/com/topjohnwu/magisk/di/ApplicationModule.kt

@@ -0,0 +1,19 @@
+package com.topjohnwu.magisk.di
+
+import android.content.Context
+import androidx.preference.PreferenceManager
+import com.skoumal.teanity.rxbus.RxBus
+import com.topjohnwu.magisk.App
+import org.koin.dsl.module
+
+
+val applicationModule = module {
+    single { RxBus() }
+    factory { get<Context>().resources }
+    factory { get<Context>() as App }
+    factory { get<Context>().packageManager }
+    single(SUTimeout) {
+        get<App>().protectedContext.getSharedPreferences("su_timeout", 0)
+    }
+    single { PreferenceManager.getDefaultSharedPreferences(get<App>().protectedContext) }
+}

app/src/main/java/com/topjohnwu/magisk/di/DatabaseModule.kt

@@ -0,0 +1,12 @@
+package com.topjohnwu.magisk.di
+
+import com.topjohnwu.magisk.App
+import com.topjohnwu.magisk.data.database.MagiskDB
+import com.topjohnwu.magisk.data.database.RepoDatabaseHelper
+import org.koin.dsl.module
+
+
+val databaseModule = module {
+    single { MagiskDB(get<App>().protectedContext) }
+    single { RepoDatabaseHelper(get()) }
+}

app/src/main/java/com/topjohnwu/magisk/di/MiscModule.kt

@@ -0,0 +1,10 @@
+package com.topjohnwu.magisk.di
+
+import org.koin.dsl.module
+
+
+val miscModule = module {
+
+    // define miscs here
+
+}

app/src/main/java/com/topjohnwu/magisk/di/Modules.kt

@@ -0,0 +1,10 @@
+package com.topjohnwu.magisk.di
+
+val koinModules = listOf(
+    applicationModule,
+    networkingModule,
+    databaseModule,
+    repositoryModule,
+    viewModelModules,
+    miscModule
+)

app/src/main/java/com/topjohnwu/magisk/di/NamedInjection.kt

@@ -0,0 +1,5 @@
+package com.topjohnwu.magisk.di
+
+import org.koin.core.qualifier.named
+
+val SUTimeout = named("su_timeout")

app/src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt

@@ -0,0 +1,6 @@
+package com.topjohnwu.magisk.di
+
+import org.koin.dsl.module
+
+
+val networkingModule = module {}

app/src/main/java/com/topjohnwu/magisk/di/RepositoryModule.kt

@@ -0,0 +1,6 @@
+package com.topjohnwu.magisk.di
+
+import org.koin.dsl.module
+
+
+val repositoryModule = module {}

app/src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt

@@ -0,0 +1,25 @@
+package com.topjohnwu.magisk.di
+
+import android.net.Uri
+import com.topjohnwu.magisk.ui.MainViewModel
+import com.topjohnwu.magisk.ui.flash.FlashViewModel
+import com.topjohnwu.magisk.ui.hide.HideViewModel
+import com.topjohnwu.magisk.ui.home.HomeViewModel
+import com.topjohnwu.magisk.ui.log.LogViewModel
+import com.topjohnwu.magisk.ui.module.ModuleViewModel
+import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
+import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.dsl.module
+
+
+val viewModelModules = module {
+    viewModel { MainViewModel() }
+    viewModel { HomeViewModel(get()) }
+    viewModel { SuperuserViewModel(get(), get(), get(), get()) }
+    viewModel { HideViewModel(get(), get()) }
+    viewModel { ModuleViewModel(get(), get()) }
+    viewModel { LogViewModel(get(), get()) }
+    viewModel { (action: String, uri: Uri?) -> FlashViewModel(action, uri, get()) }
+    viewModel { SuRequestViewModel(get(), get(), get(SUTimeout), get()) }
+}

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

@@ -1,47 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-
-import android.os.Build;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.viewpager.widget.ViewPager;
-
-import com.google.android.material.tabs.TabLayout;
-import com.topjohnwu.magisk.MainActivity;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.adapters.TabFragmentAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-
-import butterknife.BindView;
-
-public class LogFragment extends BaseFragment {
-
-    @BindView(R.id.container) ViewPager viewPager;
-    @BindView(R.id.tab) TabLayout tab;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View v = inflater.inflate(R.layout.fragment_log, container, false);
-        unbinder = new LogFragment_ViewBinding(this, v);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            ((MainActivity) requireActivity()).toolbar.setElevation(0);
-        }
-
-        TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());
-
-        adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
-        adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
-        tab.setupWithViewPager(viewPager);
-        tab.setVisibility(View.VISIBLE);
-
-        viewPager.setAdapter(adapter);
-
-        return v;
-    }
-}

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

@@ -1,333 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-import android.net.Uri;
-import android.os.Bundle;
-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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.cardview.widget.CardView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.transition.ChangeBounds;
-import androidx.transition.Fade;
-import androidx.transition.Transition;
-import androidx.transition.TransitionManager;
-import androidx.transition.TransitionSet;
-
-import com.topjohnwu.magisk.BuildConfig;
-import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.MainActivity;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.dialogs.EnvFixDialog;
-import com.topjohnwu.magisk.dialogs.MagiskInstallDialog;
-import com.topjohnwu.magisk.dialogs.ManagerInstallDialog;
-import com.topjohnwu.magisk.dialogs.UninstallDialog;
-import com.topjohnwu.magisk.tasks.CheckUpdates;
-import com.topjohnwu.magisk.uicomponents.ArrowExpandable;
-import com.topjohnwu.magisk.uicomponents.Expandable;
-import com.topjohnwu.magisk.uicomponents.ExpandableViewHolder;
-import com.topjohnwu.magisk.uicomponents.MarkDownWindow;
-import com.topjohnwu.magisk.uicomponents.SafetyNet;
-import com.topjohnwu.magisk.uicomponents.UpdateCardHolder;
-import com.topjohnwu.magisk.utils.Event;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.net.Networking;
-import com.topjohnwu.superuser.Shell;
-
-import java.util.Locale;
-
-import butterknife.BindColor;
-import butterknife.BindView;
-import butterknife.OnClick;
-
-public class MagiskFragment extends BaseFragment implements SwipeRefreshLayout.OnRefreshListener {
-
-    private static boolean shownDialog = false;
-
-    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
-    @BindView(R.id.linearLayout) LinearLayout root;
-
-    @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_option_expand) ViewGroup optionExpandLayout;
-    @BindView(R.id.arrow) ImageView arrow;
-
-    @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.green500) int colorNeutral;
-    @BindColor(R.color.blue500) int colorInfo;
-
-    private UpdateCardHolder magisk;
-    private UpdateCardHolder manager;
-    private SafetyNet safetyNet;
-    private Transition transition;
-    private Expandable optionExpand;
-
-    private void magiskInstall(View v) {
-        // Show Manager update first
-        if (Config.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-            new ManagerInstallDialog(requireActivity()).show();
-            return;
-        }
-        new MagiskInstallDialog((BaseActivity) requireActivity()).show();
-    }
-
-    private void managerInstall(View v) {
-        new ManagerInstallDialog(requireActivity()).show();
-    }
-
-    private void openLink(String url) {
-        Utils.openLink(requireActivity(), Uri.parse(url));
-    }
-
-    @OnClick(R.id.paypal)
-    void paypal() {
-        openLink(Const.Url.PAYPAL_URL);
-    }
-
-    @OnClick(R.id.patreon)
-    void patreon() {
-        openLink(Const.Url.PATREON_URL);
-    }
-
-    @OnClick(R.id.twitter)
-    void twitter() {
-        openLink(Const.Url.TWITTER_URL);
-    }
-
-    @OnClick(R.id.github)
-    void github() {
-        openLink(Const.Url.SOURCE_CODE_URL);
-    }
-
-    @OnClick(R.id.xda)
-    void xda() {
-        openLink(Const.Url.XDA_THREAD);
-    }
-
-    @OnClick(R.id.uninstall_button)
-    void uninstall() {
-        new UninstallDialog(requireActivity()).show();
-    }
-
-    @OnClick(R.id.arrow)
-    void expandOptions() {
-        if (optionExpand.isExpanded())
-            optionExpand.collapse();
-        else optionExpand.expand();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.fragment_magisk, container, false);
-        unbinder = new MagiskFragment_ViewBinding(this, v);
-        requireActivity().setTitle(R.string.magisk);
-
-        optionExpand = new ArrowExpandable(new ExpandableViewHolder(optionExpandLayout), arrow);
-        safetyNet = new SafetyNet(v);
-        magisk = new UpdateCardHolder(inflater, root);
-        manager = new UpdateCardHolder(inflater, root);
-        manager.setClickable(vv ->
-                MarkDownWindow.show(requireActivity(), null,
-                        getResources().openRawResource(R.raw.changelog)));
-        root.addView(magisk.itemView, 1);
-        root.addView(manager.itemView, 2);
-
-        keepVerityChkbox.setChecked(Config.keepVerity);
-        keepVerityChkbox.setOnCheckedChangeListener((view, checked) -> Config.keepVerity = checked);
-        keepEncChkbox.setChecked(Config.keepEnc);
-        keepEncChkbox.setOnCheckedChangeListener((view, checked) -> Config.keepEnc = checked);
-
-        mSwipeRefreshLayout.setOnRefreshListener(this);
-
-        magisk.install.setOnClickListener(this::magiskInstall);
-        manager.install.setOnClickListener(this::managerInstall);
-        if (Config.get(Config.Key.COREONLY)) {
-            magisk.additional.setText(R.string.core_only_enabled);
-            magisk.additional.setVisibility(View.VISIBLE);
-        }
-        if (!app.getPackageName().equals(BuildConfig.APPLICATION_ID)) {
-            manager.additional.setText("(" + app.getPackageName() +  ")");
-            manager.additional.setVisibility(View.VISIBLE);
-        }
-
-        transition = new TransitionSet()
-                .setOrdering(TransitionSet.ORDERING_TOGETHER)
-                .addTransition(new Fade(Fade.OUT))
-                .addTransition(new ChangeBounds())
-                .addTransition(new Fade(Fade.IN));
-
-        updateUI();
-        return v;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        safetyNet.unbinder.unbind();
-        magisk.unbinder.unbind();
-        manager.unbinder.unbind();
-    }
-
-    @Override
-    public void onRefresh() {
-        mSwipeRefreshLayout.setRefreshing(false);
-        TransitionManager.beginDelayedTransition(root, transition);
-        safetyNet.reset();
-        magisk.reset();
-        manager.reset();
-
-        Config.loadMagiskInfo();
-        updateUI();
-
-        Event.reset(this);
-        Config.remoteMagiskVersionString = null;
-        Config.remoteMagiskVersionCode = -1;
-
-        shownDialog = false;
-
-        // Trigger state check
-        if (Networking.checkNetworkStatus(app)) {
-            CheckUpdates.check();
-        }
-    }
-
-    @Override
-    public int[] getListeningEvents() {
-        return new int[] {Event.UPDATE_CHECK_DONE};
-    }
-
-    @Override
-    public void onEvent(int event) {
-        updateCheckUI();
-    }
-
-    private void updateUI() {
-        ((MainActivity) requireActivity()).checkHideSection();
-        int image, color;
-        String status;
-        if (Config.magiskVersionCode < 0) {
-            color = colorBad;
-            image = R.drawable.ic_cancel;
-            status = getString(R.string.magisk_version_error);
-            magisk.status.setText(status);
-            magisk.currentVersion.setVisibility(View.GONE);
-        } else {
-            color = colorOK;
-            image = R.drawable.ic_check_circle;
-            status = getString(R.string.magisk);
-            magisk.currentVersion.setText(getString(R.string.current_installed,
-                    String.format(Locale.US, "v%s (%d)",
-                            Config.magiskVersionString, Config.magiskVersionCode)));
-        }
-        magisk.statusIcon.setColorFilter(color);
-        magisk.statusIcon.setImageResource(image);
-
-        manager.statusIcon.setColorFilter(colorOK);
-        manager.statusIcon.setImageResource(R.drawable.ic_check_circle);
-        manager.currentVersion.setText(getString(R.string.current_installed,
-                String.format(Locale.US, "v%s (%d)",
-                        BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));
-
-        if (!Networking.checkNetworkStatus(app)) {
-            // No network, updateCheckUI will not be triggered
-            magisk.status.setText(status);
-            manager.status.setText(R.string.app_name);
-            magisk.setValid(false);
-            manager.setValid(false);
-        }
-    }
-
-    private void updateCheckUI() {
-        int image, color;
-        String status, button = "";
-
-        TransitionManager.beginDelayedTransition(root, transition);
-
-        if (Config.remoteMagiskVersionCode < 0) {
-            color = colorNeutral;
-            image = R.drawable.ic_help;
-            status = getString(R.string.invalid_update_channel);
-        } else {
-            magisk.latestVersion.setText(getString(R.string.latest_version,
-                    String.format(Locale.US, "v%s (%d)",
-                            Config.remoteMagiskVersionString, Config.remoteMagiskVersionCode)));
-            if (Config.remoteMagiskVersionCode > Config.magiskVersionCode) {
-                color = colorInfo;
-                image = R.drawable.ic_update;
-                status = getString(R.string.magisk_update_title);
-                button = getString(R.string.update);
-            } else {
-                color = colorOK;
-                image = R.drawable.ic_check_circle;
-                status = getString(R.string.magisk_up_to_date);
-                button = getString(R.string.install);
-            }
-        }
-        if (Config.magiskVersionCode > 0) {
-            // Only override status if Magisk is installed
-            magisk.statusIcon.setImageResource(image);
-            magisk.statusIcon.setColorFilter(color);
-            magisk.status.setText(status);
-            magisk.install.setText(button);
-        }
-
-        if (Config.remoteManagerVersionCode < 0) {
-            color = colorNeutral;
-            image = R.drawable.ic_help;
-            status = getString(R.string.invalid_update_channel);
-        } else {
-            manager.latestVersion.setText(getString(R.string.latest_version,
-                    String.format(Locale.US, "v%s (%d)",
-                            Config.remoteManagerVersionString, Config.remoteManagerVersionCode)));
-            if (Config.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-                color = colorInfo;
-                image = R.drawable.ic_update;
-                status = getString(R.string.manager_update_title);
-                manager.install.setText(R.string.update);
-            } else {
-                color = colorOK;
-                image = R.drawable.ic_check_circle;
-                status = getString(R.string.manager_up_to_date);
-                manager.install.setText(R.string.install);
-            }
-        }
-        manager.statusIcon.setImageResource(image);
-        manager.statusIcon.setColorFilter(color);
-        manager.status.setText(status);
-
-        magisk.setValid(Config.remoteMagiskVersionCode > 0);
-        manager.setValid(Config.remoteManagerVersionCode > 0);
-
-        if (Config.remoteMagiskVersionCode < 0) {
-            // Hide install related components
-            installOptionCard.setVisibility(View.GONE);
-            uninstallButton.setVisibility(View.GONE);
-        } else {
-            // Show install related components
-            installOptionCard.setVisibility(View.VISIBLE);
-            uninstallButton.setVisibility(Shell.rootAccess() ? View.VISIBLE : View.GONE);
-        }
-
-        if (!shownDialog && Config.magiskVersionCode > 0 &&
-                !Shell.su("env_check").exec().isSuccess()) {
-            shownDialog = true;
-            new EnvFixDialog(requireActivity()).show();
-        }
-    }
-}
-

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

@@ -1,101 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-import android.os.Bundle;
-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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.adapters.ApplicationAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.utils.Event;
-
-import butterknife.BindView;
-
-public class MagiskHideFragment extends BaseFragment {
-
-    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
-    @BindView(R.id.recyclerView) RecyclerView recyclerView;
-
-    private SearchView search;
-    private ApplicationAdapter adapter;
-    private SearchView.OnQueryTextListener searchListener;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_magisk_hide, container, false);
-        unbinder = new MagiskHideFragment_ViewBinding(this, view);
-
-        adapter = new ApplicationAdapter(requireActivity());
-        recyclerView.setAdapter(adapter);
-
-        mSwipeRefreshLayout.setRefreshing(true);
-        mSwipeRefreshLayout.setOnRefreshListener(adapter::refresh);
-
-        searchListener = new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                adapter.filter(query);
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                adapter.filter(newText);
-                return false;
-            }
-        };
-
-        requireActivity().setTitle(R.string.magiskhide);
-
-        return view;
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_magiskhide, menu);
-        search = (SearchView) menu.findItem(R.id.app_search).getActionView();
-        search.setOnQueryTextListener(searchListener);
-        menu.findItem(R.id.show_system).setChecked(Config.get(Config.Key.SHOW_SYSTEM_APP));
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.show_system) {
-            boolean showSystem = !item.isChecked();
-            item.setChecked(showSystem);
-            Config.set(Config.Key.SHOW_SYSTEM_APP, showSystem);
-            adapter.setShowSystem(showSystem);
-            adapter.filter(search.getQuery().toString());
-        }
-        return true;
-    }
-
-    @Override
-    public int[] getListeningEvents() {
-        return new int[] {Event.MAGISK_HIDE_DONE};
-    }
-
-    @Override
-    public void onEvent(int event) {
-        mSwipeRefreshLayout.setRefreshing(false);
-        adapter.filter(search.getQuery().toString());
-    }
-}

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

@@ -1,158 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-import android.Manifest;
-import android.os.Bundle;
-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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.snackbar.Snackbar;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.adapters.StringListAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.uicomponents.SnackbarMaker;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.internal.NOPList;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.List;
-
-import butterknife.BindView;
-
-public class MagiskLogFragment extends BaseFragment {
-
-    @BindView(R.id.recyclerView) RecyclerView rv;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_magisk_log, container, false);
-        unbinder = new MagiskLogFragment_ViewBinding(this, view);
-        setHasOptionsMenu(true);
-        return view;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        getActivity().setTitle(R.string.log);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        readLogs();
-    }
-
-    @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();
-                rv.setAdapter(new MagiskLogAdapter(NOPList.getInstance()));
-                return true;
-            default:
-                return true;
-        }
-    }
-
-    private void readLogs() {
-        Shell.su("tail -n 5000 " + Const.MAGISK_LOG).submit(result -> {
-            rv.setAdapter(new MagiskLogAdapter(result.getOut()));
-        });
-    }
-
-    private 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 logFile = new File(Const.EXTERNAL_PATH, filename);
-        try {
-            logFile.createNewFile();
-        } catch (IOException e) {
-            return;
-        }
-        Shell.su("cat " + Const.MAGISK_LOG + " > " + logFile)
-                .submit(result ->
-                        SnackbarMaker.make(rv, logFile.getPath(), Snackbar.LENGTH_SHORT).show());
-    }
-
-    private void clearLogs() {
-        Shell.su("echo -n > " + Const.MAGISK_LOG).submit();
-        SnackbarMaker.make(rv, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
-    }
-
-    private class MagiskLogAdapter extends StringListAdapter<MagiskLogAdapter.ViewHolder> {
-
-        MagiskLogAdapter(List<String> list) {
-            super(list);
-            if (mList.isEmpty())
-                mList.add(requireContext().getString(R.string.log_is_empty));
-        }
-
-        @Override
-        protected int itemLayoutRes() {
-            return R.layout.list_item_console;
-        }
-
-        @NonNull
-        @Override
-        public ViewHolder createViewHolder(@NonNull View v) {
-            return new ViewHolder(v);
-        }
-
-        @Override
-        protected void onUpdateTextWidth(ViewHolder holder) {
-            super.onUpdateTextWidth(holder);
-            // Find the longest string and update accordingly
-            int max = 0;
-            String maxStr = "";
-            for (String s : mList) {
-                int len = s.length();
-                if (len > max) {
-                    max = len;
-                    maxStr = s;
-                }
-            }
-            holder.txt.setText(maxStr);
-            super.onUpdateTextWidth(holder);
-        }
-
-        public class ViewHolder extends StringListAdapter.ViewHolder {
-
-            public ViewHolder(@NonNull View itemView) {
-                super(itemView);
-            }
-
-            @Override
-            protected int textViewResId() {
-                return R.id.txt;
-            }
-        }
-    }
-}

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

@@ -1,142 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-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.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import com.topjohnwu.magisk.ClassMap;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.FlashActivity;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.adapters.ModulesAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.utils.Event;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-public class ModulesFragment extends BaseFragment {
-
-    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
-    @BindView(R.id.recyclerView) RecyclerView recyclerView;
-    @BindView(R.id.empty_rv) TextView emptyRv;
-
-    @OnClick(R.id.fab)
-    void selectFile() {
-        runWithPermission(new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, () -> {
-            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-            intent.setType("application/zip");
-            startActivityForResult(intent, Const.ID.FETCH_ZIP);
-        });
-    }
-
-    private List<Module> listModules = new ArrayList<>();
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_modules, container, false);
-        unbinder = new ModulesFragment_ViewBinding(this, view);
-        setHasOptionsMenu(true);
-
-        mSwipeRefreshLayout.setOnRefreshListener(() -> {
-            recyclerView.setVisibility(View.GONE);
-            Utils.loadModules();
-        });
-
-        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                mSwipeRefreshLayout.setEnabled(recyclerView.getChildAt(0).getTop() >= 0);
-            }
-
-            @Override
-            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
-            }
-        });
-
-        requireActivity().setTitle(R.string.modules);
-
-        return view;
-    }
-
-    @Override
-    public int[] getListeningEvents() {
-        return new int[] {Event.MODULE_LOAD_DONE};
-    }
-
-    @Override
-    public void onEvent(int event) {
-        updateUI(Event.getResult(event));
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == Const.ID.FETCH_ZIP && resultCode == Activity.RESULT_OK && data != null) {
-            // Get the URI of the selected file
-            Intent intent = new Intent(getActivity(), ClassMap.get(FlashActivity.class));
-            intent.setData(data.getData()).putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP);
-            startActivity(intent);
-        }
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_reboot, menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.reboot:
-                Utils.reboot();
-                return true;
-            case R.id.reboot_recovery:
-                Shell.su("/system/bin/reboot recovery").submit();
-                return true;
-            case R.id.reboot_bootloader:
-                Shell.su("/system/bin/reboot bootloader").submit();
-                return true;
-            case R.id.reboot_download:
-                Shell.su("/system/bin/reboot download").submit();
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    private void updateUI(Map<String, Module> moduleMap) {
-        listModules.clear();
-        listModules.addAll(moduleMap.values());
-        if (listModules.size() == 0) {
-            emptyRv.setVisibility(View.VISIBLE);
-            recyclerView.setVisibility(View.GONE);
-        } else {
-            emptyRv.setVisibility(View.GONE);
-            recyclerView.setVisibility(View.VISIBLE);
-            recyclerView.setAdapter(new ModulesAdapter(listModules));
-        }
-        mSwipeRefreshLayout.setRefreshing(false);
-    }
-}

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

@@ -1,102 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-import android.app.AlertDialog;
-import android.os.Bundle;
-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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.adapters.ReposAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.tasks.UpdateRepos;
-import com.topjohnwu.magisk.utils.Event;
-
-import butterknife.BindView;
-
-public class ReposFragment extends BaseFragment {
-
-    @BindView(R.id.recyclerView) RecyclerView recyclerView;
-    @BindView(R.id.empty_rv) TextView emptyRv;
-    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
-
-    private ReposAdapter adapter;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_repos, container, false);
-        unbinder = new ReposFragment_ViewBinding(this, view);
-
-        mSwipeRefreshLayout.setRefreshing(true);
-        mSwipeRefreshLayout.setOnRefreshListener(() -> new UpdateRepos().exec(true));
-
-        adapter = new ReposAdapter();
-        recyclerView.setAdapter(adapter);
-        recyclerView.setVisibility(View.GONE);
-
-        requireActivity().setTitle(R.string.downloads);
-
-        return view;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        Event.unregister(adapter);
-    }
-
-    @Override
-    public int[] getListeningEvents() {
-        return new int[] {Event.REPO_LOAD_DONE};
-    }
-
-    @Override
-    public void onEvent(int event) {
-        adapter.notifyDBChanged(false);
-        Event.register(adapter);
-        mSwipeRefreshLayout.setRefreshing(false);
-        boolean empty = adapter.getItemCount() == 0;
-        recyclerView.setVisibility(empty ? View.GONE : View.VISIBLE);
-        emptyRv.setVisibility(empty ? View.VISIBLE : View.GONE);
-    }
-
-    @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();
-        adapter.setSearchView(search);
-    }
-
-    @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,
-                        Config.get(Config.Key.REPO_ORDER), (d, which) -> {
-                    Config.set(Config.Key.REPO_ORDER, which);
-                    adapter.notifyDBChanged(true);
-                    d.dismiss();
-                }).show();
-        }
-        return true;
-    }
-}

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

@@ -1,80 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-import android.os.Bundle;
-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.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.adapters.SuLogAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-
-import butterknife.BindView;
-
-public class SuLogFragment extends BaseFragment {
-
-    @BindView(R.id.empty_rv) TextView emptyRv;
-    @BindView(R.id.recyclerView) RecyclerView recyclerView;
-
-    private SuLogAdapter adapter;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_log, menu);
-        menu.findItem(R.id.menu_save).setVisible(false);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View v = inflater.inflate(R.layout.fragment_su_log, container, false);
-        unbinder = new SuLogFragment_ViewBinding(this, v);
-        adapter = new SuLogAdapter(app.mDB);
-        recyclerView.setAdapter(adapter);
-
-        updateList();
-
-        return v;
-    }
-
-    private void updateList() {
-        adapter.notifyDBChanged();
-
-        if (adapter.getSectionCount() == 0) {
-            emptyRv.setVisibility(View.VISIBLE);
-            recyclerView.setVisibility(View.GONE);
-        } else {
-            emptyRv.setVisibility(View.GONE);
-            recyclerView.setVisibility(View.VISIBLE);
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_refresh:
-                updateList();
-                return true;
-            case R.id.menu_clear:
-                app.mDB.clearLogs();
-                updateList();
-                return true;
-            default:
-                return true;
-        }
-    }
-}

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

@@ -1,64 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.adapters.PolicyAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.container.Policy;
-
-import java.util.List;
-
-import butterknife.BindView;
-
-public class SuperuserFragment extends BaseFragment {
-
-    @BindView(R.id.recyclerView) RecyclerView recyclerView;
-    @BindView(R.id.empty_rv) TextView emptyRv;
-
-    private PackageManager pm;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_superuser, container, false);
-        unbinder = new SuperuserFragment_ViewBinding(this, view);
-
-        pm = requireActivity().getPackageManager();
-        return view;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        requireActivity().setTitle(getString(R.string.superuser));
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        displayPolicyList();
-    }
-
-    private void displayPolicyList() {
-        List<Policy> policyList = app.mDB.getPolicyList();
-
-        if (policyList.size() == 0) {
-            emptyRv.setVisibility(View.VISIBLE);
-            recyclerView.setVisibility(View.GONE);
-        } else {
-            recyclerView.setAdapter(new PolicyAdapter(policyList, app.mDB, pm));
-            emptyRv.setVisibility(View.GONE);
-            recyclerView.setVisibility(View.VISIBLE);
-        }
-    }
-
-}

app/src/main/java/com/topjohnwu/magisk/model/download/DownloadModuleService.java

@@ -0,0 +1,156 @@
+package com.topjohnwu.magisk.model.download;
+
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.IBinder;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.model.entity.Repo;
+import com.topjohnwu.magisk.ui.flash.FlashActivity;
+import com.topjohnwu.magisk.view.Notifications;
+import com.topjohnwu.magisk.view.ProgressNotification;
+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.ArrayList;
+import java.util.List;
+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 List<ProgressNotification> notifications;
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        notifications = new ArrayList<>();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Shell.EXECUTOR.execute(() -> {
+            Repo repo = intent.getParcelableExtra("repo");
+            boolean install = intent.getBooleanExtra("install", false);
+            dlProcessInstall(repo, install);
+        });
+        return START_REDELIVER_INTENT;
+    }
+
+    @Override
+    public synchronized void onTaskRemoved(Intent rootIntent) {
+        for (ProgressNotification n : notifications) {
+            Notifications.mgr.cancel(n.hashCode());
+        }
+        notifications.clear();
+    }
+
+    private synchronized void addNotification(ProgressNotification n) {
+        if (notifications.isEmpty()) {
+            // Start foreground
+            startForeground(n.hashCode(), n.getNotification());
+        }
+        notifications.add(n);
+    }
+
+    private synchronized void removeNotification(ProgressNotification n) {
+        notifications.remove(n);
+        if (notifications.isEmpty()) {
+            // No more tasks, stop service
+            stopForeground(true);
+            stopSelf();
+        } else {
+            // Pick another notification as our foreground notification
+            n = notifications.get(0);
+            startForeground(n.hashCode(), n.getNotification());
+        }
+    }
+
+    private void dlProcessInstall(Repo repo, boolean install) {
+        File output = new File(Const.EXTERNAL_PATH, repo.getDownloadFilename());
+        ProgressNotification progress = new ProgressNotification(output.getName());
+        addNotification(progress);
+        try {
+            InputStream in = Networking.get(repo.getZipUrl())
+                    .setDownloadProgressListener(progress)
+                    .execForInputStream().getResult();
+            OutputStream out = new BufferedOutputStream(new FileOutputStream(output));
+            processZip(in, out);
+            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);
+            synchronized (getApplication()) {
+                if (install && App.foreground() != null &&
+                        !(App.foreground() instanceof FlashActivity)) {
+                    /* Only start flashing if there is a foreground activity and the
+                     * user is not also flashing another module at the same time */
+                    App.foreground().startActivity(intent);
+                } else {
+                    /* Or else we preset a notification notifying that we are done */
+                    PendingIntent pi = PendingIntent.getActivity(this, progress.hashCode(), intent,
+                            PendingIntent.FLAG_UPDATE_CURRENT);
+                    progress.dlDone(pi);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            progress.dlFail();
+        }
+        removeNotification(progress);
+    }
+
+    private void processZip(InputStream in, OutputStream out)
+            throws IOException {
+        try (ZipInputStream zin = new ZipInputStream(in);
+             ZipOutputStream zout = new ZipOutputStream(out)) {
+
+            // Inject latest module-installer.sh as update-binary
+            zout.putNextEntry(new ZipEntry("META-INF/"));
+            zout.putNextEntry(new ZipEntry("META-INF/com/"));
+            zout.putNextEntry(new ZipEntry("META-INF/com/google/"));
+            zout.putNextEntry(new ZipEntry("META-INF/com/google/android/"));
+            zout.putNextEntry(new ZipEntry("META-INF/com/google/android/update-binary"));
+            try (InputStream update_bin = Networking.get(Const.Url.MODULE_INSTALLER)
+                    .execForInputStream().getResult()) {
+                ShellUtils.pump(update_bin, zout);
+            }
+            zout.putNextEntry(new ZipEntry("META-INF/com/google/android/updater-script"));
+            zout.write("#MAGISK\n".getBytes("UTF-8"));
+
+            int off = -1;
+            ZipEntry entry;
+            while ((entry = zin.getNextEntry()) != null) {
+                if (off < 0)
+                    off = entry.getName().indexOf('/') + 1;
+                String path = entry.getName().substring(off);
+                if (path.isEmpty())
+                    continue;
+                if (path.startsWith("META-INF"))
+                    continue;
+                zout.putNextEntry(new ZipEntry(path));
+                if (!entry.isDirectory())
+                    ShellUtils.pump(zin, zout);
+            }
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/BaseModule.java

@@ -1,18 +1,18 @@
-package com.topjohnwu.magisk.container;
+package com.topjohnwu.magisk.model.entity;
 
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import androidx.annotation.NonNull;
-
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
 
     private String mId, mName, mVersion, mAuthor, mDescription;
-    private int mVersionCode = -1, minMagiskVersion = -1;
+    private int mVersionCode = -1;
 
     protected BaseModule() {
         mId = mName = mVersion = mAuthor = mDescription = "";
@@ -25,7 +25,6 @@ public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
         mVersionCode = c.getInt(c.getColumnIndex("versionCode"));
         mAuthor = nonNull(c.getString(c.getColumnIndex("author")));
         mDescription = nonNull(c.getString(c.getColumnIndex("description")));
-        minMagiskVersion = c.getInt(c.getColumnIndex("minMagisk"));
     }
 
     protected BaseModule(Parcel p) {
@@ -35,7 +34,6 @@ public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
         mAuthor = p.readString();
         mDescription = p.readString();
         mVersionCode = p.readInt();
-        minMagiskVersion = p.readInt();
     }
 
     @Override
@@ -56,7 +54,6 @@ public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
         dest.writeString(mAuthor);
         dest.writeString(mDescription);
         dest.writeInt(mVersionCode);
-        dest.writeInt(minMagiskVersion);
     }
 
     private String nonNull(String s) {
@@ -71,7 +68,6 @@ public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
         values.put("versionCode", mVersionCode);
         values.put("author", mAuthor);
         values.put("description", mDescription);
-        values.put("minMagisk", minMagiskVersion);
         return values;
     }
 
@@ -107,10 +103,6 @@ public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
                 case "description":
                     mDescription = value;
                     break;
-                case "minMagisk":
-                case "template":
-                    minMagiskVersion = Integer.parseInt(value);
-                    break;
                 default:
                     break;
             }
@@ -149,7 +141,4 @@ public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
         return mVersionCode;
     }
 
-    public int getMinMagiskVersion() {
-        return minMagiskVersion;
-    }
 }

app/src/main/java/com/topjohnwu/magisk/model/entity/HideAppInfo.kt

@@ -0,0 +1,16 @@
+package com.topjohnwu.magisk.model.entity
+
+import android.content.pm.ApplicationInfo
+import android.graphics.drawable.Drawable
+import com.topjohnwu.magisk.utils.packageInfo
+import com.topjohnwu.magisk.utils.processes
+
+class HideAppInfo(
+    val info: ApplicationInfo,
+    val name: String,
+    val icon: Drawable
+) {
+
+    val processes = info.packageInfo?.processes?.distinct() ?: listOf(info.packageName)
+
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/HideTarget.kt

@@ -0,0 +1,10 @@
+package com.topjohnwu.magisk.model.entity
+
+class HideTarget(line: String) {
+
+    private val split = line.split(Regex("\\|"), 2)
+
+    val packageName = split[0]
+    val process = split.getOrElse(1) { packageName }
+
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/Module.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.container;
+package com.topjohnwu.magisk.model.entity;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -76,4 +76,4 @@ public class Module extends BaseModule {
         return mUpdated;
     }
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/Policy.java

@@ -1,13 +1,13 @@
-package com.topjohnwu.magisk.container;
+package com.topjohnwu.magisk.model.entity;
 
 import android.content.ContentValues;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
-import androidx.annotation.NonNull;
-
 import com.topjohnwu.magisk.utils.Utils;
 
+import androidx.annotation.NonNull;
+
 
 public class Policy implements Comparable<Policy>{
     public static final int INTERACTIVE = 0;

app/src/main/java/com/topjohnwu/magisk/model/entity/Repo.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.container;
+package com.topjohnwu.magisk.model.entity;
 
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -6,10 +6,7 @@ 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 com.topjohnwu.net.Networking;
-import com.topjohnwu.net.Request;
 
 import java.text.DateFormat;
 import java.util.Date;
@@ -62,9 +59,6 @@ public class Repo extends BaseModule {
         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 {
@@ -95,18 +89,6 @@ public class Repo extends BaseModule {
         return String.format(Const.Url.FILE_URL, getId(), file);
     }
 
-    public boolean isNewInstaller() {
-        try (Request install = Networking.get(getFileUrl("install.sh"))) {
-            if (install.connect().isSuccess()) {
-                // Double check whether config.sh exists
-                try (Request config = Networking.get(getFileUrl("config.sh"))) {
-                    return !config.connect().isSuccess();
-                }
-            }
-            return false;
-        }
-    }
-
     public String getLastUpdateString() {
         return DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM).format(mLastUpdate);
     }

app/src/main/java/com/topjohnwu/magisk/model/entity/SuLogEntry.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.container;
+package com.topjohnwu.magisk.model.entity;
 
 import android.content.ContentValues;
 

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ConsoleRvItem.kt

@@ -0,0 +1,11 @@
+package com.topjohnwu.magisk.model.entity.recycler
+
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.topjohnwu.magisk.R
+
+class ConsoleRvItem(val item: String) : ComparableRvItem<ConsoleRvItem>() {
+    override val layoutRes: Int = R.layout.item_console
+
+    override fun contentSameAs(other: ConsoleRvItem) = itemSameAs(other)
+    override fun itemSameAs(other: ConsoleRvItem) = item == other.item
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt

@@ -0,0 +1,92 @@
+package com.topjohnwu.magisk.model.entity.recycler
+
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
+import com.skoumal.teanity.rxbus.RxBus
+import com.skoumal.teanity.util.DiffObservableList
+import com.skoumal.teanity.util.KObservableField
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.model.entity.HideAppInfo
+import com.topjohnwu.magisk.model.entity.HideTarget
+import com.topjohnwu.magisk.model.entity.state.IndeterminateState
+import com.topjohnwu.magisk.model.events.HideProcessEvent
+import com.topjohnwu.magisk.utils.inject
+import com.topjohnwu.magisk.utils.toggle
+
+class HideRvItem(val item: HideAppInfo, targets: List<HideTarget>) :
+    ComparableRvItem<HideRvItem>() {
+
+    override val layoutRes: Int = R.layout.item_hide_app
+
+    val packageName = item.info.packageName.orEmpty()
+    val items = DiffObservableList(callback).also {
+        val items = item.processes.map {
+            val isHidden = targets.any { target ->
+                packageName == target.packageName && it == target.process
+            }
+            HideProcessRvItem(packageName, it, isHidden)
+        }
+        it.update(items)
+    }
+    val isHiddenState = KObservableField(currentState)
+    val isExpanded = KObservableField(false)
+
+    private val itemsProcess get() = items.filterIsInstance<HideProcessRvItem>()
+
+    private val currentState
+        get() = when (itemsProcess.count { it.isHidden.value }) {
+            items.size -> IndeterminateState.CHECKED
+            in 1 until items.size -> IndeterminateState.INDETERMINATE
+            else -> IndeterminateState.UNCHECKED
+        }
+
+    init {
+        itemsProcess.forEach {
+            it.isHidden.addOnPropertyChangedCallback { isHiddenState.value = currentState }
+        }
+    }
+
+    fun toggle() {
+        val desiredState = when (isHiddenState.value) {
+            IndeterminateState.INDETERMINATE,
+            IndeterminateState.UNCHECKED -> true
+            IndeterminateState.CHECKED -> false
+        }
+        itemsProcess.forEach { it.isHidden.value = desiredState }
+        isHiddenState.value = currentState
+    }
+
+    fun toggleExpansion() {
+        if (items.size <= 1) return
+        isExpanded.toggle()
+    }
+
+    override fun contentSameAs(other: HideRvItem): Boolean = items.all { other.items.contains(it) }
+    override fun itemSameAs(other: HideRvItem): Boolean = item.info == other.item.info
+
+}
+
+class HideProcessRvItem(
+    val packageName: String,
+    val process: String,
+    isHidden: Boolean
+) : ComparableRvItem<HideProcessRvItem>() {
+
+    override val layoutRes: Int = R.layout.item_hide_process
+
+    val isHidden = KObservableField(isHidden)
+
+    private val rxBus: RxBus by inject()
+
+    init {
+        this.isHidden.addOnPropertyChangedCallback {
+            rxBus.post(HideProcessEvent(this@HideProcessRvItem))
+        }
+    }
+
+    fun toggle() = isHidden.toggle()
+
+    override fun contentSameAs(other: HideProcessRvItem): Boolean = itemSameAs(other)
+    override fun itemSameAs(other: HideProcessRvItem): Boolean =
+        packageName == other.packageName && process == other.process
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt

@@ -0,0 +1,75 @@
+package com.topjohnwu.magisk.model.entity.recycler
+
+import androidx.databinding.ObservableList
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.skoumal.teanity.util.DiffObservableList
+import com.skoumal.teanity.util.KObservableField
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.model.entity.SuLogEntry
+import com.topjohnwu.magisk.utils.toggle
+
+class LogRvItem : ComparableRvItem<LogRvItem>() {
+    override val layoutRes: Int = R.layout.item_page_log
+
+    val items = DiffObservableList(callback)
+
+    fun update(list: List<LogItemRvItem>) {
+        list.firstOrNull()?.isExpanded?.value = true
+        items.update(list)
+    }
+
+    //two of these will never be present, safe to assume it's unique
+    override fun contentSameAs(other: LogRvItem): Boolean = false
+
+    override fun itemSameAs(other: LogRvItem): Boolean = false
+}
+
+class LogItemRvItem(
+    val items: ObservableList<ComparableRvItem<*>>
+) : ComparableRvItem<LogItemRvItem>() {
+    override val layoutRes: Int = R.layout.item_superuser_log
+
+    val date = items.filterIsInstance<LogItemEntryRvItem>().firstOrNull()
+        ?.item?.dateString.orEmpty()
+    val isExpanded = KObservableField(false)
+
+    fun toggle() = isExpanded.toggle()
+
+    override fun contentSameAs(other: LogItemRvItem): Boolean = items
+        .any { !other.items.contains(it) }
+
+    override fun itemSameAs(other: LogItemRvItem): Boolean = date == other.date
+}
+
+class LogItemEntryRvItem(val item: SuLogEntry) : ComparableRvItem<LogItemEntryRvItem>() {
+    override val layoutRes: Int = R.layout.item_superuser_log_entry
+
+    val isExpanded = KObservableField(false)
+
+    fun toggle() = isExpanded.toggle()
+
+    override fun contentSameAs(other: LogItemEntryRvItem) = item.fromUid == other.item.fromUid &&
+            item.toUid == other.item.toUid &&
+            item.fromPid == other.item.fromPid &&
+            item.packageName == other.item.packageName &&
+            item.command == other.item.command &&
+            item.action == other.item.action &&
+            item.date == other.item.date
+
+    override fun itemSameAs(other: LogItemEntryRvItem) = item.appName == other.item.appName
+}
+
+class MagiskLogRvItem : ComparableRvItem<MagiskLogRvItem>() {
+    override val layoutRes: Int = R.layout.item_page_magisk_log
+
+    val items = DiffObservableList(callback)
+
+    fun update(list: List<ConsoleRvItem>) {
+        items.update(list)
+    }
+
+    //two of these will never be present, safe to assume it's unique
+    override fun contentSameAs(other: MagiskLogRvItem): Boolean = false
+
+    override fun itemSameAs(other: MagiskLogRvItem): Boolean = false
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt

@@ -0,0 +1,66 @@
+package com.topjohnwu.magisk.model.entity.recycler
+
+import android.content.res.Resources
+import androidx.annotation.StringRes
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
+import com.skoumal.teanity.util.KObservableField
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.model.entity.Module
+import com.topjohnwu.magisk.model.entity.Repo
+import com.topjohnwu.magisk.utils.get
+import com.topjohnwu.magisk.utils.toggle
+
+class ModuleRvItem(val item: Module) : ComparableRvItem<ModuleRvItem>() {
+
+    override val layoutRes: Int = R.layout.item_module
+
+    val lastActionNotice = KObservableField("")
+    val isChecked = KObservableField(item.isEnabled)
+    val isDeletable = KObservableField(item.willBeRemoved())
+
+    init {
+        isChecked.addOnPropertyChangedCallback {
+            when (it) {
+                true -> item.removeDisableFile().notice(R.string.disable_file_removed)
+                false -> item.createDisableFile().notice(R.string.disable_file_created)
+            }
+        }
+        isDeletable.addOnPropertyChangedCallback {
+            when (it) {
+                true -> item.createRemoveFile().notice(R.string.remove_file_created)
+                false -> item.deleteRemoveFile().notice(R.string.remove_file_deleted)
+            }
+        }
+        when {
+            item.isUpdated -> notice(R.string.update_file_created)
+            item.willBeRemoved() -> notice(R.string.remove_file_created)
+        }
+    }
+
+    fun toggle() = isChecked.toggle()
+    fun toggleDelete() = isDeletable.toggle()
+
+    @Suppress("unused")
+    private fun Any.notice(@StringRes info: Int) {
+        lastActionNotice.value = get<Resources>().getString(info)
+    }
+
+    override fun contentSameAs(other: ModuleRvItem): Boolean = item.version == other.item.version
+            && item.versionCode == other.item.versionCode
+            && item.description == other.item.description
+
+    override fun itemSameAs(other: ModuleRvItem): Boolean = item.name == other.item.name
+}
+
+class RepoRvItem(val item: Repo) : ComparableRvItem<RepoRvItem>() {
+
+    override val layoutRes: Int = R.layout.item_repo
+
+    override fun contentSameAs(other: RepoRvItem): Boolean = item.version == other.item.version
+            && item.lastUpdate == other.item.lastUpdate
+            && item.versionCode == other.item.versionCode
+            && item.description == other.item.description
+
+    override fun itemSameAs(other: RepoRvItem): Boolean = item.detailUrl == other.item.detailUrl
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt

@@ -0,0 +1,47 @@
+package com.topjohnwu.magisk.model.entity.recycler
+
+import android.graphics.drawable.Drawable
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
+import com.skoumal.teanity.rxbus.RxBus
+import com.skoumal.teanity.util.KObservableField
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.model.entity.Policy
+import com.topjohnwu.magisk.model.events.PolicyEnableEvent
+import com.topjohnwu.magisk.model.events.PolicyUpdateEvent
+import com.topjohnwu.magisk.utils.inject
+import com.topjohnwu.magisk.utils.toggle
+
+class PolicyRvItem(val item: Policy, val icon: Drawable) : ComparableRvItem<PolicyRvItem>() {
+
+    override val layoutRes: Int = R.layout.item_policy
+
+    val isExpanded = KObservableField(false)
+    val isEnabled = KObservableField(item.policy == Policy.ALLOW)
+    val shouldNotify = KObservableField(item.notification)
+    val shouldLog = KObservableField(item.logging)
+
+    fun toggle() = isExpanded.toggle()
+
+    private val rxBus: RxBus by inject()
+
+    init {
+        isEnabled.addOnPropertyChangedCallback {
+            it ?: return@addOnPropertyChangedCallback
+            rxBus.post(PolicyEnableEvent(this@PolicyRvItem, it))
+        }
+        shouldNotify.addOnPropertyChangedCallback {
+            it ?: return@addOnPropertyChangedCallback
+            item.notification = it
+            rxBus.post(PolicyUpdateEvent.Notification(this@PolicyRvItem))
+        }
+        shouldLog.addOnPropertyChangedCallback {
+            it ?: return@addOnPropertyChangedCallback
+            item.logging = it
+            rxBus.post(PolicyUpdateEvent.Log(this@PolicyRvItem))
+        }
+    }
+
+    override fun contentSameAs(other: PolicyRvItem): Boolean = itemSameAs(other)
+    override fun itemSameAs(other: PolicyRvItem): Boolean = item.uid == other.item.uid
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/SectionRvItem.kt

@@ -0,0 +1,11 @@
+package com.topjohnwu.magisk.model.entity.recycler
+
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.topjohnwu.magisk.R
+
+class SectionRvItem(val text: String) : ComparableRvItem<SectionRvItem>() {
+    override val layoutRes: Int = R.layout.item_section
+
+    override fun contentSameAs(other: SectionRvItem) = itemSameAs(other)
+    override fun itemSameAs(other: SectionRvItem) = text == other.text
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/SpinnerRvItem.kt

@@ -0,0 +1,13 @@
+package com.topjohnwu.magisk.model.entity.recycler
+
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.topjohnwu.magisk.R
+
+class SpinnerRvItem(val item: String) : ComparableRvItem<SpinnerRvItem>() {
+
+    override val layoutRes: Int = R.layout.item_spinner
+
+    override fun contentSameAs(other: SpinnerRvItem) = itemSameAs(other)
+    override fun itemSameAs(other: SpinnerRvItem) = item == other.item
+
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/state/IndeterminateState.kt

@@ -0,0 +1,5 @@
+package com.topjohnwu.magisk.model.entity.state
+
+enum class IndeterminateState {
+    CHECKED, INDETERMINATE, UNCHECKED
+}

app/src/main/java/com/topjohnwu/magisk/model/events/RxEvents.kt

@@ -0,0 +1,16 @@
+package com.topjohnwu.magisk.model.events
+
+import com.skoumal.teanity.rxbus.RxBus
+import com.topjohnwu.magisk.model.entity.recycler.HideProcessRvItem
+import com.topjohnwu.magisk.model.entity.recycler.ModuleRvItem
+import com.topjohnwu.magisk.model.entity.recycler.PolicyRvItem
+
+class HideProcessEvent(val item: HideProcessRvItem) : RxBus.Event
+
+class PolicyEnableEvent(val item: PolicyRvItem, val enable: Boolean) : RxBus.Event
+sealed class PolicyUpdateEvent(val item: PolicyRvItem) : RxBus.Event {
+    class Notification(item: PolicyRvItem) : PolicyUpdateEvent(item)
+    class Log(item: PolicyRvItem) : PolicyUpdateEvent(item)
+}
+
+class ModuleUpdatedEvent(val item: ModuleRvItem) : RxBus.Event

app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt

@@ -0,0 +1,40 @@
+package com.topjohnwu.magisk.model.events
+
+import android.app.Activity
+import com.skoumal.teanity.viewevents.ViewEvent
+import com.topjohnwu.magisk.model.entity.Policy
+import com.topjohnwu.magisk.model.entity.Repo
+import io.reactivex.subjects.PublishSubject
+
+
+data class OpenLinkEvent(val url: String) : ViewEvent()
+
+class ManagerInstallEvent : ViewEvent()
+class MagiskInstallEvent : ViewEvent()
+
+class ManagerChangelogEvent : ViewEvent()
+class MagiskChangelogEvent : ViewEvent()
+
+class UninstallEvent : ViewEvent()
+class EnvFixEvent : ViewEvent()
+
+class UpdateSafetyNetEvent : ViewEvent()
+
+class ViewActionEvent(val action: Activity.() -> Unit) : ViewEvent()
+
+class OpenFilePickerEvent : ViewEvent()
+
+class OpenChangelogEvent(val item: Repo) : ViewEvent()
+class InstallModuleEvent(val item: Repo) : ViewEvent()
+
+class PageChangedEvent : ViewEvent()
+
+class PermissionEvent(
+    val permissions: List<String>,
+    val callback: PublishSubject<Boolean>
+) : ViewEvent()
+
+class BackPressEvent : ViewEvent()
+
+class SuDialogEvent(val policy: Policy) : ViewEvent()
+class DieEvent : ViewEvent()

app/src/main/java/com/topjohnwu/magisk/model/flash/FlashResultListener.kt

@@ -0,0 +1,7 @@
+package com.topjohnwu.magisk.model.flash
+
+interface FlashResultListener {
+
+    fun onResult(isSuccess: Boolean)
+
+}

app/src/main/java/com/topjohnwu/magisk/model/flash/Flashing.kt

@@ -0,0 +1,62 @@
+package com.topjohnwu.magisk.model.flash
+
+import android.content.Context
+import android.net.Uri
+import androidx.core.os.postDelayed
+import com.topjohnwu.magisk.tasks.FlashZip
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.magisk.utils.inject
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.internal.UiThreadHandler
+
+sealed class Flashing(
+    uri: Uri,
+    private val console: MutableList<String>,
+    log: MutableList<String>,
+    private val resultListener: FlashResultListener
+) : FlashZip(uri, console, log) {
+
+    override fun onResult(success: Boolean) {
+        if (!success) {
+            console.add("! Installation failed")
+        }
+
+        resultListener.onResult(success)
+    }
+
+    class Install(
+        uri: Uri,
+        console: MutableList<String>,
+        log: MutableList<String>,
+        resultListener: FlashResultListener
+    ) : Flashing(uri, console, log, resultListener) {
+
+        override fun onResult(success: Boolean) {
+            if (success) {
+                Utils.loadModules()
+            }
+            super.onResult(success)
+        }
+
+    }
+
+    class Uninstall(
+        uri: Uri,
+        console: MutableList<String>,
+        log: MutableList<String>,
+        resultListener: FlashResultListener
+    ) : Flashing(uri, console, log, resultListener) {
+
+        private val context: Context by inject()
+
+        override fun onResult(success: Boolean) {
+            if (success) {
+                UiThreadHandler.handler.postDelayed(3000) {
+                    Shell.su("pm uninstall " + context.packageName).exec()
+                }
+            }
+            super.onResult(success)
+        }
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/model/flash/Patching.kt

@@ -0,0 +1,51 @@
+package com.topjohnwu.magisk.model.flash
+
+import android.net.Uri
+import com.topjohnwu.magisk.tasks.MagiskInstaller
+import com.topjohnwu.superuser.Shell
+
+sealed class Patching(
+    private val console: MutableList<String>,
+    logs: MutableList<String>,
+    private val resultListener: FlashResultListener
+) : MagiskInstaller(console, logs) {
+
+    override fun onResult(success: Boolean) {
+        if (success) {
+            console.add("- All done!")
+        } else {
+            Shell.sh("rm -rf $installDir").submit()
+            console.add("! Installation failed")
+        }
+        resultListener.onResult(success)
+    }
+
+    class File(
+        private val uri: Uri,
+        console: MutableList<String>,
+        logs: MutableList<String>,
+        resultListener: FlashResultListener
+    ) : Patching(console, logs, resultListener) {
+        override fun operations() =
+            extractZip() && handleFile(uri) && patchBoot() && storeBoot()
+    }
+
+    class SecondSlot(
+        console: MutableList<String>,
+        logs: MutableList<String>,
+        resultListener: FlashResultListener
+    ) : Patching(console, logs, resultListener) {
+        override fun operations() =
+            findSecondaryImage() && extractZip() && patchBoot() && flashBoot() && postOTA()
+    }
+
+    class Direct(
+        console: MutableList<String>,
+        logs: MutableList<String>,
+        resultListener: FlashResultListener
+    ) : Patching(console, logs, resultListener) {
+        override fun operations() =
+            findImage() && extractZip() && patchBoot() && flashBoot()
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/model/navigation/MagiskNavigationEvent.kt

@@ -0,0 +1,84 @@
+package com.topjohnwu.magisk.model.navigation
+
+import android.os.Bundle
+import androidx.annotation.AnimRes
+import androidx.annotation.AnimatorRes
+import androidx.fragment.app.Fragment
+import com.skoumal.teanity.viewevents.NavigationDslMarker
+import com.skoumal.teanity.viewevents.ViewEvent
+import kotlin.reflect.KClass
+
+class MagiskNavigationEvent(
+    val navDirections: MagiskNavDirectionsBuilder,
+    val navOptions: MagiskNavOptions,
+    val animOptions: MagiskAnimBuilder
+) : ViewEvent() {
+
+    companion object {
+        operator fun invoke(builder: Builder.() -> Unit) = Builder().apply(builder).build()
+    }
+
+    @NavigationDslMarker
+    class Builder {
+
+        private var animOptions: MagiskAnimBuilder = MagiskAnimBuilder()
+        private var navOptions: MagiskNavOptions = MagiskNavOptions()
+        private val directionsBuilder = MagiskNavDirectionsBuilder()
+
+        fun args(builder: Bundle.() -> Unit) = directionsBuilder.args(builder)
+
+        fun navAnim(builder: MagiskAnimBuilder.() -> Unit) {
+            animOptions = MagiskAnimBuilder().apply(builder)
+        }
+
+        fun navOptions(builder: MagiskNavOptions.() -> Unit) {
+            navOptions = MagiskNavOptions().apply(builder)
+        }
+
+        fun navDirections(builder: MagiskNavDirectionsBuilder.() -> Unit) {
+            directionsBuilder.apply(builder)
+        }
+
+        internal fun build() = MagiskNavigationEvent(directionsBuilder, navOptions, animOptions)
+    }
+}
+
+@NavigationDslMarker
+class MagiskNavDirectionsBuilder {
+
+    var destination: KClass<out Fragment>? = null
+    var isActivity: Boolean = false
+    val args: Bundle = Bundle()
+
+    fun args(builder: Bundle.() -> Unit) = args.apply(builder)
+
+}
+
+@NavigationDslMarker
+class MagiskNavOptions {
+    var popUpTo: KClass<*>? = null
+    var inclusive: Boolean = false
+    var clearTask: Boolean = false
+    var singleTop: Boolean = false
+}
+
+@NavigationDslMarker
+class MagiskAnimBuilder {
+    @AnimRes
+    @AnimatorRes
+    var enter = 0
+
+    @AnimRes
+    @AnimatorRes
+    var exit = 0
+
+    @AnimRes
+    @AnimatorRes
+    var popEnter = 0
+
+    @AnimRes
+    @AnimatorRes
+    var popExit = 0
+
+    val anySet: Boolean get() = enter != 0 || exit != 0 || popEnter != 0 || popExit != 0
+}

app/src/main/java/com/topjohnwu/magisk/model/navigation/Navigation.kt

@@ -0,0 +1,57 @@
+package com.topjohnwu.magisk.model.navigation
+
+import com.topjohnwu.magisk.ui.hide.MagiskHideFragment
+import com.topjohnwu.magisk.ui.home.HomeFragment
+import com.topjohnwu.magisk.ui.log.LogFragment
+import com.topjohnwu.magisk.ui.module.ModulesFragment
+import com.topjohnwu.magisk.ui.module.ReposFragment
+import com.topjohnwu.magisk.ui.settings.SettingsFragment
+import com.topjohnwu.magisk.ui.superuser.SuperuserFragment
+
+
+object Navigation {
+
+    fun home() = MagiskNavigationEvent {
+        navDirections { destination = HomeFragment::class }
+        navOptions { popUpTo = HomeFragment::class }
+    }
+
+    fun superuser() = MagiskNavigationEvent {
+        navDirections { destination = SuperuserFragment::class }
+    }
+
+    fun modules() = MagiskNavigationEvent {
+        navDirections { destination = ModulesFragment::class }
+    }
+
+    fun repos() = MagiskNavigationEvent {
+        navDirections { destination = ReposFragment::class }
+    }
+
+    fun hide() = MagiskNavigationEvent {
+        navDirections { destination = MagiskHideFragment::class }
+    }
+
+    fun log() = MagiskNavigationEvent {
+        navDirections { destination = LogFragment::class }
+    }
+
+    fun settings() = MagiskNavigationEvent {
+        navDirections { destination = SettingsFragment::class }
+    }
+
+    fun fromSection(section: String) = when (section) {
+        "superuser" -> superuser()
+        "modules" -> modules()
+        "downloads" -> repos()
+        "magiskhide" -> hide()
+        "log" -> log()
+        "settings" -> settings()
+        else -> home()
+    }
+
+
+    object Main {
+        const val OPEN_NAV = 1
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/navigation/Navigator.kt

@@ -0,0 +1,13 @@
+package com.topjohnwu.magisk.model.navigation
+
+import androidx.fragment.app.Fragment
+import kotlin.reflect.KClass
+
+interface Navigator {
+
+    //TODO Elevate Fragment to MagiskFragment<*,*> once everything is on board with it
+    val baseFragments: List<KClass<out Fragment>>
+
+    fun navigateTo(event: MagiskNavigationEvent)
+
+}

app/src/main/java/com/topjohnwu/magisk/model/observer/Observer.kt

@@ -0,0 +1,31 @@
+package com.topjohnwu.magisk.model.observer
+
+import androidx.databinding.Observable
+import androidx.databinding.ObservableField
+import java.io.Serializable
+
+
+class Observer<T>(vararg dependencies: Observable, private val observer: () -> T) :
+    ObservableField<T>(*dependencies), Serializable {
+
+    val value: T get() = observer()
+
+    @Deprecated(
+        message = "Use KObservableField.value syntax from code",
+        replaceWith = ReplaceWith("value")
+    )
+    override fun get(): T {
+        return value
+    }
+
+    @Deprecated(
+        message = "Observer cannot be set",
+        level = DeprecationLevel.HIDDEN
+    )
+    override fun set(newValue: T) {
+    }
+
+    override fun toString(): String {
+        return "Observer(value=$value)"
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/permissions/PermissionRequestBuilder.kt

@@ -0,0 +1,40 @@
+package com.topjohnwu.magisk.model.permissions
+
+typealias SimpleCallback = () -> Unit
+typealias PermissionRationaleCallback = (List<String>) -> Unit
+
+class PermissionRequestBuilder {
+
+    private var onSuccessCallback: SimpleCallback = {}
+    private var onFailureCallback: SimpleCallback = {}
+    private var onShowRationaleCallback: PermissionRationaleCallback = {}
+
+    fun onSuccess(callback: SimpleCallback) {
+        onSuccessCallback = callback
+    }
+
+    fun onFailure(callback: SimpleCallback) {
+        onFailureCallback = callback
+    }
+
+    fun onShowRationale(callback: PermissionRationaleCallback) {
+        onShowRationaleCallback = callback
+    }
+
+    fun build(): PermissionRequest {
+        return PermissionRequest(onSuccessCallback, onFailureCallback, onShowRationaleCallback)
+    }
+
+}
+
+class PermissionRequest(
+    private val onSuccessCallback: SimpleCallback,
+    private val onFailureCallback: SimpleCallback,
+    private val onShowRationaleCallback: PermissionRationaleCallback
+) {
+
+    fun onSuccess() = onSuccessCallback()
+    fun onFailure() = onFailureCallback()
+    fun onShowRationale(permissions: List<String>) = onShowRationaleCallback(permissions)
+
+}

app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt

@@ -0,0 +1,80 @@
+package com.topjohnwu.magisk.model.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.topjohnwu.magisk.ClassMap
+import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.data.database.MagiskDB
+import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
+import com.topjohnwu.magisk.utils.DownloadApp
+import com.topjohnwu.magisk.utils.RootUtils
+import com.topjohnwu.magisk.utils.SuLogger
+import com.topjohnwu.magisk.utils.get
+import com.topjohnwu.magisk.view.Notifications
+import com.topjohnwu.magisk.view.Shortcuts
+import com.topjohnwu.superuser.Shell
+
+open class GeneralReceiver : BroadcastReceiver() {
+
+    companion object {
+        const val REQUEST = "request"
+        const val LOG = "log"
+        const val NOTIFY = "notify"
+        const val TEST = "test"
+    }
+
+    private fun getPkg(intent: Intent): String {
+        return intent.data?.encodedSchemeSpecificPart ?: ""
+    }
+
+    override fun onReceive(context: Context, intent: Intent?) {
+        if (intent == null)
+            return
+        val mDB: MagiskDB = get()
+        var action: String? = intent.action ?: return
+        when (action) {
+            Intent.ACTION_REBOOT, Intent.ACTION_BOOT_COMPLETED -> {
+                action = intent.getStringExtra("action")
+                if (action == null) {
+                    // Actual boot completed event
+                    Shell.su("mm_patch_dtbo").submit { result ->
+                        if (result.isSuccess)
+                            Notifications.dtboPatched()
+                    }
+                    return
+                }
+                when (action) {
+                    REQUEST -> {
+                        val i = Intent(context, ClassMap.get<Any>(SuRequestActivity::class.java))
+                                .setAction(action)
+                                .putExtra("socket", intent.getStringExtra("socket"))
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                .addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
+                        context.startActivity(i)
+                    }
+                    LOG -> SuLogger.handleLogs(intent)
+                    NOTIFY -> SuLogger.handleNotify(intent)
+                    TEST -> Shell.su("magisk --use-broadcast").submit()
+                }
+            }
+            Intent.ACTION_PACKAGE_REPLACED ->
+                // This will only work pre-O
+                if (Config.get<Boolean>(Config.Key.SU_REAUTH)!!) {
+                    mDB.deletePolicy(getPkg(intent))
+                }
+            Intent.ACTION_PACKAGE_FULLY_REMOVED -> {
+                val pkg = getPkg(intent)
+                mDB.deletePolicy(pkg)
+                Shell.su("magiskhide --rm $pkg").submit()
+            }
+            Intent.ACTION_LOCALE_CHANGED -> Shortcuts.setup(context)
+            Const.Key.BROADCAST_MANAGER_UPDATE -> {
+                Config.managerLink = intent.getStringExtra(Const.Key.INTENT_SET_LINK)
+                DownloadApp.upgrade(intent.getStringExtra(Const.Key.INTENT_SET_NAME))
+            }
+            Const.Key.BROADCAST_REBOOT -> RootUtils.reboot()
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.java

@@ -1,12 +1,14 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.model.update;
 
 import androidx.annotation.NonNull;
 import androidx.work.ListenableWorker;
 
+import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.model.worker.DelegateWorker;
 import com.topjohnwu.magisk.tasks.CheckUpdates;
-import com.topjohnwu.magisk.uicomponents.Notifications;
+import com.topjohnwu.magisk.view.Notifications;
 import com.topjohnwu.superuser.Shell;
 
 public class UpdateCheckService extends DelegateWorker {
@@ -14,8 +16,10 @@ public class UpdateCheckService extends DelegateWorker {
     @NonNull
     @Override
     public ListenableWorker.Result doWork() {
-        Shell.getShell();
-        CheckUpdates.checkNow(this::onCheckDone);
+        if (App.foreground() == null) {
+            Shell.getShell();
+            CheckUpdates.check(this::onCheckDone);
+        }
         return ListenableWorker.Result.success();
     }
 

app/src/main/java/com/topjohnwu/magisk/model/worker/DelegateWorker.java

@@ -1,9 +1,15 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.model.worker;
 
 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;
@@ -11,12 +17,6 @@ import androidx.annotation.RequiresApi;
 import androidx.work.Data;
 import androidx.work.ListenableWorker;
 
-import com.google.common.util.concurrent.ListenableFuture;
-
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
 public abstract class DelegateWorker {
 
     private ListenableWorker worker;

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

@@ -8,6 +8,7 @@ import com.topjohnwu.magisk.utils.Event;
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.net.Request;
 import com.topjohnwu.net.ResponseListener;
+import com.topjohnwu.superuser.ShellUtils;
 import com.topjohnwu.superuser.internal.UiThreadHandler;
 
 import org.json.JSONException;
@@ -30,7 +31,6 @@ public class CheckUpdates {
             case Config.Value.CANARY_DEBUG_CHANNEL:
                 url = Const.Url.CANARY_DEBUG_URL;
                 break;
-            case Config.Value.STABLE_CHANNEL:
             default:
                 url = Const.Url.STABLE_URL;
                 break;
@@ -39,13 +39,19 @@ public class CheckUpdates {
     }
 
     public static void check() {
-        getRequest().getAsJSONObject(new UpdateListener(null));
+        check(null);
     }
 
-    public static void checkNow(Runnable cb) {
-        JSONObject json = getRequest().execForJSONObject().getResult();
-        if (json != null)
-            new UpdateListener(cb).onResponse(json);
+    public static void check(Runnable cb) {
+        Request request = getRequest();
+        UpdateListener listener = new UpdateListener(cb);
+        if (ShellUtils.onMainThread()) {
+            request.getAsJSONObject(listener);
+        } else {
+            JSONObject json = request.execForJSONObject().getResult();
+            if (json != null)
+                listener.onResponse(json);
+        }
     }
 
     private static class UpdateListener implements ResponseListener<JSONObject> {
@@ -89,8 +95,20 @@ public class CheckUpdates {
         @Override
         public void onResponse(JSONObject json) {
             JSONObject magisk = getJson(json, "magisk");
-            Config.remoteMagiskVersionString = getString(magisk, "version", null);
             Config.remoteMagiskVersionCode = getInt(magisk, "versionCode", -1);
+
+            if ((int) Config.get(Config.Key.UPDATE_CHANNEL) == Config.Value.DEFAULT_CHANNEL) {
+                if (Config.magiskVersionCode > Config.remoteMagiskVersionCode) {
+                    // If we are newer than current stable channel, switch to beta
+                    Config.set(Config.Key.UPDATE_CHANNEL, Config.Value.BETA_CHANNEL);
+                    check(cb);
+                    return;
+                } else {
+                    Config.set(Config.Key.UPDATE_CHANNEL, Config.Value.STABLE_CHANNEL);
+                }
+            }
+
+            Config.remoteMagiskVersionString = getString(magisk, "version", null);
             Config.magiskLink = getString(magisk, "link", null);
             Config.magiskNoteLink = getString(magisk, "note", null);
             Config.magiskMD5 = getString(magisk, "md5", null);

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

@@ -1,85 +0,0 @@
-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/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.kt

@@ -0,0 +1,96 @@
+package com.topjohnwu.magisk.tasks
+
+import android.net.Uri
+import com.skoumal.teanity.extensions.subscribeK
+import com.topjohnwu.magisk.App
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.utils.fileName
+import com.topjohnwu.magisk.utils.inject
+import com.topjohnwu.magisk.utils.readUri
+import com.topjohnwu.magisk.utils.unzip
+import com.topjohnwu.superuser.Shell
+import io.reactivex.Single
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
+
+abstract class FlashZip(
+    private val mUri: Uri,
+    private val console: MutableList<String>,
+    private val logs: MutableList<String>
+) {
+
+    private val app: App by inject()
+    private val tmpFile: File = File(app.cacheDir, "install.zip")
+
+    @Throws(IOException::class)
+    private fun unzipAndCheck(): Boolean {
+        val parentFile = tmpFile.parentFile ?: return false
+        tmpFile.unzip(parentFile, "META-INF/com/google/android", true)
+
+        val updaterScript = File(parentFile, "updater-script")
+        return Shell
+            .su("grep -q '#MAGISK' $updaterScript")
+            .exec()
+            .isSuccess
+    }
+
+    @Throws(IOException::class)
+    private fun flash(): Boolean {
+        console.add("- Copying zip to temp directory")
+
+        runCatching {
+            app.readUri(mUri).use { input ->
+                tmpFile.outputStream().use { out -> input.copyTo(out) }
+            }
+        }.getOrElse {
+            when (it) {
+                is FileNotFoundException -> console.add("! Invalid Uri")
+                is IOException -> console.add("! Cannot copy to cache")
+            }
+            throw it
+        }
+
+        val isMagiskModule = runCatching {
+            unzipAndCheck()
+        }.getOrElse {
+            console.add("! Unzip error")
+            throw it
+        }
+
+        if (!isMagiskModule) {
+            console.add("! This zip is not a Magisk Module!")
+            return false
+        }
+
+        console.add("- Installing ${mUri.fileName}")
+
+        val parentFile = tmpFile.parent ?: return false
+
+        return Shell
+            .su(
+                "cd $parentFile",
+                "BOOTMODE=true sh update-binary dummy 1 $tmpFile"
+            )
+            .to(console, logs)
+            .exec().isSuccess
+    }
+
+    fun exec() = Single
+        .fromCallable {
+            runCatching {
+                flash()
+            }.getOrElse {
+                it.printStackTrace()
+                false
+            }.apply {
+                Shell.su("cd /", "rm -rf ${tmpFile.parent} ${Const.TMP_FOLDER_PATH}")
+                    .submit()
+            }
+        }
+        .subscribeK(onError = { onResult(false) }) { onResult(it) }
+        .let { Unit } // ignores result disposable
+
+
+    protected abstract fun onResult(success: Boolean)
+}

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

@@ -10,7 +10,6 @@ import androidx.annotation.WorkerThread;
 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;
@@ -23,6 +22,8 @@ import com.topjohnwu.superuser.io.SuFile;
 import com.topjohnwu.superuser.io.SuFileInputStream;
 import com.topjohnwu.superuser.io.SuFileOutputStream;
 
+import org.kamranzafar.jtar.TarEntry;
+import org.kamranzafar.jtar.TarHeader;
 import org.kamranzafar.jtar.TarInputStream;
 import org.kamranzafar.jtar.TarOutputStream;
 
@@ -30,11 +31,11 @@ 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.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.List;
 import java.util.zip.ZipEntry;
@@ -42,10 +43,13 @@ import java.util.zip.ZipInputStream;
 
 public abstract class MagiskInstaller {
 
-    private List<String> console, logs;
     protected String srcBoot;
+    protected File destFile;
     protected File installDir;
 
+    private List<String> console, logs;
+    private boolean isTar = false;
+
     private class ProgressLog implements DownloadProgressListener {
 
         private int prev = -1;
@@ -79,12 +83,12 @@ public abstract class MagiskInstaller {
     }
 
     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;
         }
+        console.add("- Target image: " + srcBoot);
         return true;
     }
 
@@ -92,7 +96,6 @@ public abstract class MagiskInstaller {
         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",
@@ -103,6 +106,7 @@ public abstract class MagiskInstaller {
             console.add("! Unable to detect target image");
             return false;
         }
+        console.add("- Target image: " + srcBoot);
         return true;
     }
 
@@ -160,44 +164,107 @@ public abstract class MagiskInstaller {
             return false;
         }
 
-        SuFile init64 = new SuFile(installDir, "magiskinit64");
+        File init64 = SuFile.open(installDir, "magiskinit64");
         if (Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_64_BIT_ABIS.length != 0) {
-            init64.renameTo(new SuFile(installDir, "magiskinit"));
+            init64.renameTo(SuFile.open(installDir, "magiskinit"));
         } else {
             init64.delete();
         }
+        Shell.sh("cd " + installDir, "chmod 755 *").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();
+    private TarEntry newEntry(String name, long size) {
+        console.add("-- Writing: " + name);
+        return new TarEntry(TarHeader.createHeader(name, size, 0, false, 0644));
+    }
 
-            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;
+    private void handleTar(InputStream in) throws IOException {
+        console.add("- Processing tar file");
+        boolean vbmeta = false;
+        try (TarInputStream tarIn = new TarInputStream(in);
+             TarOutputStream tarOut = new TarOutputStream(destFile)) {
+            TarEntry entry;
+            while ((entry = tarIn.getNextEntry()) != null) {
+                if (entry.getName().contains("boot.img")
+                        || entry.getName().contains("recovery.img")) {
+                    String name = entry.getName();
+                    console.add("-- Extracting: " + name);
+                    File extract = new File(installDir, name);
+                    try (FileOutputStream fout = new FileOutputStream(extract)) {
+                        ShellUtils.pump(tarIn, fout);
+                    }
+                    if (name.contains(".lz4")) {
+                        console.add("-- Decompressing: " + name);
+                        Shell.sh("./magiskboot --decompress " + extract).to(console).exec();
+                    }
+                } else if (entry.getName().contains("vbmeta.img")) {
+                    vbmeta = true;
+                    ByteBuffer buf = ByteBuffer.allocate(256);
+                    buf.put("AVB0".getBytes()); // magic
+                    buf.putInt(1);              // required_libavb_version_major
+                    buf.putInt(120, 2);         // flags
+                    buf.position(128);          // release_string
+                    buf.put("avbtool 1.1.0".getBytes());
+                    tarOut.putNextEntry(newEntry("vbmeta.img", 256));
+                    tarOut.write(buf.array());
+                } else {
+                    console.add("-- Writing: " + entry.getName());
+                    tarOut.putNextEntry(entry);
+                    ShellUtils.pump(tarIn, tarOut);
+                }
+            }
+            File boot = SuFile.open(installDir, "boot.img");
+            File recovery = SuFile.open(installDir, "recovery.img");
+            if (vbmeta && recovery.exists() && boot.exists()) {
+                // Install Magisk to recovery
+                srcBoot = recovery.getPath();
+                // Repack boot image to prevent restore
+                Shell.sh(
+                        "./magiskboot --unpack boot.img",
+                        "./magiskboot --repack boot.img",
+                        "./magiskboot --cleanup",
+                        "mv new-boot.img boot.img").exec();
+                try (InputStream sin = new SuFileInputStream(boot)) {
+                    tarOut.putNextEntry(newEntry("boot.img", boot.length()));
+                    ShellUtils.pump(sin, tarOut);
+                }
+                boot.delete();
+            } else {
+                if (!boot.exists()) {
+                    console.add("! No boot image found");
+                    throw new IOException();
+                }
+                srcBoot = boot.getPath();
+            }
+        }
+    }
+
+    protected boolean handleFile(Uri uri) {
+        try (InputStream in = new BufferedInputStream(App.self.getContentResolver().openInputStream(uri))) {
+            in.mark(500);
+            byte[] magic = new byte[5];
+            if (in.skip(257) != 257 || in.read(magic) != magic.length) {
+                console.add("! Invalid file");
+                return false;
+            }
+            in.reset();
+            if (Arrays.equals(magic, "ustar".getBytes())) {
+                isTar = true;
+                destFile = new File(Const.EXTERNAL_PATH, "magisk_patched.tar");
+                handleTar(in);
+            } else {
+                // Raw image
+                srcBoot = new File(installDir, "boot.img").getPath();
+                destFile = new File(Const.EXTERNAL_PATH, "magisk_patched.img");
+                console.add("- Copying image to cache");
+                try (OutputStream out = new FileOutputStream(srcBoot)) {
+                    ShellUtils.pump(in, out);
                 }
-                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");
+            console.add("! Process error");
+            e.printStackTrace();
             return false;
         }
         return true;
@@ -215,9 +282,10 @@ public abstract class MagiskInstaller {
             return false;
         }
 
-        if (!Shell.sh("cd " + installDir, Utils.fmt(
-                "KEEPFORCEENCRYPT=%b KEEPVERITY=%b sh update-binary sh boot_patch.sh %s",
-                Config.keepEnc, Config.keepVerity, srcBoot))
+        if (!Shell.sh(Utils.fmt(
+                "KEEPFORCEENCRYPT=%b KEEPVERITY=%b RECOVERYMODE=%b " +
+                "sh update-binary sh boot_patch.sh %s",
+                Config.keepEnc, Config.keepVerity, Config.recovery, srcBoot))
                 .to(console, logs).exec().isSuccess())
             return false;
 
@@ -252,35 +320,30 @@ public abstract class MagiskInstaller {
     }
 
     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;
+        File patched = SuFile.open(installDir, "new-boot.img");
         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;
+            OutputStream os;
+            if (isTar) {
+                os = new TarOutputStream(destFile, true);
+                ((TarOutputStream) os).putNextEntry(newEntry(
+                                srcBoot.contains("recovery") ? "recovery.img" : "boot.img",
+                                patched.length()));
+            } else {
+                os = new BufferedOutputStream(new FileOutputStream(destFile));
             }
-            try (InputStream in = new SuFileInputStream(patched)) {
-                ShellUtils.pump(in, os);
-                os.close();
+            try (InputStream in = new SuFileInputStream(patched);
+                OutputStream out = os) {
+                ShellUtils.pump(in, out);
             }
         } catch (IOException e) {
-            console.add("! Failed to store boot to " + dest);
-            return false;
+            console.add("! Failed to output to " + destFile);
+            e.printStackTrace();
         }
-        Shell.sh("rm -f " + patched).exec();
+        patched.delete();
         console.add("");
         console.add("****************************");
-        console.add(" Patched image is placed in ");
-        console.add(" " + dest + " ");
+        console.add(" Output file is placed in ");
+        console.add(" " + destFile + " ");
         console.add("****************************");
         return true;
     }

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

@@ -6,7 +6,7 @@ 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.model.entity.Repo;
 import com.topjohnwu.magisk.utils.Event;
 import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.Utils;
@@ -34,7 +34,7 @@ import java.util.concurrent.Future;
 public class UpdateRepos {
     private static final DateFormat DATE_FORMAT;
 
-    private App app = App.self;
+    private final App app = App.self;
     private Set<String> cached;
     private Queue<Pair<String, Date>> moduleQueue;
 
@@ -116,17 +116,17 @@ public class UpdateRepos {
                 Pair<String, Date> pair = moduleQueue.poll();
                 if (pair == null)
                     return;
-                Repo repo = app.repoDB.getRepo(pair.first);
+                Repo repo = app.getRepoDB().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);
+                    app.getRepoDB().addRepo(repo);
                 } catch (Repo.IllegalRepoException e) {
                     Logger.debug(e.getMessage());
-                    app.repoDB.removeRepo(pair.first);
+                    app.getRepoDB().removeRepo(pair.first);
                 }
             }
         });
@@ -134,7 +134,7 @@ public class UpdateRepos {
     }
 
     private void fullReload() {
-        Cursor c = app.repoDB.getRawCursor();
+        Cursor c = app.getRepoDB().getRawCursor();
         runTasks(() -> {
             while (true) {
                 Repo repo;
@@ -145,10 +145,10 @@ public class UpdateRepos {
                 }
                 try {
                     repo.update();
-                    app.repoDB.addRepo(repo);
+                    app.getRepoDB().addRepo(repo);
                 } catch (Repo.IllegalRepoException e) {
                     Logger.debug(e.getMessage());
-                    app.repoDB.removeRepo(repo);
+                    app.getRepoDB().removeRepo(repo);
                 }
             }
         });
@@ -157,12 +157,12 @@ public class UpdateRepos {
     public void exec(boolean force) {
         Event.reset(Event.REPO_LOAD_DONE);
         App.THREAD_POOL.execute(() -> {
-            cached = Collections.synchronizedSet(app.repoDB.getRepoIDSet());
+            cached = Collections.synchronizedSet(app.getRepoDB().getRepoIDSet());
             moduleQueue = new ConcurrentLinkedQueue<>();
 
             if (loadPages()) {
                 // The leftover cached means they are removed from online repo
-                app.repoDB.removeRepo(cached);
+                app.getRepoDB().removeRepo(cached);
             } else if (force) {
                 fullReload();
             }

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

@@ -0,0 +1,118 @@
+package com.topjohnwu.magisk.ui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.view.GravityCompat
+import androidx.fragment.app.Fragment
+import com.topjohnwu.magisk.ClassMap
+import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.Const.Key.OPEN_SECTION
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ActivityMainBinding
+import com.topjohnwu.magisk.model.navigation.Navigation
+import com.topjohnwu.magisk.ui.base.MagiskActivity
+import com.topjohnwu.magisk.ui.hide.MagiskHideFragment
+import com.topjohnwu.magisk.ui.home.HomeFragment
+import com.topjohnwu.magisk.ui.log.LogFragment
+import com.topjohnwu.magisk.ui.module.ModulesFragment
+import com.topjohnwu.magisk.ui.module.ReposFragment
+import com.topjohnwu.magisk.ui.settings.SettingsFragment
+import com.topjohnwu.magisk.ui.superuser.SuperuserFragment
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.net.Networking
+import com.topjohnwu.superuser.Shell
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import kotlin.reflect.KClass
+
+
+open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
+
+    override val layoutRes: Int = R.layout.activity_main
+    override val viewModel: MainViewModel by viewModel()
+    override val navHostId: Int = R.id.main_nav_host
+    override val defaultPosition: Int = 0
+
+    override val baseFragments: List<KClass<out Fragment>> = listOf(
+        HomeFragment::class,
+        SuperuserFragment::class,
+        MagiskHideFragment::class,
+        ModulesFragment::class,
+        ReposFragment::class,
+        LogFragment::class,
+        SettingsFragment::class
+    )
+
+    /*override fun getDarkTheme(): Int {
+        return R.style.AppTheme_Dark
+    }*/
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        if (!SplashActivity.DONE) {
+            startActivity(Intent(this, ClassMap.get<Any>(SplashActivity::class.java)))
+            finish()
+        }
+
+        super.onCreate(savedInstanceState)
+        checkHideSection()
+        setSupportActionBar(binding.mainInclude.mainToolbar)
+
+        if (savedInstanceState == null) {
+            intent.getStringExtra(OPEN_SECTION)?.let {
+                onEventDispatched(Navigation.fromSection(it))
+            }
+        }
+    }
+
+    override fun setTitle(title: CharSequence?) {
+        supportActionBar?.title = title
+    }
+
+    override fun setTitle(titleId: Int) {
+        supportActionBar?.setTitle(titleId)
+    }
+
+    override fun onTabTransaction(fragment: Fragment?, index: Int) {
+        val fragmentId = when (fragment) {
+            is HomeFragment -> R.id.magiskFragment
+            is SuperuserFragment -> R.id.superuserFragment
+            is MagiskHideFragment -> R.id.magiskHideFragment
+            is ModulesFragment -> R.id.modulesFragment
+            is ReposFragment -> R.id.reposFragment
+            is LogFragment -> R.id.logFragment
+            is SettingsFragment -> R.id.settings
+            else -> return
+        }
+        binding.navView.setCheckedItem(fragmentId)
+    }
+
+    override fun onBackPressed() {
+        if (binding.drawerLayout.isDrawerOpen(binding.navView)) {
+            binding.drawerLayout.closeDrawer(binding.navView)
+        } else {
+            super.onBackPressed()
+        }
+    }
+
+    override fun onSimpleEventDispatched(event: Int) {
+        super.onSimpleEventDispatched(event)
+        when (event) {
+            Navigation.Main.OPEN_NAV -> openNav()
+        }
+    }
+
+    private fun openNav() = binding.drawerLayout.openDrawer(GravityCompat.START)
+
+    private fun checkHideSection() {
+        val menu = binding.navView.menu
+        menu.findItem(R.id.magiskHideFragment).isVisible =
+            Shell.rootAccess() && Config.get<Any>(Config.Key.MAGISKHIDE) as Boolean
+        menu.findItem(R.id.modulesFragment).isVisible =
+            Shell.rootAccess() && Config.magiskVersionCode >= 0
+        menu.findItem(R.id.reposFragment).isVisible =
+            (Networking.checkNetworkStatus(this) && Shell.rootAccess() && Config.magiskVersionCode >= 0)
+        menu.findItem(R.id.logFragment).isVisible =
+            Shell.rootAccess()
+        menu.findItem(R.id.superuserFragment).isVisible =
+            Utils.showSuperUser()
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/MainViewModel.kt

@@ -0,0 +1,27 @@
+package com.topjohnwu.magisk.ui
+
+import android.view.MenuItem
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.model.navigation.Navigation
+import com.topjohnwu.magisk.ui.base.MagiskViewModel
+
+
+class MainViewModel : MagiskViewModel() {
+
+    fun navPressed() = Navigation.Main.OPEN_NAV.publish()
+
+    fun navigationItemPressed(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.magiskFragment -> Navigation.home()
+            R.id.superuserFragment -> Navigation.superuser()
+            R.id.magiskHideFragment -> Navigation.hide()
+            R.id.modulesFragment -> Navigation.modules()
+            R.id.reposFragment -> Navigation.repos()
+            R.id.logFragment -> Navigation.log()
+            R.id.settings -> Navigation.settings()
+            else -> null
+        }?.publish()?.let { return@navigationItemPressed true }
+        return false
+    }
+
+}

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

@@ -0,0 +1,87 @@
+package com.topjohnwu.magisk.ui
+
+import android.content.Intent
+import android.os.Bundle
+import android.text.TextUtils
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.topjohnwu.magisk.*
+import com.topjohnwu.magisk.tasks.CheckUpdates
+import com.topjohnwu.magisk.tasks.UpdateRepos
+import com.topjohnwu.magisk.utils.LocaleManager
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.magisk.view.Notifications
+import com.topjohnwu.magisk.view.Shortcuts
+import com.topjohnwu.net.Networking
+import com.topjohnwu.superuser.Shell
+
+open class SplashActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        Shell.getShell {
+            if (Config.magiskVersionCode > 0 && Config.magiskVersionCode < Const.MAGISK_VER.MIN_SUPPORT) {
+                AlertDialog.Builder(this)
+                    .setTitle(R.string.unsupport_magisk_title)
+                    .setMessage(R.string.unsupport_magisk_message)
+                    .setNegativeButton(R.string.ok, null)
+                    .setOnDismissListener { finish() }
+                    .show()
+            } else {
+                initAndStart()
+            }
+        }
+    }
+
+    private fun initAndStart() {
+        val pkg = Config.get<String>(Config.Key.SU_MANAGER)
+        if (pkg != null && packageName == BuildConfig.APPLICATION_ID) {
+            Config.remove(Config.Key.SU_MANAGER)
+            Shell.su("pm uninstall $pkg").submit()
+        }
+        if (TextUtils.equals(pkg, packageName)) {
+            runCatching {
+                // We are the manager, remove com.topjohnwu.magisk as it could be malware
+                packageManager.getApplicationInfo(BuildConfig.APPLICATION_ID, 0)
+                Shell.su("pm uninstall " + BuildConfig.APPLICATION_ID).submit()
+            }
+        }
+
+        // Dynamic detect all locales
+        LocaleManager.loadAvailableLocales(R.string.app_changelog)
+
+        // Set default configs
+        Config.initialize()
+
+        // Create notification channel on Android O
+        Notifications.setup(this)
+
+        // Schedule periodic update checks
+        Utils.scheduleUpdateCheck()
+        CheckUpdates.check()
+
+        // Setup shortcuts
+        Shortcuts.setup(this)
+
+        // Magisk working as expected
+        if (Shell.rootAccess() && Config.magiskVersionCode > 0) {
+            // Load modules
+            Utils.loadModules(false)
+            // Load repos
+            if (Networking.checkNetworkStatus(this))
+                UpdateRepos().exec()
+        }
+
+        val intent = Intent(this, ClassMap.get<Any>(MainActivity::class.java))
+        intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION))
+        DONE = true
+        startActivity(intent)
+        finish()
+    }
+
+    companion object {
+
+        var DONE = false
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/base/ActivityResultListener.kt

@@ -0,0 +1,7 @@
+package com.topjohnwu.magisk.ui.base
+
+import android.content.Intent
+
+interface ActivityResultListener {
+    fun onActivityResult(resultCode: Int, data: Intent?)
+}

app/src/main/java/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.ui.base;
 
 import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
@@ -8,6 +8,10 @@ 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.Event;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceFragmentCompat;
@@ -16,10 +20,6 @@ import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.topjohnwu.magisk.App;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Event;
-
 public abstract class BasePreferenceFragment extends PreferenceFragmentCompat
         implements SharedPreferences.OnSharedPreferenceChangeListener, Event.AutoListener {
 
@@ -28,21 +28,21 @@ public abstract class BasePreferenceFragment extends PreferenceFragmentCompat
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = super.onCreateView(inflater, container, savedInstanceState);
-        app.prefs.registerOnSharedPreferenceChangeListener(this);
+        app.getPrefs().registerOnSharedPreferenceChangeListener(this);
         Event.register(this);
         return v;
     }
 
     @Override
     public void onDestroyView() {
-        app.prefs.unregisterOnSharedPreferenceChangeListener(this);
+        app.getPrefs().unregisterOnSharedPreferenceChangeListener(this);
         Event.unregister(this);
         super.onDestroyView();
     }
 
     @Override
     public int[] getListeningEvents() {
-        return BaseActivity.EMPTY_INT_ARRAY;
+        return new int[0];
     }
 
     @Override

app/src/main/java/com/topjohnwu/magisk/ui/base/IBaseLeanback.kt

@@ -0,0 +1,11 @@
+package com.topjohnwu.magisk.ui.base
+
+import android.content.Intent
+
+interface IBaseLeanback {
+
+    fun runWithExternalRW(callback: Runnable)
+    fun runWithPermissions(vararg permissions: String, callback: Runnable)
+    fun startActivityForResult(intent: Intent, requestCode: Int, listener: ActivityResultListener)
+
+}

app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt

@@ -0,0 +1,210 @@
+package com.topjohnwu.magisk.ui.base
+
+import android.content.Intent
+import android.content.res.Configuration
+import android.os.Bundle
+import androidx.annotation.CallSuper
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.net.toUri
+import androidx.databinding.ViewDataBinding
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentTransaction
+import com.karumi.dexter.Dexter
+import com.karumi.dexter.MultiplePermissionsReport
+import com.karumi.dexter.PermissionToken
+import com.karumi.dexter.listener.PermissionRequest
+import com.karumi.dexter.listener.multi.MultiplePermissionsListener
+import com.ncapdevi.fragnav.FragNavController
+import com.ncapdevi.fragnav.FragNavTransactionOptions
+import com.skoumal.teanity.viewevents.ViewEvent
+import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.model.events.BackPressEvent
+import com.topjohnwu.magisk.model.events.PermissionEvent
+import com.topjohnwu.magisk.model.events.ViewActionEvent
+import com.topjohnwu.magisk.model.navigation.MagiskAnimBuilder
+import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent
+import com.topjohnwu.magisk.model.navigation.Navigator
+import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
+import com.topjohnwu.magisk.utils.LocaleManager
+import com.topjohnwu.magisk.utils.Utils
+import timber.log.Timber
+import kotlin.reflect.KClass
+
+
+abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
+    MagiskLeanbackActivity<ViewModel, Binding>(), FragNavController.RootFragmentListener,
+    Navigator, FragNavController.TransactionListener {
+
+    override val numberOfRootFragments: Int get() = baseFragments.size
+    override val baseFragments: List<KClass<out Fragment>> = listOf()
+
+    protected open val defaultPosition: Int = 0
+
+    protected val navigationController get() = if (navHostId == 0) null else _navigationController
+    private val _navigationController by lazy {
+        if (navHostId == 0) throw IllegalStateException("Did you forget to override \"navHostId\"?")
+        FragNavController(supportFragmentManager, navHostId)
+    }
+
+    private val isRootFragment
+        get() = navigationController?.let { it.currentStackIndex != defaultPosition } ?: false
+
+    init {
+        val isDarkTheme = Config.get<Boolean>(Config.Key.DARK_THEME)
+        val theme = if (isDarkTheme) {
+            AppCompatDelegate.MODE_NIGHT_YES
+        } else {
+            AppCompatDelegate.MODE_NIGHT_NO
+        }
+        AppCompatDelegate.setDefaultNightMode(theme)
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+    }
+
+    override fun applyOverrideConfiguration(config: Configuration?) {
+        // Force applying our preferred local
+        config?.setLocale(LocaleManager.locale)
+        super.applyOverrideConfiguration(config)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        navigationController?.apply {
+            rootFragmentListener = this@MagiskActivity
+            transactionListener = this@MagiskActivity
+            initialize(defaultPosition, savedInstanceState)
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        navigationController?.onSaveInstanceState(outState)
+    }
+
+    @CallSuper
+    override fun onEventDispatched(event: ViewEvent) {
+        super.onEventDispatched(event)
+        when (event) {
+            is BackPressEvent -> onBackPressed()
+            is MagiskNavigationEvent -> navigateTo(event)
+            is ViewActionEvent -> event.action(this)
+            is PermissionEvent -> withPermissions(*event.permissions.toTypedArray()) {
+                onSuccess { event.callback.onNext(true) }
+                onFailure {
+                    event.callback.onNext(false)
+                    event.callback.onError(SecurityException("User refused permissions"))
+                }
+            }
+        }
+    }
+
+    override fun getRootFragment(index: Int) = baseFragments[index].java.newInstance()
+
+    override fun navigateTo(event: MagiskNavigationEvent) {
+        val directions = event.navDirections
+
+        navigationController?.defaultTransactionOptions = FragNavTransactionOptions.newBuilder()
+            .customAnimations(event.animOptions)
+            .build()
+
+        navigationController?.currentStack
+            ?.indexOfFirst { it.javaClass == event.navOptions.popUpTo }
+            ?.let { if (it == -1) null else it } // invalidate if class is not found
+            ?.let { if (event.navOptions.inclusive) it + 1 else it }
+            ?.let { navigationController?.popFragments(it) }
+
+        when (directions.isActivity) {
+            true -> navigateToActivity(event)
+            else -> navigateToFragment(event)
+        }
+    }
+
+    private fun navigateToActivity(event: MagiskNavigationEvent) {
+        val destination = event.navDirections.destination?.java ?: let {
+            Timber.e("Cannot navigate to null destination")
+            return
+        }
+        val options = event.navOptions
+
+        Intent(this, destination)
+            .putExtras(event.navDirections.args)
+            .apply {
+                if (options.singleTop) addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                if (options.clearTask) addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+            }
+            .let { startActivity(it) }
+    }
+
+    private fun navigateToFragment(event: MagiskNavigationEvent) {
+        val destination = event.navDirections.destination?.java ?: let {
+            Timber.e("Cannot navigate to null destination")
+            return
+        }
+
+        when (val index = baseFragments.indexOfFirst { it.java.name == destination.name }) {
+            -1 -> destination.newInstance()
+                .apply { arguments = event.navDirections.args }
+                .let { navigationController?.pushFragment(it) }
+            // When it's desired that fragments of same class are put on top of one another edit this
+            else -> navigationController?.switchTab(index)
+        }
+    }
+
+    override fun onBackPressed() {
+        val fragment = navigationController?.currentFrag as? MagiskFragment<*, *>
+
+        if (fragment?.onBackPressed() == true) {
+            return
+        }
+
+        try {
+            navigationController?.popFragment() ?: throw UnsupportedOperationException()
+        } catch (e: UnsupportedOperationException) {
+            when {
+                isRootFragment -> {
+                    val options = FragNavTransactionOptions.newBuilder()
+                        .transition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
+                        .build()
+                    navigationController?.switchTab(defaultPosition, options)
+                }
+                else -> super.onBackPressed()
+            }
+        }
+    }
+
+    override fun onFragmentTransaction(
+        fragment: Fragment?,
+        transactionType: FragNavController.TransactionType
+    ) = Unit
+
+    override fun onTabTransaction(fragment: Fragment?, index: Int) = Unit
+
+    fun openUrl(url: String) = Utils.openLink(this, url.toUri())
+
+    fun withPermissions(vararg permissions: String, builder: PermissionRequestBuilder.() -> Unit) {
+        val request = PermissionRequestBuilder().apply(builder).build()
+        Dexter.withActivity(this)
+            .withPermissions(*permissions)
+            .withListener(object : MultiplePermissionsListener {
+                override fun onPermissionsChecked(report: MultiplePermissionsReport?) =
+                    if (report?.areAllPermissionsGranted() == true) {
+                        request.onSuccess()
+                    } else {
+                        request.onFailure()
+                    }
+
+                override fun onPermissionRationaleShouldBeShown(
+                    permissions: MutableList<PermissionRequest>?,
+                    token: PermissionToken?
+                ) = request.onShowRationale(permissions.orEmpty().map { it.name })
+            })
+            .check()
+    }
+
+    private fun FragNavTransactionOptions.Builder.customAnimations(options: MagiskAnimBuilder) =
+        customAnimations(options.enter, options.exit, options.popEnter, options.popExit).apply {
+            if (!options.anySet) {
+                transition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+            }
+        }
+
+}

app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskFragment.kt

@@ -0,0 +1,52 @@
+package com.topjohnwu.magisk.ui.base
+
+import androidx.annotation.CallSuper
+import androidx.databinding.ViewDataBinding
+import androidx.fragment.app.Fragment
+import com.skoumal.teanity.view.TeanityFragment
+import com.skoumal.teanity.viewevents.ViewEvent
+import com.topjohnwu.magisk.model.events.BackPressEvent
+import com.topjohnwu.magisk.model.events.PermissionEvent
+import com.topjohnwu.magisk.model.events.ViewActionEvent
+import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent
+import com.topjohnwu.magisk.model.navigation.Navigator
+import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
+import kotlin.reflect.KClass
+
+
+abstract class MagiskFragment<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
+    TeanityFragment<ViewModel, Binding>(), Navigator {
+
+    protected val magiskActivity get() = activity as MagiskActivity<*, *>
+
+    // We don't need nested fragments
+    override val baseFragments: List<KClass<Fragment>> = listOf()
+
+    override fun navigateTo(event: MagiskNavigationEvent) = magiskActivity.navigateTo(event)
+
+    @CallSuper
+    override fun onEventDispatched(event: ViewEvent) {
+        super.onEventDispatched(event)
+        when (event) {
+            is BackPressEvent -> magiskActivity.onBackPressed()
+            is MagiskNavigationEvent -> navigateTo(event)
+            is ViewActionEvent -> event.action(requireActivity())
+            is PermissionEvent -> magiskActivity.withPermissions(*event.permissions.toTypedArray()) {
+                onSuccess { event.callback.onNext(true) }
+                onFailure {
+                    event.callback.onNext(false)
+                    event.callback.onError(SecurityException("User refused permissions"))
+                }
+            }
+        }
+    }
+
+    fun withPermissions(vararg permissions: String, builder: PermissionRequestBuilder.() -> Unit) {
+        magiskActivity.withPermissions(*permissions, builder = builder)
+    }
+
+    fun openLink(url: String) = magiskActivity.openUrl(url)
+
+    open fun onBackPressed(): Boolean = false
+
+}

app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskLeanbackActivity.kt

@@ -0,0 +1,64 @@
+package com.topjohnwu.magisk.ui.base
+
+import android.Manifest
+import android.content.Intent
+import androidx.collection.SparseArrayCompat
+import androidx.databinding.ViewDataBinding
+import com.karumi.dexter.Dexter
+import com.karumi.dexter.MultiplePermissionsReport
+import com.karumi.dexter.PermissionToken
+import com.karumi.dexter.listener.PermissionRequest
+import com.karumi.dexter.listener.multi.MultiplePermissionsListener
+import com.skoumal.teanity.view.TeanityActivity
+import com.topjohnwu.magisk.Const
+
+abstract class MagiskLeanbackActivity<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
+    TeanityActivity<ViewModel, Binding>(), IBaseLeanback {
+
+    private val resultListeners = SparseArrayCompat<ActivityResultListener>()
+
+    @Deprecated("Permissions will be checked in a different streamlined way")
+    fun runWithExternalRW(callback: () -> Unit) = runWithExternalRW(Runnable { callback() })
+
+    @Deprecated("Permissions will be checked in a different streamlined way")
+    override fun runWithExternalRW(callback: Runnable) {
+        runWithPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, callback = callback)
+    }
+
+    @Deprecated("Permissions will be checked in a different streamlined way")
+    override fun runWithPermissions(vararg permissions: String, callback: Runnable) {
+        Dexter.withActivity(this)
+            .withPermissions(*permissions)
+            .withListener(object : MultiplePermissionsListener {
+                override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
+                    if (report?.areAllPermissionsGranted() == true) {
+                        Const.EXTERNAL_PATH.mkdirs()
+                        callback.run()
+                    }
+                }
+
+                override fun onPermissionRationaleShouldBeShown(
+                    permissions: MutableList<PermissionRequest>?,
+                    token: PermissionToken?
+                ) = Unit
+            })
+            .check()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        resultListeners.get(requestCode)?.apply {
+            resultListeners.remove(requestCode)
+            onActivityResult(resultCode, data)
+        }
+    }
+
+    override fun startActivityForResult(
+        intent: Intent,
+        requestCode: Int,
+        listener: ActivityResultListener
+    ) {
+        resultListeners.put(requestCode, listener)
+        startActivityForResult(intent, requestCode)
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskViewModel.kt

@@ -0,0 +1,31 @@
+package com.topjohnwu.magisk.ui.base
+
+import android.app.Activity
+import com.skoumal.teanity.extensions.doOnSubscribeUi
+import com.skoumal.teanity.viewmodel.LoadingViewModel
+import com.topjohnwu.magisk.model.events.BackPressEvent
+import com.topjohnwu.magisk.model.events.PermissionEvent
+import com.topjohnwu.magisk.model.events.ViewActionEvent
+import com.topjohnwu.magisk.utils.Event
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import timber.log.Timber
+
+
+abstract class MagiskViewModel : LoadingViewModel(), Event.AutoListener {
+
+    override fun onEvent(event: Int) = Timber.i("Event of $event was not handled")
+    override fun getListeningEvents(): IntArray = intArrayOf()
+
+    fun withView(action: Activity.() -> Unit) {
+        ViewActionEvent(action).publish()
+    }
+
+    fun withPermissions(vararg permissions: String): Observable<Boolean> {
+        val subject = PublishSubject.create<Boolean>()
+        return subject.doOnSubscribeUi { PermissionEvent(permissions.toList(), subject).publish() }
+    }
+
+    fun back() = BackPressEvent().publish()
+
+}

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt

@@ -0,0 +1,24 @@
+package com.topjohnwu.magisk.ui.flash
+
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ActivityFlashBinding
+import com.topjohnwu.magisk.ui.base.MagiskActivity
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+open class FlashActivity : MagiskActivity<FlashViewModel, ActivityFlashBinding>() {
+
+    override val layoutRes: Int = R.layout.activity_flash
+    override val viewModel: FlashViewModel by viewModel {
+        val uri = intent.data
+        val action = intent.getStringExtra(Const.Key.FLASH_ACTION) ?: let { finish();"" }
+        parametersOf(action, uri)
+    }
+
+    override fun onBackPressed() {
+        if (viewModel.loading) return
+        super.onBackPressed()
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt

@@ -0,0 +1,110 @@
+package com.topjohnwu.magisk.ui.flash
+
+import android.Manifest.permission.READ_EXTERNAL_STORAGE
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+import android.content.res.Resources
+import android.net.Uri
+import android.os.Handler
+import androidx.core.os.postDelayed
+import androidx.databinding.ObservableArrayList
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.skoumal.teanity.extensions.subscribeK
+import com.skoumal.teanity.util.DiffObservableList
+import com.skoumal.teanity.util.KObservableField
+import com.skoumal.teanity.viewevents.SnackbarEvent
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem
+import com.topjohnwu.magisk.model.flash.FlashResultListener
+import com.topjohnwu.magisk.model.flash.Flashing
+import com.topjohnwu.magisk.model.flash.Patching
+import com.topjohnwu.magisk.ui.base.MagiskViewModel
+import com.topjohnwu.magisk.utils.*
+import com.topjohnwu.superuser.Shell
+import me.tatarka.bindingcollectionadapter2.ItemBinding
+import java.io.File
+import java.util.*
+
+class FlashViewModel(
+    action: String,
+    uri: Uri?,
+    private val resources: Resources
+) : MagiskViewModel(), FlashResultListener {
+
+    val canShowReboot = Shell.rootAccess()
+    val showRestartTitle = KObservableField(false)
+
+    val behaviorText = KObservableField(resources.getString(R.string.flashing))
+
+    val items = DiffObservableList(ComparableRvItem.callback)
+    val itemBinding = ItemBinding.of<ComparableRvItem<*>> { itemBinding, _, item ->
+        item.bind(itemBinding)
+        itemBinding.bindExtra(BR.viewModel, this@FlashViewModel)
+    }
+
+    private val outItems = ObservableArrayList<String>()
+    private val logItems = Collections.synchronizedList(mutableListOf<String>())
+
+    init {
+        outItems.sendUpdatesTo(items) { it.map { ConsoleRvItem(it) } }
+        outItems.copyNewInputInto(logItems)
+
+        state = State.LOADING
+
+        val uri = uri ?: Uri.EMPTY
+        when (action) {
+            Const.Value.FLASH_ZIP -> Flashing
+                .Install(uri, outItems, logItems, this)
+                .exec()
+            Const.Value.UNINSTALL -> Flashing
+                .Uninstall(uri, outItems, logItems, this)
+                .exec()
+            Const.Value.FLASH_MAGISK -> Patching
+                .Direct(outItems, logItems, this)
+                .exec()
+            Const.Value.FLASH_INACTIVE_SLOT -> Patching
+                .SecondSlot(outItems, logItems, this)
+                .exec()
+            Const.Value.PATCH_FILE -> Patching
+                .File(uri, outItems, logItems, this)
+                .exec()
+        }
+    }
+
+    override fun onResult(isSuccess: Boolean) {
+        state = if (isSuccess) State.LOADED else State.LOADING_FAILED
+        behaviorText.value = when {
+            isSuccess -> resources.getString(R.string.done)
+            else -> resources.getString(R.string.failure)
+        }
+
+        if (isSuccess) {
+            Handler().postDelayed(500) {
+                showRestartTitle.value = true
+            }
+        }
+    }
+
+    fun savePressed() = withPermissions(READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE)
+        .map { now }
+        .map { it.toTime(timeFormatStandard) }
+        .map { Const.MAGISK_INSTALL_LOG_FILENAME.format(it) }
+        .map { File(Const.EXTERNAL_PATH, it) }
+        .map { file ->
+            file.bufferedWriter().use { writer ->
+                logItems.forEach {
+                    writer.write(it)
+                    writer.newLine()
+                }
+            }
+            file.path
+        }
+        .subscribeK { SnackbarEvent(it).publish() }
+        .add()
+
+    fun restartPressed() = RootUtils.reboot()
+
+    fun backPressed() = back()
+
+}

app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt

@@ -0,0 +1,128 @@
+package com.topjohnwu.magisk.ui.hide
+
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
+import com.skoumal.teanity.extensions.subscribeK
+import com.skoumal.teanity.rxbus.RxBus
+import com.skoumal.teanity.util.DiffObservableList
+import com.skoumal.teanity.util.KObservableField
+import com.topjohnwu.magisk.App
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.model.entity.HideAppInfo
+import com.topjohnwu.magisk.model.entity.HideTarget
+import com.topjohnwu.magisk.model.entity.recycler.HideProcessRvItem
+import com.topjohnwu.magisk.model.entity.recycler.HideRvItem
+import com.topjohnwu.magisk.model.entity.state.IndeterminateState
+import com.topjohnwu.magisk.model.events.HideProcessEvent
+import com.topjohnwu.magisk.ui.base.MagiskViewModel
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.magisk.utils.toSingle
+import com.topjohnwu.magisk.utils.update
+import com.topjohnwu.superuser.Shell
+import io.reactivex.Single
+import me.tatarka.bindingcollectionadapter2.OnItemBind
+import timber.log.Timber
+
+class HideViewModel(
+    private val packageManager: PackageManager,
+    rxBus: RxBus
+) : MagiskViewModel() {
+
+    val query = KObservableField("")
+    val isShowSystem = KObservableField(false)
+
+    private val allItems = mutableListOf<ComparableRvItem<*>>()
+    val items = DiffObservableList(ComparableRvItem.callback)
+    val itemBinding = OnItemBind<ComparableRvItem<*>> { itemBinding, _, item ->
+        item.bind(itemBinding)
+        itemBinding.bindExtra(BR.viewModel, this@HideViewModel)
+    }
+
+    init {
+        rxBus.register<HideProcessEvent>()
+            .subscribeK { toggleItem(it.item) }
+            .add()
+
+        isShowSystem.addOnPropertyChangedCallback { query() }
+        query.addOnPropertyChangedCallback { query() }
+
+        refresh()
+    }
+
+    fun refresh() {
+        // fetching this for every item is nonsensical, so we add .cache() so the response is all
+        // the same for every single mapped item, it only actually executes the whole thing the
+        // first time around.
+        val hideTargets = Shell.su("magiskhide --ls").toSingle()
+            .map { it.exec().out }
+            .flattenAsFlowable { it }
+            .map { HideTarget(it) }
+            .toList()
+            .cache()
+
+        Single.fromCallable { packageManager.getInstalledApplications(0) }
+            .flattenAsFlowable { it }
+            .filter { it.enabled && !blacklist.contains(it.packageName) }
+            .map {
+                val label = Utils.getAppLabel(it, packageManager)
+                val icon = it.loadIcon(packageManager)
+                HideAppInfo(it, label, icon)
+            }
+            .filter { it.processes.isNotEmpty() }
+            .map { HideRvItem(it, hideTargets.blockingGet()) }
+            .toList()
+            .map { it.sortWith(compareBy(
+                    {it.isHiddenState.value}, {it.item.name}, {it.packageName})); it }
+            .doOnSuccess { allItems.update(it) }
+            .flatMap { queryRaw() }
+            .applyViewModel(this)
+            .subscribeK(onError = Timber::e) { items.update(it.first, it.second) }
+            .add()
+    }
+
+    private fun query() = queryRaw()
+        .subscribeK { items.update(it.first, it.second) }
+        .add()
+
+    private fun queryRaw(
+        showSystem: Boolean = isShowSystem.value,
+        query: String = this.query.value
+    ) = allItems.toSingle()
+        .map { it.filterIsInstance<HideRvItem>() }
+        .flattenAsFlowable { it }
+        .filter {
+            it.item.name.contains(query, ignoreCase = true) ||
+                    it.item.processes.any { it.contains(query, ignoreCase = true) }
+        }
+        .filter {
+            showSystem || (it.isHiddenState.value != IndeterminateState.UNCHECKED) ||
+                    (it.item.info.flags and ApplicationInfo.FLAG_SYSTEM == 0)
+        }
+        .toList()
+        .map { it to items.calculateDiff(it) }
+
+    private fun toggleItem(item: HideProcessRvItem) {
+        val state = if (item.isHidden.value) "add" else "rm"
+        "magiskhide --%s %s %s".format(state, item.packageName, item.process)
+            .let { Shell.su(it) }
+            .toSingle()
+            .map { it.submit() }
+            .subscribeK()
+    }
+
+    companion object {
+        private val blacklist = listOf(
+            App.self.packageName,
+            "android",
+            "com.android.chrome",
+            "com.chrome.beta",
+            "com.chrome.dev",
+            "com.chrome.canary",
+            "com.android.webview",
+            "com.google.android.webview"
+        )
+    }
+
+}