Update v7.3.4 changelogs

Close #1607

.gitattributes

@@ -11,8 +11,9 @@
 *.bat text eol=crlf
 
 # Denote all files that are truly binary and should not be modified.
-chromeos/** binary
+tools/** binary
 *.jar binary
 *.exe binary
 *.apk binary
 *.png binary
+*.jpg binary

.gitmodules

@@ -19,3 +19,9 @@
 [submodule "nanopb"]
 	path = native/jni/external/nanopb
 	url = https://github.com/nanopb/nanopb.git
+[submodule "mincrypt"]
+	path = native/jni/external/mincrypt
+	url = https://github.com/topjohnwu/mincrypt.git
+[submodule "termux-elf-cleaner"]
+	path = tools/termux-elf-cleaner
+	url = https://github.com/termux/termux-elf-cleaner.git

README.MD

@@ -10,7 +10,7 @@ Furthermore, Magisk provides a **Systemless Interface** to alter the system (or
 
 ## Bug Reports
 
-**Make sure to install the latest [Canary Build](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337) before reporting any bugs!** **DO NOT** report bugs that is already fixed upstream. Follow the instructions in the [Canary Channel XDA Thread](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337), and report a bug either by opening an issue on GitHub or directly in the thread.
+**Make sure to install the latest [Canary Build](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337) before reporting any bugs!** **DO NOT** report bugs that are already fixed upstream. Follow the instructions in the [Canary Channel XDA Thread](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337), and report a bug either by [opening an issue on GitHub](https://github.com/topjohnwu/Magisk/issues) or directly in the thread.
 
 ## Building Environment Requirements
 
@@ -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,51 +1,119 @@
 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
-        javaCompileOptions {
-            annotationProcessorOptions {
-                argument('butterknife.debuggable', 'false')
-            }
-        }
+        multiDexEnabled true
+        versionName props['appVersion']
+        versionCode props['appVersionCode'] as Integer
     }
 
     buildTypes {
         release {
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
+                    'proguard-rules.pro', 'proguard-kotlin.pro'
         }
     }
+
+    dataBinding {
+        enabled = true
+    }
+
+    packagingOptions {
+        exclude '/META-INF/*.version'
+        exclude '/META-INF/*.kotlin_module'
+        exclude '/META-INF/rxkotlin.properties'
+        exclude '/androidsupportmultidexversion.txt'
+        exclude '/org/bouncycastle/**'
+        exclude '/kotlin/**'
+        exclude '/kotlinx/**'
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+androidExtensions {
+    experimental = true
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    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 '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'
+    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.6'
+
+    def vMarkwon = '3.1.0'
+    implementation "ru.noties.markwon:core:${vMarkwon}"
+    implementation "ru.noties.markwon:html:${vMarkwon}"
+    implementation "ru.noties.markwon:image-svg:${vMarkwon}"
+
+    def vLibsu = '2.5.1'
+    implementation "com.github.topjohnwu.libsu:core:${vLibsu}"
+    implementation "com.github.topjohnwu.libsu:io:${vLibsu}"
+
+    def vKoin = "2.0.1"
+    implementation "org.koin:koin-core:${vKoin}"
+    implementation "org.koin:koin-android:${vKoin}"
+    implementation "org.koin:koin-androidx-viewmodel:${vKoin}"
+
+    def vRetrofit = '2.6.1'
+    implementation "com.squareup.retrofit2:retrofit:${vRetrofit}"
+    implementation "com.squareup.retrofit2:converter-moshi:${vRetrofit}"
+    implementation "com.squareup.retrofit2:converter-scalars:${vRetrofit}"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}"
+
+    def vOkHttp = '3.12.2'
+    implementation "com.squareup.okhttp3:okhttp:${vOkHttp}"
+    implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
+
+    def vMoshi = "1.8.0"
+    implementation "com.squareup.moshi:moshi:${vMoshi}"
+
+    def vKotshi = "2.0.1"
+    implementation "se.ansman.kotshi:api:${vKotshi}"
+    kapt "se.ansman.kotshi:compiler:${vKotshi}"
+
+    modules {
+        module('androidx.room:room-runtime') {
+            replacedBy('com.github.topjohnwu:room-runtime')
+        }
+    }
+    def vRoom = "2.1.0"
+    implementation "com.github.topjohnwu:room-runtime:${vRoom}"
+    kapt "androidx.room:room-compiler:${vRoom}"
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVer}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVer}"
+
     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'
-
-    def libsuVersion = '2.3.2'
-    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}"
+    implementation 'androidx.browser:browser:1.0.0'
+    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.work:work-runtime:2.2.0'
+    implementation 'androidx.transition:transition:1.2.0-rc01'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'com.google.android.material:material:1.1.0-alpha10'
 }

app/proguard-kotlin.pro

@@ -0,0 +1,20 @@
+## So every class is case insensitive to avoid some bizare problems
+-dontusemixedcaseclassnames
+
+## If reflection issues come up uncomment this, that should temporarily fix it
+#-keep class kotlin.** { *; }
+#-keep class kotlin.Metadata { *; }
+#-keepclassmembers class kotlin.Metadata {
+#    public <methods>;
+#}
+
+## Never warn about Kotlin, it should work as-is
+-dontwarn kotlin.**
+
+## Removes runtime null checks - doesn't really matter if it crashes on kotlin or java NPE
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+    static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
+}
+
+## Useless option for dex
+-dontpreverify

app/proguard-rules.pro

@@ -16,34 +16,32 @@
 #   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
--keepclassmembers class * implements com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback {
+-keepclassmembers class com.topjohnwu.magisk.utils.SafetyNetHelper { *; }
+-keep,allowobfuscation interface com.topjohnwu.magisk.utils.SafetyNetHelper$Callback
+-keepclassmembers class * implements com.topjohnwu.magisk.utils.SafetyNetHelper$Callback {
   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(...);
-}
+-assumenosideeffects class timber.log.Timber.Tree { *; }
 
 # Excessive obfuscation
 -repackageclasses 'a'
 -allowaccessmodification
--optimizationpasses 6
+
+# QOL
+-dontnote **
+-dontwarn com.caverock.androidsvg.**
+-dontwarn ru.noties.markwon.**

app/src/main/AndroidManifest.xml

@@ -3,15 +3,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
     <application
-        android:allowBackup="true"
         android:name="a.e"
-        android:theme="@style/AppTheme"
+        android:allowBackup="true"
+        android:theme="@style/MagiskTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
 
@@ -35,7 +36,7 @@
             android:name="a.f"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="nosensor"
-            android:theme="@style/AppTheme.NoDrawer" />
+            android:theme="@style/MagiskTheme.Flashing" />
 
         <!-- Superuser -->
 
@@ -43,9 +44,8 @@
             android:name="a.m"
             android:directBootAware="true"
             android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity="a.m"
-            android:theme="@style/SuRequest" />
+            android:exported="false"
+            android:theme="@style/MagiskTheme.SU" />
 
         <!-- Receiver -->
 
@@ -66,7 +66,8 @@
 
         <!-- Service -->
 
-        <service android:name="a.j" />
+        <service android:name="a.j"
+            android:exported="false" />
 
         <!-- Hardcode GMS version -->
         <meta-data
@@ -75,4 +76,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,7 +1,7 @@
 package a;
 
-import com.topjohnwu.magisk.components.DownloadModuleService;
+import com.topjohnwu.magisk.model.download.DownloadService;
 
-public class j extends DownloadModuleService {
+public class j extends DownloadService {
     /* 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,14 +2,14 @@ package a;
 
 import android.content.Context;
 
-import com.topjohnwu.magisk.components.DelegateWorker;
-
-import java.lang.reflect.ParameterizedType;
-
 import androidx.annotation.NonNull;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
 
+import com.topjohnwu.magisk.model.worker.DelegateWorker;
+
+import java.lang.reflect.ParameterizedType;
+
 public abstract class w<T extends DelegateWorker> extends Worker {
 
     /* Wrapper class to workaround Proguard -keep class * extends Worker */
@@ -22,7 +22,7 @@ public abstract class w<T extends DelegateWorker> extends Worker {
         try {
             base = ((Class<T>) ((ParameterizedType) getClass().getGenericSuperclass())
                     .getActualTypeArguments()[0]).newInstance();
-            base.setActualWorker(this);
+            base.attachWorker(this);
         } catch (Exception ignored) {}
     }
 

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,62 @@
+package com.topjohnwu.magisk
+
+import android.app.Application
+import android.content.Context
+import android.content.res.Configuration
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.multidex.MultiDex
+import androidx.room.Room
+import androidx.work.impl.WorkDatabase
+import androidx.work.impl.WorkDatabase_Impl
+import com.topjohnwu.magisk.data.database.RepoDatabase
+import com.topjohnwu.magisk.data.database.RepoDatabase_Impl
+import com.topjohnwu.magisk.di.ActivityTracker
+import com.topjohnwu.magisk.di.koinModules
+import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.net.Networking
+import com.topjohnwu.magisk.utils.LocaleManager
+import com.topjohnwu.magisk.utils.RootUtils
+import com.topjohnwu.superuser.Shell
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
+import timber.log.Timber
+
+open class App : Application() {
+
+    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)
+        Room.setFactory {
+            when (it) {
+                WorkDatabase::class.java -> WorkDatabase_Impl()
+                RepoDatabase::class.java -> RepoDatabase_Impl()
+                else -> 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)
+        }
+
+        registerActivityLifecycleCallbacks(get<ActivityTracker>())
+
+        Networking.init(base)
+        LocaleManager.setLocale(this)
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        LocaleManager.setLocale(this)
+    }
+}

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

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

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

@@ -0,0 +1,26 @@
+package com.topjohnwu.magisk
+
+import com.topjohnwu.magisk.model.download.DownloadService
+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
+
+object ClassMap {
+    private val map = mapOf(
+        App::class.java to a.e::class.java,
+        MainActivity::class.java to a.b::class.java,
+        SplashActivity::class.java to a.c::class.java,
+        FlashActivity::class.java to a.f::class.java,
+        UpdateCheckService::class.java to a.g::class.java,
+        GeneralReceiver::class.java to a.h::class.java,
+        DownloadService::class.java to a.j::class.java,
+        SuRequestActivity::class.java to a.m::class.java
+    )
+
+    operator fun <T : Class<*>>get(c: Class<*>): T {
+        return map.getOrElse(c) { throw IllegalArgumentException() } as T
+    }
+}

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

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

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

