Fix stub strings

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

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

Fix #1412

.gitattributes

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

.gitignore

@@ -3,9 +3,7 @@ out
 *.jks
 *.apk
 config.prop
-
-# Manually dumped jars
-snet/libs
+update.sh
 
 # Built binaries
 native/out
@@ -17,4 +15,3 @@ native/out
 /.idea
 /build
 /captures
-.externalNativeBuild

README.MD

@@ -1,41 +1,75 @@
 # Magisk
-[XDA Announcement Thread](https://forum.xda-developers.com/apps/magisk/official-magisk-v7-universal-systemless-t3473445)
 
-## Building Environment Requirements
-1. Python 3.5+: run `build.py` script
-2. Java Development Kit (JDK) 8: Compile Magisk Manager and sign zips
-3. Latest Android SDK: set `ANDROID_HOME` environment variable to the path to Android SDK
-4. Android NDK: Install NDK along with SDK (`$ANDROID_HOME/ndk-bundle`), or optionally specify a custom path `ANDROID_NDK_HOME`
-5. (Windows Only) Python package Colorama: Install with `pip install colorama`, used for ANSI color codes
+[Downloads](https://github.com/topjohnwu/Magisk/releases) \| [Documentation](https://topjohnwu.github.io/Magisk/) \| [XDA Thread](https://forum.xda-developers.com/apps/magisk/official-magisk-v7-universal-systemless-t3473445)
 
-## Building Notes and Instructions
-1. Clone sources with submodules: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git`
-2. Building is supported on macOS, Linux, and Windows. Official releases are built and tested with [FrankeNDK](https://github.com/topjohnwu/FrankeNDK); point `ANDROID_NDK_HOME` to FrankeNDK if you want to use it for compiling.
-3. Set configurations in `config.prop`. A sample file `config.prop.sample` is provided as an example.
-4. Run `build.py` with argument `-h` to see the built-in help message. The `-h` option also works for each supported actions, e.g. `./build.py binary -h`
-5. By default, `build.py` build binaries and Magisk Manager in debug mode. If you want to build Magisk Manager in release mode (via the `-r, --release` flag), you need a Java Keystore file `release-key.jks` (only `JKS` format is supported) to sign APKs and zips. For more information, check out [Google's Official Documentation](https://developer.android.com/studio/publish/app-signing.html#signing-manually).
+## Introduction
+
+Magisk is a suite of open source tools for customizing Android, supporting devices higher than Android 4.2 (API 17). It covers the fundamental parts for Android customization: root, boot scripts, SELinux patches, AVB2.0 / dm-verity / forceencrypt removals etc.
+
+Furthermore, Magisk provides a **Systemless Interface** to alter the system (or vendor) arbitrarily while the actual partitions stay completely intact. With its systemless nature along with several other hacks, Magisk can hide modifications from nearly any system integrity verifications used in banking apps, corporation monitoring apps, game cheat detections, and most importantly [Google's SafetyNet API](https://developer.android.com/training/safetynet/index.html).
 
 ## Bug Reports
-**Make sure to install the latest [Canary Build](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337) before reporting any bugs!** Please **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 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.
 
-## Documentation
-[Link to Documentation](docs/README.MD)
+## Building Environment Requirements
+
+-  Python 3: run `build.py` script
+-  Java Development Kit (JDK) 8: Compile Magisk Manager and sign zips
+-  Latest Android SDK: set `ANDROID_HOME` environment variable to the path to Android SDK
+-  Android NDK: Install NDK along with SDK (`$ANDROID_HOME/ndk-bundle`), or optionally specify a custom path `ANDROID_NDK_HOME`
+-  (Windows Only) Python package Colorama: Install with `pip install colorama`, used for ANSI color codes
+
+## Building Notes and Instructions
+
+-  Clone sources with submodules: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git`
+-  Building is supported on macOS, Linux, and Windows. Official releases are built and tested with [FrankeNDK](https://github.com/topjohnwu/FrankeNDK); point `ANDROID_NDK_HOME` to FrankeNDK if you want to use it for compiling.
+-  Set configurations in `config.prop`. A sample file `config.prop.sample` is provided as an example.
+-  Run `build.py` with argument `-h` to see the built-in help message. The `-h` option also works for each supported actions, e.g. `./build.py binary -h`
+-  By default, `build.py` build binaries and Magisk Manager in debug mode. If you want to build Magisk Manager in release mode (via the `-r, --release` flag), you need a Java Keystore file `release-key.jks` (only `JKS` format is supported) to sign APKs and zips. For more information, check out [Google's Official Documentation](https://developer.android.com/studio/publish/app-signing.html#signing-manually).
+
+## Translations
+
+Default string resources for Magisk Manager are scattered throughout
+
+- `app/src/main/res/values/strings.xml`
+- `stub/src/main/res/values/strings.xml`
+- `shared/src/main/res/values/strings.xml`
+
+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:
-you can redistribute it and/or modify it under the terms of the 
-GNU General Public License as published by the Free Software Foundation, 
-either version 3 of the License, or (at your option) any later version.
+    Magisk, including all git submodules are free software:
+    you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation,
+    either version 3 of the License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-```
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

app/.gitignore

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

app/README.md

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

app/build.gradle

@@ -1,82 +1,83 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
-def configProps = new Properties()
-def configPath = project.hasProperty('configPath') ? project.configPath : rootProject.file('config.prop')
-configProps.load(new FileInputStream(configPath))
+kapt {
+    correctErrorTypes = true
+    useBuildCache = true
+    mapDiagnosticLocations = true
+    javacOptions {
+        option("-Xmaxerrs", 1000)
+    }
+}
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
     defaultConfig {
-        applicationId "com.topjohnwu.magisk"
-        minSdkVersion 21
-        targetSdkVersion rootProject.ext.compileSdkVersion
-    }
-
-    signingConfigs {
-        config {
-            storeFile rootProject.file('release-key.jks')
-            storePassword configProps['keyStorePass']
-            keyAlias configProps['keyAlias']
-            keyPassword configProps['keyPass']
+        applicationId 'com.topjohnwu.magisk'
+        vectorDrawables.useSupportLibrary = true
+        multiDexEnabled true
+        versionName configProps['appVersion']
+        versionCode configProps['appVersionCode'] as Integer
+        javaCompileOptions {
+            annotationProcessorOptions {
+                argument('butterknife.debuggable', 'false')
+            }
         }
     }
 
     buildTypes {
-        debug {
-            // If keystore exists, sign the APK with custom signature
-            if (signingConfigs.config.storeFile.exists())
-                signingConfig signingConfigs.config
-        }
         release {
-            minifyEnabled true
-            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.config
         }
     }
 
-    flavorDimensions "mode"
-
-    productFlavors {
-        full {
-            versionName configProps['appVersion']
-            versionCode configProps['appVersionCode'] as Integer
-            javaCompileOptions {
-                annotationProcessorOptions {
-                    argument('butterknife.debuggable', 'false')
-                }
-            }
-        }
-        stub {
-            versionCode 1
-            versionName "stub"
-        }
+    dataBinding {
+        enabled = true
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    dexOptions {
-        preDexLibraries true
-        javaMaxHeapSize "2g"
-    }
-    lintOptions {
-        disable 'MissingTranslation'
+    packagingOptions {
+        exclude '/META-INF/*.version'
+        exclude '/META-INF/*.kotlin_module'
+        exclude '/META-INF/rxkotlin.properties'
+        exclude '/androidsupportmultidexversion.txt'
+        exclude '/org/**'
+        exclude '/kotlin/**'
+        exclude '/kotlinx/**'
     }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    fullImplementation project(':utils')
-    implementation "androidx.core:core:${rootProject.ext.androidXVersion}"
-    fullImplementation "androidx.preference:preference:${rootProject.ext.androidXVersion}"
-    fullImplementation "androidx.recyclerview:recyclerview:${rootProject.ext.androidXVersion}"
-    fullImplementation "androidx.cardview:cardview:${rootProject.ext.androidXVersion}"
-    fullImplementation "com.google.android.material:material:${rootProject.ext.androidXVersion}"
-    fullImplementation 'com.github.topjohnwu:libsu:2.0.2'
-    fullImplementation 'com.atlassian.commonmark:commonmark:0.11.0'
-    fullImplementation 'org.kamranzafar:jtar:2.3'
+    implementation project(':net')
+    implementation project(':shared')
+    implementation project(':signing')
+
+    implementation 'com.github.topjohnwu:jtar:1.0.0'
+    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'com.github.skoumalcz:teanity:0.3.3'
+    implementation 'com.ncapdevi:frag-nav:3.2.0'
+
+    def markwonVersion = '3.0.1'
+    implementation "ru.noties.markwon:core:${markwonVersion}"
+    implementation "ru.noties.markwon:html:${markwonVersion}"
+    implementation "ru.noties.markwon:image-svg:${markwonVersion}"
+
+    def libsuVersion = '2.5.0'
+    implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
+    implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
+
+    def koin = "2.0.0-rc-2"
+    implementation "org.koin:koin-core:${koin}"
+    implementation "org.koin:koin-android:${koin}"
+    implementation "org.koin:koin-androidx-viewmodel:${koin}"
+
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha05'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha06'
+    implementation 'androidx.work:work-runtime:2.0.1'
+    implementation 'androidx.transition:transition:1.2.0-alpha01'
+    implementation 'androidx.multidex:multidex:2.0.1'
 }

app/proguard-rules.pro

@@ -16,14 +16,23 @@
 #   public *;
 #}
 
-# BouncyCastle
--keep class org.bouncycastle.jcajce.provider.asymmetric.rsa.**SHA1** { *; }
--keep class org.bouncycastle.jcajce.provider.asymmetric.RSA** { *; }
--keep class org.bouncycastle.jcajce.provider.digest.SHA1** { *; }
--dontwarn javax.naming.**
-
-# Snet extention
+# Snet
 -keepclassmembers class com.topjohnwu.magisk.utils.ISafetyNetHelper { *; }
+-keep,allowobfuscation interface com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback
+-keepclassmembers class * implements com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback {
+  void onResponse(int);
+}
+
+# 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 { *; }
 
 # Strip logging
 -assumenosideeffects class com.topjohnwu.magisk.utils.Logger {
@@ -33,3 +42,8 @@
 # Excessive obfuscation
 -repackageclasses 'a'
 -allowaccessmodification
+
+# QOL
+-dontnote **
+-dontwarn com.caverock.androidsvg.**
+-dontwarn ru.noties.markwon.**

app/src/full/AndroidManifest.xml

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.topjohnwu.magisk">
-
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <application
-        android:name="a.q"
-        android:theme="@style/AppTheme"
-        tools:ignore="GoogleAppIndexingWarning">
-
-        <!-- Activities -->
-
-        <activity
-            android:name="a.b"
-            android:configChanges="orientation|screenSize"
-            android:exported="true" />
-        <activity
-            android:name="a.c"
-            android:configChanges="orientation|screenSize"
-            android:exported="true"
-            android:theme="@style/SplashTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="a.d"
-            android:theme="@style/AppTheme.StatusBar" />
-        <activity
-            android:name="a.e"
-            android:theme="@style/AppTheme.StatusBar"/>
-        <activity
-            android:name="a.f"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="nosensor"
-            android:theme="@style/AppTheme.StatusBar" />
-        <activity
-            android:name="a.g"
-            android:theme="@style/AppTheme.Translucent" />
-
-        <!-- Superuser -->
-
-        <activity
-            android:name="a.p"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity="internal.superuser"
-            android:theme="@style/SuRequest" />
-
-        <activity
-            android:name=".superuser.RequestActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity="internal.superuser"
-            android:theme="@style/AppTheme.Translucent" />
-
-        <receiver android:name=".superuser.SuReceiver" />
-
-        <!-- Receiver -->
-
-        <receiver android:name="a.h">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name="a.i">
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
-                <data android:scheme="package" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name="a.j" />
-        <receiver android:name="a.k" />
-        <receiver android:name="a.l">
-            <intent-filter>
-                <action android:name="android.intent.action.LOCALE_CHANGED" />
-            </intent-filter>
-        </receiver>
-
-        <!-- Service -->
-
-        <service
-            android:name="a.m"
-            android:exported="true"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service
-            android:name="a.n"
-            android:exported="true"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
-        <!-- Hardcode GMS version -->
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="12451000" />
-
-    </application>
-
-</manifest>

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

@@ -1,10 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.utils.BootSigner;
-
-import androidx.annotation.Keep;
-
-@Keep
-public class a extends BootSigner {
-    /* stub */
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,22 +0,0 @@
-package a;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import com.topjohnwu.magisk.components.AboutCardRow;
-
-public class o extends AboutCardRow {
-    /* stub */
-
-    public o(Context context) {
-        super(context);
-    }
-
-    public o(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public o(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-}

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

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

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

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

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

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

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

@@ -1,156 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.os.Process;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
-public class Const {
-
-    public static final String DEBUG_TAG = "MagiskManager";
-    public static final String ORIG_PKG_NAME = BuildConfig.APPLICATION_ID;
-    public static final String MAGISKHIDE_PROP = "persist.magisk.hide";
-
-    // APK content
-    public static final String ANDROID_MANIFEST = "AndroidManifest.xml";
-
-    public static final String SU_KEYSTORE_KEY = "su_key";
-
-    // Paths
-    public static File MAGISK_PATH;
-    public static File MAGISK_DISABLE_FILE;
-    public static File MAGISK_HOST_FILE;
-
-    static {
-        /* Prevent crashing on unrooted devices */
-        MAGISK_PATH = MAGISK_DISABLE_FILE = MAGISK_HOST_FILE = new File("xxx");
-    }
-
-    public static final String BUSYBOX_PATH = "/sbin/.core/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 int MIN_MODULE_VER() {
-        return Data.magiskVersionCode >= MAGISK_VER.REMOVE_LEGACY_LINK ? 1500 : 1400;
-    }
-
-    /* A list of apps that should not be shown as hide-able */
-    public static final List<String> HIDE_BLACKLIST =  Arrays.asList(
-            "android",
-            Data.MM().getPackageName(),
-            "com.google.android.gms"
-    );
-
-    public static final int USER_ID = Process.myUid() / 100000;
-
-    public static final class MAGISK_VER {
-        public static final int UNIFIED = 1300;
-        public static final int FBE_AWARE = 1410;
-        public static final int RESETPROP_PERSIST = 1436;
-        public static final int MANAGER_HIDE = 1440;
-        public static final int HIDDEN_PATH = 1460;
-        public static final int REMOVE_LEGACY_LINK = 1630;
-        public static final int SEPOL_REFACTOR = 1640;
-        public static final int FIX_ENV = 1650;
-        public static final int DBVER_SIX = 17000;
-    }
-
-    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 String NOTIFICATION_CHANNEL = "magisk_notification";
-    }
-
-    public static class Url {
-        public static final String STABLE_URL = "https://raw.githubusercontent.com/topjohnwu/magisk_files/master/stable.json";
-        public static final String BETA_URL = "https://raw.githubusercontent.com/topjohnwu/magisk_files/master/beta.json";
-        public static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&sort=pushed&page=%d";
-        public static final String FILE_URL = "https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s";
-        public static final String ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip";
-        public static final String PAYPAL_URL = "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=CC7FZ7526MNGG";
-        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 class Key {
-        // su
-        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";
-
-        // intents
-        public static final String OPEN_SECTION = "section";
-        public static final String INTENT_SET_FILENAME = "filename";
-        public static final String INTENT_SET_LINK = "link";
-        public static final String FLASH_ACTION = "action";
-        public static final String FLASH_SET_BOOT = "boot";
-
-        // others
-        public static final String CHECK_UPDATES = "check_update";
-        public static final String UPDATE_CHANNEL = "update_channel";
-        public static final String CUSTOM_CHANNEL = "custom_channel";
-        public static final String BOOT_FORMAT = "boot_format";
-        public static final String UPDATE_SERVICE_VER = "update_service_version";
-        public static final String APP_VER = "app_version";
-        public static final String MAGISKHIDE = "magiskhide";
-        public static final String HOSTS = "hosts";
-        public static final String COREONLY = "disable";
-        public static final String LOCALE = "locale";
-        public static final String DARK_THEME = "dark_theme";
-        public static final String ETAG_KEY = "ETag";
-        public static final String LINK_KEY = "Link";
-        public static final String IF_NONE_MATCH = "If-None-Match";
-        public static final String REPO_ORDER = "repo_order";
-    }
-
-
-    public static class Value {
-        public static final int STABLE_CHANNEL = 0;
-        public static final int BETA_CHANNEL = 1;
-        public static final int CUSTOM_CHANNEL = 2;
-        public static final int ROOT_ACCESS_DISABLED = 0;
-        public static final int ROOT_ACCESS_APPS_ONLY = 1;
-        public static final int ROOT_ACCESS_ADB_ONLY = 2;
-        public static final int ROOT_ACCESS_APPS_AND_ADB = 3;
-        public static final int MULTIUSER_MODE_OWNER_ONLY = 0;
-        public static final int MULTIUSER_MODE_OWNER_MANAGED = 1;
-        public static final int MULTIUSER_MODE_USER = 2;
-        public static final int NAMESPACE_MODE_GLOBAL = 0;
-        public static final int NAMESPACE_MODE_REQUESTER = 1;
-        public static final int NAMESPACE_MODE_ISOLATE = 2;
-        public static final int NO_NOTIFICATION = 0;
-        public static final int NOTIFICATION_TOAST = 1;
-        public static final int SU_PROMPT = 0;
-        public static final int SU_AUTO_DENY = 1;
-        public static final int SU_AUTO_ALLOW = 2;
-        public static final 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";
-        public static final int[] timeoutList = {0, -1, 10, 20, 30, 60};
-        public static final int ORDER_NAME = 0;
-        public static final int ORDER_DATE = 1;
-    }
-}

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

@@ -1,218 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.SharedPreferences;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Xml;
-
-import com.topjohnwu.magisk.components.AboutCardRow;
-import com.topjohnwu.magisk.receivers.BootReceiver;
-import com.topjohnwu.magisk.receivers.ManagerUpdate;
-import com.topjohnwu.magisk.receivers.PackageReceiver;
-import com.topjohnwu.magisk.receivers.RebootReceiver;
-import com.topjohnwu.magisk.receivers.ShortcutReceiver;
-import com.topjohnwu.magisk.services.OnBootService;
-import com.topjohnwu.magisk.services.UpdateCheckService;
-import com.topjohnwu.magisk.utils.FingerprintHelper;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.io.SuFile;
-import com.topjohnwu.superuser.io.SuFileInputStream;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.Map;
-
-public class Data {
-    // Global app instance
-    public static WeakReference<MagiskManager> weakApp;
-    public static Handler mainHandler = new Handler(Looper.getMainLooper());
-    public static Map<Class, Class> classMap = new HashMap<>();
-
-    // Current status
-    public static String magiskVersionString;
-    public static int magiskVersionCode = -1;
-    public 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;
-    public static int snetVersionCode;
-    public static String snetLink;
-
-    // Install flags
-    public static boolean keepVerity = false;
-    public static boolean keepEnc = false;
-
-    // Configs
-    public static boolean isDarkTheme;
-    public static int suRequestTimeout;
-    public static int suLogTimeout = 14;
-    public static int suAccessState;
-    public static boolean suFingerprint;
-    public static int multiuserMode;
-    public static int suResponseType;
-    public static int suNotificationType;
-    public static int suNamespaceMode;
-    public static int updateChannel;
-    public static int repoOrder;
-
-    static {
-        classMap.put(MagiskManager.class, a.q.class);
-        classMap.put(MainActivity.class, a.b.class);
-        classMap.put(SplashActivity.class, a.c.class);
-        classMap.put(AboutActivity.class, a.d.class);
-        classMap.put(DonationActivity.class, a.e.class);
-        classMap.put(FlashActivity.class, a.f.class);
-        classMap.put(NoUIActivity.class, a.g.class);
-        classMap.put(BootReceiver.class, a.h.class);
-        classMap.put(PackageReceiver.class, a.i.class);
-        classMap.put(ManagerUpdate.class, a.j.class);
-        classMap.put(RebootReceiver.class, a.k.class);
-        classMap.put(ShortcutReceiver.class, a.l.class);
-        classMap.put(OnBootService.class, a.m.class);
-        classMap.put(UpdateCheckService.class, a.n.class);
-        classMap.put(AboutCardRow.class, a.o.class);
-        classMap.put(SuRequestActivity.class, a.p.class);
-
-    }
-
-    public static void loadMagiskInfo() {
-        try {
-            magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":")[0];
-            magiskVersionCode = Integer.parseInt(ShellUtils.fastCmd("magisk -V"));
-            String s = ShellUtils.fastCmd((magiskVersionCode >= Const.MAGISK_VER.RESETPROP_PERSIST ?
-                    "resetprop -p " : "getprop ") + Const.MAGISKHIDE_PROP);
-            magiskHide = s.isEmpty() || Integer.parseInt(s) != 0;
-        } catch (NumberFormatException ignored) {}
-    }
-
-    public static MagiskManager MM() {
-        return weakApp.get();
-    }
-
-    public static void exportPrefs() {
-        // Flush prefs to disk
-        MagiskManager mm = MM();
-        mm.prefs.edit().commit();
-        File xml = new File(mm.getFilesDir().getParent() + "/shared_prefs",
-                mm.getPackageName() + "_preferences.xml");
-        Shell.su(Utils.fmt("for usr in /data/user/*; do cat %s > ${usr}/%s; done", xml, Const.MANAGER_CONFIGS)).exec();
-    }
-
-    public static void importPrefs() {
-        MagiskManager mm = MM();
-        SuFile config = new SuFile(Utils.fmt("/data/user/%d/%s", Const.USER_ID, Const.MANAGER_CONFIGS));
-        if (config.exists()) {
-            SharedPreferences.Editor editor = mm.prefs.edit();
-            try {
-                SuFileInputStream is = new SuFileInputStream(config);
-                XmlPullParser parser = Xml.newPullParser();
-                parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
-                parser.setInput(is, "UTF-8");
-                parser.nextTag();
-                parser.require(XmlPullParser.START_TAG, null, "map");
-                while (parser.next() != XmlPullParser.END_TAG) {
-                    if (parser.getEventType() != XmlPullParser.START_TAG)
-                        continue;
-                    String key = parser.getAttributeValue(null, "name");
-                    String value = parser.getAttributeValue(null, "value");
-                    switch (parser.getName()) {
-                        case "string":
-                            parser.require(XmlPullParser.START_TAG, null, "string");
-                            editor.putString(key, parser.nextText());
-                            parser.require(XmlPullParser.END_TAG, null, "string");
-                            break;
-                        case "boolean":
-                            parser.require(XmlPullParser.START_TAG, null, "boolean");
-                            editor.putBoolean(key, Boolean.parseBoolean(value));
-                            parser.nextTag();
-                            parser.require(XmlPullParser.END_TAG, null, "boolean");
-                            break;
-                        case "int":
-                            parser.require(XmlPullParser.START_TAG, null, "int");
-                            editor.putInt(key, Integer.parseInt(value));
-                            parser.nextTag();
-                            parser.require(XmlPullParser.END_TAG, null, "int");
-                            break;
-                        case "long":
-                            parser.require(XmlPullParser.START_TAG, null, "long");
-                            editor.putLong(key, Long.parseLong(value));
-                            parser.nextTag();
-                            parser.require(XmlPullParser.END_TAG, null, "long");
-                            break;
-                        case "float":
-                            parser.require(XmlPullParser.START_TAG, null, "int");
-                            editor.putFloat(key, Float.parseFloat(value));
-                            parser.nextTag();
-                            parser.require(XmlPullParser.END_TAG, null, "int");
-                            break;
-                        default:
-                            parser.next();
-                    }
-                }
-            } catch (IOException | XmlPullParserException e) {
-                e.printStackTrace();
-            }
-            editor.remove(Const.Key.ETAG_KEY);
-            editor.apply();
-            loadConfig();
-            config.delete();
-        }
-    }
-
-    public static void loadConfig() {
-        MagiskManager mm = MM();
-        // su
-        suRequestTimeout = Utils.getPrefsInt(mm.prefs, Const.Key.SU_REQUEST_TIMEOUT, Const.Value.timeoutList[2]);
-        suResponseType = Utils.getPrefsInt(mm.prefs, Const.Key.SU_AUTO_RESPONSE, Const.Value.SU_PROMPT);
-        suNotificationType = Utils.getPrefsInt(mm.prefs, Const.Key.SU_NOTIFICATION, Const.Value.NOTIFICATION_TOAST);
-        suAccessState = mm.mDB.getSettings(Const.Key.ROOT_ACCESS, Const.Value.ROOT_ACCESS_APPS_AND_ADB);
-        multiuserMode = mm.mDB.getSettings(Const.Key.SU_MULTIUSER_MODE, Const.Value.MULTIUSER_MODE_OWNER_ONLY);
-        suNamespaceMode = mm.mDB.getSettings(Const.Key.SU_MNT_NS, Const.Value.NAMESPACE_MODE_REQUESTER);
-        suFingerprint = mm.mDB.getSettings(Const.Key.SU_FINGERPRINT, 0) != 0;
-        if (suFingerprint && !FingerprintHelper.canUseFingerprint()) {
-            // User revoked the fingerprint
-            mm.mDB.setSettings(Const.Key.SU_FINGERPRINT, 0);
-            suFingerprint = false;
-        }
-
-        // config
-        isDarkTheme = mm.prefs.getBoolean(Const.Key.DARK_THEME, false);
-        updateChannel = Utils.getPrefsInt(mm.prefs, Const.Key.UPDATE_CHANNEL, Const.Value.STABLE_CHANNEL);
-        repoOrder = mm.prefs.getInt(Const.Key.REPO_ORDER, Const.Value.ORDER_DATE);
-    }
-
-    public static void writeConfig() {
-        MM().prefs.edit()
-                .putBoolean(Const.Key.DARK_THEME, isDarkTheme)
-                .putBoolean(Const.Key.MAGISKHIDE, magiskHide)
-                .putBoolean(Const.Key.HOSTS, Const.MAGISK_HOST_FILE.exists())
-                .putBoolean(Const.Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
-                .putBoolean(Const.Key.SU_FINGERPRINT, suFingerprint)
-                .putString(Const.Key.SU_REQUEST_TIMEOUT, String.valueOf(suRequestTimeout))
-                .putString(Const.Key.SU_AUTO_RESPONSE, String.valueOf(suResponseType))
-                .putString(Const.Key.SU_NOTIFICATION, String.valueOf(suNotificationType))
-                .putString(Const.Key.ROOT_ACCESS, String.valueOf(suAccessState))
-                .putString(Const.Key.SU_MULTIUSER_MODE, String.valueOf(multiuserMode))
-                .putString(Const.Key.SU_MNT_NS, String.valueOf(suNamespaceMode))
-                .putString(Const.Key.UPDATE_CHANNEL, String.valueOf(updateChannel))
-                .putInt(Const.Key.UPDATE_SERVICE_VER, Const.UPDATE_SERVICE_VER)
-                .putInt(Const.Key.REPO_ORDER, repoOrder)
-                .apply();
-    }
-}

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

@@ -1,43 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.net.Uri;
-import android.os.Bundle;
-
-import com.topjohnwu.magisk.components.AboutCardRow;
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.utils.Utils;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
-
-public class DonationActivity extends BaseActivity {
-
-    Toolbar toolbar;
-    AboutCardRow paypal;
-    AboutCardRow patreon;
-
-    @Override
-    public int getDarkTheme() {
-        return R.style.AppTheme_StatusBar_Dark;
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_donation);
-        ViewBinder.bind(this);
-
-        setSupportActionBar(toolbar);
-        toolbar.setNavigationOnClickListener(view -> finish());
-
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setTitle(R.string.donation);
-            ab.setDisplayHomeAsUpEnabled(true);
-        }
-
-        paypal.setOnClickListener(v -> Utils.openLink(this, Uri.parse(Const.Url.PAYPAL_URL)));
-        patreon.setOnClickListener(v -> Utils.openLink(this, Uri.parse(Const.Url.PATREON_URL)));
-    }
-}

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

@@ -1,164 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.Manifest;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.asyncs.FlashZip;
-import com.topjohnwu.magisk.asyncs.InstallMagisk;
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.utils.Download;
-import com.topjohnwu.magisk.utils.RootUtils;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.CallbackList;
-import com.topjohnwu.superuser.Shell;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Locale;
-
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
-
-public class FlashActivity extends BaseActivity {
-
-    Toolbar toolbar;
-    TextView flashLogs;
-    public LinearLayout buttonPanel;
-    public Button reboot;
-    ScrollView sv;
-
-    private List<String> logs;
-
-    void dismiss() {
-        finish();
-    }
-
-    void reboot() {
-        Shell.su("/system/bin/reboot").submit();
-    }
-
-    void saveLogs() {
-        runWithPermission(new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, () -> {
-            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(Download.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);
-        });
-    }
-
-    @Override
-    public int getDarkTheme() {
-        return R.style.AppTheme_StatusBar_Dark;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_flash);
-        ViewBinder.bind(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 = new ArrayList<>();
-        CallbackList<String> console = new CallbackList<String>(new ArrayList<>()) {
-
-            private void updateUI() {
-                flashLogs.setText(TextUtils.join("\n", this));
-                sv.postDelayed(() -> sv.fullScroll(ScrollView.FOCUS_DOWN), 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);
-                Data.mainHandler.post(this::updateUI);
-                return ret;
-            }
-        };
-
-        // We must receive a Uri of the target zip
-        Intent intent = getIntent();
-        Uri uri = intent.getData();
-
-        switch (intent.getStringExtra(Const.Key.FLASH_ACTION)) {
-            case Const.Value.FLASH_ZIP:
-                new FlashZip(this, uri, console, logs).exec();
-                break;
-            case Const.Value.UNINSTALL:
-                new UninstallMagisk(this, uri, console, logs).exec();
-                break;
-            case Const.Value.FLASH_MAGISK:
-                new InstallMagisk(this, console, logs, InstallMagisk.DIRECT_MODE).exec();
-                break;
-            case Const.Value.FLASH_INACTIVE_SLOT:
-                new InstallMagisk(this, console, logs, InstallMagisk.SECOND_SLOT_MODE).exec();
-                break;
-            case Const.Value.PATCH_BOOT:
-                runWithPermission(new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                        () -> new InstallMagisk(this, console, logs,
-                                intent.getParcelableExtra(Const.Key.FLASH_SET_BOOT)).exec());
-                break;
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        // Prevent user accidentally press back button
-    }
-
-    private static class UninstallMagisk extends FlashZip {
-
-        private UninstallMagisk(BaseActivity context, Uri uri, List<String> console, List<String> logs) {
-            super(context, uri, console, logs);
-        }
-
-        @Override
-        protected void onPostExecute(Integer result) {
-            if (result == 1) {
-                Data.mainHandler.postDelayed(() ->
-                        RootUtils.uninstallPkg(getActivity().getPackageName()), 3000);
-            } else {
-                super.onPostExecute(result);
-            }
-        }
-    }
-}

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

@@ -1,65 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.preference.PreferenceManager;
-import android.text.TextUtils;
-
-import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.utils.LocaleManager;
-import com.topjohnwu.magisk.utils.RootUtils;
-import com.topjohnwu.superuser.ContainerApp;
-import com.topjohnwu.superuser.Shell;
-
-import java.lang.ref.WeakReference;
-
-public class MagiskManager extends ContainerApp {
-
-    // Info
-    public boolean hasInit = false;
-
-    // Global resources
-    public SharedPreferences prefs;
-    public MagiskDatabaseHelper mDB;
-    public RepoDatabaseHelper repoDB;
-
-    public MagiskManager() {
-        Data.weakApp = new WeakReference<>(this);
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER);
-        Shell.Config.verboseLogging(BuildConfig.DEBUG);
-        Shell.Config.setInitializer(RootUtils.class);
-
-        prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        mDB = MagiskDatabaseHelper.getInstance(this);
-
-        String pkg = mDB.getStrings(Const.Key.SU_MANAGER, null);
-        if (pkg != null && getPackageName().equals(Const.ORIG_PKG_NAME)) {
-            mDB.setStrings(Const.Key.SU_MANAGER, null);
-            Shell.su("pm uninstall " + pkg).exec();
-        }
-        if (TextUtils.equals(pkg, getPackageName())) {
-            try {
-                // We are the manager, remove com.topjohnwu.magisk as it could be malware
-                getPackageManager().getApplicationInfo(Const.ORIG_PKG_NAME, 0);
-                RootUtils.uninstallPkg(Const.ORIG_PKG_NAME);
-            } catch (PackageManager.NameNotFoundException ignored) {}
-        }
-
-        LocaleManager.setLocale(this);
-        Data.loadConfig();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        LocaleManager.setLocale(this);
-    }
-}

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

@@ -1,211 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-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.Download;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.superuser.Shell;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.widget.Toolbar;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-
-public class MainActivity extends BaseActivity
-        implements NavigationView.OnNavigationItemSelectedListener, Topic.Subscriber {
-
-    private final Handler mDrawerHandler = new Handler();
-    private int mDrawerItem;
-    private static boolean fromShortcut = false;
-
-    public Toolbar toolbar;
-    DrawerLayout drawer;
-    NavigationView navigationView;
-
-    private float toolbarElevation;
-
-    @Override
-    public int getDarkTheme() {
-        return R.style.AppTheme_Dark;
-    }
-
-    @Override
-    protected void onCreate(final Bundle savedInstanceState) {
-        if (!mm.hasInit) {
-            startActivity(new Intent(this, Data.classMap.get(SplashActivity.class)));
-            finish();
-        }
-
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        ViewBinder.bind(this);
-
-        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
-            }
-        };
-
-        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
-    protected void onResume() {
-        super.onResume();
-        checkHideSection();
-    }
-
-    @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;
-    }
-
-    @Override
-    public void onPublish(int topic, Object[] result) {
-        recreate();
-    }
-
-    public void checkHideSection() {
-        Menu menu = navigationView.getMenu();
-        menu.findItem(R.id.magiskhide).setVisible(Shell.rootAccess() &&
-                Data.magiskVersionCode >= Const.MAGISK_VER.UNIFIED &&
-                mm.prefs.getBoolean(Const.Key.MAGISKHIDE, false));
-        menu.findItem(R.id.modules).setVisible(Shell.rootAccess() && Data.magiskVersionCode >= 0);
-        menu.findItem(R.id.downloads).setVisible(Download.checkNetworkStatus(this)
-                && Shell.rootAccess() && Data.magiskVersionCode >= 0);
-        menu.findItem(R.id.log).setVisible(Shell.rootAccess());
-        menu.findItem(R.id.superuser).setVisible(Shell.rootAccess() &&
-                !(Const.USER_ID > 0 && Data.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED));
-    }
-
-    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;
-                case "about":
-                    itemId = R.id.app_about;
-                    break;
-                case "donation":
-                    itemId = R.id.donation;
-                    break;
-            }
-        }
-        navigate(itemId);
-    }
-
-    public void navigate(int itemId) {
-        int bak = mDrawerItem;
-        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;
-            case R.id.app_about:
-                startActivity(new Intent(this, Data.classMap.get(AboutActivity.class)));
-                mDrawerItem = bak;
-                break;
-            case R.id.donation:
-                startActivity(new Intent(this, Data.classMap.get(DonationActivity.class)));
-                mDrawerItem = bak;
-                break;
-        }
-    }
-
-    private void displayFragment(@NonNull Fragment navFragment, boolean setElevation) {
-        supportInvalidateOptionsMenu();
-        getSupportFragmentManager()
-                .beginTransaction()
-                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
-                .replace(R.id.content_frame, navFragment)
-                .commitNow();
-        toolbar.setElevation(setElevation ? toolbarElevation : 0);
-    }
-}

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

@@ -1,13 +0,0 @@
-package com.topjohnwu.magisk;
-
-import com.topjohnwu.magisk.components.BaseActivity;
-
-import androidx.annotation.NonNull;
-
-public class NoUIActivity extends BaseActivity {
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        finish();
-    }
-}

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

@@ -1,67 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-
-import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.asyncs.UpdateRepos;
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.receivers.ShortcutReceiver;
-import com.topjohnwu.magisk.utils.Download;
-import com.topjohnwu.magisk.utils.LocaleManager;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-
-public class SplashActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Magisk working as expected
-        if (Shell.rootAccess() && Data.magiskVersionCode > 0) {
-            // Update check service
-            Utils.setupUpdateCheck();
-            // Load modules
-            Utils.loadModules();
-        }
-
-        mm.repoDB = new RepoDatabaseHelper(this);
-        Data.importPrefs();
-
-        // Dynamic detect all locales
-        LocaleManager.loadAvailableLocales();
-
-        // Create notification channel on Android O
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel(Const.ID.NOTIFICATION_CHANNEL,
-                    getString(R.string.magisk_updates), NotificationManager.IMPORTANCE_DEFAULT);
-            getSystemService(NotificationManager.class).createNotificationChannel(channel);
-        }
-
-        // Setup shortcuts
-        sendBroadcast(new Intent(this, Data.classMap.get(ShortcutReceiver.class)));
-
-        if (Download.checkNetworkStatus(this)) {
-            // Fire update check
-            CheckUpdates.check();
-            // Repo update check
-            new UpdateRepos().exec();
-        }
-
-        // Write back default values
-        Data.writeConfig();
-
-        mm.hasInit = true;
-
-        Intent intent = new Intent(this, Data.classMap.get(MainActivity.class));
-        intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION));
-        intent.putExtra(BaseActivity.INTENT_PERM, getIntent().getStringExtra(BaseActivity.INTENT_PERM));
-        startActivity(intent);
-        finish();
-    }
-}

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

@@ -1,258 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.hardware.fingerprint.FingerprintManager;
-import android.net.LocalSocketAddress;
-import android.os.Bundle;
-import android.os.CountDownTimer;
-import android.os.FileObserver;
-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 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.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import androidx.annotation.Nullable;
-
-public class SuRequestActivity extends BaseActivity {
-    LinearLayout suPopup;
-    Spinner timeout;
-    ImageView appIcon;
-    TextView appNameView;
-    TextView packageNameView;
-    Button grant_btn;
-    Button deny_btn;
-    ImageView fingerprintImg;
-    TextView warning;
-
-    private SuConnector connector;
-    private Policy policy;
-    private CountDownTimer timer;
-    private FingerprintHelper fingerprintHelper;
-
-    class SuConnectorV1 extends SuConnector {
-
-        SuConnectorV1(String name) throws IOException {
-            socket.connect(new LocalSocketAddress(name, LocalSocketAddress.Namespace.FILESYSTEM));
-            new FileObserver(name) {
-                @Override
-                public void onEvent(int fileEvent, String path) {
-                    if (fileEvent == FileObserver.DELETE_SELF) {
-                        finish();
-                    }
-                }
-            }.startWatching();
-        }
-
-        @Override
-        public void response() {
-            try (OutputStream out = getOutputStream()) {
-                out.write((policy.policy == Policy.ALLOW ? "socket:ALLOW" : "socket:DENY").getBytes());
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    class SuConnectorV2 extends SuConnector {
-
-        SuConnectorV2(String name) throws IOException {
-            socket.connect(new LocalSocketAddress(name, LocalSocketAddress.Namespace.ABSTRACT));
-        }
-
-        @Override
-        public void response() {
-            try (DataOutputStream out = getOutputStream()) {
-                out.writeInt(policy.policy);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    @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();
-        mm.mDB.clearOutdated();
-
-        // Get policy
-        Intent intent = getIntent();
-        try {
-            connector =  intent.getIntExtra("version", 1) == 1 ?
-                    new SuConnectorV1(intent.getStringExtra("socket")) :
-                    new SuConnectorV2(intent.getStringExtra("socket"));
-            Bundle bundle = connector.readSocketInput();
-            int uid = Integer.parseInt(bundle.getString("uid"));
-            policy = mm.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, Const.ORIG_PKG_NAME)) {
-            finish();
-            return;
-        }
-
-        switch (Data.suResponseType) {
-            case Const.Value.SU_AUTO_DENY:
-                handleAction(Policy.DENY, 0);
-                return;
-            case Const.Value.SU_AUTO_ALLOW:
-                handleAction(Policy.ALLOW, 0);
-                return;
-            case Const.Value.SU_PROMPT:
-            default:
-        }
-
-        // If not interactive, response directly
-        if (policy.policy != Policy.INTERACTIVE) {
-            handleAction();
-            return;
-        }
-
-        setContentView(R.layout.activity_request);
-        ViewBinder.bind(this);
-
-        appIcon.setImageDrawable(policy.info.loadIcon(pm));
-        appNameView.setText(policy.appName);
-        packageNameView.setText(policy.packageName);
-
-        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);
-
-        timer = new CountDownTimer(Data.suRequestTimeout * 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 useFingerprint = Data.suFingerprint && FingerprintHelper.canUseFingerprint();
-
-        if (useFingerprint) {
-            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();
-                useFingerprint = false;
-            }
-        }
-
-        if (!useFingerprint) {
-            grant_btn.setOnClickListener(v -> {
-                handleAction(Policy.ALLOW);
-                timer.cancel();
-            });
-            grant_btn.requestFocus();
-        }
-
-        grant_btn.setVisibility(useFingerprint ? View.GONE : View.VISIBLE);
-        fingerprintImg.setVisibility(useFingerprint ? 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) {
-        handleAction(action, Const.Value.timeoutList[timeout.getSelectedItemPosition()]);
-    }
-
-    private void handleAction(int action, int time) {
-        policy.policy = action;
-        if (time >= 0) {
-            policy.until = (time == 0) ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
-            mm.mDB.addPolicy(policy);
-        }
-        handleAction();
-    }
-}

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

@@ -1,293 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Context;
-import android.view.View;
-
-import com.topjohnwu.magisk.adapters.ApplicationAdapter;
-import com.topjohnwu.magisk.adapters.ModulesAdapter;
-import com.topjohnwu.magisk.adapters.PolicyAdapter;
-import com.topjohnwu.magisk.adapters.ReposAdapter;
-import com.topjohnwu.magisk.adapters.SuLogAdapter;
-import com.topjohnwu.magisk.components.AboutCardRow;
-import com.topjohnwu.magisk.components.CustomAlertDialog;
-import com.topjohnwu.magisk.fragments.LogFragment;
-import com.topjohnwu.magisk.fragments.MagiskFragment;
-import com.topjohnwu.magisk.fragments.MagiskHideFragment;
-import com.topjohnwu.magisk.fragments.MagiskLogFragment;
-import com.topjohnwu.magisk.fragments.ModulesFragment;
-import com.topjohnwu.magisk.fragments.ReposFragment;
-import com.topjohnwu.magisk.fragments.SuLogFragment;
-import com.topjohnwu.magisk.fragments.SuperuserFragment;
-
-import androidx.core.content.ContextCompat;
-
-public class ViewBinder {
-
-    public static void bind(MainActivity target) {
-        target.drawer = target.findViewById(R.id.drawer_layout);
-        target.toolbar = target.findViewById(R.id.toolbar);
-        target.navigationView = target.findViewById(R.id.nav_view);
-    }
-
-    public static void bind(AboutActivity target) {
-        target.toolbar = target.findViewById(R.id.toolbar);
-        target.appVersionInfo = target.findViewById(R.id.app_version_info);
-        target.appChangelog = target.findViewById(R.id.app_changelog);
-        target.appTranslators = target.findViewById(R.id.app_translators);
-        target.appSourceCode = target.findViewById(R.id.app_source_code);
-        target.supportThread = target.findViewById(R.id.support_thread);
-        target.twitter = target.findViewById(R.id.follow_twitter);
-    }
-
-    public static void bind(DonationActivity target) {
-        target.toolbar = target.findViewById(R.id.toolbar);
-        target.paypal = target.findViewById(R.id.paypal);
-        target.patreon = target.findViewById(R.id.patreon);
-    }
-
-    public static void bind(FlashActivity target) {
-        target.toolbar = target.findViewById(R.id.toolbar);
-        target.flashLogs = target.findViewById(R.id.txtLog);
-        target.buttonPanel = target.findViewById(R.id.button_panel);
-        target.sv = target.findViewById(R.id.scrollView);
-        target.reboot = target.findViewById(R.id.reboot);
-        target.reboot.setOnClickListener(v -> target.reboot());
-        target.findViewById(R.id.no_thanks).setOnClickListener(v -> target.finish());
-        target.findViewById(R.id.save_logs).setOnClickListener(v -> target.saveLogs());
-    }
-
-    public static void bind(SuRequestActivity target) {
-        target.suPopup = target.findViewById(R.id.su_popup);
-        target.timeout = target.findViewById(R.id.timeout);
-        target.appIcon = target.findViewById(R.id.app_icon);
-        target.appNameView = target.findViewById(R.id.app_name);
-        target.packageNameView = target.findViewById(R.id.package_name);
-        target.grant_btn = target.findViewById(R.id.grant_btn);
-        target.deny_btn = target.findViewById(R.id.deny_btn);
-        target.fingerprintImg = target.findViewById(R.id.fingerprint);
-        target.warning = target.findViewById(R.id.warning);
-    }
-
-    public static void bind(LogFragment target, View v) {
-        target.viewPager = v.findViewById(R.id.container);
-        target.tab = v.findViewById(R.id.tab);
-    }
-
-    public static void unbind(LogFragment target) {
-        target.viewPager = null;
-        target.tab = null;
-    }
-
-    public static void bind(MagiskFragment target, View v) {
-        target.mSwipeRefreshLayout = v.findViewById(R.id.swipeRefreshLayout);
-        target.coreOnlyNotice = v.findViewById(R.id.core_only_notice);
-        target.magiskUpdate = v.findViewById(R.id.magisk_update);
-        target.magiskUpdateIcon = v.findViewById(R.id.magisk_update_icon);
-        target.magiskUpdateText = v.findViewById(R.id.magisk_update_status);
-        target.magiskUpdateProgress = v.findViewById(R.id.magisk_update_progress);
-        target.magiskStatusIcon = v.findViewById(R.id.magisk_status_icon);
-        target.magiskVersionText = v.findViewById(R.id.magisk_version);
-        target.safetyNetCard = v.findViewById(R.id.safetyNet_card);
-        target.safetyNetRefreshIcon = v.findViewById(R.id.safetyNet_refresh);
-        target.safetyNetStatusText = v.findViewById(R.id.safetyNet_status);
-        target.safetyNetProgress = v.findViewById(R.id.safetyNet_check_progress);
-        target.expandLayout = v.findViewById(R.id.expand_layout);
-        target.ctsStatusIcon = v.findViewById(R.id.cts_status_icon);
-        target.ctsStatusText = v.findViewById(R.id.cts_status);
-        target.basicStatusIcon = v.findViewById(R.id.basic_status_icon);
-        target.basicStatusText = v.findViewById(R.id.basic_status);
-        target.installOptionCard = v.findViewById(R.id.install_option_card);
-        target.keepEncChkbox = v.findViewById(R.id.keep_force_enc);
-        target.keepVerityChkbox = v.findViewById(R.id.keep_verity);
-        target.installButton = v.findViewById(R.id.install_button);
-        target.installText = v.findViewById(R.id.install_text);
-        target.uninstallButton = v.findViewById(R.id.uninstall_button);
-
-        v.findViewById(R.id.safetyNet_title).setOnClickListener(v1 -> target.safetyNet());
-        v.findViewById(R.id.install_button).setOnClickListener(v1 -> target.install());
-        v.findViewById(R.id.uninstall_button).setOnClickListener(v1 -> target.uninstall());
-
-        Context ctx = target.getContext();
-        target.colorBad = ContextCompat.getColor(ctx, R.color.red500);
-        target.colorOK = ContextCompat.getColor(ctx, R.color.green500);
-        target.colorWarn = ContextCompat.getColor(ctx, R.color.yellow500);
-        target.colorNeutral = ContextCompat.getColor(ctx, R.color.grey500);
-        target.colorInfo = ContextCompat.getColor(ctx, R.color.blue500);
-    }
-
-    public static void unbind(MagiskFragment target) {
-        target.mSwipeRefreshLayout = null;
-        target.coreOnlyNotice = null;
-        target.magiskUpdate = null;
-        target.magiskUpdateIcon = null;
-        target.magiskUpdateText = null;
-        target.magiskUpdateProgress = null;
-        target.magiskStatusIcon = null;
-        target.magiskVersionText = null;
-        target.safetyNetCard = null;
-        target.safetyNetRefreshIcon = null;
-        target.safetyNetStatusText = null;
-        target.safetyNetProgress = null;
-        target.expandLayout = null;
-        target.ctsStatusIcon = null;
-        target.ctsStatusText = null;
-        target.basicStatusIcon = null;
-        target.basicStatusText = null;
-        target.installOptionCard = null;
-        target.keepEncChkbox = null;
-        target.keepVerityChkbox = null;
-        target.installButton = null;
-        target.installText = null;
-        target.uninstallButton = null;
-
-        View v = target.getView();
-        v.findViewById(R.id.safetyNet_title).setOnClickListener(null);
-        v.findViewById(R.id.install_button).setOnClickListener(null);
-        v.findViewById(R.id.uninstall_button).setOnClickListener(null);
-    }
-
-    public static void bind(MagiskHideFragment target, View v) {
-        target.mSwipeRefreshLayout = v.findViewById(R.id.swipeRefreshLayout);
-        target.recyclerView = v.findViewById(R.id.recyclerView);
-    }
-
-    public static void unbind(MagiskHideFragment target) {
-        target.mSwipeRefreshLayout = null;
-        target.recyclerView = null;
-    }
-    
-    public static void bind(MagiskLogFragment target, View v) {
-        target.txtLog = v.findViewById(R.id.txtLog);
-        target.svLog = v.findViewById(R.id.svLog);
-        target.hsvLog = v.findViewById(R.id.hsvLog);
-        target.progressBar = v.findViewById(R.id.progressBar);
-    }
-    
-    public static void unbind(MagiskLogFragment target) {
-        target.txtLog = null;
-        target.svLog = null;
-        target.hsvLog = null;
-        target.progressBar = null;
-    }
-    
-    public static void bind(ModulesFragment target, View v) {
-        target.mSwipeRefreshLayout = v.findViewById(R.id.swipeRefreshLayout);
-        target.recyclerView = v.findViewById(R.id.recyclerView);
-        target.emptyRv = v.findViewById(R.id.empty_rv);
-        v.findViewById(R.id.fab).setOnClickListener(v1 -> target.selectFile());
-    }
-
-    public static void unbind(ModulesFragment target) {
-        target.mSwipeRefreshLayout = null;
-        target.recyclerView = null;
-        target.emptyRv = null;
-        View v = target.getView();
-        v.findViewById(R.id.fab).setOnClickListener(null);
-    }
-    
-    public static void bind(ReposFragment target, View source) {
-        target.recyclerView = source.findViewById(R.id.recyclerView);
-        target.emptyRv = source.findViewById(R.id.empty_rv);
-        target.mSwipeRefreshLayout = source.findViewById(R.id.swipeRefreshLayout);
-    }
-    
-    public static void unbind(ReposFragment target) {
-        target.recyclerView = null;
-        target.emptyRv = null;
-        target.mSwipeRefreshLayout = null;
-    }
-    
-    public static void bind(SuLogFragment target, View source) {
-        target.emptyRv = source.findViewById(R.id.empty_rv);
-        target.recyclerView = source.findViewById(R.id.recyclerView);
-    }
-    
-    public static void unbind(SuLogFragment target) {
-        target.emptyRv = null;
-        target.recyclerView = null;
-    }
-    
-    public static void bind(SuperuserFragment target, View source) {
-        target.recyclerView = source.findViewById(R.id.recyclerView);
-        target.emptyRv = source.findViewById(R.id.empty_rv);
-    }
-    
-    public static void unbind(SuperuserFragment target) {
-        target.emptyRv = null;
-        target.recyclerView = null;
-    }
-    
-    public static void bind(CustomAlertDialog.ViewHolder target, View source) {
-        target.dialogLayout = source.findViewById(R.id.dialog_layout);
-        target.buttons = source.findViewById(R.id.button_panel);
-        target.messageView = source.findViewById(R.id.message);
-        target.negative = source.findViewById(R.id.negative);
-        target.positive = source.findViewById(R.id.positive);
-        target.neutral = source.findViewById(R.id.neutral);
-    }
-    
-    public static void bind(AboutCardRow target, View source) {
-        target.mTitle = source.findViewById(android.R.id.title);
-        target.mSummary = source.findViewById(android.R.id.summary);
-        target.mIcon = source.findViewById(android.R.id.icon);
-        target.mView = source.findViewById(R.id.container);
-    }
-    
-    public static void bind(ApplicationAdapter.ViewHolder target, View source) {
-        target.appIcon = source.findViewById(R.id.app_icon);
-        target.appName = source.findViewById(R.id.app_name);
-        target.appPackage = source.findViewById(R.id.package_name);
-        target.checkBox = source.findViewById(R.id.checkbox);
-    }
-    
-    public static void bind(ModulesAdapter.ViewHolder target, View source) {
-        target.title = source.findViewById(R.id.title);
-        target.versionName = source.findViewById(R.id.version_name);
-        target.description = source.findViewById(R.id.description);
-        target.notice = source.findViewById(R.id.notice);
-        target.checkBox = source.findViewById(R.id.checkbox);
-        target.author = source.findViewById(R.id.author);
-        target.delete = source.findViewById(R.id.delete);
-    }
-
-    public static void bind(PolicyAdapter.ViewHolder target, View source) {
-        target.appName = source.findViewById(R.id.app_name);
-        target.packageName = source.findViewById(R.id.package_name);
-        target.appIcon = source.findViewById(R.id.app_icon);
-        target.masterSwitch = source.findViewById(R.id.master_switch);
-        target.notificationSwitch = source.findViewById(R.id.notification_switch);
-        target.loggingSwitch = source.findViewById(R.id.logging_switch);
-        target.expandLayout = source.findViewById(R.id.expand_layout);
-        target.delete = source.findViewById(R.id.delete);
-        target.moreInfo = source.findViewById(R.id.more_info);
-    }
-
-    public static void bind(ReposAdapter.SectionHolder target, View source) {
-        target.sectionText = source.findViewById(R.id.section_text);
-    }
-
-    public static void bind(ReposAdapter.RepoHolder target, View source) {
-        target.title = source.findViewById(R.id.title);
-        target.versionName = source.findViewById(R.id.version_name);
-        target.description = source.findViewById(R.id.description);
-        target.author = source.findViewById(R.id.author);
-        target.infoLayout = source.findViewById(R.id.info_layout);
-        target.downloadImage = source.findViewById(R.id.download);
-        target.updateTime = source.findViewById(R.id.update_time);
-    }
-
-    public static void bind(SuLogAdapter.SectionHolder target, View source) {
-        target.date = source.findViewById(R.id.date);
-        target.arrow = source.findViewById(R.id.arrow);
-    }
-
-    public static void bind(SuLogAdapter.LogViewHolder target, View source) {
-        target.appName = source.findViewById(R.id.app_name);
-        target.action = source.findViewById(R.id.action);
-        target.time = source.findViewById(R.id.time);
-        target.fromPid = source.findViewById(R.id.fromPid);
-        target.toUid = source.findViewById(R.id.toUid);
-        target.command = source.findViewById(R.id.command);
-        target.expandLayout = source.findViewById(R.id.expand_layout);
-    }
-}

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

@@ -1,166 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.AsyncTask;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.Filter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.utils.LocaleManager;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.superuser.Shell;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.ViewHolder> {
-
-    private List<ApplicationInfo> fullList, showList;
-    private List<String> hideList;
-    private PackageManager pm;
-    private ApplicationFilter filter;
-
-    public ApplicationAdapter(Context context) {
-        fullList = showList = Collections.emptyList();
-        hideList = Collections.emptyList();
-        filter = new ApplicationFilter();
-        pm = context.getPackageManager();
-        AsyncTask.THREAD_POOL_EXECUTOR.execute(this::loadApps);
-    }
-
-    @NonNull
-    @Override
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_app, parent, false);
-        return new ViewHolder(v);
-    }
-
-    private String getLabel(ApplicationInfo info) {
-        if (info.labelRes > 0) {
-            try {
-                Resources res = pm.getResourcesForApplication(info);
-                Configuration config = new Configuration();
-                config.setLocale(LocaleManager.locale);
-                res.updateConfiguration(config, res.getDisplayMetrics());
-                return res.getString(info.labelRes);
-            } catch (PackageManager.NameNotFoundException ignored) { /* Impossible */ }
-        }
-        return info.loadLabel(pm).toString();
-    }
-
-    private void loadApps() {
-        fullList = pm.getInstalledApplications(0);
-        hideList = Shell.su("magiskhide --ls").exec().getOut();
-        for (Iterator<ApplicationInfo> i = fullList.iterator(); i.hasNext(); ) {
-            ApplicationInfo info = i.next();
-            if (Const.HIDE_BLACKLIST.contains(info.packageName) || !info.enabled) {
-                i.remove();
-            }
-        }
-        Collections.sort(fullList, (a, b) -> {
-            boolean ah = hideList.contains(a.packageName);
-            boolean bh = hideList.contains(b.packageName);
-            if (ah == bh) {
-                return getLabel(a).toLowerCase().compareTo(getLabel(b).toLowerCase());
-            } else if (ah) {
-                return -1;
-            } else {
-                return 1;
-            }
-        });
-        Topic.publish(false, Topic.MAGISK_HIDE_DONE);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        ApplicationInfo info = showList.get(position);
-
-        holder.appIcon.setImageDrawable(info.loadIcon(pm));
-        holder.appName.setText(getLabel(info));
-        holder.appPackage.setText(info.packageName);
-
-        holder.checkBox.setOnCheckedChangeListener(null);
-        holder.checkBox.setChecked(hideList.contains(info.packageName));
-        holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
-            if (isChecked) {
-                Shell.su("magiskhide --add " + info.packageName).submit();
-                hideList.add(info.packageName);
-            } else {
-                Shell.su("magiskhide --rm " + info.packageName).submit();
-                hideList.remove(info.packageName);
-            }
-        });
-    }
-
-    @Override
-    public int getItemCount() {
-        return showList.size();
-    }
-
-    public void filter(String constraint) {
-        filter.filter(constraint);
-    }
-
-    public void refresh() {
-        AsyncTask.THREAD_POOL_EXECUTOR.execute(this::loadApps);
-    }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-
-        public ImageView appIcon;
-        public TextView appName;
-        public TextView appPackage;
-        public CheckBox checkBox;
-
-        ViewHolder(View itemView) {
-            super(itemView);
-            ViewBinder.bind(this, itemView);
-        }
-    }
-
-    private class ApplicationFilter extends Filter {
-
-        private boolean lowercaseContains(String s, CharSequence filter) {
-            return !TextUtils.isEmpty(s) && s.toLowerCase().contains(filter);
-        }
-
-        @Override
-        protected FilterResults performFiltering(CharSequence constraint) {
-            if (constraint == null || constraint.length() == 0) {
-                showList = fullList;
-            } else {
-                showList = new ArrayList<>();
-                String filter = constraint.toString().toLowerCase();
-                for (ApplicationInfo info : fullList) {
-                    if (lowercaseContains(getLabel(info), filter)
-                            || lowercaseContains(info.packageName, filter)) {
-                        showList.add(info);
-                    }
-                }
-            }
-            return null;
-        }
-
-        @Override
-        protected void publishResults(CharSequence constraint, FilterResults results) {
-            notifyDataSetChanged();
-        }
-    }
-}

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

@@ -1,124 +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 com.google.android.material.snackbar.Snackbar;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.superuser.Shell;
-
-import java.util.List;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHolder> {
-
-    private final List<Module> mList;
-
-    public ModulesAdapter(List<Module> list) {
-        mList = list;
-    }
-
-    @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();
-    }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-
-        public TextView title;
-        public TextView versionName;
-        public TextView description;
-        public TextView notice;
-        public CheckBox checkBox;
-        public TextView author;
-        public ImageView delete;
-
-        ViewHolder(View itemView) {
-            super(itemView);
-            ViewBinder.bind(this, itemView);
-
-            if (!Shell.rootAccess()) {
-                checkBox.setEnabled(false);
-                delete.setEnabled(false);
-            }
-        }
-    }
-}

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

@@ -1,149 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-import android.app.Activity;
-import android.content.pm.PackageManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import com.google.android.material.snackbar.Snackbar;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.components.CustomAlertDialog;
-import com.topjohnwu.magisk.components.ExpandableView;
-import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.container.Policy;
-import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder> {
-
-    private List<Policy> policyList;
-    private MagiskDatabaseHelper dbHelper;
-    private PackageManager pm;
-    private Set<Policy> expandList = new HashSet<>();
-
-    public PolicyAdapter(List<Policy> list, MagiskDatabaseHelper db, PackageManager pm) {
-        policyList = list;
-        dbHelper = db;
-        this.pm = pm;
-    }
-
-    @Override
-    public ViewHolder onCreateViewHolder(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(ViewHolder holder, int position) {
-        Policy policy = policyList.get(position);
-
-        holder.setExpanded(expandList.contains(policy));
-
-        holder.itemView.setOnClickListener(view -> {
-            if (holder.isExpanded()) {
-                holder.collapse();
-                expandList.remove(policy);
-            } else {
-                holder.expand();
-                expandList.add(policy);
-            }
-        });
-
-        holder.appName.setText(policy.appName);
-        holder.packageName.setText(policy.packageName);
-        holder.appIcon.setImageDrawable(policy.info.loadIcon(pm));
-        holder.masterSwitch.setOnCheckedChangeListener((v, isChecked) -> {
-            if ((isChecked && policy.policy == Policy.DENY) ||
-                    (!isChecked && policy.policy == Policy.ALLOW)) {
-                policy.policy = isChecked ? Policy.ALLOW : Policy.DENY;
-                String message = v.getContext().getString(
-                        isChecked ? R.string.su_snack_grant : R.string.su_snack_deny, policy.appName);
-                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                dbHelper.updatePolicy(policy);
-            }
-        });
-        holder.notificationSwitch.setOnCheckedChangeListener((v, isChecked) -> {
-            if ((isChecked && !policy.notification) ||
-                    (!isChecked && policy.notification)) {
-                policy.notification = isChecked;
-                String message = v.getContext().getString(
-                        isChecked ? R.string.su_snack_notif_on : R.string.su_snack_notif_off, policy.appName);
-                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                dbHelper.updatePolicy(policy);
-            }
-        });
-        holder.loggingSwitch.setOnCheckedChangeListener((v, isChecked) -> {
-            if ((isChecked && !policy.logging) ||
-                    (!isChecked && policy.logging)) {
-                policy.logging = isChecked;
-                String message = v.getContext().getString(
-                        isChecked ? R.string.su_snack_log_on : R.string.su_snack_log_off, policy.appName);
-                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                dbHelper.updatePolicy(policy);
-            }
-        });
-        holder.delete.setOnClickListener(v -> new CustomAlertDialog((Activity) v.getContext())
-                .setTitle(R.string.su_revoke_title)
-                .setMessage(v.getContext().getString(R.string.su_revoke_msg, policy.appName))
-                .setPositiveButton(R.string.yes, (dialog, which) -> {
-                    policyList.remove(position);
-                    notifyItemRemoved(position);
-                    notifyItemRangeChanged(position, policyList.size());
-                    SnackbarMaker.make(holder.itemView, v.getContext().getString(R.string.su_snack_revoke, policy.appName),
-                            Snackbar.LENGTH_SHORT).show();
-                    dbHelper.deletePolicy(policy);
-                })
-                .setNegativeButton(R.string.no_thanks, null)
-                .setCancelable(true)
-                .show());
-        holder.masterSwitch.setChecked(policy.policy == Policy.ALLOW);
-        holder.notificationSwitch.setChecked(policy.notification);
-        holder.loggingSwitch.setChecked(policy.logging);
-
-        // Hide for now
-        holder.moreInfo.setVisibility(View.GONE);
-    }
-
-    @Override
-    public int getItemCount() {
-        return policyList.size();
-    }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder implements ExpandableView {
-
-        public TextView appName;
-        public TextView packageName;
-        public ImageView appIcon;
-        public Switch masterSwitch;
-        public Switch notificationSwitch;
-        public Switch loggingSwitch;
-        public ViewGroup expandLayout;
-
-        public ImageView delete;
-        public ImageView moreInfo;
-
-        private Container container = new Container();
-
-        public ViewHolder(View itemView) {
-            super(itemView);
-            ViewBinder.bind(this, itemView);
-            container.expandLayout = expandLayout;
-            setupExpandable();
-        }
-
-        @Override
-        public Container getContainer() {
-            return container;
-        }
-    }
-}

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

@@ -1,192 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.text.TextUtils;
-import android.util.Pair;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.asyncs.MarkDownWindow;
-import com.topjohnwu.magisk.asyncs.ProcessRepoZip;
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.components.CustomAlertDialog;
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.container.Repo;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, ReposAdapter.RepoHolder> {
-
-    private static final int UPDATES = 0;
-    private static final int INSTALLED = 1;
-    private static final int OTHERS = 2;
-
-    private Cursor repoCursor = null;
-    private Map<String, Module> moduleMap;
-    private RepoDatabaseHelper repoDB;
-    private List<Pair<Integer, List<Repo>>> repoPairs;
-
-    public ReposAdapter(RepoDatabaseHelper db, Map<String, Module> map) {
-        repoDB = db;
-        moduleMap = map;
-        repoPairs = new ArrayList<>();
-        notifyDBChanged();
-    }
-
-
-    @Override
-    public int getSectionCount() {
-        return repoPairs.size();
-    }
-
-    @Override
-    public 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 ->
-                new MarkDownWindow((BaseActivity) context, null, repo.getDetailUrl()).exec());
-
-        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) ->
-                        new ProcessRepoZip((BaseActivity) context, repo, true).exec()
-                    )
-                    .setNeutralButton(R.string.download, (d, i) ->
-                        new ProcessRepoZip((BaseActivity) context, repo, false).exec())
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
-        });
-    }
-
-    public void notifyDBChanged() {
-        if (repoCursor != null)
-            repoCursor.close();
-        repoCursor = repoDB.getRepoCursor();
-        filter("");
-    }
-
-    public void filter(String s) {
-        List<Repo> updates = new ArrayList<>();
-        List<Repo> installed = new ArrayList<>();
-        List<Repo> others = new ArrayList<>();
-
-        repoPairs.clear();
-        while (repoCursor.moveToNext()) {
-            Repo repo = new Repo(repoCursor);
-            if (repo.getName().toLowerCase().contains(s.toLowerCase())
-                    || repo.getAuthor().toLowerCase().contains(s.toLowerCase())
-                    || repo.getDescription().toLowerCase().contains(s.toLowerCase())
-                    ) {
-                // Passed the repoFilter
-                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);
-                }
-            }
-        }
-        repoCursor.moveToFirst();
-
-        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();
-    }
-
-    public static class SectionHolder extends RecyclerView.ViewHolder {
-
-        public TextView sectionText;
-
-        SectionHolder(View itemView) {
-            super(itemView);
-            ViewBinder.bind(this, itemView);
-        }
-    }
-
-    public static class RepoHolder extends RecyclerView.ViewHolder {
-
-        public TextView title;
-        public TextView versionName;
-        public TextView description;
-        public TextView author;
-        public LinearLayout infoLayout;
-        public ImageView downloadImage;
-        public TextView updateTime;
-
-        RepoHolder(View itemView) {
-            super(itemView);
-            ViewBinder.bind(this, itemView);
-        }
-
-    }
-}

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

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

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

@@ -1,154 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-import android.database.Cursor;
-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 com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.components.ExpandableView;
-import com.topjohnwu.magisk.container.SuLogEntry;
-import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, SuLogAdapter.LogViewHolder> {
-
-    private List<List<Integer>> logEntryList;
-    private Set<Integer> itemExpanded, sectionExpanded;
-    private MagiskDatabaseHelper suDB;
-    private Cursor suLogCursor = null;
-
-    public SuLogAdapter(MagiskDatabaseHelper db) {
-        suDB = db;
-        logEntryList = Collections.emptyList();
-        sectionExpanded = new HashSet<>();
-        itemExpanded = new HashSet<>();
-    }
-
-    @Override
-    public int getSectionCount() {
-        return logEntryList.size();
-    }
-
-    @Override
-    public int getItemCount(int section) {
-        return sectionExpanded.contains(section) ? logEntryList.get(section).size() : 0;
-    }
-
-    @Override
-    public SectionHolder onCreateSectionViewHolder(ViewGroup parent) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_sulog_group, parent, false);
-        return new SectionHolder(v);
-    }
-
-    @Override
-    public LogViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_sulog, parent, false);
-        return new LogViewHolder(v);
-    }
-
-    @Override
-    public void onBindSectionViewHolder(SectionHolder holder, int section) {
-        suLogCursor.moveToPosition(logEntryList.get(section).get(0));
-        SuLogEntry entry = new SuLogEntry(suLogCursor);
-        holder.arrow.setRotation(sectionExpanded.contains(section) ? 180 : 0);
-        holder.itemView.setOnClickListener(v -> {
-            RotateAnimation rotate;
-            if (sectionExpanded.contains(section)) {
-                holder.arrow.setRotation(0);
-                rotate = new RotateAnimation(180, 0, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
-                sectionExpanded.remove(section);
-                notifyItemRangeRemoved(getItemPosition(section, 0), logEntryList.get(section).size());
-            } else {
-                rotate = new RotateAnimation(0, 180, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
-                sectionExpanded.add(section);
-                notifyItemRangeInserted(getItemPosition(section, 0), logEntryList.get(section).size());
-            }
-            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) {
-        int sqlPosition = logEntryList.get(section).get(position);
-        suLogCursor.moveToPosition(sqlPosition);
-        SuLogEntry entry = new SuLogEntry(suLogCursor);
-        holder.setExpanded(itemExpanded.contains(sqlPosition));
-        holder.itemView.setOnClickListener(view -> {
-            if (holder.isExpanded()) {
-                holder.collapse();
-                itemExpanded.remove(sqlPosition);
-            } else {
-                holder.expand();
-                itemExpanded.add(sqlPosition);
-            }
-        });
-        holder.appName.setText(entry.appName);
-        holder.action.setText(entry.action ? R.string.grant : R.string.deny);
-        holder.command.setText(entry.command);
-        holder.fromPid.setText(String.valueOf(entry.fromPid));
-        holder.toUid.setText(String.valueOf(entry.toUid));
-        holder.time.setText(entry.getTimeString());
-    }
-
-    public void notifyDBChanged() {
-        if (suLogCursor != null)
-            suLogCursor.close();
-        suLogCursor = suDB.getLogCursor();
-        logEntryList = suDB.getLogStructure();
-        itemExpanded.clear();
-        sectionExpanded.clear();
-        sectionExpanded.add(0);
-        notifyDataSetChanged();
-    }
-
-    public static class SectionHolder extends RecyclerView.ViewHolder {
-
-        public TextView date;
-        public ImageView arrow;
-
-        SectionHolder(View itemView) {
-            super(itemView);
-            ViewBinder.bind(this, itemView);
-        }
-    }
-
-    public static class LogViewHolder extends RecyclerView.ViewHolder implements ExpandableView {
-
-        public TextView appName;
-        public TextView action;
-        public TextView time;
-        public TextView fromPid;
-        public TextView toUid;
-        public TextView command;
-        public ViewGroup expandLayout;
-
-        private Container container = new Container();
-
-        LogViewHolder(View itemView) {
-            super(itemView);
-            ViewBinder.bind(this, itemView);
-            container.expandLayout = expandLayout;
-            setupExpandable();
-        }
-
-        @Override
-        public Container getContainer() {
-            return container;
-        }
-    }
-}

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

@@ -1,41 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-
-public class TabFragmentAdapter extends FragmentPagerAdapter {
-
-    private List<Fragment> fragmentList;
-    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/full/java/com/topjohnwu/magisk/asyncs/CheckSafetyNet.java

@@ -1,77 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.utils.ISafetyNetHelper;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.WebService;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-
-import dalvik.system.DexClassLoader;
-
-public class CheckSafetyNet extends ParallelTask<Void, Void, Void> {
-
-    public static final File dexPath =
-            new File(Data.MM().getFilesDir().getParent() + "/snet", "snet.apk");
-    private ISafetyNetHelper helper;
-
-    public CheckSafetyNet(Activity activity) {
-        super(activity);
-    }
-
-    private void dlSnet() throws Exception {
-        Shell.sh("rm -rf " + dexPath.getParent()).exec();
-        dexPath.getParentFile().mkdir();
-        HttpURLConnection conn = WebService.mustRequest(Data.snetLink, null);
-        try (
-                OutputStream out = new BufferedOutputStream(new FileOutputStream(dexPath));
-                InputStream in = new BufferedInputStream(conn.getInputStream())) {
-            ShellUtils.pump(in, out);
-        } finally {
-            conn.disconnect();
-        }
-    }
-
-    private void dyload() throws Exception {
-        DexClassLoader loader = new DexClassLoader(dexPath.getPath(), dexPath.getParent(),
-                null, ISafetyNetHelper.class.getClassLoader());
-        Class<?> clazz = loader.loadClass("com.topjohnwu.snet.Snet");
-        helper = (ISafetyNetHelper) clazz.getMethod("newHelper",
-                Class.class, String.class, Activity.class, Object.class)
-                .invoke(null, ISafetyNetHelper.class, dexPath.getPath(), getActivity(),
-                        (ISafetyNetHelper.Callback) code ->
-                                Topic.publish(false, Topic.SNET_CHECK_DONE, code));
-        if (helper.getVersion() < Data.snetVersionCode) {
-            throw new Exception();
-        }
-    }
-
-    @Override
-    protected Void doInBackground(Void... voids) {
-        try {
-            try {
-                dyload();
-            } catch (Exception e) {
-                // If dynamic load failed, try re-downloading and reload
-                dlSnet();
-                dyload();
-            }
-            // Run attestation
-            helper.attest();
-        } catch (Exception e) {
-            e.printStackTrace();
-            Topic.publish(false, Topic.SNET_CHECK_DONE, -1);
-        }
-        return null;
-    }
-}

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

@@ -1,105 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.os.AsyncTask;
-
-import com.topjohnwu.magisk.BuildConfig;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.utils.NotificationMgr;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.WebService;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class CheckUpdates {
-
-    private static int getInt(JSONObject json, String name, int defValue) {
-        if (json == null)
-            return defValue;
-        try {
-            return json.getInt(name);
-        } catch (JSONException e) {
-            return defValue;
-        }
-    }
-
-    private static String getString(JSONObject json, String name, String defValue) {
-        if (json == null)
-            return defValue;
-        try {
-            return json.getString(name);
-        } catch (JSONException e) {
-            return defValue;
-        }
-    }
-
-    private static JSONObject getJson(JSONObject json, String name) {
-        try {
-            return json.getJSONObject(name);
-        } catch (JSONException e) {
-            return null;
-        }
-    }
-
-    public static void fetchUpdates() {
-        String jsonStr = "";
-        switch (Data.updateChannel) {
-            case Const.Value.STABLE_CHANNEL:
-                jsonStr = WebService.getString(Const.Url.STABLE_URL);
-                break;
-            case Const.Value.BETA_CHANNEL:
-                jsonStr = WebService.getString(Const.Url.BETA_URL);
-                break;
-            case Const.Value.CUSTOM_CHANNEL:
-                jsonStr = WebService.getString(Data.MM().prefs.getString(Const.Key.CUSTOM_CHANNEL, ""));
-                break;
-        }
-
-        JSONObject json;
-        try {
-            json = new JSONObject(jsonStr);
-        } catch (JSONException e) {
-            return;
-        }
-
-        JSONObject magisk = getJson(json, "magisk");
-        Data.remoteMagiskVersionString = getString(magisk, "version", null);
-        Data.remoteMagiskVersionCode = getInt(magisk, "versionCode", -1);
-        Data.magiskLink = getString(magisk, "link", null);
-        Data.magiskNoteLink = getString(magisk, "note", null);
-        Data.magiskMD5 = getString(magisk, "md5", null);
-
-        JSONObject manager = getJson(json, "app");
-        Data.remoteManagerVersionString = getString(manager, "version", null);
-        Data.remoteManagerVersionCode = getInt(manager, "versionCode", -1);
-        Data.managerLink = getString(manager, "link", null);
-        Data.managerNoteLink = getString(manager, "note", null);
-
-        JSONObject uninstaller = getJson(json, "uninstaller");
-        Data.uninstallerLink = getString(uninstaller, "link", null);
-
-        JSONObject snet = getJson(json, "snet");
-        Data.snetVersionCode = getInt(snet, "versionCode", -1);
-        Data.snetLink = getString(snet, "link", null);
-    }
-
-    public static void check(Runnable cb) {
-        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
-            fetchUpdates();
-            if (cb != null) {
-                if (BuildConfig.VERSION_CODE < Data.remoteManagerVersionCode) {
-                    NotificationMgr.managerUpdate();
-                } else if (Data.magiskVersionCode < Data.remoteMagiskVersionCode) {
-                    NotificationMgr.magiskUpdate();
-                }
-                cb.run();
-            }
-            Topic.publish(Topic.UPDATE_CHECK_DONE);
-        });
-    }
-
-    public static void check() {
-        check(null);
-    }
-}

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

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

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

@@ -1,398 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.net.Uri;
-import android.os.Build;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.FlashActivity;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.container.TarEntry;
-import com.topjohnwu.magisk.utils.Download;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.WebService;
-import com.topjohnwu.magisk.utils.ZipUtils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.internal.NOPList;
-import com.topjohnwu.superuser.io.SuFile;
-import com.topjohnwu.superuser.io.SuFileInputStream;
-import com.topjohnwu.superuser.io.SuFileOutputStream;
-import com.topjohnwu.utils.SignBoot;
-
-import org.kamranzafar.jtar.TarInputStream;
-import org.kamranzafar.jtar.TarOutputStream;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.util.Arrays;
-import java.util.List;
-
-import androidx.annotation.NonNull;
-
-public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
-
-    private static final int PATCH_MODE = 0;
-    public static final int DIRECT_MODE = 1;
-    private static final int FIX_ENV_MODE = 2;
-    public static final int SECOND_SLOT_MODE = 3;
-
-    private Uri bootUri;
-    private List<String> console, logs;
-    private String mBoot;
-    private int mode;
-    private File installDir;
-    private ProgressDialog dialog;
-    private MagiskManager mm;
-
-    public InstallMagisk(Activity context) {
-        super(context);
-        mm = Data.MM();
-        mode = FIX_ENV_MODE;
-    }
-
-    public InstallMagisk(Activity context, List<String> console, List<String> logs, int mode) {
-        this(context);
-        this.console = console;
-        this.logs = logs;
-        this.mode = mode;
-    }
-
-    public InstallMagisk(FlashActivity context, List<String> console, List<String> logs, Uri boot) {
-        this(context, console, logs, PATCH_MODE);
-        bootUri = boot;
-    }
-
-    @Override
-    protected void onPreExecute() {
-        if (mode == FIX_ENV_MODE) {
-            Activity a = getActivity();
-            dialog = ProgressDialog.show(a, a.getString(R.string.setup_title), a.getString(R.string.setup_msg));
-            console = NOPList.getInstance();
-        }
-    }
-
-    private class ProgressStream extends FilterInputStream {
-
-        private int prev = -1;
-        private int progress = 0;
-        private int total;
-
-        private ProgressStream(HttpURLConnection conn) throws IOException {
-            super(conn.getInputStream());
-            total = conn.getContentLength();
-            console.add("... 0%");
-        }
-
-        private void update(int step) {
-            progress += step;
-            int curr = (int) (100 * (double) progress / total);
-            if (prev != curr) {
-                prev = curr;
-                console.set(console.size() - 1, "... " + prev + "%");
-            }
-        }
-
-        @Override
-        public int read() throws IOException {
-            int b = super.read();
-            if (b > 0)
-                update(1);
-            return b;
-        }
-
-        @Override
-        public int read(@NonNull byte[] b) throws IOException {
-            return read(b, 0, b.length);
-        }
-
-        @Override
-        public int read(@NonNull byte[] b, int off, int len) throws IOException {
-            int step = super.read(b, off, len);
-            if (step > 0)
-                update(step);
-            return step;
-        }
-    }
-
-    private void extractFiles(String arch) throws IOException {
-        File zip = new File(mm.getFilesDir(), "magisk.zip");
-        BufferedInputStream buf;
-
-        if (!ShellUtils.checkSum("MD5", zip, Data.magiskMD5)) {
-            console.add("- Downloading zip");
-            HttpURLConnection conn = WebService.mustRequest(Data.magiskLink, null);
-            buf = new BufferedInputStream(new ProgressStream(conn), conn.getContentLength());
-            buf.mark(conn.getContentLength() + 1);
-            try (OutputStream out = new FileOutputStream(zip)) {
-                ShellUtils.pump(buf, out);
-            }
-            buf.reset();
-            conn.disconnect();
-        } else {
-            console.add("- Existing zip found");
-            buf = new BufferedInputStream(new FileInputStream(zip), (int) zip.length());
-            buf.mark((int) zip.length() + 1);
-        }
-
-        console.add("- Extracting files");
-        try (InputStream in = buf) {
-            ZipUtils.unzip(in, installDir, arch + "/", true);
-            in.reset();
-            ZipUtils.unzip(in, installDir, "common/", true);
-            in.reset();
-            ZipUtils.unzip(in, installDir, "chromeos/", false);
-            in.reset();
-            ZipUtils.unzip(in, installDir, "META-INF/com/google/android/update-binary", true);
-        } catch (IOException e) {
-            console.add("! Cannot unzip zip");
-            throw e;
-        }
-        Shell.sh(Utils.fmt("chmod -R 755 %s/*; %s/magiskinit -x magisk %s/magisk",
-                installDir, installDir, installDir)).exec();
-    }
-
-    private boolean dumpBoot() {
-        console.add("- Copying image to cache");
-        // Copy boot image to local
-        try (InputStream in = mm.getContentResolver().openInputStream(bootUri);
-             OutputStream out = new FileOutputStream(mBoot)
-        ) {
-            if (in == null)
-                throw new FileNotFoundException();
-
-            InputStream src;
-            if (Utils.getNameFromUri(mm, bootUri).endsWith(".tar")) {
-                // Extract boot.img from tar
-                TarInputStream tar = new TarInputStream(new BufferedInputStream(in));
-                org.kamranzafar.jtar.TarEntry entry;
-                while ((entry = tar.getNextEntry()) != null) {
-                    if (entry.getName().equals("boot.img"))
-                        break;
-                }
-                src = tar;
-            } else {
-                // Direct copy raw image
-                src = new BufferedInputStream(in);
-            }
-            ShellUtils.pump(src, out);
-        } catch (FileNotFoundException e) {
-            console.add("! Invalid Uri");
-            return false;
-        } catch (IOException e) {
-            console.add("! Copy failed");
-            return false;
-        }
-        return true;
-    }
-
-    private File patchBoot() throws IOException {
-        boolean isSigned;
-        try (InputStream in = new SuFileInputStream(mBoot)) {
-            isSigned = SignBoot.verifySignature(in, null);
-            if (isSigned) {
-                console.add("- Boot image is signed with AVB 1.0");
-            }
-        } catch (IOException e) {
-            console.add("! Unable to check signature");
-            throw e;
-        }
-
-        // Patch boot image
-        if (!Shell.sh("cd " + installDir, Utils.fmt(
-                "KEEPFORCEENCRYPT=%b KEEPVERITY=%b sh update-binary indep boot_patch.sh %s",
-                Data.keepEnc, Data.keepVerity, mBoot))
-                .to(console, logs).exec().isSuccess())
-            return null;
-
-        Shell.Job job = Shell.sh("mv bin/busybox busybox",
-                "rm -rf magisk.apk bin boot.img update-binary",
-                "cd /");
-
-        File patched = new File(installDir, "new-boot.img");
-        if (isSigned) {
-            console.add("- Signing boot image with test keys");
-            File signed = new File(installDir, "signed.img");
-            try (InputStream in = new SuFileInputStream(patched);
-                 OutputStream out = new BufferedOutputStream(new FileOutputStream(signed))
-            ) {
-                SignBoot.doSignature("/boot", in, out, null, null);
-            }
-            job.add("mv -f " + signed + " " + patched);
-        }
-        job.exec();
-        return patched;
-    }
-
-    private boolean outputBoot(File patched) throws IOException {
-        switch (mode) {
-            case PATCH_MODE:
-                String fmt = mm.prefs.getString(Const.Key.BOOT_FORMAT, ".img");
-                File dest = new File(Download.EXTERNAL_PATH, "patched_boot" + fmt);
-                dest.getParentFile().mkdirs();
-                OutputStream out;
-                switch (fmt) {
-                    case ".img.tar":
-                        out = new TarOutputStream(new BufferedOutputStream(new FileOutputStream(dest)));
-                        ((TarOutputStream) out).putNextEntry(new TarEntry(patched, "boot.img"));
-                        break;
-                    default:
-                    case ".img":
-                        out = new BufferedOutputStream(new FileOutputStream(dest));
-                        break;
-                }
-                try (InputStream in = new SuFileInputStream(patched)) {
-                    ShellUtils.pump(in, out);
-                    out.close();
-                }
-                Shell.sh("rm -f " + patched).exec();
-                console.add("");
-                console.add("****************************");
-                console.add(" Patched image is placed in ");
-                console.add(" " + dest + " ");
-                console.add("****************************");
-                break;
-            case SECOND_SLOT_MODE:
-            case DIRECT_MODE:
-                if (!Shell.su(Utils.fmt("direct_install %s %s", installDir, mBoot))
-                        .to(console, logs).exec().isSuccess())
-                    return false;
-                if (!Data.keepVerity)
-                    Shell.su("find_dtbo_image", "patch_dtbo_image").to(console, logs).exec();
-                break;
-        }
-        return true;
-    }
-
-    private void postOTA() {
-        SuFile bootctl = new SuFile(Const.MAGISK_PATH + "/.core/bootctl");
-        try (InputStream in = mm.getResources().openRawResource(R.raw.bootctl);
-             OutputStream out = new SuFileOutputStream(bootctl)) {
-            ShellUtils.pump(in, out);
-            Shell.su("post_ota " + bootctl.getParent()).exec();
-            console.add("***************************************");
-            console.add(" Next reboot will boot to second slot!");
-            console.add("***************************************");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... voids) {
-        if (mode == FIX_ENV_MODE) {
-            installDir = new File("/data/adb/magisk");
-            Shell.su("rm -rf /data/adb/magisk/*").exec();
-        } else {
-            installDir = new File(
-                    (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ?
-                            mm.createDeviceProtectedStorageContext() : mm)
-                            .getFilesDir().getParent()
-                    , "install");
-            Shell.sh("rm -rf " + installDir).exec();
-            installDir.mkdirs();
-        }
-
-        switch (mode) {
-            case PATCH_MODE:
-                mBoot = new File(installDir, "boot.img").getAbsolutePath();
-                if (!dumpBoot())
-                    return false;
-                break;
-            case DIRECT_MODE:
-                console.add("- Detecting target image");
-                mBoot = ShellUtils.fastCmd("find_boot_image", "echo \"$BOOTIMAGE\"");
-                break;
-            case SECOND_SLOT_MODE:
-                String slot = ShellUtils.fastCmd("echo $SLOT");
-                String target = (TextUtils.equals(slot, "_a") ? "_b" : "_a");
-                console.add("- Target slot: " + target);
-                console.add("- Detecting target image");
-                mBoot = ShellUtils.fastCmd(
-                        "SLOT=" + target,
-                        "find_boot_image",
-                        "SLOT=" + slot,
-                        "echo \"$BOOTIMAGE\""
-                );
-                break;
-            case FIX_ENV_MODE:
-                mBoot = "";
-                break;
-        }
-        if (mBoot == null) {
-            console.add("! Unable to detect target image");
-            return false;
-        }
-
-        if (mode == DIRECT_MODE || mode == SECOND_SLOT_MODE)
-            console.add("- Target image: " + mBoot);
-
-        List<String> abis = Arrays.asList(Build.SUPPORTED_ABIS);
-        String arch;
-
-        if (Data.remoteMagiskVersionCode >= Const.MAGISK_VER.SEPOL_REFACTOR) {
-            // 32-bit only
-            if (abis.contains("x86")) arch = "x86";
-            else arch = "arm";
-        } else {
-            if (abis.contains("x86_64")) arch = "x64";
-            else if (abis.contains("arm64-v8a")) arch = "arm64";
-            else if (abis.contains("x86")) arch = "x86";
-            else arch = "arm";
-        }
-
-        console.add("- Device platform: " + Build.SUPPORTED_ABIS[0]);
-
-        try {
-            extractFiles(arch);
-            if (mode == FIX_ENV_MODE) {
-                Shell.su("fix_env").exec();
-            } else {
-                File patched = patchBoot();
-                if (patched == null)
-                    return false;
-                if (!outputBoot(patched))
-                    return false;
-                if (mode == SECOND_SLOT_MODE)
-                    postOTA();
-                console.add("- All done!");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        if (mode == FIX_ENV_MODE) {
-            dialog.dismiss();
-            Utils.toast(result ? R.string.setup_done : R.string.setup_fail, Toast.LENGTH_LONG);
-        } else {
-            // Running in FlashActivity
-            FlashActivity activity = (FlashActivity) getActivity();
-            if (!result) {
-                Shell.sh("rm -rf " + installDir).submit();
-                console.add("! Installation failed");
-                activity.reboot.setVisibility(View.GONE);
-            }
-            activity.buttonPanel.setVisibility(View.VISIBLE);
-        }
-    }
-}

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

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

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

@@ -1,26 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.os.AsyncTask;
-
-import java.lang.ref.WeakReference;
-
-public abstract class ParallelTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
-
-    private WeakReference<Activity> weakActivity;
-
-    public ParallelTask() {}
-
-    public ParallelTask(Activity context) {
-        weakActivity = new WeakReference<>(context);
-    }
-
-    protected Activity getActivity() {
-        return weakActivity.get();
-    }
-
-    @SuppressWarnings("unchecked")
-    public void exec(Params... params) {
-        executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, params);
-    }
-}

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

@@ -1,153 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.os.AsyncTask;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.RootUtils;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.io.SuFile;
-import com.topjohnwu.superuser.io.SuFileOutputStream;
-import com.topjohnwu.utils.JarMap;
-import com.topjohnwu.utils.SignAPK;
-
-import java.security.SecureRandom;
-import java.util.jar.JarEntry;
-
-public class PatchAPK {
-
-    private static String genPackageName(String prefix, int length) {
-        StringBuilder builder = new StringBuilder(length);
-        builder.append(prefix);
-        length -= prefix.length();
-        SecureRandom random = new SecureRandom();
-        String base = "abcdefghijklmnopqrstuvwxyz";
-        String alpha = base + base.toUpperCase();
-        String full = alpha + "0123456789..........";
-        char next, prev = '\0';
-        for (int i = 0; i < length; ++i) {
-            if (prev == '.' || i == length - 1 || i == 0) {
-                next = alpha.charAt(random.nextInt(alpha.length()));
-            } else {
-                next = full.charAt(random.nextInt(full.length()));
-            }
-            builder.append(next);
-            prev = next;
-        }
-        return builder.toString();
-    }
-
-    private static int findOffset(byte buf[], byte pattern[]) {
-        int offset = -1;
-        for (int i = 0; i < buf.length - pattern.length; ++i) {
-            boolean match = true;
-            for (int j = 0; j < pattern.length; ++j) {
-                if (buf[i + j] != pattern[j]) {
-                    match = false;
-                    break;
-                }
-            }
-            if (match) {
-                offset = i;
-                break;
-            }
-        }
-        return offset;
-    }
-
-    /* It seems that AAPT sometimes generate another type of string format */
-    private static boolean fallbackPatch(byte xml[], String from, String to) {
-
-        byte[] target = new byte[from.length() * 2 + 2];
-        for (int i = 0; i < from.length(); ++i) {
-            target[i * 2] = (byte) from.charAt(i);
-        }
-        int offset = findOffset(xml, target);
-        if (offset < 0)
-            return false;
-        byte[] dest = new byte[target.length - 2];
-        for (int i = 0; i < to.length(); ++i) {
-            dest[i * 2] = (byte) to.charAt(i);
-        }
-        System.arraycopy(dest, 0, xml, offset, dest.length);
-        return true;
-    }
-
-    private static boolean findAndPatch(byte xml[], String from, String to) {
-        byte target[] = (from + '\0').getBytes();
-        int offset = findOffset(xml, target);
-        if (offset < 0)
-            return fallbackPatch(xml, from, to);
-        System.arraycopy(to.getBytes(), 0, xml, offset, to.length());
-        return true;
-    }
-
-    private static boolean patchAndHide() {
-        MagiskManager mm = Data.MM();
-
-        // Generate a new app with random package name
-        SuFile repack = new SuFile("/data/local/tmp/repack.apk");
-        String pkg = genPackageName("com.", Const.ORIG_PKG_NAME.length());
-
-        try {
-            JarMap apk = new JarMap(mm.getPackageCodePath());
-            if (!patchPackageID(apk, Const.ORIG_PKG_NAME, pkg))
-                return false;
-            SignAPK.sign(apk, new SuFileOutputStream(repack));
-        } catch (Exception e) {
-            return false;
-        }
-
-        // Install the application
-        if (!ShellUtils.fastCmdResult("pm install " + repack))
-            return false;
-
-        repack.delete();
-
-        mm.mDB.setStrings(Const.Key.SU_MANAGER, pkg);
-        Data.exportPrefs();
-        RootUtils.uninstallPkg(Const.ORIG_PKG_NAME);
-
-        return true;
-    }
-
-    public static boolean patchPackageID(JarMap apk, String from, String to) {
-        try {
-            JarEntry je = apk.getJarEntry(Const.ANDROID_MANIFEST);
-            byte xml[] = apk.getRawData(je);
-
-            if (!findAndPatch(xml, from, to))
-                return false;
-            if (!findAndPatch(xml, from + ".provider", to + ".provider"))
-                return false;
-
-            // Write in changes
-            apk.getOutputStream(je).write(xml);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-        return true;
-    }
-
-    public static void hideManager(Activity activity) {
-        ProgressDialog dialog = ProgressDialog.show(activity,
-                activity.getString(R.string.hide_manager_toast),
-                activity.getString(R.string.hide_manager_toast2));
-        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
-            boolean b = patchAndHide();
-            Data.mainHandler.post(() -> {
-                dialog.cancel();
-                if (!b) {
-                    Utils.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
-                }
-            });
-        });
-    }
-}

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

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

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

@@ -1,161 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.database.Cursor;
-import android.os.AsyncTask;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.container.Repo;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.WebService;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.net.HttpURLConnection;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-public class UpdateRepos {
-
-    private static final int CPU_COUNT = Runtime.getRuntime().availableProcessors();
-    private static final int CORE_POOL_SIZE = Math.max(2, CPU_COUNT - 1);
-    private static final DateFormat dateFormat;
-
-    static {
-        dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
-        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-    }
-
-    private MagiskManager mm;
-    private Set<String> cached;
-    private ExecutorService threadPool;
-
-    public UpdateRepos() {
-        mm = Data.MM();
-    }
-
-    private void waitTasks() {
-        threadPool.shutdown();
-        try {
-            threadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException ignored) {}
-    }
-
-    private boolean loadJSON(String jsonString) throws JSONException, ParseException {
-        JSONArray jsonArray = new JSONArray(jsonString);
-
-        // Empty page, halt
-        if (jsonArray.length() == 0)
-            return false;
-
-        for (int i = 0; i < jsonArray.length(); i++) {
-            JSONObject rawRepo = jsonArray.getJSONObject(i);
-            String id = rawRepo.getString("description");
-            String name = rawRepo.getString("name");
-            Date date = dateFormat.parse(rawRepo.getString("pushed_at"));
-            Set<String> set = Collections.synchronizedSet(cached);
-            threadPool.execute(() -> {
-                Repo repo = mm.repoDB.getRepo(id);
-                try {
-                    if (repo == null)
-                        repo = new Repo(name);
-                    else
-                        set.remove(id);
-                    repo.update(date);
-                    mm.repoDB.addRepo(repo);
-                } catch (Repo.IllegalRepoException e) {
-                    Logger.debug(e.getMessage());
-                    mm.repoDB.removeRepo(id);
-                }
-            });
-        }
-        return true;
-    }
-
-    /* We sort repos by last push, which means that we only need to check whether the
-     * first page is updated to determine whether the online repo database is changed
-     */
-    private boolean loadPage(int page) {
-        Map<String, String> header = new HashMap<>();
-        if (page == 0)
-            header.put(Const.Key.IF_NONE_MATCH, mm.prefs.getString(Const.Key.ETAG_KEY, ""));
-        String url = Utils.fmt(Const.Url.REPO_URL, page + 1);
-
-        try {
-            HttpURLConnection conn = WebService.request(url, header);
-            // No updates
-            if (conn.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED)
-                return false;
-            // Current page is the last page
-            if (!loadJSON(WebService.getString(conn)))
-                return true;
-        } catch (Exception e) {
-            // Should not happen, but if exception occurs, page load fails
-            return false;
-        }
-
-        // Update ETAG
-        if (page == 0) {
-            String etag = header.get(Const.Key.ETAG_KEY);
-            etag = etag.substring(etag.indexOf('\"'), etag.lastIndexOf('\"') + 1);
-            mm.prefs.edit().putString(Const.Key.ETAG_KEY, etag).apply();
-        }
-
-        String links = header.get(Const.Key.LINK_KEY);
-        return links == null || !links.contains("next") || loadPage(page + 1);
-    }
-
-    private void fullReload() {
-        Cursor c = mm.repoDB.getRawCursor();
-        while (c.moveToNext()) {
-            Repo repo = new Repo(c);
-            threadPool.execute(() -> {
-                try {
-                    repo.update();
-                    mm.repoDB.addRepo(repo);
-                } catch (Repo.IllegalRepoException e) {
-                    Logger.debug(e.getMessage());
-                    mm.repoDB.removeRepo(repo);
-                }
-            });
-        }
-        waitTasks();
-    }
-
-    public void exec(boolean force) {
-        Topic.reset(Topic.REPO_LOAD_DONE);
-        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
-            cached = mm.repoDB.getRepoIDSet();
-            threadPool = Executors.newFixedThreadPool(CORE_POOL_SIZE);
-
-            if (loadPage(0)) {
-                waitTasks();
-                // The leftover cached means they are removed from online repo
-                mm.repoDB.removeRepo(cached);
-            } else if (force) {
-                fullReload();
-            }
-            Topic.publish(Topic.REPO_LOAD_DONE);
-        });
-    }
-
-    public void exec() {
-        exec(false);
-    }
-}

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

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

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

@@ -1,48 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.content.Intent;
-
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Topic;
-
-import androidx.fragment.app.Fragment;
-
-public class BaseFragment extends Fragment implements Topic.AutoSubscriber {
-
-    public MagiskManager mm;
-
-    public BaseFragment() {
-        mm = Data.MM();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        Topic.subscribe(this);
-    }
-
-    @Override
-    public void onPause() {
-        Topic.unsubscribe(this);
-        super.onPause();
-    }
-
-    @Override
-    public void startActivityForResult(Intent intent, int requestCode) {
-        startActivityForResult(intent, requestCode, this::onActivityResult);
-    }
-
-    public void startActivityForResult(Intent intent, int requestCode, BaseActivity.ActivityResultListener listener) {
-        ((BaseActivity) requireActivity()).startActivityForResult(intent, requestCode, listener);
-    }
-
-    public void runWithPermission(String[] permissions, Runnable callback) {
-        ((BaseActivity) requireActivity()).runWithPermission(permissions,callback);
-    }
-
-    @Override
-    public int[] getSubscribedTopics() {
-        return FlavorActivity.EMPTY_INT_ARRAY;
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.app.Activity;
-
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.InstallMagisk;
-
-import androidx.annotation.NonNull;
-
-public class EnvFixDialog extends CustomAlertDialog {
-
-    public EnvFixDialog(@NonNull Activity activity) {
-        super(activity);
-        setTitle(R.string.env_fix_title);
-        setMessage(R.string.env_fix_msg);
-        setCancelable(true);
-        setPositiveButton(R.string.yes, (d, i) -> new InstallMagisk(activity).exec());
-        setNegativeButton(R.string.no_thanks, null);
-    }
-}

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

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

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

@@ -1,88 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.view.WindowManager;
-
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.LocaleManager;
-import com.topjohnwu.magisk.utils.Topic;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.StyleRes;
-import androidx.appcompat.app.AppCompatActivity;
-
-public abstract class FlavorActivity extends AppCompatActivity implements Topic.AutoSubscriber {
-
-    private ActivityResultListener activityResultListener;
-    static int[] EMPTY_INT_ARRAY = new int[0];
-    public MagiskManager mm;
-
-    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(base);
-        Configuration config = base.getResources().getConfiguration();
-        config.setLocale(LocaleManager.locale);
-        applyOverrideConfiguration(config);
-        mm = Data.MM();
-    }
-
-    @Override
-    public int[] getSubscribedTopics() {
-        return EMPTY_INT_ARRAY;
-    }
-
-    @StyleRes
-    public int getDarkTheme() {
-        return -1;
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        Topic.subscribe(this);
-        if (Data.isDarkTheme && getDarkTheme() != -1) {
-            setTheme(getDarkTheme());
-        }
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected void onDestroy() {
-        Topic.unsubscribe(this);
-        super.onDestroy();
-    }
-
-    protected void setFloating() {
-        boolean isTablet = getResources().getBoolean(R.bool.isTablet);
-        if (isTablet) {
-            WindowManager.LayoutParams params = getWindow().getAttributes();
-            params.height = getResources().getDimensionPixelSize(R.dimen.floating_height);
-            params.width = getResources().getDimensionPixelSize(R.dimen.floating_width);
-            params.alpha = 1.0f;
-            params.dimAmount = 0.6f;
-            params.flags |= 2;
-            getWindow().setAttributes(params);
-            setFinishOnTouchOutside(true);
-        }
-    }
-
-    @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);
-    }
-
-    public interface ActivityResultListener {
-        void onActivityResult(int requestCode, int resultCode, Intent data);
-    }
-}

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

@@ -1,80 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.widget.Toast;
-
-import com.google.android.material.snackbar.Snackbar;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.FlashActivity;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.receivers.DownloadReceiver;
-import com.topjohnwu.magisk.utils.Download;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.util.List;
-
-import androidx.appcompat.app.AlertDialog;
-
-class InstallMethodDialog extends AlertDialog.Builder {
-
-    InstallMethodDialog(BaseActivity activity, List<String> options) {
-        super(activity);
-        setTitle(R.string.select_method);
-        setItems(options.toArray(new String [0]), (dialog, idx) -> {
-            Intent intent;
-            switch (idx) {
-                case 1:
-                    if (Data.remoteMagiskVersionCode < 1400) {
-                        SnackbarMaker.make(activity, R.string.no_boot_file_patch_support,
-                                Snackbar.LENGTH_LONG).show();
-                        return;
-                    }
-                    Utils.toast(R.string.boot_file_patch_msg, Toast.LENGTH_LONG);
-                    intent = new Intent(Intent.ACTION_GET_CONTENT).setType("*/*");
-                    activity.startActivityForResult(intent, Const.ID.SELECT_BOOT,
-                            (requestCode, resultCode, data) -> {
-                                if (requestCode == Const.ID.SELECT_BOOT &&
-                                        resultCode == BaseActivity.RESULT_OK && data != null) {
-                                    Intent i = new Intent(activity, Data.classMap.get(FlashActivity.class))
-                                            .putExtra(Const.Key.FLASH_SET_BOOT, data.getData())
-                                            .putExtra(Const.Key.FLASH_ACTION, Const.Value.PATCH_BOOT);
-                                    activity.startActivity(i);
-                                }
-                            });
-                    break;
-                case 0:
-                    String filename = Utils.fmt("Magisk-v%s(%d).zip",
-                            Data.remoteMagiskVersionString, Data.remoteMagiskVersionCode);
-                    Download.receive(activity, new DownloadReceiver() {
-                        @Override
-                        public void onDownloadDone(Context context, Uri uri) {
-                            SnackbarMaker.showUri(activity, uri);
-                        }
-                    }, Data.magiskLink, filename);
-                    break;
-                case 2:
-                    intent = new Intent(activity, Data.classMap.get(FlashActivity.class))
-                            .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_MAGISK);
-                    activity.startActivity(intent);
-                    break;
-                case 3:
-                    new CustomAlertDialog(activity)
-                            .setTitle(R.string.warning)
-                            .setMessage(R.string.install_inactive_slot_msg)
-                            .setCancelable(true)
-                            .setPositiveButton(R.string.yes, (d, i) -> {
-                                Intent it = new Intent(activity, Data.classMap.get(FlashActivity.class))
-                                        .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_INACTIVE_SLOT);
-                                activity.startActivity(it);
-                            })
-                            .setNegativeButton(R.string.no_thanks, null)
-                            .show();
-                    break;
-                default:
-            }
-        });
-    }
-}

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

@@ -1,51 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.net.Uri;
-import android.text.TextUtils;
-
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.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 activity) {
-        super(activity);
-        MagiskManager mm = Data.MM();
-        String filename = Utils.fmt("Magisk-v%s(%d).zip",
-                Data.remoteMagiskVersionString, Data.remoteMagiskVersionCode);
-        setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.magisk)));
-        setMessage(mm.getString(R.string.repo_install_msg, filename));
-        setCancelable(true);
-        setPositiveButton(R.string.install, (d, i) -> {
-            List<String> options = new ArrayList<>();
-            options.add(mm.getString(R.string.download_zip_only));
-            options.add(mm.getString(R.string.patch_boot_file));
-            if (Shell.rootAccess()) {
-                options.add(mm.getString(R.string.direct_install));
-                String s = ShellUtils.fastCmd("grep_prop ro.build.ab_update");
-                if (!s.isEmpty() && Boolean.parseBoolean(s)) {
-                    options.add(mm.getString(R.string.install_inactive_slot));
-                }
-            }
-            new InstallMethodDialog(activity, options).show();
-        });
-        setNegativeButton(R.string.no_thanks, null);
-        if (!TextUtils.isEmpty(Data.magiskNoteLink)) {
-            setNeutralButton(R.string.release_notes, (d, i) -> {
-                if (Data.magiskNoteLink.contains("forum.xda-developers")) {
-                    // Open forum links in browser
-                    Utils.openLink(activity, Uri.parse(Data.magiskNoteLink));
-                } else {
-                    new MarkDownWindow(activity, null, Data.magiskNoteLink).exec();
-                }
-            });
-        }
-    }
-}

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

@@ -1,40 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.Manifest;
-import android.content.Intent;
-import android.text.TextUtils;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.MarkDownWindow;
-import com.topjohnwu.magisk.receivers.ManagerUpdate;
-import com.topjohnwu.magisk.utils.Utils;
-
-import androidx.annotation.NonNull;
-
-public class ManagerInstallDialog extends CustomAlertDialog {
-
-    public ManagerInstallDialog(@NonNull BaseActivity activity) {
-        super(activity);
-        MagiskManager mm = Data.MM();
-        String filename = Utils.fmt("MagiskManager-v%s(%d).apk",
-                Data.remoteManagerVersionString, Data.remoteManagerVersionCode);
-        setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.app_name)));
-        setMessage(mm.getString(R.string.repo_install_msg, filename));
-        setCancelable(true);
-        setPositiveButton(R.string.install, (d, i) -> activity.runWithPermission(
-                new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, () -> {
-                    Intent intent = new Intent(mm, Data.classMap.get(ManagerUpdate.class));
-                    intent.putExtra(Const.Key.INTENT_SET_LINK, Data.managerLink);
-                    intent.putExtra(Const.Key.INTENT_SET_FILENAME, filename);
-                    mm.sendBroadcast(intent);
-                }))
-                .setNegativeButton(R.string.no_thanks, null);
-        if (!TextUtils.isEmpty(Data.managerNoteLink)) {
-            setNeutralButton(R.string.app_changelog, (d, i) ->
-                    new MarkDownWindow(activity, null, Data.managerNoteLink).exec());
-        }
-    }
-}

app/src/full/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/full/java/com/topjohnwu/magisk/database/MagiskDatabaseHelper.java

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

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

@@ -1,53 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.google.android.material.tabs.TabLayout;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MainActivity;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.adapters.TabFragmentAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-
-import androidx.viewpager.widget.ViewPager;
-
-public class LogFragment extends BaseFragment {
-
-    public ViewPager viewPager;
-    public 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);
-        ViewBinder.bind(this, v);
-
-        ((MainActivity) requireActivity()).toolbar.setElevation(0);
-
-        TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());
-
-        if (!(Const.USER_ID > 0 && Data.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
-            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;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        ViewBinder.unbind(this);
-    }
-}

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

@@ -1,316 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-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 android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.BuildConfig;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MainActivity;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.asyncs.CheckSafetyNet;
-import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.components.CustomAlertDialog;
-import com.topjohnwu.magisk.components.EnvFixDialog;
-import com.topjohnwu.magisk.components.ExpandableView;
-import com.topjohnwu.magisk.components.MagiskInstallDialog;
-import com.topjohnwu.magisk.components.ManagerInstallDialog;
-import com.topjohnwu.magisk.components.UninstallDialog;
-import com.topjohnwu.magisk.utils.Download;
-import com.topjohnwu.magisk.utils.ISafetyNetHelper;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.cardview.widget.CardView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-public class MagiskFragment extends BaseFragment
-        implements SwipeRefreshLayout.OnRefreshListener, ExpandableView, Topic.Subscriber {
-
-    private Container expandableContainer = new Container();
-    private static boolean shownDialog = false;
-
-    public SwipeRefreshLayout mSwipeRefreshLayout;
-
-    public CardView coreOnlyNotice;
-
-    public RelativeLayout magiskUpdate;
-    public ImageView magiskUpdateIcon;
-    public TextView magiskUpdateText;
-    public ProgressBar magiskUpdateProgress;
-    public ImageView magiskStatusIcon;
-    public TextView magiskVersionText;
-
-    public CardView safetyNetCard;
-    public ImageView safetyNetRefreshIcon;
-    public TextView safetyNetStatusText;
-    public ProgressBar safetyNetProgress;
-    public LinearLayout expandLayout;
-    public ImageView ctsStatusIcon;
-    public TextView ctsStatusText;
-    public ImageView basicStatusIcon;
-    public TextView basicStatusText;
-
-    public CardView installOptionCard;
-    public CheckBox keepEncChkbox;
-    public CheckBox keepVerityChkbox;
-    public CardView installButton;
-    public TextView installText;
-    public CardView uninstallButton;
-
-    public int colorBad;
-    public int colorOK;
-    public int colorWarn;
-    public int colorNeutral;
-    public int colorInfo;
-
-    public void safetyNet() {
-        Runnable task = () -> {
-            safetyNetProgress.setVisibility(View.VISIBLE);
-            safetyNetRefreshIcon.setVisibility(View.GONE);
-            safetyNetStatusText.setText(R.string.checking_safetyNet_status);
-            new CheckSafetyNet(requireActivity()).exec();
-            collapse();
-        };
-        if (!CheckSafetyNet.dexPath.exists()) {
-            // Show dialog
-            new CustomAlertDialog(requireActivity())
-                    .setTitle(R.string.proprietary_title)
-                    .setMessage(R.string.proprietary_notice)
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.yes, (d, i) -> task.run())
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
-        } else {
-            task.run();
-        }
-
-    }
-
-    public void install() {
-        shownDialog = true;
-
-        // Show Manager update first
-        if (Data.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-            new ManagerInstallDialog((BaseActivity) requireActivity()).show();
-            return;
-        }
-
-        ((NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE)).cancelAll();
-        new MagiskInstallDialog((BaseActivity) getActivity()).show();
-    }
-
-    public void uninstall() {
-        new UninstallDialog(requireActivity()).show();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.fragment_magisk, container, false);
-        ViewBinder.bind(this, v);
-        requireActivity().setTitle(R.string.magisk);
-
-        expandableContainer.expandLayout = expandLayout;
-        setupExpandable();
-
-        keepVerityChkbox.setChecked(Data.keepVerity);
-        keepVerityChkbox.setOnCheckedChangeListener((view, checked) -> Data.keepVerity = checked);
-        keepEncChkbox.setChecked(Data.keepEnc);
-        keepEncChkbox.setOnCheckedChangeListener((view, checked) -> Data.keepEnc = checked);
-
-        mSwipeRefreshLayout.setOnRefreshListener(this);
-        updateUI();
-
-        return v;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        ViewBinder.unbind(this);
-    }
-
-    @Override
-    public void onRefresh() {
-        Data.loadMagiskInfo();
-        updateUI();
-
-        magiskUpdateText.setText(R.string.checking_for_updates);
-        magiskUpdateProgress.setVisibility(View.VISIBLE);
-        magiskUpdateIcon.setVisibility(View.GONE);
-
-        safetyNetStatusText.setText(R.string.safetyNet_check_text);
-
-        Topic.reset(getSubscribedTopics());
-        Data.remoteMagiskVersionString = null;
-        Data.remoteMagiskVersionCode = -1;
-        collapse();
-
-        shownDialog = false;
-
-        // Trigger state check
-        if (Download.checkNetworkStatus(mm)) {
-            CheckUpdates.check();
-        } else {
-            mSwipeRefreshLayout.setRefreshing(false);
-        }
-    }
-
-    @Override
-    public int[] getSubscribedTopics() {
-        return new int[] {Topic.SNET_CHECK_DONE, Topic.UPDATE_CHECK_DONE};
-    }
-
-    @Override
-    public void onPublish(int topic, Object[] result) {
-        switch (topic) {
-            case Topic.SNET_CHECK_DONE:
-                updateSafetyNetUI((int) result[0]);
-                break;
-            case Topic.UPDATE_CHECK_DONE:
-                updateCheckUI();
-                break;
-        }
-    }
-
-    @Override
-    public Container getContainer() {
-        return expandableContainer;
-    }
-
-    private boolean hasGms() {
-        PackageManager pm = mm.getPackageManager();
-        PackageInfo info;
-        try {
-            info = pm.getPackageInfo("com.google.android.gms", 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-        return info.applicationInfo.enabled;
-    }
-
-    private void updateUI() {
-        ((MainActivity) requireActivity()).checkHideSection();
-
-        boolean hasNetwork = Download.checkNetworkStatus(mm);
-        boolean hasRoot = Shell.rootAccess();
-        boolean isUpToDate = Data.magiskVersionCode > Const.MAGISK_VER.UNIFIED;
-
-        magiskUpdate.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
-        installOptionCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
-        uninstallButton.setVisibility(isUpToDate && hasRoot ? View.VISIBLE : View.GONE);
-        coreOnlyNotice.setVisibility(mm.prefs.getBoolean(Const.Key.COREONLY, false) ? View.VISIBLE : View.GONE);
-
-        int image, color;
-
-        if (Data.magiskVersionCode < 0) {
-            color = colorBad;
-            image = R.drawable.ic_cancel;
-            magiskVersionText.setText(R.string.magisk_version_error);
-        } else {
-            color = colorOK;
-            image = R.drawable.ic_check_circle;
-            magiskVersionText.setText(getString(R.string.current_magisk_title, "v" + Data.magiskVersionString));
-        }
-
-        magiskStatusIcon.setImageResource(image);
-        magiskStatusIcon.setColorFilter(color);
-    }
-
-    private void updateCheckUI() {
-        int image, color;
-
-        safetyNetCard.setVisibility(hasGms() ? View.VISIBLE : View.GONE);
-
-        if (Data.remoteMagiskVersionCode < 0) {
-            color = colorNeutral;
-            image = R.drawable.ic_help;
-            magiskUpdateText.setText(R.string.invalid_update_channel);
-            installButton.setVisibility(View.GONE);
-        } else {
-            color = colorOK;
-            image = R.drawable.ic_check_circle;
-            magiskUpdateText.setText(getString(R.string.install_magisk_title, "v" + Data.remoteMagiskVersionString));
-            installButton.setVisibility(View.VISIBLE);
-            if (Data.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-                installText.setText(getString(R.string.update, getString(R.string.app_name)));
-            } else if (Data.magiskVersionCode > 0 && Data.remoteMagiskVersionCode > Data.magiskVersionCode) {
-                installText.setText(getString(R.string.update, getString(R.string.magisk)));
-            } else {
-                installText.setText(R.string.install);
-            }
-        }
-
-        magiskUpdateIcon.setImageResource(image);
-        magiskUpdateIcon.setColorFilter(color);
-        magiskUpdateIcon.setVisibility(View.VISIBLE);
-
-        magiskUpdateProgress.setVisibility(View.GONE);
-        mSwipeRefreshLayout.setRefreshing(false);
-
-        if (!shownDialog) {
-            if (Data.remoteMagiskVersionCode > Data.magiskVersionCode
-                    || Data.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-                install();
-            } else if (Data.remoteMagiskVersionCode >= Const.MAGISK_VER.FIX_ENV &&
-                    !ShellUtils.fastCmdResult("env_check")) {
-                new EnvFixDialog(requireActivity()).show();
-            }
-        }
-    }
-
-    private void updateSafetyNetUI(int response) {
-        safetyNetProgress.setVisibility(View.GONE);
-        safetyNetRefreshIcon.setVisibility(View.VISIBLE);
-        if ((response & 0x0F) == 0) {
-            safetyNetStatusText.setText(R.string.safetyNet_check_success);
-
-            boolean b;
-            b = (response & ISafetyNetHelper.CTS_PASS) != 0;
-            ctsStatusText.setText("ctsProfile: " + b);
-            ctsStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
-            ctsStatusIcon.setColorFilter(b ? colorOK : colorBad);
-
-            b = (response & ISafetyNetHelper.BASIC_PASS) != 0;
-            basicStatusText.setText("basicIntegrity: " + b);
-            basicStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
-            basicStatusIcon.setColorFilter(b ? colorOK : colorBad);
-
-            expand();
-        } else {
-            @StringRes int resid;
-            switch (response) {
-                case ISafetyNetHelper.RESPONSE_ERR:
-                    resid = R.string.safetyNet_res_invalid;
-                    break;
-                case ISafetyNetHelper.CONNECTION_FAIL:
-                default:
-                    resid = R.string.safetyNet_api_error;
-                    break;
-            }
-            safetyNetStatusText.setText(resid);
-        }
-    }
-}
-

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

@@ -1,92 +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.View;
-import android.view.ViewGroup;
-import android.widget.SearchView;
-
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.adapters.ApplicationAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.utils.Topic;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-public class MagiskHideFragment extends BaseFragment implements Topic.Subscriber {
-
-    public SwipeRefreshLayout mSwipeRefreshLayout;
-    public RecyclerView recyclerView;
-    SearchView search;
-
-    private ApplicationAdapter appAdapter;
-
-    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);
-        ViewBinder.bind(this, view);
-
-        appAdapter = new ApplicationAdapter(requireActivity());
-        recyclerView.setAdapter(appAdapter);
-
-        mSwipeRefreshLayout.setRefreshing(true);
-        mSwipeRefreshLayout.setOnRefreshListener(appAdapter::refresh);
-
-        searchListener = new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                appAdapter.filter(query);
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                appAdapter.filter(newText);
-                return false;
-            }
-        };
-
-        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);
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        ViewBinder.unbind(this);
-    }
-
-    @Override
-    public int[] getSubscribedTopics() {
-        return new int[] {Topic.MAGISK_HIDE_DONE};
-    }
-
-    @Override
-    public void onPublish(int topic, Object[] result) {
-        mSwipeRefreshLayout.setRefreshing(false);
-        appAdapter.filter(search.getQuery().toString());
-    }
-}

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

@@ -1,125 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-import android.Manifest;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.HorizontalScrollView;
-import android.widget.ProgressBar;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import com.google.android.material.snackbar.Snackbar;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.utils.Download;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Calendar;
-
-import androidx.annotation.Nullable;
-
-public class MagiskLogFragment extends BaseFragment {
-
-    public TextView txtLog;
-    public ScrollView svLog;
-    public HorizontalScrollView hsvLog;
-    public ProgressBar progressBar;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_magisk_log, container, false);
-        ViewBinder.bind(this, view);
-        setHasOptionsMenu(true);
-        txtLog.setTextIsSelectable(true);
-        return view;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        getActivity().setTitle(R.string.log);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        readLogs();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        ViewBinder.unbind(this);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_log, menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_refresh:
-                readLogs();
-                return true;
-            case R.id.menu_save:
-                runWithPermission(new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, this::saveLogs);
-                return true;
-            case R.id.menu_clear:
-                clearLogs();
-                return true;
-            default:
-                return true;
-        }
-    }
-
-    public void readLogs() {
-        Shell.su("cat " + Const.MAGISK_LOG + " | tail -n 5000").submit(result -> {
-            progressBar.setVisibility(View.GONE);
-            if (result.getOut().isEmpty())
-                txtLog.setText(R.string.log_is_empty);
-            else
-                txtLog.setText(TextUtils.join("\n", result.getOut()));
-            svLog.postDelayed(() -> svLog.fullScroll(ScrollView.FOCUS_DOWN), 100);
-            hsvLog.postDelayed(() -> hsvLog.fullScroll(ScrollView.FOCUS_LEFT), 100);
-        });
-    }
-
-    public void saveLogs() {
-        Calendar now = Calendar.getInstance();
-        String filename = Utils.fmt("magisk_log_%04d%02d%02d_%02d%02d%02d.log",
-                now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
-                now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
-                now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
-
-        File logFile = new File(Download.EXTERNAL_PATH, filename);
-        try {
-            logFile.createNewFile();
-        } catch (IOException e) {
-            return;
-        }
-        Shell.su("cat " + Const.MAGISK_LOG + " > " + logFile)
-                .submit(result ->
-                        SnackbarMaker.make(txtLog, logFile.getPath(), Snackbar.LENGTH_SHORT).show());
-    }
-
-    public void clearLogs() {
-        Shell.su("echo -n > " + Const.MAGISK_LOG).submit();
-        txtLog.setText(R.string.log_is_empty);
-        SnackbarMaker.make(txtLog, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
-    }
-}

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

@@ -1,145 +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 com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.FlashActivity;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.adapters.ModulesAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-public class ModulesFragment extends BaseFragment implements Topic.Subscriber {
-
-    public SwipeRefreshLayout mSwipeRefreshLayout;
-    public RecyclerView recyclerView;
-    public TextView emptyRv;
-
-    public 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);
-        ViewBinder.bind(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[] getSubscribedTopics() {
-        return new int[] {Topic.MODULE_LOAD_DONE};
-    }
-
-    @Override
-    public void onPublish(int topic, Object[] result) {
-        updateUI((Map<String, Module>) result[0]);
-    }
-
-    @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(), Data.classMap.get(FlashActivity.class));
-            intent.setData(data.getData()).putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP);
-            startActivity(intent);
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        ViewBinder.unbind(this);
-    }
-
-    @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:
-                Shell.su("/system/bin/reboot").submit();
-                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/full/java/com/topjohnwu/magisk/fragments/ReposFragment.java

@@ -1,125 +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 com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.adapters.ReposAdapter;
-import com.topjohnwu.magisk.asyncs.UpdateRepos;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.utils.Topic;
-
-import java.util.Map;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-public class ReposFragment extends BaseFragment implements Topic.Subscriber {
-
-    public RecyclerView recyclerView;
-    public TextView emptyRv;
-    public 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);
-        ViewBinder.bind(this, view);
-
-        mSwipeRefreshLayout.setRefreshing(true);
-        recyclerView.setVisibility(View.GONE);
-
-        mSwipeRefreshLayout.setOnRefreshListener(() -> {
-            recyclerView.setVisibility(View.VISIBLE);
-            emptyRv.setVisibility(View.GONE);
-            new UpdateRepos().exec(true);
-        });
-
-        requireActivity().setTitle(R.string.downloads);
-
-        return view;
-    }
-
-    @Override
-    public int[] getSubscribedTopics() {
-        return new int[] {Topic.MODULE_LOAD_DONE, Topic.REPO_LOAD_DONE};
-    }
-
-    @Override
-    public void onPublish(int topic, Object[] result) {
-        if (topic == Topic.MODULE_LOAD_DONE) {
-            adapter = new ReposAdapter(mm.repoDB, (Map<String, Module>) result[0]);
-            mm.repoDB.registerAdapter(adapter);
-            recyclerView.setAdapter(adapter);
-            recyclerView.setVisibility(View.VISIBLE);
-            emptyRv.setVisibility(View.GONE);
-        }
-        if (Topic.isPublished(getSubscribedTopics())) {
-            mSwipeRefreshLayout.setRefreshing(false);
-            recyclerView.setVisibility(adapter.getItemCount() == 0 ? View.GONE : View.VISIBLE);
-            emptyRv.setVisibility(adapter.getItemCount() == 0 ? 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();
-        search.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                adapter.filter(newText);
-                return false;
-            }
-        });
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.repo_sort) {
-            new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.sorting_order)
-                .setSingleChoiceItems(R.array.sorting_orders, Data.repoOrder, (d, which) -> {
-                    Data.repoOrder = which;
-                    mm.prefs.edit().putInt(Const.Key.REPO_ORDER, Data.repoOrder).apply();
-                    adapter.notifyDBChanged();
-                    d.dismiss();
-                }).show();
-        }
-        return true;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mm.repoDB.unregisterAdapter();
-        ViewBinder.unbind(this);
-    }
-}

app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java

@@ -1,394 +0,0 @@
-package com.topjohnwu.magisk.fragments;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.SharedPreferences;
-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.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.asyncs.PatchAPK;
-import com.topjohnwu.magisk.components.CustomAlertDialog;
-import com.topjohnwu.magisk.receivers.DownloadReceiver;
-import com.topjohnwu.magisk.utils.Download;
-import com.topjohnwu.magisk.utils.FingerprintHelper;
-import com.topjohnwu.magisk.utils.LocaleManager;
-import com.topjohnwu.magisk.utils.RootUtils;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-import java.io.IOException;
-import java.util.Locale;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.ListPreference;
-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.preference.SwitchPreference;
-import androidx.recyclerview.widget.RecyclerView;
-
-public class SettingsFragment extends PreferenceFragmentCompat
-        implements SharedPreferences.OnSharedPreferenceChangeListener,
-        Topic.Subscriber, Topic.AutoSubscriber {
-
-    private PreferenceScreen prefScreen;
-
-    private ListPreference updateChannel, suAccess, autoRes, suNotification,
-            requestTimeout, multiuserMode, namespaceMode;
-    private MagiskManager mm;
-    private PreferenceCategory generalCatagory;
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        setPreferencesFromResource(R.xml.app_settings, rootKey);
-        mm = Data.MM();
-        prefScreen = getPreferenceScreen();
-
-        generalCatagory = (PreferenceCategory) findPreference("general");
-        PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
-        PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
-        Preference hideManager = findPreference("hide");
-        Preference restoreManager = findPreference("restore");
-        findPreference("clear").setOnPreferenceClickListener((pref) -> {
-            mm.prefs.edit().remove(Const.Key.ETAG_KEY).apply();
-            mm.repoDB.clearRepo();
-            Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT);
-            return true;
-        });
-
-        updateChannel = (ListPreference) findPreference(Const.Key.UPDATE_CHANNEL);
-        suAccess = (ListPreference) findPreference(Const.Key.ROOT_ACCESS);
-        autoRes = (ListPreference) findPreference(Const.Key.SU_AUTO_RESPONSE);
-        requestTimeout = (ListPreference) findPreference(Const.Key.SU_REQUEST_TIMEOUT);
-        suNotification = (ListPreference) findPreference(Const.Key.SU_NOTIFICATION);
-        multiuserMode = (ListPreference) findPreference(Const.Key.SU_MULTIUSER_MODE);
-        namespaceMode = (ListPreference) findPreference(Const.Key.SU_MNT_NS);
-        SwitchPreference reauth = (SwitchPreference) findPreference(Const.Key.SU_REAUTH);
-        SwitchPreference fingerprint = (SwitchPreference) findPreference(Const.Key.SU_FINGERPRINT);
-
-        updateChannel.setOnPreferenceChangeListener((p, o) -> {
-            String prev =String.valueOf(Data.updateChannel);
-            int channel = Integer.parseInt((String) o);
-            if (channel == Const.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(mm.prefs.getString(Const.Key.CUSTOM_CHANNEL, ""));
-                new AlertDialog.Builder(requireActivity())
-                        .setTitle(R.string.settings_update_custom)
-                        .setView(v)
-                        .setPositiveButton(R.string.ok, (d, i) ->
-                                mm.prefs.edit().putString(Const.Key.CUSTOM_CHANNEL,
-                                        url.getText().toString()).apply())
-                        .setNegativeButton(R.string.close, (d, i) ->
-                                mm.prefs.edit().putString(Const.Key.UPDATE_CHANNEL, prev).apply())
-                        .setOnCancelListener(d ->
-                                mm.prefs.edit().putString(Const.Key.UPDATE_CHANNEL, prev).apply())
-                        .show();
-            }
-            return true;
-        });
-
-        setSummary();
-
-        // Disable dangerous settings in secondary user
-        if (Const.USER_ID > 0) {
-            suCategory.removePreference(multiuserMode);
-        }
-
-        // Disable re-authentication option on Android O, it will not work
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            reauth.setEnabled(false);
-            reauth.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 (Data.magiskVersionCode >= Const.MAGISK_VER.MANAGER_HIDE) {
-            if (mm.getPackageName().equals(Const.ORIG_PKG_NAME)) {
-                hideManager.setOnPreferenceClickListener((pref) -> {
-                    PatchAPK.hideManager(requireActivity());
-                    return true;
-                });
-                generalCatagory.removePreference(restoreManager);
-            } else {
-                if (Download.checkNetworkStatus(mm)) {
-                    restoreManager.setOnPreferenceClickListener((pref) -> {
-                        Download.receive(
-                            requireActivity(), new DownloadReceiver() {
-                                @Override
-                                public void onDownloadDone(Context context, Uri uri) {
-                                    Data.exportPrefs();
-                                    Shell.su("cp " + uri.getPath() + " /data/local/tmp/manager.apk").exec();
-                                    if (ShellUtils.fastCmdResult("pm install /data/local/tmp/manager.apk")) {
-                                        Shell.su("rm -f /data/local/tmp/manager.apk").exec();
-                                        RootUtils.uninstallPkg(context.getPackageName());
-                                        return;
-                                    }
-                                    Shell.su("rm -f /data/local/tmp/manager.apk").exec();
-                                }
-                            },
-                            Data.managerLink,
-                            Utils.fmt("MagiskManager-v%s.apk", Data.remoteManagerVersionString)
-                        );
-                        return true;
-                    });
-                } else {
-                    generalCatagory.removePreference(restoreManager);
-                }
-                generalCatagory.removePreference(hideManager);
-            }
-        } else {
-            generalCatagory.removePreference(restoreManager);
-            generalCatagory.removePreference(hideManager);
-        }
-
-        if (!Shell.rootAccess() || (Const.USER_ID > 0 &&
-                Data.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
-            prefScreen.removePreference(suCategory);
-        }
-
-        if (!Shell.rootAccess()) {
-            prefScreen.removePreference(magiskCategory);
-            generalCatagory.removePreference(hideManager);
-        } else if (Data.magiskVersionCode < Const.MAGISK_VER.UNIFIED) {
-            prefScreen.removePreference(magiskCategory);
-        }
-    }
-
-    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++] = locale.toLanguageTag();
-        }
-        lp.setEntries(entries);
-        lp.setEntryValues(entryValues);
-        lp.setSummary(LocaleManager.locale.getDisplayName(LocaleManager.locale));
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        mm.prefs.registerOnSharedPreferenceChangeListener(this);
-        Topic.subscribe(this);
-        requireActivity().setTitle(R.string.settings);
-        return super.onCreateView(inflater, container, savedInstanceState);
-    }
-
-    @Override
-    public void onDestroyView() {
-        mm.prefs.unregisterOnSharedPreferenceChangeListener(this);
-        Topic.unsubscribe(this);
-        super.onDestroyView();
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
-        switch (key) {
-            case Const.Key.ROOT_ACCESS:
-            case Const.Key.SU_MULTIUSER_MODE:
-            case Const.Key.SU_MNT_NS:
-                mm.mDB.setSettings(key, Utils.getPrefsInt(prefs, key));
-                break;
-        }
-        Data.loadConfig();
-        setSummary();
-        switch (key) {
-            case Const.Key.DARK_THEME:
-                requireActivity().recreate();
-                break;
-            case Const.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 Const.Key.MAGISKHIDE:
-                if (prefs.getBoolean(key, false)) {
-                    Shell.su("magiskhide --enable").submit();
-                } else {
-                    Shell.su("magiskhide --disable").submit();
-                }
-                break;
-            case Const.Key.HOSTS:
-                if (prefs.getBoolean(key, false)) {
-                    Shell.su("cp -af /system/etc/hosts " + Const.MAGISK_HOST_FILE,
-                            "mount -o bind " + Const.MAGISK_HOST_FILE + " /system/etc/hosts")
-                            .submit();
-                } else {
-                    Shell.su("umount -l /system/etc/hosts",
-                            "rm -f " + Const.MAGISK_HOST_FILE)
-                            .submit();
-                }
-                break;
-            case Const.Key.LOCALE:
-                LocaleManager.setLocale(mm);
-                requireActivity().recreate();
-                break;
-            case Const.Key.UPDATE_CHANNEL:
-            case Const.Key.CUSTOM_CHANNEL:
-                CheckUpdates.check();
-                break;
-            case Const.Key.CHECK_UPDATES:
-                Utils.setupUpdateCheck();
-                break;
-        }
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        String key = preference.getKey();
-        switch (key) {
-            case Const.Key.SU_FINGERPRINT:
-                boolean checked = ((SwitchPreference) preference).isChecked();
-                ((SwitchPreference) preference).setChecked(!checked);
-                CustomAlertDialog dialog = new CustomAlertDialog(requireActivity());
-                CustomAlertDialog.ViewHolder vh = dialog.getViewHolder();
-                Drawable fingerprint = getResources().getDrawable(R.drawable.ic_fingerprint);
-                fingerprint.setBounds(0, 0, Utils.dpInPx(50), Utils.dpInPx(50));
-                Resources.Theme theme = requireActivity().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);
-                try {
-                    FingerprintHelper helper = new FingerprintHelper() {
-                        @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) {
-                            dialog.dismiss();
-                            ((SwitchPreference) preference).setChecked(checked);
-                            mm.mDB.setSettings(key, checked ? 1 : 0);
-
-                        }
-                    };
-                    dialog.setMessage(R.string.auth_fingerprint)
-                            .setNegativeButton(R.string.close, (d, w) -> helper.cancel())
-                            .setOnCancelListener(d -> helper.cancel())
-                            .show();
-                    helper.authenticate();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    Utils.toast(R.string.auth_fail, Toast.LENGTH_SHORT);
-                }
-                break;
-        }
-        return true;
-    }
-
-    private void setSummary() {
-        updateChannel.setSummary(getResources()
-                .getStringArray(R.array.update_channel)[Data.updateChannel]);
-        suAccess.setSummary(getResources()
-                .getStringArray(R.array.su_access)[Data.suAccessState]);
-        autoRes.setSummary(getResources()
-                .getStringArray(R.array.auto_response)[Data.suResponseType]);
-        suNotification.setSummary(getResources()
-                .getStringArray(R.array.su_notification)[Data.suNotificationType]);
-        requestTimeout.setSummary(
-                getString(R.string.request_timeout_summary,
-                        mm.prefs.getString(Const.Key.SU_REQUEST_TIMEOUT, "10")));
-        multiuserMode.setSummary(getResources()
-                .getStringArray(R.array.multiuser_summary)[Data.multiuserMode]);
-        namespaceMode.setSummary(getResources()
-                .getStringArray(R.array.namespace_summary)[Data.suNamespaceMode]);
-    }
-
-    @Override
-    public void onPublish(int topic, Object[] result) {
-        setLocalePreference((ListPreference) findPreference(Const.Key.LOCALE));
-    }
-
-    @Override
-    public int[] getSubscribedTopics() {
-        return new int[] {Topic.LOCALE_FETCH_DONE};
-    }
-
-    @Override
-    protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {
-        return new PreferenceGroupAdapter(preferenceScreen) {
-            @SuppressLint("RestrictedApi")
-            @Override
-            public void onBindViewHolder(PreferenceViewHolder holder, int position) {
-                super.onBindViewHolder(holder, position);
-                Preference preference = getItem(position);
-                if (preference instanceof PreferenceCategory)
-                    setZeroPaddingToLayoutChildren(holder.itemView);
-                else {
-                    View iconFrame = holder.itemView.findViewById(R.id.icon_frame);
-                    if (iconFrame != null) {
-                        iconFrame.setVisibility(preference.getIcon() == null ? View.GONE : View.VISIBLE);
-                    }
-                }
-            }
-        };
-    }
-
-    private void setZeroPaddingToLayoutChildren(View view) {
-        if (!(view instanceof ViewGroup))
-            return;
-        ViewGroup viewGroup = (ViewGroup) view;
-        int childCount = viewGroup.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            setZeroPaddingToLayoutChildren(viewGroup.getChildAt(i));
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
-                viewGroup.setPaddingRelative(0, viewGroup.getPaddingTop(), viewGroup.getPaddingEnd(), viewGroup.getPaddingBottom());
-            else
-                viewGroup.setPadding(0, viewGroup.getPaddingTop(), viewGroup.getPaddingRight(), viewGroup.getPaddingBottom());
-        }
-    }
-}

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

@@ -1,85 +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 com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.adapters.SuLogAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-
-public class SuLogFragment extends BaseFragment {
-
-    public TextView emptyRv;
-    public 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);
-        ViewBinder.bind(this, v);
-        adapter = new SuLogAdapter(mm.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:
-                mm.mDB.clearLogs();
-                updateList();
-                return true;
-            default:
-                return true;
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        ViewBinder.unbind(this);
-    }
-}

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

@@ -1,69 +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 com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ViewBinder;
-import com.topjohnwu.magisk.adapters.PolicyAdapter;
-import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.container.Policy;
-
-import java.util.List;
-
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-
-public class SuperuserFragment extends BaseFragment {
-
-    public RecyclerView recyclerView;
-    public 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);
-        ViewBinder.bind(this, view);
-
-        pm = getActivity().getPackageManager();
-        return view;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        requireActivity().setTitle(getString(R.string.superuser));
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        displayPolicyList();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        ViewBinder.unbind(this);
-    }
-
-    private void displayPolicyList() {
-        List<Policy> policyList = mm.mDB.getPolicyList(pm);
-
-        if (policyList.size() == 0) {
-            emptyRv.setVisibility(View.VISIBLE);
-            recyclerView.setVisibility(View.GONE);
-        } else {
-            recyclerView.setAdapter(new PolicyAdapter(policyList, mm.mDB, pm));
-            emptyRv.setVisibility(View.GONE);
-            recyclerView.setVisibility(View.VISIBLE);
-        }
-    }
-
-}

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

@@ -1,35 +0,0 @@
-package com.topjohnwu.magisk.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.text.TextUtils;
-
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.SuRequestActivity;
-import com.topjohnwu.magisk.services.OnBootService;
-import com.topjohnwu.magisk.utils.SuConnector;
-
-public class BootReceiver extends BroadcastReceiver {
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (TextUtils.equals(intent.getAction(), Intent.ACTION_BOOT_COMPLETED)) {
-            switch (intent.getExtras().getString("action", "boot")) {
-                case "request":
-                    Intent i = new Intent(context, Data.classMap.get(SuRequestActivity.class))
-                            .putExtra("socket", intent.getStringExtra("socket"))
-                            .putExtra("version", 2)
-                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    context.startActivity(i);
-                    break;
-                case "log":
-                    SuConnector.handleLogs(intent, 2);
-                    break;
-                case "boot":
-                    OnBootService.enqueueWork(context);
-                    break;
-            }
-        }
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.topjohnwu.magisk.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.AsyncTask;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.asyncs.PatchAPK;
-import com.topjohnwu.magisk.utils.Download;
-import com.topjohnwu.utils.JarMap;
-import com.topjohnwu.utils.SignAPK;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-
-public class ManagerUpdate extends BroadcastReceiver {
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Download.receive(
-                context, new PatchedInstall(),
-                intent.getStringExtra(Const.Key.INTENT_SET_LINK),
-                intent.getStringExtra(Const.Key.INTENT_SET_FILENAME)
-        );
-    }
-
-    private static class PatchedInstall extends ManagerInstall {
-        @Override
-        public void onDownloadDone(Context context, Uri uri) {
-            if (!context.getPackageName().equals(Const.ORIG_PKG_NAME)) {
-                AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
-                    String orig = uri.getPath();
-                    String patch = orig.substring(0, orig.lastIndexOf('.')) + "-patched.apk";
-                    try {
-                        JarMap apk = new JarMap(orig);
-                        PatchAPK.patchPackageID(apk, Const.ORIG_PKG_NAME, context.getPackageName());
-                        SignAPK.sign(apk, new BufferedOutputStream(new FileOutputStream(patch)));
-                        super.onDownloadDone(context, Uri.fromFile(new File(patch)));
-                    } catch (Exception ignored) { }
-                });
-            } else {
-                super.onDownloadDone(context, uri);
-            }
-        }
-    }
-}

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

@@ -1,32 +0,0 @@
-package com.topjohnwu.magisk.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.superuser.Shell;
-
-public class PackageReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        MagiskManager mm = Data.MM();
-
-        String pkg = intent.getData().getEncodedSchemeSpecificPart();
-
-        switch (intent.getAction()) {
-            case Intent.ACTION_PACKAGE_REPLACED:
-                // This will only work pre-O
-                if (mm.prefs.getBoolean(Const.Key.SU_REAUTH, false)) {
-                    mm.mDB.deletePolicy(pkg);
-                }
-                break;
-            case Intent.ACTION_PACKAGE_FULLY_REMOVED:
-                mm.mDB.deletePolicy(pkg);
-                Shell.su("magiskhide --rm " + pkg).submit();
-                break;
-        }
-    }
-}

app/src/full/java/com/topjohnwu/magisk/receivers/RebootReceiver.java

@@ -1,14 +0,0 @@
-package com.topjohnwu.magisk.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import com.topjohnwu.superuser.Shell;
-
-public class RebootReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Shell.su("/system/bin/reboot").submit();
-    }
-}

app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java

@@ -1,82 +0,0 @@
-package com.topjohnwu.magisk.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ShortcutInfo;
-import android.content.pm.ShortcutManager;
-import android.graphics.drawable.Icon;
-import android.os.Build;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.SplashActivity;
-import com.topjohnwu.superuser.Shell;
-
-import java.util.ArrayList;
-
-import androidx.annotation.RequiresApi;
-
-public class ShortcutReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            MagiskManager mm = Data.MM();
-            ShortcutManager manager = context.getSystemService(ShortcutManager.class);
-            manager.setDynamicShortcuts(getShortCuts(mm));
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N_MR1)
-    private ArrayList<ShortcutInfo> getShortCuts(MagiskManager mm) {
-        ArrayList<ShortcutInfo> shortCuts = new ArrayList<>();
-        boolean root = Shell.rootAccess();
-        if (root && !(Const.USER_ID > 0 &&
-                Data.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
-            shortCuts.add(new ShortcutInfo.Builder(mm, "superuser")
-                    .setShortLabel(mm.getString(R.string.superuser))
-                    .setIntent(new Intent(mm, Data.classMap.get(SplashActivity.class))
-                            .putExtra(Const.Key.OPEN_SECTION, "superuser")
-                            .setAction(Intent.ACTION_VIEW)
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
-                    .setIcon(Icon.createWithResource(mm, R.drawable.sc_superuser))
-                    .setRank(0)
-                    .build());
-        }
-        if (root && Data.magiskVersionCode >= Const.MAGISK_VER.UNIFIED
-                && mm.prefs.getBoolean(Const.Key.MAGISKHIDE, false)) {
-            shortCuts.add(new ShortcutInfo.Builder(mm, "magiskhide")
-                    .setShortLabel(mm.getString(R.string.magiskhide))
-                    .setIntent(new Intent(mm, Data.classMap.get(SplashActivity.class))
-                            .putExtra(Const.Key.OPEN_SECTION, "magiskhide")
-                            .setAction(Intent.ACTION_VIEW)
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
-                    .setIcon(Icon.createWithResource(mm, R.drawable.sc_magiskhide))
-                    .setRank(1)
-                    .build());
-        }
-        if (!mm.prefs.getBoolean(Const.Key.COREONLY, false) && root && Data.magiskVersionCode >= 0) {
-            shortCuts.add(new ShortcutInfo.Builder(mm, "modules")
-                    .setShortLabel(mm.getString(R.string.modules))
-                    .setIntent(new Intent(mm, Data.classMap.get(SplashActivity.class))
-                            .putExtra(Const.Key.OPEN_SECTION, "modules")
-                            .setAction(Intent.ACTION_VIEW)
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
-                    .setIcon(Icon.createWithResource(mm, R.drawable.sc_extension))
-                    .setRank(3)
-                    .build());
-            shortCuts.add(new ShortcutInfo.Builder(mm, "downloads")
-                    .setShortLabel(mm.getString(R.string.download))
-                    .setIntent(new Intent(mm, Data.classMap.get(SplashActivity.class))
-                            .putExtra(Const.Key.OPEN_SECTION, "downloads")
-                            .setAction(Intent.ACTION_VIEW)
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
-                    .setIcon(Icon.createWithResource(mm, R.drawable.sc_cloud_download))
-                    .setRank(2)
-                    .build());
-        }
-        return shortCuts;
-    }
-}

app/src/full/java/com/topjohnwu/magisk/services/OnBootService.java

@@ -1,33 +0,0 @@
-package com.topjohnwu.magisk.services;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.utils.NotificationMgr;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-import androidx.annotation.NonNull;
-import androidx.core.app.JobIntentService;
-
-public class OnBootService extends JobIntentService {
-
-    public static void enqueueWork(Context context) {
-        enqueueWork(context, Data.classMap.get(OnBootService.class), Const.ID.ONBOOT_SERVICE_ID, new Intent());
-    }
-
-    @Override
-    protected void onHandleWork(@NonNull Intent intent) {
-        /* 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.
-         * */
-        if (Shell.rootAccess() && ShellUtils.fastCmdResult("mm_patch_dtbo"))
-            NotificationMgr.dtboPatched();
-    }
-}

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

@@ -1,22 +0,0 @@
-package com.topjohnwu.magisk.services;
-
-import android.app.job.JobParameters;
-import android.app.job.JobService;
-
-import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.superuser.Shell;
-
-public class UpdateCheckService extends JobService {
-
-    @Override
-    public boolean onStartJob(JobParameters params) {
-        Shell.getShell();
-        CheckUpdates.check(() -> jobFinished(params, false));
-        return true;
-    }
-
-    @Override
-    public boolean onStopJob(JobParameters params) {
-        return true;
-    }
-}

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

@@ -1,21 +0,0 @@
-package com.topjohnwu.magisk.superuser;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.SuRequestActivity;
-import com.topjohnwu.magisk.components.BaseActivity;
-
-public class RequestActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Intent intent = new Intent(this, Data.classMap.get(SuRequestActivity.class))
-                .putExtra("socket", getIntent().getStringExtra("socket"))
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent);
-        finish();
-    }
-}

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

@@ -1,15 +0,0 @@
-package com.topjohnwu.magisk.superuser;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import com.topjohnwu.magisk.utils.SuConnector;
-
-public class SuReceiver extends BroadcastReceiver {
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        SuConnector.handleLogs(intent, 1);
-    }
-}

app/src/full/java/com/topjohnwu/magisk/utils/LocaleManager.java

@@ -1,77 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.AsyncTask;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-
-import androidx.annotation.StringRes;
-
-public class LocaleManager {
-    public static Locale locale = Locale.getDefault();
-    public final static Locale defaultLocale = Locale.getDefault();
-    public static List<Locale> locales;
-
-    public static void setLocale(MagiskManager mm) {
-        String localeConfig = mm.prefs.getString(Const.Key.LOCALE, "");
-        if (localeConfig.isEmpty()) {
-            locale = defaultLocale;
-        } else {
-            locale = Locale.forLanguageTag(localeConfig);
-        }
-        Locale.setDefault(locale);
-        Resources res = mm.getResources();
-        Configuration config = res.getConfiguration();
-        config.setLocale(locale);
-        res.updateConfiguration(config, res.getDisplayMetrics());
-    }
-
-    public static String getString(Locale locale, @StringRes int id) {
-        Configuration config = new Configuration();
-        config.setLocale(locale);
-        return Data.MM().createConfigurationContext(config).getString(id);
-    }
-
-    public static void loadAvailableLocales() {
-        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
-            locales = new ArrayList<>();
-            HashSet<String> set = new HashSet<>();
-            Resources res = Data.MM().getResources();
-            Locale locale;
-
-            @StringRes int compareId = R.string.download_file_error;
-
-            // Add default locale
-            locales.add(Locale.ENGLISH);
-            set.add(getString(Locale.ENGLISH, compareId));
-
-            // Add some special locales
-            locales.add(Locale.TAIWAN);
-            set.add(getString(Locale.TAIWAN, compareId));
-            locale = new Locale("pt", "BR");
-            locales.add(locale);
-            set.add(getString(locale, compareId));
-
-            // Other locales
-            for (String s : res.getAssets().getLocales()) {
-                locale = Locale.forLanguageTag(s);
-                if (set.add(getString(locale, compareId))) {
-                    locales.add(locale);
-                }
-            }
-
-            Collections.sort(locales, (a, b) -> a.getDisplayName(a).compareTo(b.getDisplayName(b)));
-            Topic.publish(Topic.LOCALE_FETCH_DONE);
-        });
-    }
-}

app/src/full/java/com/topjohnwu/magisk/utils/NotificationMgr.java

@@ -1,87 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.SplashActivity;
-import com.topjohnwu.magisk.receivers.ManagerUpdate;
-import com.topjohnwu.magisk.receivers.RebootReceiver;
-
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.TaskStackBuilder;
-
-public class NotificationMgr {
-
-    public static void magiskUpdate() {
-        MagiskManager mm = Data.MM();
-
-        Intent intent = new Intent(mm, Data.classMap.get(SplashActivity.class));
-        intent.putExtra(Const.Key.OPEN_SECTION, "magisk");
-        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mm);
-        stackBuilder.addParentStack(Data.classMap.get(SplashActivity.class));
-        stackBuilder.addNextIntent(intent);
-        PendingIntent pendingIntent = stackBuilder.getPendingIntent(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL);
-        builder.setSmallIcon(R.drawable.ic_magisk_outline)
-                .setContentTitle(mm.getString(R.string.magisk_update_title))
-                .setContentText(mm.getString(R.string.magisk_update_available, Data.remoteMagiskVersionString))
-                .setVibrate(new long[]{0, 100, 100, 100})
-                .setAutoCancel(true)
-                .setContentIntent(pendingIntent);
-
-        NotificationManager notificationManager =
-                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.notify(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID, builder.build());
-    }
-
-    public static void managerUpdate() {
-        MagiskManager mm = Data.MM();
-        String filename = Utils.fmt("MagiskManager-v%s(%d).apk",
-                Data.remoteManagerVersionString, Data.remoteManagerVersionCode);
-
-        Intent intent = new Intent(mm, Data.classMap.get(ManagerUpdate.class));
-        intent.putExtra(Const.Key.INTENT_SET_LINK, Data.managerLink);
-        intent.putExtra(Const.Key.INTENT_SET_FILENAME, filename);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(mm,
-                Const.ID.APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL);
-        builder.setSmallIcon(R.drawable.ic_magisk_outline)
-                .setContentTitle(mm.getString(R.string.manager_update_title))
-                .setContentText(mm.getString(R.string.manager_download_install))
-                .setVibrate(new long[]{0, 100, 100, 100})
-                .setAutoCancel(true)
-                .setContentIntent(pendingIntent);
-
-        NotificationManager notificationManager =
-                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.notify(Const.ID.APK_UPDATE_NOTIFICATION_ID, builder.build());
-    }
-
-    public static void dtboPatched() {
-        MagiskManager mm = Data.MM();
-
-        Intent intent = new Intent(mm, Data.classMap.get(RebootReceiver.class));
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(mm,
-                Const.ID.DTBO_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL);
-        builder.setSmallIcon(R.drawable.ic_magisk_outline)
-                .setContentTitle(mm.getString(R.string.dtbo_patched_title))
-                .setContentText(mm.getString(R.string.dtbo_patched_reboot))
-                .setVibrate(new long[]{0, 100, 100, 100})
-                .addAction(R.drawable.ic_refresh, mm.getString(R.string.reboot), pendingIntent);
-
-        NotificationManager notificationManager =
-                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.notify(Const.ID.DTBO_NOTIFICATION_ID, builder.build());
-    }
-}

app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java

@@ -1,59 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.content.Context;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.superuser.BusyBox;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.io.SuFile;
-
-import java.io.File;
-import java.io.InputStream;
-
-import androidx.annotation.NonNull;
-
-public class RootUtils extends Shell.Initializer {
-
-    static {
-        BusyBox.BB_PATH = new File(Const.BUSYBOX_PATH);
-    }
-
-    public static void uninstallPkg(String pkg) {
-        Shell.su("db_clean " + Const.USER_ID, "pm uninstall " + pkg).exec();
-    }
-
-    @Override
-    public boolean onInit(Context context, @NonNull Shell shell) {
-        Shell.Job job = shell.newJob();
-        if (shell.isRoot()) {
-            InputStream magiskUtils = context.getResources().openRawResource(R.raw.util_functions);
-            InputStream managerUtils = context.getResources().openRawResource(R.raw.utils);
-            job.add(magiskUtils).add(managerUtils);
-
-            Const.MAGISK_DISABLE_FILE = new SuFile("/cache/.disable_magisk");
-            SuFile file = new SuFile("/sbin/.core/img");
-            if (file.exists()) {
-                Const.MAGISK_PATH = file;
-            } else if ((file = new SuFile("/dev/magisk/img")).exists()) {
-                Const.MAGISK_PATH = file;
-            } else {
-                Const.MAGISK_PATH = new SuFile("/magisk");
-            }
-            Const.MAGISK_HOST_FILE = new SuFile(Const.MAGISK_PATH + "/.core/hosts");
-
-            Data.loadMagiskInfo();
-        } else {
-            InputStream nonroot = context.getResources().openRawResource(R.raw.nonroot_utils);
-            job.add(nonroot);
-        }
-
-        job.add("mount_partitions", "get_flags", "run_migrations", "export BOOTMODE=true").exec();
-
-        Data.keepVerity = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPVERITY"));
-        Data.keepEnc = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPFORCEENCRYPT"));
-        return true;
-    }
-}

app/src/full/java/com/topjohnwu/magisk/utils/SuConnector.java

@@ -1,118 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.LocalSocket;
-import android.os.Bundle;
-import android.os.Process;
-import android.text.TextUtils;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.container.Policy;
-import com.topjohnwu.magisk.container.SuLogEntry;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.Date;
-
-public abstract class SuConnector {
-
-    protected LocalSocket socket = new LocalSocket();
-
-    private String readString(DataInputStream is) throws IOException {
-        int len = is.readInt();
-        byte[] buf = new byte[len];
-        is.readFully(buf);
-        return new String(buf);
-    }
-
-    public Bundle readSocketInput() throws IOException {
-        Bundle bundle = new Bundle();
-        DataInputStream is = new DataInputStream(socket.getInputStream());
-        while (true) {
-            String name = readString(is);
-            if (TextUtils.equals(name, "eof"))
-                break;
-            bundle.putString(name, readString(is));
-        }
-        return bundle;
-    }
-
-    protected DataOutputStream getOutputStream() throws IOException {
-        return new DataOutputStream(socket.getOutputStream());
-    }
-
-    public abstract void response();
-
-    public static void handleLogs(Intent intent, int version) {
-        MagiskManager mm = Data.MM();
-
-        if (intent == null) return;
-
-        int fromUid = intent.getIntExtra("from.uid", -1);
-        if (fromUid < 0) return;
-        if (fromUid == Process.myUid()) return;
-
-        Policy policy = mm.mDB.getPolicy(fromUid);
-        if (policy == null) {
-            try {
-                policy = new Policy(fromUid, mm.getPackageManager());
-            } catch (PackageManager.NameNotFoundException e) {
-                e.printStackTrace();
-                return;
-            }
-        }
-
-        SuLogEntry log = new SuLogEntry(policy);
-        if (version == 1) {
-            String action = intent.getStringExtra("action");
-            if (action == null) return;
-            switch (action) {
-                case "allow":
-                    log.action = true;
-                    break;
-                case "deny":
-                    log.action = false;
-                    break;
-                default:
-                    return;
-            }
-        } else {
-            switch (intent.getIntExtra("policy", -1)) {
-                case Policy.ALLOW:
-                    log.action = true;
-                    break;
-                case Policy.DENY:
-                    log.action = false;
-                    break;
-                default:
-                    return;
-            }
-        }
-
-        String message = mm.getString(log.action ?
-                R.string.su_allow_toast : R.string.su_deny_toast, policy.appName);
-
-        if (policy.notification && Data.suNotificationType == Const.Value.NOTIFICATION_TOAST)
-            Utils.toast(message, Toast.LENGTH_SHORT);
-
-        if (policy.logging) {
-            int toUid = intent.getIntExtra("to.uid", -1);
-            if (toUid < 0) return;
-            int pid = intent.getIntExtra("pid", -1);
-            if (pid < 0) return;
-            String command = intent.getStringExtra("command");
-            if (command == null) return;
-            log.toUid = toUid;
-            log.fromPid = pid;
-            log.command = command;
-            log.date = new Date();
-            mm.mDB.addLog(log);
-        }
-    }
-}

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

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

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

@@ -1,126 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.app.job.JobInfo;
-import android.app.job.JobScheduler;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.provider.OpenableColumns;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.container.ValueSortedMap;
-import com.topjohnwu.superuser.io.SuFile;
-
-import java.util.Locale;
-import java.util.Map;
-
-import a.n;
-
-public class Utils {
-
-    public static int getPrefsInt(SharedPreferences prefs, String key, int def) {
-        return Integer.parseInt(prefs.getString(key, String.valueOf(def)));
-    }
-
-    public static int getPrefsInt(SharedPreferences prefs, String key) {
-        return getPrefsInt(prefs, key, 0);
-    }
-
-    public static String getNameFromUri(Context context, Uri uri) {
-        String name = null;
-        try (Cursor c = context.getContentResolver().query(uri, null, null, null, null)) {
-            if (c != null) {
-                int nameIndex = c.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-                if (nameIndex != -1) {
-                    c.moveToFirst();
-                    name = c.getString(nameIndex);
-                }
-            }
-        }
-        if (name == null) {
-            int idx = uri.getPath().lastIndexOf('/');
-            name = uri.getPath().substring(idx + 1);
-        }
-        return name;
-    }
-
-    public static int dpInPx(int dp) {
-        float scale = Data.MM().getResources().getDisplayMetrics().density;
-        return (int) (dp * scale + 0.5);
-    }
-
-    public static String fmt(String fmt, Object... args) {
-        return String.format(Locale.US, fmt, args);
-    }
-
-    public static String dos2unix(String s) {
-        String newString = s.replace("\r\n", "\n");
-        if(!newString.endsWith("\n")) {
-            return newString + "\n";
-        } else {
-            return newString;
-        }
-    }
-
-    public static void setupUpdateCheck() {
-        MagiskManager mm = Data.MM();
-        JobScheduler scheduler = (JobScheduler) mm.getSystemService(Context.JOB_SCHEDULER_SERVICE);
-
-        if (mm.prefs.getBoolean(Const.Key.CHECK_UPDATES, true)) {
-            if (scheduler.getAllPendingJobs().isEmpty() ||
-                    Const.UPDATE_SERVICE_VER > mm.prefs.getInt(Const.Key.UPDATE_SERVICE_VER, -1)) {
-                ComponentName service = new ComponentName(mm, n.class);
-                JobInfo info = new JobInfo.Builder(Const.ID.UPDATE_SERVICE_ID, service)
-                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-                        .setPersisted(true)
-                        .setPeriodic(8 * 60 * 60 * 1000)
-                        .build();
-                scheduler.schedule(info);
-            }
-        } else {
-            scheduler.cancel(Const.UPDATE_SERVICE_VER);
-        }
-    }
-
-    public static void openLink(Context context, Uri link) {
-        Intent intent = new Intent(Intent.ACTION_VIEW, link);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        if (intent.resolveActivity(context.getPackageManager()) != null) {
-            context.startActivity(intent);
-        } else {
-            toast(R.string.open_link_failed_toast, Toast.LENGTH_SHORT);
-        }
-    }
-
-    public static void toast(CharSequence msg, int duration) {
-        Data.mainHandler.post(() -> Toast.makeText(Data.MM(), msg, duration).show());
-    }
-
-    public static void toast(int resId, int duration) {
-        Data.mainHandler.post(() -> Toast.makeText(Data.MM(), resId, duration).show());
-    }
-
-    public static void loadModules() {
-        Topic.reset(Topic.MODULE_LOAD_DONE);
-        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
-            Map<String, Module> moduleMap = new ValueSortedMap<>();
-            SuFile path = new SuFile(Const.MAGISK_PATH);
-            String[] modules = path.list(
-                    (file, name) -> !name.equals("lost+found") && !name.equals(".core"));
-            for (String name : modules) {
-                Module module = new Module(Const.MAGISK_PATH + "/" + name);
-                moduleMap.put(module.getId(), module);
-            }
-            Topic.publish(Topic.MODULE_LOAD_DONE, moduleMap);
-        });
-    }
-}

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

@@ -1,65 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.io.SuFile;
-import com.topjohnwu.superuser.io.SuFileOutputStream;
-import com.topjohnwu.utils.JarMap;
-import com.topjohnwu.utils.SignAPK;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-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;
-
-public class ZipUtils {
-
-    public static void unzip(File zip, File folder, String path, boolean junkPath) throws IOException {
-        InputStream in = new BufferedInputStream(new FileInputStream(zip));
-        unzip(in, folder, path, junkPath);
-        in.close();
-    }
-
-    public static void unzip(InputStream zip, File folder, String path, boolean junkPath) throws IOException {
-        try {
-            ZipInputStream zipfile = new ZipInputStream(zip);
-            ZipEntry entry;
-            while ((entry = zipfile.getNextEntry()) != null) {
-                if (!entry.getName().startsWith(path) || entry.isDirectory()){
-                    // Ignore directories, only create files
-                    continue;
-                }
-                String name;
-                if (junkPath) {
-                    name = entry.getName().substring(entry.getName().lastIndexOf('/') + 1);
-                } else {
-                    name = entry.getName();
-                }
-                File dest = new File(folder, name);
-                if (!dest.getParentFile().exists() && !dest.getParentFile().mkdirs()) {
-                    dest = new SuFile(folder, name);
-                    dest.getParentFile().mkdirs();
-                }
-                try (OutputStream out = new SuFileOutputStream(dest)) {
-                    ShellUtils.pump(zipfile, out);
-                }
-            }
-        }
-        catch(IOException e) {
-            e.printStackTrace();
-            throw e;
-        }
-    }
-
-    public static void signZip(File input, File output) throws Exception {
-        try (JarMap map = new JarMap(input, false);
-             BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(output))) {
-            SignAPK.sign(map, out);
-        }
-    }
-}

app/src/full/res/drawable/ic_archive.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
-</vector>

app/src/full/res/drawable/ic_attach_money.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#757575"
-        android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.78,0 2.44,0.85 2.5,2.1h2.21c-0.07,-1.72 -1.12,-3.3 -3.21,-3.81V3h-3v2.16c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -2.06,0 -2.87,-0.92 -2.98,-2.1h-2.2c0.12,2.19 1.76,3.42 3.68,3.83V21h3v-2.15c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z"/>
-</vector>

app/src/full/res/drawable/ic_device_information.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13,7h-2v2h2L13,7zM13,11h-2v6h2v-6zM17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14z"/>
-</vector>

app/src/full/res/drawable/ic_history.xml

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

app/src/full/res/drawable/ic_info_outline.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-    <path
-        android:fillColor="#757575"
-        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
-</vector>

app/src/full/res/drawable/ic_language.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-    <path
-        android:fillColor="#757575"
-        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
-</vector>

app/src/full/res/drawable/ic_menu_overflow_material.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0" >
-    <path
-            android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z"
-            android:fillColor="#757575"/>
-</vector>

app/src/full/res/drawable/ic_person.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-    <path
-        android:fillColor="#757575"
-        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>

app/src/full/res/drawable/ic_safetynet.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M10,16h4c0.55,0 1,-0.45 1,-1v-3c0,-0.55 -0.45,-1 -1,-1v-1c0,-1.11 -0.9,-2 -2,-2 -1.11,0 -2,0.9 -2,2v1c-0.55,0 -1,0.45 -1,1v3c0,0.55 0.45,1 1,1zM10.8,10c0,-0.66 0.54,-1.2 1.2,-1.2 0.66,0 1.2,0.54 1.2,1.2v1h-2.4v-1zM17,1L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-2 -2,-2zM17,19L7,19L7,5h10v14z"/>
-</vector>

app/src/full/res/drawable/ic_update.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M21,10.12h-6.78l2.74,-2.82c-2.73,-2.7 -7.15,-2.8 -9.88,-0.1 -2.73,2.71 -2.73,7.08 0,9.79 2.73,2.71 7.15,2.71 9.88,0C18.32,15.65 19,14.08 19,12.1h2c0,1.98 -0.88,4.55 -2.64,6.29 -3.51,3.48 -9.21,3.48 -12.72,0 -3.5,-3.47 -3.53,-9.11 -0.02,-12.58 3.51,-3.47 9.14,-3.47 12.65,0L21,3v7.12zM12.5,8v4.25l3.5,2.08 -0.72,1.21L11,13V8h1.5z"/>
-</vector>

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

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-
-    <include layout="@layout/toolbar"/>
-
-    <ScrollView
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        tools:ignore="UseCompoundDrawables,ContentDescription">
-
-        <LinearLayout
-            android:id="@android:id/content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                style="?attr/cardStyle"
-                app:cardUseCompatPadding="true">
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <LinearLayout
-                        android:layout_width="fill_parent"
-                        android:layout_height="72dp"
-                        android:orientation="horizontal"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="72dp"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center_vertical"
-                            android:src="@drawable/ic_logo"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:paddingLeft="16dp"
-                            android:paddingRight="16dp"
-                            android:text="@string/app_name"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Headline"/>
-                    </LinearLayout>
-
-                    <a.o
-                        android:id="@+id/app_version_info"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:icon="@drawable/ic_info_outline"
-                        app:text="@string/app_version"/>
-
-                    <a.o
-                        android:id="@+id/app_changelog"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:icon="@drawable/ic_history"
-                        app:text="@string/app_changelog"/>
-
-                    <a.o
-                        android:id="@+id/app_translators"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:icon="@drawable/ic_language"
-                        app:text="@string/app_translators"/>
-
-                    <a.o
-                        android:id="@+id/follow_twitter"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:icon="@drawable/ic_twitter"
-                        app:text="@string/follow_twitter"/>
-
-                    <a.o
-                        android:id="@+id/app_source_code"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:icon="@drawable/ic_github"
-                        app:text="@string/app_source_code"/>
-
-                    <a.o
-                        android:id="@+id/support_thread"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:icon="@drawable/ic_xda"
-                        app:text="@string/support_thread"/>
-
-                </LinearLayout>
-
-            </androidx.cardview.widget.CardView>
-
-        </LinearLayout>
-
-    </ScrollView>
-
-</LinearLayout>

app/src/full/res/layout/activity_donation.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include layout="@layout/toolbar"/>
-
-    <ScrollView
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        tools:ignore="UseCompoundDrawables,ContentDescription">
-
-        <LinearLayout
-            android:id="@android:id/content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                style="?attr/cardStyle"
-                app:cardUseCompatPadding="true">
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:padding="16dp"
-                        android:text="@string/donation"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Headline"/>
-
-                    <a.o
-                        android:id="@+id/paypal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:icon="@drawable/ic_paypal"
-                        app:text="PayPal"/>
-
-                    <a.o
-                        android:id="@+id/patreon"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:icon="@drawable/ic_patreon"
-                        app:text="Patreon"/>
-
-                </LinearLayout>
-
-            </androidx.cardview.widget.CardView>
-
-        </LinearLayout>
-
-    </ScrollView>
-
-</LinearLayout>

app/src/full/res/layout/activity_flash.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/flashing_background_color"
-    tools:context="com.topjohnwu.magisk.FlashActivity">
-
-    <include layout="@layout/toolbar"/>
-
-    <ScrollView
-        android:id="@+id/scrollView"
-        android:layout_weight="1"
-        android:layout_width="match_parent"
-        android:layout_height="0dp">
-
-        <HorizontalScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/txtLog"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="monospace"
-                android:padding="8dp"
-                android:textColor="@android:color/white"
-                android:textSize="10sp" />
-
-        </HorizontalScrollView>
-
-    </ScrollView>
-
-    <LinearLayout
-        android:id="@+id/button_panel"
-        style="?android:buttonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <Button
-            android:id="@+id/no_thanks"
-            style="?android:borderlessButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="50dp"
-            android:layout_weight="1"
-            android:text="@string/close" />
-
-        <Button
-            android:id="@+id/save_logs"
-            style="?android:borderlessButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="50dp"
-            android:layout_weight="1"
-            android:text="@string/menuSaveLog" />
-
-        <Button
-            android:id="@+id/reboot"
-            style="?android:borderlessButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="50dp"
-            android:layout_weight="1"
-            android:text="@string/reboot" />
-
-    </LinearLayout>
-
-</LinearLayout>

app/src/full/res/layout/activity_main.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?android:windowBackground"
-        android:orientation="vertical">
-
-        <FrameLayout
-            android:layout_marginTop="?attr/actionBarSize"
-            android:id="@+id/content_frame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <include layout="@layout/toolbar" />
-
-    </FrameLayout>
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true"
-        app:menu="@menu/drawer" />
-
-</androidx.drawerlayout.widget.DrawerLayout>

app/src/full/res/layout/activity_request.xml

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/su_popup"
-    tools:context=".SuRequestActivity"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:minWidth="350dp"
-    android:layout_gravity="center"
-    android:orientation="vertical"
-    android:background="?attr/colorBackgroundFloating">
-
-    <TextView
-        android:text="@string/su_request_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:id="@+id/request_title"
-        android:gravity="center_horizontal"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="5dp"/>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
-        android:layout_gravity="center_horizontal">
-
-        <ImageView
-            android:id="@+id/app_icon"
-            android:layout_weight="0"
-            android:layout_marginEnd="10dp"
-            android:layout_height="50dp"
-            android:layout_width="50dp"
-            android:layout_marginStart="5dp"
-            android:layout_gravity="center_vertical" />
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minWidth="200dp"
-                android:maxWidth="300dp"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:textColor="?android:textColorPrimary"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:id="@+id/app_name" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minWidth="200dp"
-                android:maxWidth="300dp"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:textColor="?android:textColorSecondary"
-                android:id="@+id/package_name" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <Spinner
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/timeout"
-        android:layout_gravity="center_horizontal" />
-
-    <TextView
-        android:id="@+id/warning"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawableStart="@drawable/ic_warning"
-        android:textColor="?android:textColorSecondary"
-        android:text="@string/su_warning"
-        android:layout_gravity="center_horizontal"
-        android:layout_margin="5dp"
-        android:drawablePadding="10dp" />
-
-    <LinearLayout
-        style="?android:buttonBarStyle"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="bottom"
-        android:paddingLeft="30dp"
-        android:paddingRight="30dp">
-
-        <Button
-            style="?android:buttonBarButtonStyle"
-            android:text="@string/deny_with_str"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:id="@+id/deny_btn"
-            android:layout_weight="1" />
-
-        <Button
-            android:id="@+id/grant_btn"
-            style="?android:buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/grant" />
-
-        <ImageView
-            android:id="@+id/fingerprint"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:padding="7dp"
-            android:tint="?attr/colorAccent"
-            android:src="@drawable/ic_fingerprint" />
-    </LinearLayout>
-
-</LinearLayout>

app/src/full/res/layout/activity_settings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:windowBackground"
-    android:orientation="vertical">
-
-    <include layout="@layout/toolbar" />
-
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-</LinearLayout>

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

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