@@ -0,0 +1,208 @@
+package com.topjohnwu.magisk
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Environment
+import android.util.Xml
+import androidx.core.content.edit
+import com.topjohnwu.magisk.data.database.SettingsDao
+import com.topjohnwu.magisk.data.database.StringDao
+import com.topjohnwu.magisk.data.repository.DBConfig
+import com.topjohnwu.magisk.di.Protected
+import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.extensions.inject
+import com.topjohnwu.magisk.extensions.packageName
+import com.topjohnwu.magisk.model.preference.PreferenceModel
+import com.topjohnwu.magisk.utils.FingerprintHelper
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.io.SuFile
+import com.topjohnwu.superuser.io.SuFileInputStream
+import org.xmlpull.v1.XmlPullParser
+import java.io.File
+
+object Config : PreferenceModel, DBConfig {
+
+    override val stringDao: StringDao by inject()
+    override val settingsDao: SettingsDao by inject()
+    override val context: Context by inject(Protected)
+
+    object Key {
+        // db configs
+        const val ROOT_ACCESS = "root_access"
+        const val SU_MULTIUSER_MODE = "multiuser_mode"
+        const val SU_MNT_NS = "mnt_ns"
+        const val SU_MANAGER = "requester"
+        const val SU_FINGERPRINT = "su_fingerprint"
+
+        // prefs
+        const val SU_REQUEST_TIMEOUT = "su_request_timeout"
+        const val SU_AUTO_RESPONSE = "su_auto_response"
+        const val SU_NOTIFICATION = "su_notification"
+        const val SU_REAUTH = "su_reauth"
+        const val CHECK_UPDATES = "check_update"
+        const val UPDATE_CHANNEL = "update_channel"
+        const val CUSTOM_CHANNEL = "custom_channel"
+        const val LOCALE = "locale"
+        const val DARK_THEME = "dark_theme"
+        const val REPO_ORDER = "repo_order"
+        const val SHOW_SYSTEM_APP = "show_system"
+        const val DOWNLOAD_PATH = "download_path"
+
+        // system state
+        const val MAGISKHIDE = "magiskhide"
+        const val COREONLY = "disable"
+    }
+
+    object Value {
+        // Update channels
+        const val DEFAULT_CHANNEL = -1
+        const val STABLE_CHANNEL = 0
+        const val BETA_CHANNEL = 1
+        const val CUSTOM_CHANNEL = 2
+        const val CANARY_CHANNEL = 3
+        const val CANARY_DEBUG_CHANNEL = 4
+
+        // root access mode
+        const val ROOT_ACCESS_DISABLED = 0
+        const val ROOT_ACCESS_APPS_ONLY = 1
+        const val ROOT_ACCESS_ADB_ONLY = 2
+        const val ROOT_ACCESS_APPS_AND_ADB = 3
+
+        // su multiuser
+        const val MULTIUSER_MODE_OWNER_ONLY = 0
+        const val MULTIUSER_MODE_OWNER_MANAGED = 1
+        const val MULTIUSER_MODE_USER = 2
+
+        // su mnt ns
+        const val NAMESPACE_MODE_GLOBAL = 0
+        const val NAMESPACE_MODE_REQUESTER = 1
+        const val NAMESPACE_MODE_ISOLATE = 2
+
+        // su notification
+        const val NO_NOTIFICATION = 0
+        const val NOTIFICATION_TOAST = 1
+
+        // su auto response
+        const val SU_PROMPT = 0
+        const val SU_AUTO_DENY = 1
+        const val SU_AUTO_ALLOW = 2
+
+        // su timeout
+        val TIMEOUT_LIST = intArrayOf(0, -1, 10, 20, 30, 60)
+
+        // repo order
+        const val ORDER_NAME = 0
+        const val ORDER_DATE = 1
+    }
+
+    private val defaultChannel =
+        if (Utils.isCanary) Value.CANARY_DEBUG_CHANNEL
+        else Value.DEFAULT_CHANNEL
+
+    var downloadPath by preference(Key.DOWNLOAD_PATH, Environment.DIRECTORY_DOWNLOADS)
+    var repoOrder by preference(Key.REPO_ORDER, Value.ORDER_DATE)
+
+    var suDefaultTimeout by preferenceStrInt(Key.SU_REQUEST_TIMEOUT, 10)
+    var suAutoReponse by preferenceStrInt(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT)
+    var suNotification by preferenceStrInt(Key.SU_NOTIFICATION, Value.NOTIFICATION_TOAST)
+    var updateChannel by preferenceStrInt(Key.UPDATE_CHANNEL, defaultChannel)
+
+    var darkTheme by preference(Key.DARK_THEME, true)
+    var suReAuth by preference(Key.SU_REAUTH, false)
+    var checkUpdate by preference(Key.CHECK_UPDATES, true)
+    var magiskHide by preference(Key.MAGISKHIDE, true)
+    var coreOnly by preference(Key.COREONLY, false)
+    var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
+
+    var customChannelUrl by preference(Key.CUSTOM_CHANNEL, "")
+    var locale by preference(Key.LOCALE, "")
+
+    var rootMode by dbSettings(Key.ROOT_ACCESS, Value.ROOT_ACCESS_APPS_AND_ADB)
+    var suMntNamespaceMode by dbSettings(Key.SU_MNT_NS, Value.NAMESPACE_MODE_REQUESTER)
+    var suMultiuserMode by dbSettings(Key.SU_MULTIUSER_MODE, Value.MULTIUSER_MODE_OWNER_ONLY)
+    var suFingerprint by dbSettings(Key.SU_FINGERPRINT, false)
+    var suManager by dbStrings(Key.SU_MANAGER, "", true)
+
+    // Always return a path in external storage where we can write
+    val downloadDirectory get() =
+        Utils.ensureDownloadPath(downloadPath) ?: get<Context>().getExternalFilesDir(null)!!
+
+    fun initialize() = prefs.edit {
+        parsePrefs(this)
+
+        if (!prefs.contains(Key.UPDATE_CHANNEL))
+            putString(Key.UPDATE_CHANNEL, defaultChannel.toString())
+
+        // Get actual state
+        putBoolean(Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
+
+        // Write database configs
+        putString(Key.ROOT_ACCESS, rootMode.toString())
+        putString(Key.SU_MNT_NS, suMntNamespaceMode.toString())
+        putString(Key.SU_MULTIUSER_MODE, suMultiuserMode.toString())
+        putBoolean(Key.SU_FINGERPRINT, FingerprintHelper.useFingerprint())
+    }
+
+    private fun parsePrefs(editor: SharedPreferences.Editor) = editor.apply {
+        val config = SuFile.open("/data/adb", Const.MANAGER_CONFIGS)
+        if (config.exists()) runCatching {
+            val input = SuFileInputStream(config).buffered()
+            val parser = Xml.newPullParser()
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false)
+            parser.setInput(input, "UTF-8")
+            parser.nextTag()
+            parser.require(XmlPullParser.START_TAG, null, "map")
+            while (parser.next() != XmlPullParser.END_TAG) {
+                if (parser.eventType != XmlPullParser.START_TAG)
+                    continue
+                val key: String = parser.getAttributeValue(null, "name")
+                fun value() = parser.getAttributeValue(null, "value")!!
+                when (parser.name) {
+                    "string" -> {
+                        parser.require(XmlPullParser.START_TAG, null, "string")
+                        putString(key, parser.nextText())
+                        parser.require(XmlPullParser.END_TAG, null, "string")
+                    }
+                    "boolean" -> {
+                        parser.require(XmlPullParser.START_TAG, null, "boolean")
+                        putBoolean(key, value().toBoolean())
+                        parser.nextTag()
+                        parser.require(XmlPullParser.END_TAG, null, "boolean")
+                    }
+                    "int" -> {
+                        parser.require(XmlPullParser.START_TAG, null, "int")
+                        putInt(key, value().toInt())
+                        parser.nextTag()
+                        parser.require(XmlPullParser.END_TAG, null, "int")
+                    }
+                    "long" -> {
+                        parser.require(XmlPullParser.START_TAG, null, "long")
+                        putLong(key, value().toLong())
+                        parser.nextTag()
+                        parser.require(XmlPullParser.END_TAG, null, "long")
+                    }
+                    "float" -> {
+                        parser.require(XmlPullParser.START_TAG, null, "int")
+                        putFloat(key, value().toFloat())
+                        parser.nextTag()
+                        parser.require(XmlPullParser.END_TAG, null, "int")
+                    }
+                    else -> parser.next()
+                }
+            }
+            config.delete()
+        }
+    }
+
+    fun export() {
+        // Flush prefs to disk
+        prefs.edit().commit()
+        val xml = File(
+            "${get<Context>(Protected).filesDir.parent}/shared_prefs",
+            "${packageName}_preferences.xml"
+        )
+        Shell.su("cat $xml > /data/adb/${Const.MANAGER_CONFIGS}").exec()
+    }
+
+}

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

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

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

@@ -0,0 +1,78 @@
+package com.topjohnwu.magisk
+
+import android.os.Process
+import java.io.File
+
+object Const {
+
+    // Paths
+    const val MAGISK_PATH = "/sbin/.magisk/img"
+    var MAGISK_DISABLE_FILE = File("xxx")
+    const val TMP_FOLDER_PATH = "/dev/tmp"
+    const val MAGISK_LOG = "/cache/magisk.log"
+
+    // Versions
+    const val SNET_EXT_VER = 13
+    const val SNET_REVISION = "5adbc435ce93ded953c30ebe587edfd50b5503bc"
+    const val BOOTCTL_REVISION = "9c5dfc1b8245c0b5b524901ef0ff0f8335757b77"
+
+    // Misc
+    const val ANDROID_MANIFEST = "AndroidManifest.xml"
+    const val MAGISK_INSTALL_LOG_FILENAME = "magisk_install_log_%s.log"
+    const val MANAGER_CONFIGS = ".tmp.magisk.config"
+    val USER_ID = Process.myUid() / 100000
+
+    object MagiskVersion {
+        const val MIN_SUPPORT = 18000
+    }
+
+    object ID {
+        const val FETCH_ZIP = 2
+        const val SELECT_BOOT = 3
+
+        // notifications
+        const val MAGISK_UPDATE_NOTIFICATION_ID = 4
+        const val APK_UPDATE_NOTIFICATION_ID = 5
+        const val DTBO_NOTIFICATION_ID = 7
+        const val HIDE_MANAGER_NOTIFICATION_ID = 8
+        const val UPDATE_NOTIFICATION_CHANNEL = "update"
+        const val PROGRESS_NOTIFICATION_CHANNEL = "progress"
+        const val CHECK_MAGISK_UPDATE_WORKER_ID = "magisk_update"
+    }
+
+    object Url {
+        const val ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip"
+        const val PAYPAL_URL = "https://www.paypal.me/topjohnwu"
+        const val PATREON_URL = "https://www.patreon.com/topjohnwu"
+        const val TWITTER_URL = "https://twitter.com/topjohnwu"
+        const val XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382"
+        const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"
+
+        const val GITHUB_RAW_URL = "https://raw.githubusercontent.com/"
+        const val GITHUB_API_URL = "https://api.github.com/users/Magisk-Modules-Repo/"
+    }
+
+    object Key {
+        // others
+        const val LINK_KEY = "Link"
+        const val IF_NONE_MATCH = "If-None-Match"
+        const val ETAG_KEY = "ETag"
+        // intents
+        const val OPEN_SECTION = "section"
+        const val INTENT_SET_APP = "app_json"
+        const val FLASH_ACTION = "action"
+        const val FLASH_DATA = "additional_data"
+        const val DISMISS_ID = "dismiss_id"
+        const val BROADCAST_MANAGER_UPDATE = "manager_update"
+        const val BROADCAST_REBOOT = "reboot"
+    }
+
+    object Value {
+        const val FLASH_ZIP = "flash"
+        const val PATCH_FILE = "patch"
+        const val FLASH_MAGISK = "magisk"
+        const val FLASH_INACTIVE_SLOT = "slot"
+        const val 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/Info.kt

@@ -0,0 +1,26 @@
+package com.topjohnwu.magisk
+
+import com.topjohnwu.magisk.model.entity.UpdateInfo
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.ShellUtils
+
+object Info {
+
+    var magiskVersionCode = -1
+
+    var magiskVersionString = ""
+
+    var remote = UpdateInfo()
+
+    var keepVerity = false
+    var keepEnc = false
+    var recovery = false
+
+    fun loadMagiskInfo() {
+        runCatching {
+            magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":".toRegex())[0]
+            magiskVersionCode = ShellUtils.fastCmd("magisk -V").toInt()
+            Config.magiskHide = Shell.su("magiskhide --status").exec().isSuccess
+        }
+    }
+}

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/BasePreferenceFragment.java

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

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

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

app/src/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/components/UpdateCheckService.java

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

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

@@ -1,155 +0,0 @@
-package com.topjohnwu.magisk.container;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import androidx.annotation.NonNull;
-
-import java.util.List;
-
-public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
-
-    private String mId, mName, mVersion, mAuthor, mDescription;
-    private int mVersionCode = -1, minMagiskVersion = -1;
-
-    protected BaseModule() {
-        mId = mName = mVersion = mAuthor = mDescription = "";
-    }
-
-    protected BaseModule(Cursor c) {
-        mId = nonNull(c.getString(c.getColumnIndex("id")));
-        mName = nonNull(c.getString(c.getColumnIndex("name")));
-        mVersion = nonNull(c.getString(c.getColumnIndex("version")));
-        mVersionCode = c.getInt(c.getColumnIndex("versionCode"));
-        mAuthor = nonNull(c.getString(c.getColumnIndex("author")));
-        mDescription = nonNull(c.getString(c.getColumnIndex("description")));
-        minMagiskVersion = c.getInt(c.getColumnIndex("minMagisk"));
-    }
-
-    protected BaseModule(Parcel p) {
-        mId = p.readString();
-        mName = p.readString();
-        mVersion = p.readString();
-        mAuthor = p.readString();
-        mDescription = p.readString();
-        mVersionCode = p.readInt();
-        minMagiskVersion = p.readInt();
-    }
-
-    @Override
-    public int compareTo(@NonNull BaseModule module) {
-        return this.getName().toLowerCase().compareTo(module.getName().toLowerCase());
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(mId);
-        dest.writeString(mName);
-        dest.writeString(mVersion);
-        dest.writeString(mAuthor);
-        dest.writeString(mDescription);
-        dest.writeInt(mVersionCode);
-        dest.writeInt(minMagiskVersion);
-    }
-
-    private String nonNull(String s) {
-        return s == null ? "" : s;
-    }
-
-    public ContentValues getContentValues() {
-        ContentValues values = new ContentValues();
-        values.put("id", mId);
-        values.put("name", mName);
-        values.put("version", mVersion);
-        values.put("versionCode", mVersionCode);
-        values.put("author", mAuthor);
-        values.put("description", mDescription);
-        values.put("minMagisk", minMagiskVersion);
-        return values;
-    }
-
-    protected void parseProps(List<String> props) { parseProps(props.toArray(new String[0])); }
-
-    protected void parseProps(String[] props) throws NumberFormatException {
-        for (String line : props) {
-            String[] prop = line.split("=", 2);
-            if (prop.length != 2)
-                continue;
-
-            String key = prop[0].trim();
-            String value = prop[1].trim();
-            if (key.isEmpty() || key.charAt(0) == '#')
-                continue;
-
-            switch (key) {
-                case "id":
-                    mId = value;
-                    break;
-                case "name":
-                    mName = value;
-                    break;
-                case "version":
-                    mVersion = value;
-                    break;
-                case "versionCode":
-                    mVersionCode = Integer.parseInt(value);
-                    break;
-                case "author":
-                    mAuthor = value;
-                    break;
-                case "description":
-                    mDescription = value;
-                    break;
-                case "minMagisk":
-                case "template":
-                    minMagiskVersion = Integer.parseInt(value);
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    public String getName() {
-        return mName;
-    }
-
-    public void setName(String name) {
-        mName = name;
-    }
-
-    public String getVersion() {
-        return mVersion;
-    }
-
-    public String getAuthor() {
-        return mAuthor;
-    }
-
-    public String getId() {
-        return mId;
-    }
-
-    public void setId(String id) {
-        mId = id;
-    }
-
-    public String getDescription() {
-        return mDescription;
-    }
-
-    public int getVersionCode() {
-        return mVersionCode;
-    }
-
-    public int getMinMagiskVersion() {
-        return minMagiskVersion;
-    }
-}

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

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

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

@@ -1,61 +0,0 @@
-package com.topjohnwu.magisk.container;
-
-import android.content.ContentValues;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-
-import androidx.annotation.NonNull;
-
-import com.topjohnwu.magisk.utils.Utils;
-
-
-public class Policy implements Comparable<Policy>{
-    public static final int INTERACTIVE = 0;
-    public static final int DENY = 1;
-    public static final int ALLOW = 2;
-
-    public int uid, policy = INTERACTIVE;
-    public long until;
-    public boolean logging = true, notification = true;
-    public String packageName, appName;
-    public ApplicationInfo info;
-
-    public Policy(int uid, PackageManager pm) throws PackageManager.NameNotFoundException {
-        String[] pkgs = pm.getPackagesForUid(uid);
-        if (pkgs == null || pkgs.length == 0)
-            throw new PackageManager.NameNotFoundException();
-        this.uid = uid;
-        packageName = pkgs[0];
-        info = pm.getApplicationInfo(packageName, 0);
-        appName = Utils.getAppLabel(info, pm);
-    }
-
-    public Policy(ContentValues values, PackageManager pm) throws PackageManager.NameNotFoundException {
-        uid = values.getAsInteger("uid");
-        packageName = values.getAsString("package_name");
-        policy = values.getAsInteger("policy");
-        until = values.getAsInteger("until");
-        logging = values.getAsInteger("logging") != 0;
-        notification = values.getAsInteger("notification") != 0;
-        info = pm.getApplicationInfo(packageName, 0);
-        if (info.uid != uid)
-            throw new PackageManager.NameNotFoundException();
-        appName = info.loadLabel(pm).toString();
-    }
-
-    public ContentValues getContentValues() {
-        ContentValues values = new ContentValues();
-        values.put("uid", uid);
-        values.put("package_name", packageName);
-        values.put("policy", policy);
-        values.put("until", until);
-        values.put("logging", logging ? 1 : 0);
-        values.put("notification", notification ? 1 : 0);
-        return values;
-    }
-
-    @Override
-    public int compareTo(@NonNull Policy policy) {
-        return appName.toLowerCase().compareTo(policy.appName.toLowerCase());
-    }
-}

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

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

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

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

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/container/ValueSortedMap.java

@@ -1,43 +0,0 @@
-package com.topjohnwu.magisk.container;
-
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ValueSortedMap<K, V extends Comparable<? super V>> extends HashMap<K, V> {
-
-    private List<V> sorted = new ArrayList<>();
-
-    @NonNull
-    @Override
-    public Collection<V> values() {
-        if (sorted.isEmpty()) {
-            sorted.addAll(super.values());
-            Collections.sort(sorted);
-        }
-        return sorted;
-    }
-
-    @Override
-    public V put(K key, V value) {
-        sorted.clear();
-        return super.put(key, value);
-    }
-
-    @Override
-    public void putAll(Map<? extends K, ? extends V> m) {
-        sorted.clear();
-        super.putAll(m);
-    }
-
-    @Override
-    public V remove(Object key) {
-        sorted.clear();
-        return super.remove(key);
-    }
-}

app/src/main/java/com/topjohnwu/magisk/data/database/LogDao.kt

@@ -0,0 +1,33 @@
+package com.topjohnwu.magisk.data.database
+
+import com.topjohnwu.magisk.data.database.base.*
+import com.topjohnwu.magisk.model.entity.MagiskLog
+import com.topjohnwu.magisk.model.entity.toLog
+import com.topjohnwu.magisk.model.entity.toMap
+import java.util.concurrent.TimeUnit
+
+class LogDao : BaseDao() {
+
+    override val table = DatabaseDefinition.Table.LOG
+
+    fun deleteOutdated(
+        suTimeout: Long = TimeUnit.DAYS.toMillis(14)
+    ) = query<Delete> {
+        condition {
+            lessThan("time", suTimeout.toString())
+        }
+    }.ignoreElement()
+
+    fun deleteAll() = query<Delete> {}.ignoreElement()
+
+    fun fetchAll() = query<Select> {
+        orderBy("time", Order.DESC)
+    }.flattenAsFlowable { it }
+        .map { it.toLog() }
+        .toList()
+
+    fun put(log: MagiskLog) = query<Insert> {
+        values(log.toMap())
+    }.ignoreElement()
+
+}

app/src/main/java/com/topjohnwu/magisk/data/database/PolicyDao.kt

@@ -0,0 +1,75 @@
+package com.topjohnwu.magisk.data.database
+
+import android.content.Context
+import android.content.pm.PackageManager
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.data.database.base.*
+import com.topjohnwu.magisk.extensions.now
+import com.topjohnwu.magisk.model.entity.MagiskPolicy
+import com.topjohnwu.magisk.model.entity.toMap
+import com.topjohnwu.magisk.model.entity.toPolicy
+import timber.log.Timber
+import java.util.concurrent.TimeUnit
+
+
+class PolicyDao(
+    private val context: Context
+) : BaseDao() {
+
+    override val table: String = DatabaseDefinition.Table.POLICY
+
+    fun deleteOutdated(
+        nowSeconds: Long = TimeUnit.MILLISECONDS.toSeconds(now)
+    ) = query<Delete> {
+        condition {
+            greaterThan("until", "0")
+            and {
+                lessThan("until", nowSeconds.toString())
+            }
+            or {
+                lessThan("until", "0")
+            }
+        }
+    }.ignoreElement()
+
+    fun delete(packageName: String) = query<Delete> {
+        condition {
+            equals("package_name", packageName)
+        }
+    }.ignoreElement()
+
+    fun delete(uid: Int) = query<Delete> {
+        condition {
+            equals("uid", uid)
+        }
+    }.ignoreElement()
+
+    fun fetch(uid: Int) = query<Select> {
+        condition {
+            equals("uid", uid)
+        }
+    }.map { it.first().toPolicySafe() }
+
+    fun update(policy: MagiskPolicy) = query<Replace> {
+        values(policy.toMap())
+    }.ignoreElement()
+
+    fun fetchAll() = query<Select> {
+        condition {
+            equals("uid/100000", Const.USER_ID)
+        }
+    }.map { it.mapNotNull { it.toPolicySafe() } }
+
+
+    private fun Map<String, String>.toPolicySafe(): MagiskPolicy? {
+        return runCatching { toPolicy(context.packageManager) }.getOrElse {
+            Timber.e(it)
+            if (it is PackageManager.NameNotFoundException) {
+                val uid = getOrElse("uid") { null } ?: return null
+                delete(uid).subscribe()
+            }
+            null
+        }
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/data/database/RepoDao.kt

@@ -0,0 +1,72 @@
+package com.topjohnwu.magisk.data.database
+
+import androidx.room.*
+import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.model.entity.module.Repo
+
+@Dao
+abstract class RepoDao {
+
+    val repoIDList get() = getRepoID().map { it.id }
+
+    val repos: List<Repo> get() = when (Config.repoOrder) {
+            Config.Value.ORDER_NAME -> getReposNameOrder()
+            else -> getReposDateOrder()
+        }
+
+    var etagKey: String
+        set(etag) = addEtagRaw(RepoEtag(0, etag))
+        get() = etagRaw()?.key.orEmpty()
+
+    fun clear() {
+        clearRepos()
+        clearEtag()
+    }
+
+    @Query("SELECT * FROM repos ORDER BY last_update DESC")
+    protected abstract fun getReposDateOrder(): List<Repo>
+
+    @Query("SELECT * FROM repos ORDER BY name COLLATE NOCASE")
+    protected abstract fun getReposNameOrder(): List<Repo>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun addRepo(repo: Repo)
+
+    @Query("SELECT * FROM repos WHERE id = :id")
+    abstract fun getRepo(id: String): Repo?
+
+    @Query("SELECT id FROM repos")
+    protected abstract fun getRepoID(): List<RepoID>
+
+    @Delete
+    abstract fun removeRepo(repo: Repo)
+
+    @Query("DELETE FROM repos WHERE id = :id")
+    abstract fun removeRepo(id: String)
+
+    @Query("DELETE FROM repos WHERE id IN (:idList)")
+    abstract fun removeRepos(idList: Collection<String>)
+
+    @Query("SELECT * FROM etag")
+    protected abstract fun etagRaw(): RepoEtag?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    protected abstract fun addEtagRaw(etag: RepoEtag)
+
+    @Query("DELETE FROM repos")
+    protected abstract fun clearRepos()
+
+    @Query("DELETE FROM etag")
+    protected abstract fun clearEtag()
+}
+
+data class RepoID(
+    @PrimaryKey val id: String
+)
+
+@Entity(tableName = "etag")
+data class RepoEtag(
+    @PrimaryKey val id: Int,
+    val key: String
+)
+

app/src/main/java/com/topjohnwu/magisk/data/database/RepoDatabase.kt

@@ -0,0 +1,11 @@
+package com.topjohnwu.magisk.data.database
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import com.topjohnwu.magisk.model.entity.module.Repo
+
+@Database(version = 6, entities = [Repo::class, RepoEtag::class])
+abstract class RepoDatabase : RoomDatabase() {
+
+    abstract fun repoDao() : RepoDao
+}

app/src/main/java/com/topjohnwu/magisk/data/database/SettingsDao.kt

@@ -0,0 +1,22 @@
+package com.topjohnwu.magisk.data.database
+
+import com.topjohnwu.magisk.data.database.base.*
+
+class SettingsDao : BaseDao() {
+
+    override val table = DatabaseDefinition.Table.SETTINGS
+
+    fun delete(key: String) = query<Delete> {
+        condition { equals("key", key) }
+    }.ignoreElement()
+
+    fun put(key: String, value: Int) = query<Replace> {
+        values("key" to key, "value" to value)
+    }.ignoreElement()
+
+    fun fetch(key: String, default: Int = -1) = query<Select> {
+        fields("value")
+        condition { equals("key", key) }
+    }.map { it.firstOrNull()?.values?.firstOrNull()?.toIntOrNull() ?: default }
+
+}

app/src/main/java/com/topjohnwu/magisk/data/database/StringDao.kt

@@ -0,0 +1,22 @@
+package com.topjohnwu.magisk.data.database
+
+import com.topjohnwu.magisk.data.database.base.*
+
+class StringDao : BaseDao() {
+
+    override val table = DatabaseDefinition.Table.STRINGS
+
+    fun delete(key: String) = query<Delete> {
+        condition { equals("key", key) }
+    }.ignoreElement()
+
+    fun put(key: String, value: String) = query<Replace> {
+        values("key" to key, "value" to value)
+    }.ignoreElement()
+
+    fun fetch(key: String, default: String = "") = query<Select> {
+        fields("value")
+        condition { equals("key", key) }
+    }.map { it.firstOrNull()?.values?.firstOrNull() ?: default }
+
+}

app/src/main/java/com/topjohnwu/magisk/data/database/base/BaseDao.kt

@@ -0,0 +1,15 @@
+package com.topjohnwu.magisk.data.database.base
+
+abstract class BaseDao {
+
+    abstract val table: String
+
+    inline fun <reified Builder : MagiskQueryBuilder> query(builder: Builder.() -> Unit) =
+        Builder::class.java.newInstance()
+            .apply { table = this@BaseDao.table }
+            .apply(builder)
+            .toString()
+            .let { MagiskQuery(it) }
+            .query()
+
+}

app/src/main/java/com/topjohnwu/magisk/data/database/base/DatabaseDefinition.kt

@@ -0,0 +1,30 @@
+package com.topjohnwu.magisk.data.database.base
+
+import androidx.annotation.AnyThread
+import com.topjohnwu.superuser.Shell
+import io.reactivex.Single
+
+object DatabaseDefinition {
+
+    object Table {
+        const val POLICY = "policies"
+        const val LOG = "logs"
+        const val SETTINGS = "settings"
+        const val STRINGS = "strings"
+    }
+
+}
+
+@AnyThread
+fun MagiskQuery.query() = query.su()
+
+fun String.suRaw() = Single.fromCallable { Shell.su(this).exec().out }
+fun String.su() = suRaw().map { it.toMap() }
+
+fun List<String>.toMap() = map { it.split(Regex("\\|")) }
+    .map { it.toMapInternal() }
+
+private fun List<String>.toMapInternal() = map { it.split("=", limit = 2) }
+    .filter { it.size == 2 }
+    .map { Pair(it[0], it[1]) }
+    .toMap()

app/src/main/java/com/topjohnwu/magisk/data/database/base/MagiskQuery.kt

@@ -0,0 +1,5 @@
+package com.topjohnwu.magisk.data.database.base
+
+inline class MagiskQuery(private val _query: String) {
+    val query get() = "magisk --sqlite '$_query'"
+}

app/src/main/java/com/topjohnwu/magisk/data/database/base/MagiskQueryBuilder.kt

@@ -0,0 +1,155 @@
+package com.topjohnwu.magisk.data.database.base
+
+import androidx.annotation.StringDef
+import com.topjohnwu.magisk.data.database.base.Order.Companion.ASC
+import com.topjohnwu.magisk.data.database.base.Order.Companion.DESC
+
+interface MagiskQueryBuilder {
+
+    val requestType: String
+    var table: String
+
+    companion object {
+        inline operator fun <reified Builder : MagiskQueryBuilder> invoke(builder: Builder.() -> Unit): MagiskQuery =
+            Builder::class.java.newInstance()
+                .apply(builder)
+                .toString()
+                .let {
+                    MagiskQuery(it)
+                }
+    }
+
+}
+
+class Delete : MagiskQueryBuilder {
+    override val requestType: String = "DELETE FROM"
+    override var table = ""
+
+    private var condition = ""
+
+    fun condition(builder: Condition.() -> Unit) {
+        condition = Condition().apply(builder).toString()
+    }
+
+    override fun toString(): String {
+        return listOf(requestType, table, condition).joinToString(" ")
+    }
+}
+
+class Select : MagiskQueryBuilder {
+    override val requestType: String get() = "SELECT $fields FROM"
+    override lateinit var table: String
+
+    private var fields = "*"
+    private var condition = ""
+    private var orderField = ""
+
+    fun fields(vararg newFields: String) {
+        if (newFields.isEmpty()) {
+            fields = "*"
+            return
+        }
+        fields = newFields.joinToString(", ")
+    }
+
+    fun condition(builder: Condition.() -> Unit) {
+        condition = Condition().apply(builder).toString()
+    }
+
+    fun orderBy(field: String, @OrderStrict order: String) {
+        orderField = "ORDER BY $field $order"
+    }
+
+    override fun toString(): String {
+        return listOf(requestType, table, condition, orderField).joinToString(" ")
+    }
+}
+
+class Replace : Insert() {
+    override val requestType: String = "REPLACE INTO"
+}
+
+open class Insert : MagiskQueryBuilder {
+    override val requestType: String = "INSERT INTO"
+    override lateinit var table: String
+
+    private val keys get() = _values.keys.joinToString(",")
+    private val values get() = _values.values.joinToString(",") {
+        when (it) {
+            is Boolean -> if (it) "1" else "0"
+            is Number -> it.toString()
+            else -> "\"$it\""
+        }
+    }
+    private var _values: Map<String, Any> = mapOf()
+
+    fun values(vararg pairs: Pair<String, Any>) {
+        _values = pairs.toMap()
+    }
+
+    fun values(values: Map<String, Any>) {
+        _values = values
+    }
+
+    override fun toString(): String {
+        return listOf(requestType, table, "($keys) VALUES($values)").joinToString(" ")
+    }
+}
+
+class Condition {
+
+    private val conditionWord = "WHERE %s"
+    private var condition: String = ""
+
+    fun equals(field: String, value: Any) {
+        condition = when (value) {
+            is String -> "$field=\"$value\""
+            else -> "$field=$value"
+        }
+    }
+
+    fun greaterThan(field: String, value: String) {
+        condition = "$field > $value"
+    }
+
+    fun lessThan(field: String, value: String) {
+        condition = "$field < $value"
+    }
+
+    fun greaterOrEqualTo(field: String, value: String) {
+        condition = "$field >= $value"
+    }
+
+    fun lessOrEqualTo(field: String, value: String) {
+        condition = "$field <= $value"
+    }
+
+    fun and(builder: Condition.() -> Unit) {
+        condition = "($condition AND ${Condition().apply(builder).condition})"
+    }
+
+    fun or(builder: Condition.() -> Unit) {
+        condition = "($condition OR ${Condition().apply(builder).condition})"
+    }
+
+    override fun toString(): String {
+        return conditionWord.format(condition)
+    }
+}
+
+class Order {
+
+    @set:OrderStrict
+    var order = DESC
+    var field = ""
+
+    companion object {
+        const val ASC = "ASC"
+        const val DESC = "DESC"
+    }
+
+}
+
+@StringDef(ASC, DESC)
+@Retention(AnnotationRetention.SOURCE)
+annotation class OrderStrict

app/src/main/java/com/topjohnwu/magisk/data/network/GithubServices.kt

@@ -0,0 +1,81 @@
+package com.topjohnwu.magisk.data.network
+
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.model.entity.UpdateInfo
+import com.topjohnwu.magisk.tasks.GithubRepoInfo
+import io.reactivex.Flowable
+import io.reactivex.Single
+import okhttp3.ResponseBody
+import retrofit2.adapter.rxjava2.Result
+import retrofit2.http.*
+
+interface GithubRawServices {
+
+    //region topjohnwu/magisk_files
+
+    @GET("$MAGISK_FILES/master/stable.json")
+    fun fetchStableUpdate(): Single<UpdateInfo>
+
+    @GET("$MAGISK_FILES/master/beta.json")
+    fun fetchBetaUpdate(): Single<UpdateInfo>
+
+    @GET("$MAGISK_FILES/master/canary_builds/release.json")
+    fun fetchCanaryUpdate(): Single<UpdateInfo>
+
+    @GET("$MAGISK_FILES/master/canary_builds/canary.json")
+    fun fetchCanaryDebugUpdate(): Single<UpdateInfo>
+
+    @GET
+    fun fetchCustomUpdate(@Url url: String): Single<UpdateInfo>
+
+    @GET("$MAGISK_FILES/{$REVISION}/snet.jar")
+    @Streaming
+    fun fetchSafetynet(@Path(REVISION) revision: String = Const.SNET_REVISION): Single<ResponseBody>
+
+    @GET("$MAGISK_FILES/{$REVISION}/bootctl")
+    @Streaming
+    fun fetchBootctl(@Path(REVISION) revision: String = Const.BOOTCTL_REVISION): Single<ResponseBody>
+
+    @GET("$MAGISK_MASTER/scripts/module_installer.sh")
+    @Streaming
+    fun fetchInstaller(): Single<ResponseBody>
+
+    @GET("$MAGISK_MODULES/{$MODULE}/master/{$FILE}")
+    fun fetchModuleInfo(@Path(MODULE) id: String, @Path(FILE) file: String): Single<String>
+
+    //endregion
+
+    /**
+     * This method shall be used exclusively for fetching files from urls from previous requests.
+     * Him, who uses it in a wrong way, shall die in an eternal flame.
+     * */
+    @GET
+    @Streaming
+    fun fetchFile(@Url url: String): Single<ResponseBody>
+
+    @GET
+    fun fetchString(@Url url: String): Single<String>
+
+
+    companion object {
+        private const val REVISION = "revision"
+        private const val MODULE = "module"
+        private const val FILE = "file"
+
+
+        private const val MAGISK_FILES = "topjohnwu/magisk_files"
+        private const val MAGISK_MASTER = "topjohnwu/Magisk/master"
+        private const val MAGISK_MODULES = "Magisk-Modules-Repo"
+    }
+
+}
+
+interface GithubApiServices {
+
+    @GET("repos")
+    fun fetchRepos(@Query("page") page: Int,
+                   @Header(Const.Key.IF_NONE_MATCH) etag: String,
+                   @Query("sort") sort: String = "pushed",
+                   @Query("per_page") count: Int = 100): Flowable<Result<List<GithubRepoInfo>>>
+
+}

app/src/main/java/com/topjohnwu/magisk/data/repository/DBConfig.kt

@@ -0,0 +1,106 @@
+package com.topjohnwu.magisk.data.repository
+
+import com.topjohnwu.magisk.data.database.SettingsDao
+import com.topjohnwu.magisk.data.database.StringDao
+import io.reactivex.schedulers.Schedulers
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+interface DBConfig {
+    val settingsDao: SettingsDao
+    val stringDao: StringDao
+
+    fun dbSettings(
+        name: String,
+        default: Int
+    ) = DBSettingsValue(name, default)
+
+    fun dbSettings(
+        name: String,
+        default: Boolean
+    ) = DBBoolSettings(name, default)
+
+    fun dbStrings(
+        name: String,
+        default: String,
+        sync: Boolean = false
+    ) = DBStringsValue(name, default, sync)
+
+}
+
+class DBSettingsValue(
+        private val name: String,
+        private val default: Int
+) : ReadWriteProperty<DBConfig, Int> {
+
+    private var value: Int? = null
+
+    @Synchronized
+    override fun getValue(thisRef: DBConfig, property: KProperty<*>): Int {
+        if (value == null)
+            value = thisRef.settingsDao.fetch(name, default).blockingGet()
+        return value!!
+    }
+
+    override fun setValue(thisRef: DBConfig, property: KProperty<*>, value: Int) {
+        synchronized(this) {
+            this.value = value
+        }
+        thisRef.settingsDao.put(name, value)
+                .subscribeOn(Schedulers.io())
+                .subscribe()
+    }
+}
+
+class DBBoolSettings(
+        name: String,
+        default: Boolean
+) : ReadWriteProperty<DBConfig, Boolean> {
+
+    val base = DBSettingsValue(name, if (default) 1 else 0)
+
+    override fun getValue(thisRef: DBConfig, property: KProperty<*>): Boolean
+            = base.getValue(thisRef, property) != 0
+
+    override fun setValue(thisRef: DBConfig, property: KProperty<*>, value: Boolean) =
+            base.setValue(thisRef, property, if (value) 1 else 0)
+}
+
+class DBStringsValue(
+        private val name: String,
+        private val default: String,
+        private val sync: Boolean
+) : ReadWriteProperty<DBConfig, String> {
+
+    private var value: String? = null
+
+    @Synchronized
+    override fun getValue(thisRef: DBConfig, property: KProperty<*>): String {
+        if (value == null)
+            value = thisRef.stringDao.fetch(name, default).blockingGet()
+        return value!!
+    }
+
+    override fun setValue(thisRef: DBConfig, property: KProperty<*>, value: String) {
+        synchronized(this) {
+            this.value = value
+        }
+        if (value.isEmpty()) {
+            if (sync) {
+                thisRef.stringDao.delete(name).blockingAwait()
+            } else {
+                thisRef.stringDao.delete(name)
+                        .subscribeOn(Schedulers.io())
+                        .subscribe()
+            }
+        } else {
+            if (sync) {
+                thisRef.stringDao.put(name, value).blockingAwait()
+            } else {
+                thisRef.stringDao.put(name, value)
+                        .subscribeOn(Schedulers.io())
+                        .subscribe()
+            }
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt

@@ -0,0 +1,40 @@
+package com.topjohnwu.magisk.data.repository
+
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.data.database.LogDao
+import com.topjohnwu.magisk.data.database.base.suRaw
+import com.topjohnwu.magisk.extensions.toSingle
+import com.topjohnwu.magisk.model.entity.MagiskLog
+import com.topjohnwu.magisk.model.entity.WrappedMagiskLog
+import com.topjohnwu.superuser.Shell
+import java.util.concurrent.TimeUnit
+
+
+class LogRepository(
+    private val logDao: LogDao
+) {
+
+    fun fetchLogs() = logDao.fetchAll()
+        .map { it.sortByDescending { it.date.time }; it }
+        .map { it.wrap() }
+
+    fun fetchMagiskLogs() = "tail -n 5000 ${Const.MAGISK_LOG}".suRaw()
+        .filter { it.isNotEmpty() }
+
+    fun clearLogs() = logDao.deleteAll()
+    fun clearOutdated() = logDao.deleteOutdated()
+
+    fun clearMagiskLogs() = Shell.su("echo -n > " + Const.MAGISK_LOG)
+        .toSingle()
+        .map { it.exec() }
+
+    fun put(log: MagiskLog) = logDao.put(log)
+
+    private fun List<MagiskLog>.wrap(): List<WrappedMagiskLog> {
+        val day = TimeUnit.DAYS.toMillis(1)
+        return groupBy { it.date.time / day }
+            .map { WrappedMagiskLog(it.key * day, it.value) }
+    }
+
+
+}

app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt

@@ -0,0 +1,77 @@
+package com.topjohnwu.magisk.data.repository
+
+import android.content.pm.PackageManager
+import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.Info
+import com.topjohnwu.magisk.data.database.base.su
+import com.topjohnwu.magisk.data.network.GithubRawServices
+import com.topjohnwu.magisk.extensions.getLabel
+import com.topjohnwu.magisk.extensions.packageName
+import com.topjohnwu.magisk.extensions.toSingle
+import com.topjohnwu.magisk.model.entity.HideAppInfo
+import com.topjohnwu.magisk.model.entity.HideTarget
+import com.topjohnwu.superuser.Shell
+import io.reactivex.Single
+
+class MagiskRepository(
+        private val apiRaw: GithubRawServices,
+        private val packageManager: PackageManager
+) {
+
+    fun fetchSafetynet() = apiRaw.fetchSafetynet()
+
+    fun fetchUpdate() = when (Config.updateChannel) {
+        Config.Value.DEFAULT_CHANNEL, Config.Value.STABLE_CHANNEL -> apiRaw.fetchStableUpdate()
+        Config.Value.BETA_CHANNEL -> apiRaw.fetchBetaUpdate()
+        Config.Value.CANARY_CHANNEL -> apiRaw.fetchCanaryUpdate()
+        Config.Value.CANARY_DEBUG_CHANNEL -> apiRaw.fetchCanaryDebugUpdate()
+        Config.Value.CUSTOM_CHANNEL -> apiRaw.fetchCustomUpdate(Config.customChannelUrl)
+        else -> throw IllegalArgumentException()
+    }.flatMap {
+        // If remote version is lower than current installed, try switching to beta
+        if (it.magisk.versionCode < Info.magiskVersionCode
+                && Config.updateChannel == Config.Value.DEFAULT_CHANNEL) {
+            Config.updateChannel = Config.Value.BETA_CHANNEL
+            apiRaw.fetchBetaUpdate()
+        } else {
+            Single.just(it)
+        }
+    }.doOnSuccess { Info.remote = it }
+
+    fun fetchApps() =
+        Single.fromCallable { packageManager.getInstalledApplications(0) }
+            .flattenAsFlowable { it }
+            .filter { it.enabled && !blacklist.contains(it.packageName) }
+            .map {
+                val label = it.getLabel(packageManager)
+                val icon = it.loadIcon(packageManager)
+                HideAppInfo(it, label, icon)
+            }
+            .filter { it.processes.isNotEmpty() }
+            .toList()
+
+    fun fetchHideTargets() = Shell.su("magiskhide --ls").toSingle()
+        .map { it.exec().out }
+        .flattenAsFlowable { it }
+        .map { HideTarget(it) }
+        .toList()
+
+    fun toggleHide(isEnabled: Boolean, packageName: String, process: String) =
+        "magiskhide --%s %s %s".format(isEnabled.state, packageName, process).su().ignoreElement()
+
+    private val Boolean.state get() = if (this) "add" else "rm"
+
+    companion object {
+        private val blacklist by lazy { listOf(
+            packageName,
+            "android",
+            "com.android.chrome",
+            "com.chrome.beta",
+            "com.chrome.dev",
+            "com.chrome.canary",
+            "com.android.webview",
+            "com.google.android.webview"
+        ) }
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/data/repository/StringRepository.kt

@@ -0,0 +1,15 @@
+package com.topjohnwu.magisk.data.repository
+
+import com.topjohnwu.magisk.data.network.GithubRawServices
+import com.topjohnwu.magisk.model.entity.module.Repo
+
+class StringRepository(
+    private val api: GithubRawServices
+) {
+
+    fun getString(url: String) = api.fetchString(url)
+
+    fun getMetadata(repo: Repo) = api.fetchModuleInfo(repo.id, "module.prop")
+
+    fun getReadme(repo: Repo) = api.fetchModuleInfo(repo.id, "README.md")
+}

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

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

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

@@ -1,113 +0,0 @@
-package com.topjohnwu.magisk.database;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-
-import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.container.Repo;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class RepoDatabaseHelper extends SQLiteOpenHelper {
-
-    private static final int DATABASE_VER = 4;
-    private static final String TABLE_NAME = "repos";
-
-    private SQLiteDatabase mDb;
-
-    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
-    public void onCreate(SQLiteDatabase db) {
-        onUpgrade(db, 0, DATABASE_VER);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        if (oldVersion != newVersion) {
-            // Nuke old DB and create new table
-            db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
-            db.execSQL(
-                    "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
-                            "(id TEXT, name TEXT, version TEXT, versionCode INT, minMagisk INT, " +
-                            "author TEXT, description TEXT, last_update INT, PRIMARY KEY(id))");
-            Config.remove(Config.Key.ETAG_KEY);
-        }
-    }
-
-    @Override
-    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        onUpgrade(db, 0, DATABASE_VER);
-    }
-
-    public void clearRepo() {
-        mDb.delete(TABLE_NAME, null, null);
-    }
-
-
-    public void removeRepo(String id) {
-        mDb.delete(TABLE_NAME, "id=?", new String[] { id });
-    }
-
-    public void removeRepo(Repo repo) {
-        removeRepo(repo.getId());
-    }
-
-    public void removeRepo(Iterable<String> list) {
-        for (String id : list) {
-            if (id == null) continue;
-            mDb.delete(TABLE_NAME, "id=?", new String[] { id });
-        }
-    }
-
-    public void addRepo(Repo repo) {
-        mDb.replace(TABLE_NAME, null, repo.getContentValues());
-    }
-
-    public Repo getRepo(String id) {
-        try (Cursor c = mDb.query(TABLE_NAME, null, "id=?", new String[] { id }, null, null, null)) {
-            if (c.moveToNext()) {
-                return new Repo(c);
-            }
-        }
-        return null;
-    }
-
-    public Cursor getRawCursor() {
-        return mDb.query(TABLE_NAME, null, null, null, null, null, null);
-    }
-
-    public Cursor getRepoCursor() {
-        String orderBy = null;
-        switch ((int) Config.get(Config.Key.REPO_ORDER)) {
-            case Config.Value.ORDER_NAME:
-                orderBy = "name COLLATE NOCASE";
-                break;
-            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);
-    }
-
-    public Set<String> getRepoIDSet() {
-        HashSet<String> set = new HashSet<>(300);
-        try (Cursor c = mDb.query(TABLE_NAME, null, null, null, null, null, null)) {
-            while (c.moveToNext()) {
-                set.add(c.getString(c.getColumnIndex("id")));
-            }
-        }
-        return set;
-    }
-}

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

@@ -0,0 +1,61 @@
+package com.topjohnwu.magisk.di
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.Application
+import android.content.Context
+import android.os.Build
+import android.os.Bundle
+import androidx.preference.PreferenceManager
+import com.skoumal.teanity.rxbus.RxBus
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+
+val SUTimeout = named("su_timeout")
+val Protected = named("protected")
+
+val applicationModule = module {
+    single { RxBus() }
+    factory { get<Context>().resources }
+    factory { get<Context>().packageManager }
+    factory(Protected) { createDEContext(get()) }
+    single(SUTimeout) { get<Context>(Protected).getSharedPreferences("su_timeout", 0) }
+    single { PreferenceManager.getDefaultSharedPreferences(get<Context>(Protected)) }
+    single { ActivityTracker() }
+    factory { get<ActivityTracker>().foreground ?: NullActivity }
+}
+
+private fun createDEContext(context: Context): Context {
+    return if (Build.VERSION.SDK_INT >= 24)
+        context.createDeviceProtectedStorageContext()
+    else context
+}
+
+class ActivityTracker : Application.ActivityLifecycleCallbacks {
+
+    @Volatile
+    var foreground: Activity? = null
+
+    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) {}
+}
+
+@SuppressLint("Registered")
+object NullActivity : Activity()

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

@@ -0,0 +1,23 @@
+package com.topjohnwu.magisk.di
+
+import android.content.Context
+import androidx.room.Room
+import com.topjohnwu.magisk.data.database.*
+import com.topjohnwu.magisk.tasks.RepoUpdater
+import org.koin.dsl.module
+
+
+val databaseModule = module {
+    single { LogDao() }
+    single { PolicyDao(get()) }
+    single { SettingsDao() }
+    single { StringDao() }
+    single { createRepoDatabase(get()) }
+    single { get<RepoDatabase>().repoDao() }
+    single { RepoUpdater(get(), get()) }
+}
+
+fun createRepoDatabase(context: Context) =
+        Room.databaseBuilder(context, RepoDatabase::class.java, "repo.db")
+            .fallbackToDestructiveMigration()
+            .build()

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

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

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

@@ -0,0 +1,65 @@
+package com.topjohnwu.magisk.di
+
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.data.network.GithubApiServices
+import com.topjohnwu.magisk.data.network.GithubRawServices
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import org.koin.dsl.module
+import retrofit2.Retrofit
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.converter.scalars.ScalarsConverterFactory
+import se.ansman.kotshi.KotshiJsonAdapterFactory
+
+val networkingModule = module {
+    single { createOkHttpClient() }
+    single { createMoshiConverterFactory() }
+    single { createRetrofit(get(), get()) }
+    single { createApiService<GithubRawServices>(get(), Const.Url.GITHUB_RAW_URL) }
+    single { createApiService<GithubApiServices>(get(), Const.Url.GITHUB_API_URL) }
+}
+
+fun createOkHttpClient(): OkHttpClient {
+    val builder = OkHttpClient.Builder()
+
+    if (BuildConfig.DEBUG) {
+        val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
+            level = HttpLoggingInterceptor.Level.HEADERS
+        }
+        builder.addInterceptor(httpLoggingInterceptor)
+    }
+
+    return builder.build()
+}
+
+fun createMoshiConverterFactory(): MoshiConverterFactory {
+    val moshi = Moshi.Builder()
+            .add(KotshiJsonAdapterFactory)
+            .build()
+    return MoshiConverterFactory.create(moshi)
+}
+
+fun createRetrofit(
+    okHttpClient: OkHttpClient,
+    converterFactory: MoshiConverterFactory
+): Retrofit.Builder {
+    return Retrofit.Builder()
+        .addConverterFactory(ScalarsConverterFactory.create())
+        .addConverterFactory(converterFactory)
+        .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+        .client(okHttpClient)
+}
+
+@KotshiJsonAdapterFactory
+abstract class JsonAdapterFactory : JsonAdapter.Factory
+
+inline fun <reified T> createApiService(retrofitBuilder: Retrofit.Builder, baseUrl: String): T {
+    return retrofitBuilder
+        .baseUrl(baseUrl)
+        .build()
+        .create(T::class.java)
+}

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

@@ -0,0 +1,13 @@
+package com.topjohnwu.magisk.di
+
+import com.topjohnwu.magisk.data.repository.LogRepository
+import com.topjohnwu.magisk.data.repository.MagiskRepository
+import com.topjohnwu.magisk.data.repository.StringRepository
+import org.koin.dsl.module
+
+
+val repositoryModule = module {
+    single { MagiskRepository(get(), get()) }
+    single { LogRepository(get()) }
+    single { StringRepository(get()) }
+}

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

@@ -0,0 +1,27 @@
+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(), get()) }
+    viewModel { LogViewModel(get(), get()) }
+    viewModel { (action: String, file: Uri, additional: Uri) ->
+        FlashViewModel(action, file, additional, get())
+    }
+    viewModel { SuRequestViewModel(get(), get(), get(SUTimeout), get()) }
+}

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

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

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

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

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

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

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

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

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

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

app/src/main/java/com/topjohnwu/magisk/dialogs/ManagerInstallDialog.java

@@ -1,28 +0,0 @@
-package com.topjohnwu.magisk.dialogs;
-
-import android.app.Activity;
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-
-import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.uicomponents.MarkDownWindow;
-import com.topjohnwu.magisk.utils.DownloadApp;
-import com.topjohnwu.magisk.utils.Utils;
-
-public class ManagerInstallDialog extends CustomAlertDialog {
-
-    public ManagerInstallDialog(@NonNull Activity a) {
-        super(a);
-        String name = Utils.fmt("MagiskManager v%s(%d)",
-                Config.remoteManagerVersionString, Config.remoteManagerVersionCode);
-        setTitle(a.getString(R.string.repo_install_title, a.getString(R.string.app_name)));
-        setMessage(a.getString(R.string.repo_install_msg, name));
-        setCancelable(true);
-        setPositiveButton(R.string.install, (d, i) -> DownloadApp.upgrade(name));
-        if (!TextUtils.isEmpty(Config.managerNoteLink)) {
-            setNeutralButton(R.string.app_changelog, (d, i) -> MarkDownWindow.show(a, null, Config.managerNoteLink));
-        }
-    }
-}

app/src/main/java/com/topjohnwu/magisk/dialogs/UninstallDialog.java

@@ -1,61 +0,0 @@
-package com.topjohnwu.magisk.dialogs;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-
-import com.topjohnwu.magisk.ClassMap;
-import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.FlashActivity;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.uicomponents.ProgressNotification;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.net.Networking;
-import com.topjohnwu.superuser.Shell;
-
-import java.io.File;
-
-public class UninstallDialog extends CustomAlertDialog {
-
-    public UninstallDialog(@NonNull Activity activity) {
-        super(activity);
-        setTitle(R.string.uninstall_magisk_title);
-        setMessage(R.string.uninstall_magisk_msg);
-        setNeutralButton(R.string.restore_img, (d, i) -> {
-            ProgressDialog dialog = ProgressDialog.show(activity,
-                    activity.getString(R.string.restore_img),
-                    activity.getString(R.string.restore_img_msg));
-            Shell.su("restore_imgs").submit(result -> {
-                dialog.cancel();
-                if (result.isSuccess()) {
-                    Utils.toast(R.string.restore_done, Toast.LENGTH_SHORT);
-                } else {
-                    Utils.toast(R.string.restore_fail, Toast.LENGTH_LONG);
-                }
-            });
-        });
-        if (!TextUtils.isEmpty(Config.uninstallerLink)) {
-            setPositiveButton(R.string.complete_uninstall, (d, i) -> {
-                File zip = new File(activity.getFilesDir(), "uninstaller.zip");
-                ProgressNotification progress = new ProgressNotification(zip.getName());
-                Networking.get(Config.uninstallerLink)
-                    .setDownloadProgressListener(progress)
-                    .setErrorHandler(((conn, e) -> progress.dlFail()))
-                    .getAsFile(zip, f -> {
-                        progress.dismiss();
-                        Intent intent = new Intent(activity, ClassMap.get(FlashActivity.class))
-                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                .setData(Uri.fromFile(f))
-                                .putExtra(Const.Key.FLASH_ACTION, Const.Value.UNINSTALL);
-                        activity.startActivity(intent);
-                    });
-            });
-        }
-    }
-}

app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt

@@ -0,0 +1,121 @@
+package com.topjohnwu.magisk.extensions
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.content.pm.ComponentInfo
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.*
+import android.content.res.Configuration
+import android.database.Cursor
+import android.net.Uri
+import android.provider.OpenableColumns
+import com.topjohnwu.magisk.utils.FileProvider
+import com.topjohnwu.magisk.utils.currentLocale
+import java.io.File
+import java.io.FileNotFoundException
+
+val packageName: String get() = get<Context>().packageName
+
+val PackageInfo.processes
+    get() = activities?.processNames.orEmpty() +
+            services?.processNames.orEmpty() +
+            receivers?.processNames.orEmpty() +
+            providers?.processNames.orEmpty()
+
+val Array<out ComponentInfo>.processNames get() = mapNotNull { it.processName }
+
+val ApplicationInfo.packageInfo: PackageInfo?
+    get() {
+        val pm: PackageManager by inject()
+
+        return try {
+            val request = GET_ACTIVITIES or
+                    GET_SERVICES or
+                    GET_RECEIVERS or
+                    GET_PROVIDERS
+            pm.getPackageInfo(packageName, request)
+        } catch (e1: Exception) {
+            try {
+                pm.activities(packageName).apply {
+                    services = pm.services(packageName)
+                    receivers = pm.receivers(packageName)
+                    providers = pm.providers(packageName)
+                }
+            } catch (e2: Exception) {
+                null
+            }
+        }
+    }
+
+val Uri.fileName: String
+    get() {
+        var name: String? = null
+        get<Context>().contentResolver.query(this, null, null, null, null)?.use { c ->
+            val nameIndex = c.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+            if (nameIndex != -1) {
+                c.moveToFirst()
+                name = c.getString(nameIndex)
+            }
+        }
+        if (name == null && path != null) {
+            val idx = path!!.lastIndexOf('/')
+            name = path!!.substring(idx + 1)
+        }
+        return name.orEmpty()
+    }
+
+fun PackageManager.activities(packageName: String) =
+    getPackageInfo(packageName, GET_ACTIVITIES)
+
+fun PackageManager.services(packageName: String) =
+    getPackageInfo(packageName, GET_SERVICES).services
+
+fun PackageManager.receivers(packageName: String) =
+    getPackageInfo(packageName, GET_RECEIVERS).receivers
+
+fun PackageManager.providers(packageName: String) =
+    getPackageInfo(packageName, GET_PROVIDERS).providers
+
+fun Context.rawResource(id: Int) = resources.openRawResource(id)
+
+fun Context.readUri(uri: Uri) =
+    contentResolver.openInputStream(uri) ?: throw FileNotFoundException()
+
+fun Intent.startActivity(context: Context) = context.startActivity(this)
+
+fun File.provide(context: Context = get()): Uri {
+    return FileProvider.getUriForFile(context, context.packageName + ".provider", this)
+}
+
+fun File.mv(destination: File) {
+    inputStream().writeTo(destination)
+    deleteRecursively()
+}
+
+fun String.toFile() = File(this)
+
+fun Intent.chooser(title: String = "Pick an app") = Intent.createChooser(this, title)
+
+fun Context.cachedFile(name: String) = File(cacheDir, name)
+
+fun <Result> Cursor.toList(transformer: (Cursor) -> Result): List<Result> {
+    val out = mutableListOf<Result>()
+    while (moveToNext()) out.add(transformer(this))
+    return out
+}
+
+fun ApplicationInfo.getLabel(pm: PackageManager): String {
+    runCatching {
+        if (labelRes > 0) {
+            val res = pm.getResourcesForApplication(this)
+            val config = Configuration()
+            config.setLocale(currentLocale)
+            res.updateConfiguration(config, res.displayMetrics)
+            return res.getString(labelRes)
+        }
+    }
+
+    return loadLabel(pm).toString()
+}

app/src/main/java/com/topjohnwu/magisk/extensions/XBinding.kt

@@ -0,0 +1,8 @@
+package com.topjohnwu.magisk.extensions
+
+import com.skoumal.teanity.util.KObservableField
+
+
+fun KObservableField<Boolean>.toggle() {
+    value = !value
+}

app/src/main/java/com/topjohnwu/magisk/extensions/XJava.kt

@@ -0,0 +1,103 @@
+package com.topjohnwu.magisk.extensions
+
+import android.net.Uri
+import android.os.Build
+import androidx.core.net.toFile
+import java.io.File
+import java.io.InputStream
+import java.io.OutputStream
+import java.util.*
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import kotlin.NoSuchElementException
+
+fun ZipInputStream.forEach(callback: (ZipEntry) -> Unit) {
+    var entry: ZipEntry? = nextEntry
+    while (entry != null) {
+        callback(entry)
+        entry = nextEntry
+    }
+}
+
+fun Uri.writeTo(file: File) = toFile().copyTo(file)
+
+fun InputStream.writeTo(file: File) =
+        withStreams(this, file.outputStream()) { reader, writer -> reader.copyTo(writer) }
+
+inline fun <In : InputStream, Out : OutputStream> withStreams(
+    inStream: In,
+    outStream: Out,
+    withBoth: (In, Out) -> Unit
+) {
+    inStream.use { reader ->
+        outStream.use { writer ->
+            withBoth(reader, writer)
+        }
+    }
+}
+
+inline fun <T, R> List<T>.firstMap(mapper: (T) -> R?): R {
+    for (item: T in this) {
+        return mapper(item) ?: continue
+    }
+    throw NoSuchElementException("Collection contains no element matching the predicate.")
+}
+
+fun String.langTagToLocale(): Locale {
+    if (Build.VERSION.SDK_INT >= 21) {
+        return Locale.forLanguageTag(this)
+    } else {
+        val tok = split("-".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+        if (tok.isEmpty()) {
+            return Locale("")
+        }
+        val language = when (tok[0]) {
+            "und" -> "" // Undefined
+            "fil" -> "tl" // Filipino
+            else -> tok[0]
+        }
+        if (language.length != 2 && language.length != 3)
+            return Locale("")
+        if (tok.size == 1)
+            return Locale(language)
+        val country = tok[1]
+
+        return if (country.length != 2 && country.length != 3) Locale(language)
+        else Locale(language, country)
+    }
+}
+
+fun Locale.toLangTag(): String {
+    if (Build.VERSION.SDK_INT >= 21) {
+        return toLanguageTag()
+    } else {
+        var language = language
+        var country = country
+        var variant = variant
+        when {
+            language.isEmpty() || !language.matches("\\p{Alpha}{2,8}".toRegex()) ->
+                language = "und"       // Follow the Locale#toLanguageTag() implementation
+            language == "iw" -> language = "he"        // correct deprecated "Hebrew"
+            language == "in" -> language = "id"        // correct deprecated "Indonesian"
+            language == "ji" -> language = "yi"        // correct deprecated "Yiddish"
+        }
+        // ensure valid country code, if not well formed, it's omitted
+
+        // variant subtags that begin with a letter must be at least 5 characters long
+        // ensure valid country code, if not well formed, it's omitted
+        if (!country.matches("\\p{Alpha}{2}|\\p{Digit}{3}".toRegex())) {
+            country = ""
+        }
+
+        // variant subtags that begin with a letter must be at least 5 characters long
+        if (!variant.matches("\\p{Alnum}{5,8}|\\p{Digit}\\p{Alnum}{3}".toRegex())) {
+            variant = ""
+        }
+        val tag = StringBuilder(language)
+        if (country.isNotEmpty())
+            tag.append('-').append(country)
+        if (variant.isNotEmpty())
+            tag.append('-').append(variant)
+        return tag.toString()
+    }
+}

app/src/main/java/com/topjohnwu/magisk/extensions/XKoin.kt

@@ -0,0 +1,17 @@
+package com.topjohnwu.magisk.extensions
+
+import org.koin.core.context.GlobalContext
+import org.koin.core.parameter.ParametersDefinition
+import org.koin.core.qualifier.Qualifier
+
+fun getKoin() = GlobalContext.get().koin
+
+inline fun <reified T> inject(
+    qualifier: Qualifier? = null,
+    noinline parameters: ParametersDefinition? = null
+) = lazy { get<T>(qualifier, parameters) }
+
+inline fun <reified T> get(
+    qualifier: Qualifier? = null,
+    noinline parameters: ParametersDefinition? = null
+): T = getKoin().get(qualifier, parameters)

app/src/main/java/com/topjohnwu/magisk/extensions/XList.kt

@@ -0,0 +1,84 @@
+package com.topjohnwu.magisk.extensions
+
+import androidx.collection.SparseArrayCompat
+import androidx.databinding.ObservableList
+import com.skoumal.teanity.extensions.subscribeK
+import com.skoumal.teanity.util.DiffObservableList
+import io.reactivex.disposables.Disposable
+
+fun <T> MutableList<T>.update(newList: List<T>) {
+    clear()
+    addAll(newList)
+}
+
+fun List<String>.toShellCmd(): String {
+    val sb = StringBuilder()
+    for (s in this) {
+        if (s.contains(" ")) {
+            sb.append('"').append(s).append('"')
+        } else {
+            sb.append(s)
+        }
+        sb.append(' ')
+    }
+    sb.deleteCharAt(sb.length - 1)
+    return sb.toString()
+}
+
+fun <T1, T2> ObservableList<T1>.sendUpdatesTo(
+    target: DiffObservableList<T2>,
+    mapper: (List<T1>) -> List<T2>
+) = addOnListChangedCallback(object :
+    ObservableList.OnListChangedCallback<ObservableList<T1>>() {
+    override fun onChanged(sender: ObservableList<T1>?) {
+        updateAsync(sender ?: return)
+    }
+
+    override fun onItemRangeRemoved(sender: ObservableList<T1>?, p0: Int, p1: Int) {
+        updateAsync(sender ?: return)
+    }
+
+    override fun onItemRangeMoved(sender: ObservableList<T1>?, p0: Int, p1: Int, p2: Int) {
+        updateAsync(sender ?: return)
+    }
+
+    override fun onItemRangeInserted(sender: ObservableList<T1>?, p0: Int, p1: Int) {
+        updateAsync(sender ?: return)
+    }
+
+    override fun onItemRangeChanged(sender: ObservableList<T1>?, p0: Int, p1: Int) {
+        updateAsync(sender ?: return)
+    }
+
+    private var updater: Disposable? = null
+
+    private fun updateAsync(sender: List<T1>) {
+        updater?.dispose()
+        updater = sender.toSingle()
+            .map { mapper(it) }
+            .map { it to target.calculateDiff(it) }
+            .subscribeK { target.update(it.first, it.second) }
+    }
+})
+
+fun <T1> ObservableList<T1>.copyNewInputInto(
+    target: MutableList<T1>
+) = addOnListChangedCallback(object : ObservableList.OnListChangedCallback<ObservableList<T1>>() {
+    override fun onChanged(p0: ObservableList<T1>?) = Unit
+    override fun onItemRangeRemoved(p0: ObservableList<T1>?, p1: Int, p2: Int) = Unit
+    override fun onItemRangeMoved(p0: ObservableList<T1>?, p1: Int, p2: Int, p3: Int) = Unit
+    override fun onItemRangeChanged(p0: ObservableList<T1>?, p1: Int, p2: Int) = Unit
+    override fun onItemRangeInserted(
+        sender: ObservableList<T1>?,
+        positionStart: Int,
+        itemCount: Int
+    ) {
+        val positionEnd = positionStart + itemCount
+        val addedValues = sender?.slice(positionStart until positionEnd).orEmpty()
+        target.addAll(addedValues)
+    }
+})
+
+operator fun <E> SparseArrayCompat<E>.set(key: Int, value: E) {
+    put(key, value)
+}

app/src/main/java/com/topjohnwu/magisk/extensions/XRx.kt

@@ -0,0 +1,9 @@
+package com.topjohnwu.magisk.extensions
+
+import io.reactivex.Single
+import io.reactivex.functions.BiFunction
+
+fun <T : Any> T.toSingle() = Single.just(this)
+
+fun <T1, T2, R> zip(t1: Single<T1>, t2: Single<T2>, zipper: (T1, T2) -> R) =
+    Single.zip(t1, t2, BiFunction<T1, T2, R> { rt1, rt2 -> zipper(rt1, rt2) })

app/src/main/java/com/topjohnwu/magisk/extensions/XSU.kt

@@ -0,0 +1,14 @@
+package com.topjohnwu.magisk.extensions
+
+import com.topjohnwu.magisk.Info
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.io.SuFileInputStream
+import com.topjohnwu.superuser.io.SuFileOutputStream
+import java.io.File
+
+fun reboot(reason: String = if (Info.recovery) "recovery" else "") {
+    Shell.su("/system/bin/svc power reboot $reason || /system/bin/reboot $reason").submit()
+}
+
+fun File.suOutputStream() = SuFileOutputStream(this)
+fun File.suInputStream() = SuFileInputStream(this)

app/src/main/java/com/topjohnwu/magisk/extensions/XString.kt

@@ -0,0 +1,27 @@
+package com.topjohnwu.magisk.extensions
+
+import android.content.res.Resources
+
+val specialChars = arrayOf('!', '@', '#', '$', '%', '&', '?')
+
+fun String.replaceRandomWithSpecial(): String {
+    var random: Char
+    do {
+        random = random()
+    } while (random == '.')
+    return replace(random, specialChars.random())
+}
+
+fun StringBuilder.appendIf(condition: Boolean, builder: StringBuilder.() -> Unit) =
+    if (condition) apply(builder) else this
+
+fun Int.res(vararg args: Any): String {
+    val resources: Resources by inject()
+    return resources.getString(this, *args)
+}
+
+fun String.trimEmptyToNull(): String? = if (isBlank()) null else this
+
+fun String.legalFilename() = replace(" ", "_").replace("'", "").replace("\"", "")
+        .replace("$", "").replace("`", "").replace("*", "").replace("/", "_")
+        .replace("#", "").replace("@", "").replace("\\", "_")

app/src/main/java/com/topjohnwu/magisk/extensions/XTime.kt

@@ -0,0 +1,20 @@
+package com.topjohnwu.magisk.extensions
+
+import com.topjohnwu.magisk.utils.currentLocale
+import java.text.DateFormat
+import java.text.ParseException
+import java.text.SimpleDateFormat
+
+val now get() = System.currentTimeMillis()
+
+fun Long.toTime(format: DateFormat) = format.format(this).orEmpty()
+fun String.toTime(format: DateFormat) = try {
+    format.parse(this)?.time ?: -1
+} catch (e: ParseException) {
+    -1L
+}
+
+val timeFormatFull by lazy { SimpleDateFormat("yyyy/MM/dd_HH:mm:ss", currentLocale) }
+val timeFormatStandard by lazy { SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", currentLocale) }
+val timeFormatMedium by lazy { DateFormat.getDateInstance(DateFormat.MEDIUM, currentLocale) }
+val timeFormatTime by lazy { SimpleDateFormat("h:mm a", currentLocale) }

app/src/main/java/com/topjohnwu/magisk/extensions/XView.kt

@@ -0,0 +1,14 @@
+package com.topjohnwu.magisk.extensions
+
+import android.view.View
+import android.view.ViewTreeObserver
+
+fun View.setOnViewReadyListener(callback: () -> Unit) = addOnGlobalLayoutListener(true, callback)
+
+fun View.addOnGlobalLayoutListener(oneShot: Boolean = false, callback: () -> Unit) =
+    viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
+        override fun onGlobalLayout() {
+            if (oneShot) viewTreeObserver.removeOnGlobalLayoutListener(this)
+            callback()
+        }
+    })

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/SettingsFragment.java

@@ -1,298 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreferenceCompat;
-
-import com.topjohnwu.magisk.BuildConfig;
-import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.BasePreferenceFragment;
-import com.topjohnwu.magisk.dialogs.FingerprintAuthDialog;
-import com.topjohnwu.magisk.tasks.CheckUpdates;
-import com.topjohnwu.magisk.utils.DownloadApp;
-import com.topjohnwu.magisk.utils.Event;
-import com.topjohnwu.magisk.utils.FingerprintHelper;
-import com.topjohnwu.magisk.utils.LocaleManager;
-import com.topjohnwu.magisk.utils.PatchAPK;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.net.Networking;
-import com.topjohnwu.superuser.Shell;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Locale;
-
-public class SettingsFragment extends BasePreferenceFragment {
-
-    private ListPreference updateChannel, autoRes, suNotification,
-            requestTimeout, rootConfig, multiuserConfig, nsConfig;
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        setPreferencesFromResource(R.xml.app_settings, rootKey);
-        requireActivity().setTitle(R.string.settings);
-
-        boolean showSuperuser = Utils.showSuperUser();
-        app.prefs.edit()
-                .putBoolean(Config.Key.SU_FINGERPRINT, FingerprintHelper.useFingerprint())
-                .apply();
-
-        PreferenceScreen prefScreen = getPreferenceScreen();
-
-        PreferenceCategory generalCatagory = (PreferenceCategory) findPreference("general");
-        PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
-        PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
-        Preference hideManager = findPreference("hide");
-        hideManager.setOnPreferenceClickListener(pref -> {
-            PatchAPK.hideManager();
-            return true;
-        });
-        Preference restoreManager = findPreference("restore");
-        restoreManager.setOnPreferenceClickListener(pref -> {
-            DownloadApp.restore();
-            return true;
-        });
-        findPreference("clear").setOnPreferenceClickListener(pref -> {
-            app.prefs.edit().remove(Config.Key.ETAG_KEY).apply();
-            app.repoDB.clearRepo();
-            Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT);
-            return true;
-        });
-        findPreference("hosts").setOnPreferenceClickListener(pref -> {
-            Shell.su("add_hosts_module").exec();
-            Utils.loadModules();
-            Utils.toast(R.string.settings_hosts_toast, Toast.LENGTH_SHORT);
-            return true;
-        });
-
-        updateChannel = (ListPreference) findPreference(Config.Key.UPDATE_CHANNEL);
-        rootConfig = (ListPreference) findPreference(Config.Key.ROOT_ACCESS);
-        autoRes = (ListPreference) findPreference(Config.Key.SU_AUTO_RESPONSE);
-        requestTimeout = (ListPreference) findPreference(Config.Key.SU_REQUEST_TIMEOUT);
-        suNotification = (ListPreference) findPreference(Config.Key.SU_NOTIFICATION);
-        multiuserConfig = (ListPreference) findPreference(Config.Key.SU_MULTIUSER_MODE);
-        nsConfig = (ListPreference) findPreference(Config.Key.SU_MNT_NS);
-        SwitchPreferenceCompat reauth = (SwitchPreferenceCompat) findPreference(Config.Key.SU_REAUTH);
-        SwitchPreferenceCompat fingerprint = (SwitchPreferenceCompat) findPreference(Config.Key.SU_FINGERPRINT);
-
-        updateChannel.setOnPreferenceChangeListener((p, o) -> {
-            int prev = Config.get(Config.Key.UPDATE_CHANNEL);
-            int channel = Integer.parseInt((String) o);
-            if (channel == Config.Value.CUSTOM_CHANNEL) {
-                View v = LayoutInflater.from(requireActivity()).inflate(R.layout.custom_channel_dialog, null);
-                EditText url = v.findViewById(R.id.custom_url);
-                url.setText(app.prefs.getString(Config.Key.CUSTOM_CHANNEL, ""));
-                new AlertDialog.Builder(requireActivity())
-                        .setTitle(R.string.settings_update_custom)
-                        .setView(v)
-                        .setPositiveButton(R.string.ok, (d, i) ->
-                               Config.set(Config.Key.CUSTOM_CHANNEL, url.getText().toString()))
-                        .setNegativeButton(R.string.close, (d, i) ->
-                                Config.set(Config.Key.UPDATE_CHANNEL, prev))
-                        .setOnCancelListener(d ->
-                                Config.set(Config.Key.UPDATE_CHANNEL, prev))
-                        .show();
-            }
-            return true;
-        });
-
-        /* We only show canary channels if user is already on canary channel
-         * or the user have already chosen canary channel */
-        if (!Utils.isCanary() &&
-                (int) Config.get(Config.Key.UPDATE_CHANNEL) < Config.Value.CANARY_CHANNEL) {
-            // Remove the last 2 entries
-            CharSequence[] entries = updateChannel.getEntries();
-            updateChannel.setEntries(Arrays.copyOf(entries, entries.length - 2));
-        }
-
-        setSummary();
-
-        // Disable dangerous settings in secondary user
-        if (Const.USER_ID > 0) {
-            suCategory.removePreference(multiuserConfig);
-        }
-
-        // Disable re-authentication option on Android O, it will not work
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            reauth.setEnabled(false);
-            reauth.setChecked(false);
-            reauth.setSummary(R.string.android_o_not_support);
-        }
-
-        // Disable fingerprint option if not possible
-        if (!FingerprintHelper.canUseFingerprint()) {
-            fingerprint.setEnabled(false);
-            fingerprint.setChecked(false);
-            fingerprint.setSummary(R.string.disable_fingerprint);
-        }
-
-        if (Shell.rootAccess() && Const.USER_ID == 0) {
-            if (app.getPackageName().equals(BuildConfig.APPLICATION_ID)) {
-                generalCatagory.removePreference(restoreManager);
-            } else {
-                if (!Networking.checkNetworkStatus(app))
-                    generalCatagory.removePreference(restoreManager);
-                generalCatagory.removePreference(hideManager);
-            }
-        } else {
-            generalCatagory.removePreference(restoreManager);
-            generalCatagory.removePreference(hideManager);
-        }
-
-        if (!showSuperuser) {
-            prefScreen.removePreference(suCategory);
-        }
-
-        if (!Shell.rootAccess()) {
-            prefScreen.removePreference(magiskCategory);
-            generalCatagory.removePreference(hideManager);
-        }
-    }
-
-    private void setLocalePreference(ListPreference lp) {
-        CharSequence[] entries = new CharSequence[LocaleManager.locales.size() + 1];
-        CharSequence[] entryValues = new CharSequence[LocaleManager.locales.size() + 1];
-        entries[0] = LocaleManager.getString(LocaleManager.defaultLocale, R.string.system_default);
-        entryValues[0] = "";
-        int i = 1;
-        for (Locale locale : LocaleManager.locales) {
-            entries[i] = locale.getDisplayName(locale);
-            entryValues[i++] = LocaleManager.toLanguageTag(locale);
-        }
-        lp.setEntries(entries);
-        lp.setEntryValues(entryValues);
-        lp.setSummary(LocaleManager.locale.getDisplayName(LocaleManager.locale));
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
-        switch (key) {
-            case Config.Key.ROOT_ACCESS:
-            case Config.Key.SU_MULTIUSER_MODE:
-            case Config.Key.SU_MNT_NS:
-                app.mDB.setSettings(key, Utils.getPrefsInt(prefs, key));
-                break;
-            case Config.Key.DARK_THEME:
-                requireActivity().recreate();
-                break;
-            case Config.Key.COREONLY:
-                if (prefs.getBoolean(key, false)) {
-                    try {
-                        Const.MAGISK_DISABLE_FILE.createNewFile();
-                    } catch (IOException ignored) {}
-                } else {
-                    Const.MAGISK_DISABLE_FILE.delete();
-                }
-                Utils.toast(R.string.settings_reboot_toast, Toast.LENGTH_LONG);
-                break;
-            case Config.Key.MAGISKHIDE:
-                if (prefs.getBoolean(key, false)) {
-                    Shell.su("magiskhide --enable").submit();
-                } else {
-                    Shell.su("magiskhide --disable").submit();
-                }
-                break;
-            case Config.Key.LOCALE:
-                LocaleManager.setLocale(app);
-                requireActivity().recreate();
-                break;
-            case Config.Key.UPDATE_CHANNEL:
-            case Config.Key.CUSTOM_CHANNEL:
-                CheckUpdates.check();
-                break;
-            case Config.Key.CHECK_UPDATES:
-                Utils.scheduleUpdateCheck();
-                break;
-        }
-        setSummary(key);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        String key = preference.getKey();
-        switch (key) {
-            case Config.Key.SU_FINGERPRINT:
-                boolean checked = ((SwitchPreferenceCompat) preference).isChecked();
-                ((SwitchPreferenceCompat) preference).setChecked(!checked);
-                new FingerprintAuthDialog(requireActivity(), () -> {
-                    ((SwitchPreferenceCompat) preference).setChecked(checked);
-                    Config.set(key, checked);
-                }).show();
-                break;
-        }
-        return true;
-    }
-
-    private void setSummary(String key) {
-        switch (key) {
-            case Config.Key.UPDATE_CHANNEL:
-                updateChannel.setSummary(getResources()
-                        .getStringArray(R.array.update_channel)
-                        [(int) Config.get(Config.Key.UPDATE_CHANNEL)]);
-                break;
-            case Config.Key.ROOT_ACCESS:
-                rootConfig.setSummary(getResources()
-                        .getStringArray(R.array.su_access)
-                        [(int) Config.get(Config.Key.ROOT_ACCESS)]);
-                break;
-            case Config.Key.SU_AUTO_RESPONSE:
-                autoRes.setSummary(getResources()
-                        .getStringArray(R.array.auto_response)
-                        [(int) Config.get(Config.Key.SU_AUTO_RESPONSE)]);
-                break;
-            case Config.Key.SU_NOTIFICATION:
-                suNotification.setSummary(getResources()
-                        .getStringArray(R.array.su_notification)
-                        [(int) Config.get(Config.Key.SU_NOTIFICATION)]);
-                break;
-            case Config.Key.SU_REQUEST_TIMEOUT:
-                requestTimeout.setSummary(
-                        getString(R.string.request_timeout_summary,
-                                (int) Config.get(Config.Key.SU_REQUEST_TIMEOUT)));
-                break;
-            case Config.Key.SU_MULTIUSER_MODE:
-                multiuserConfig.setSummary(getResources()
-                        .getStringArray(R.array.multiuser_summary)
-                        [(int) Config.get(Config.Key.SU_MULTIUSER_MODE)]);
-                break;
-            case Config.Key.SU_MNT_NS:
-                nsConfig.setSummary(getResources()
-                        .getStringArray(R.array.namespace_summary)
-                        [(int) Config.get(Config.Key.SU_MNT_NS)]);
-                break;
-        }
-    }
-
-    private void setSummary() {
-        setSummary(Config.Key.UPDATE_CHANNEL);
-        setSummary(Config.Key.ROOT_ACCESS);
-        setSummary(Config.Key.SU_AUTO_RESPONSE);
-        setSummary(Config.Key.SU_NOTIFICATION);
-        setSummary(Config.Key.SU_REQUEST_TIMEOUT);
-        setSummary(Config.Key.SU_MULTIUSER_MODE);
-        setSummary(Config.Key.SU_MNT_NS);
-    }
-
-    @Override
-    public void onEvent(int event) {
-        setLocalePreference((ListPreference) findPreference(Config.Key.LOCALE));
-    }
-
-    @Override
-    public int[] getListeningEvents() {
-        return new int[] {Event.LOCALE_FETCH_DONE};
-    }
-}

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/binding/BindingAdapter.kt

@@ -0,0 +1,37 @@
+package com.topjohnwu.magisk.model.binding
+
+import androidx.databinding.ViewDataBinding
+import androidx.recyclerview.widget.RecyclerView
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.topjohnwu.magisk.model.entity.recycler.LenientRvItem
+import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
+
+class BindingAdapter : BindingRecyclerViewAdapter<ComparableRvItem<*>>() {
+
+    private var recyclerView: RecyclerView? = null
+
+    override fun onBindBinding(
+        binding: ViewDataBinding,
+        variableId: Int,
+        layoutRes: Int,
+        position: Int,
+        item: ComparableRvItem<*>
+    ) {
+        super.onBindBinding(binding, variableId, layoutRes, position, item)
+
+        when (item) {
+            is LenientRvItem -> {
+                val recycler = recyclerView ?: return
+                item.onBindingBound(binding)
+                item.onBindingBound(binding, recycler)
+            }
+            else -> item.onBindingBound(binding)
+        }
+    }
+
+    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+        super.onAttachedToRecyclerView(recyclerView)
+        this.recyclerView = recyclerView
+    }
+
+}