Release Magisk v25.1

Co-authored-by: John Wu <topjohnwu@gmail.com>

.gitattributes

@@ -11,8 +11,14 @@
 *.bat text eol=crlf
 
 # Denote all files that are truly binary and should not be modified.
-chromeos/** binary
+tools/** binary
 *.jar binary
 *.exe binary
 *.apk binary
 *.png binary
+*.jpg binary
+*.ttf binary
+
+# Help GitHub detect languages
+native/jni/external/** linguist-vendored
+native/jni/systemproperties/** linguist-language=C++

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ""
+labels: ""
+assignees: ""
+---
+
+<!--
+
+## READ BEFORE OPENING ISSUES
+
+All bug reports require you to **USE DEBUG BUILDS**. Please include the version name and version code in the bug report.
+
+If you experience a bootloop, attach a `dmesg` (kernel logs) when the device refuse to boot. This may very likely require a custom kernel on some devices as `last_kmsg` or `pstore ramoops` are usually not enabled by default. In addition, please also upload the result of `cat /proc/mounts` when your device is working correctly **WITHOUT MAGISK**.
+
+If you experience issues during installation, in recovery, upload the recovery logs, or in Magisk, upload the install logs. Please also upload the `boot.img` or `recovery.img` that you are using for patching.
+
+If you experience a crash of Magisk app, dump the full `logcat` **when the crash happens**.
+
+If you experience other issues related to Magisk, upload `magisk.log`, and preferably also include a boot `logcat` (start dumping `logcat` when the device boots up)
+
+**DO NOT** open issues regarding root detection.
+
+**DO NOT** ask for instructions.
+
+**DO NOT** report issues if you have any modules installed.
+
+Without following the rules above, your issue will be closed without explanation.
+
+-->
+
+Device:
+Android version:
+Magisk version name:
+Magisk version code:

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,6 @@
+blank_issues_enabled: false
+contact_links:
+  - name: XDA Community Support
+    url: https://forum.xda-developers.com/f/magisk.5903/
+    about: Please ask and answer questions here.
+

.github/ccache.sh

@@ -0,0 +1,19 @@
+OS=$(uname)
+CCACHE_VER=4.4
+
+case $OS in
+  Darwin )
+    brew install ccache
+    ln -s $(which ccache) ./ccache
+    ;;
+  Linux )
+    sudo apt-get install -y ccache
+    ln -s $(which ccache) ./ccache
+    ;;
+  * )
+    curl -OL https://github.com/ccache/ccache/releases/download/v${CCACHE_VER}/ccache-${CCACHE_VER}-windows-64.zip
+    unzip -j ccache-*-windows-64.zip '*/ccache.exe'
+    ;;
+esac
+mkdir ./.ccache
+./ccache -o compiler_check='%compiler% -dumpmachine; %compiler% -dumpversion'

.github/workflows/build.yml

@@ -0,0 +1,91 @@
+name: Magisk Build
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'app/**'
+      - 'native/**'
+      - 'stub/**'
+      - 'buildSrc/**'
+      - 'build.py'
+      - 'gradle.properties'
+      - '.github/workflows/build.yml'
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+    env:
+      NDK_CCACHE: ${{ github.workspace }}/ccache
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+
+    steps:
+      - name: Check out
+        uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+          fetch-depth: 0
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+
+      - name: Set up Python 3
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Set up ccache
+        run: bash .github/ccache.sh
+
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            !~/.gradle/caches/build-cache-*
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: ${{ runner.os }}-gradle-
+
+      - name: Cache build cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ${{ github.workspace }}/.ccache
+            ~/.gradle/caches/build-cache-*
+          key: ${{ runner.os }}-build-cache-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-build-cache-
+
+      - name: Set up NDK
+        run: python build.py -v ndk
+
+      - name: Build release
+        run: |
+          ./ccache -zp
+          python build.py -vr all
+
+      - name: Build debug
+        run: |
+          python build.py -v all
+          ./ccache -s
+
+      - name: Stop gradle daemon
+        run: ./gradlew --stop
+
+      # Only upload artifacts built on Linux
+      - name: Upload build artifact
+        if: runner.os == 'Linux'
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ github.sha }}
+          path: out

.gitignore

@@ -2,10 +2,9 @@ out
 *.zip
 *.jks
 *.apk
-config.prop
-
-# Manually dumped jars
-snet/libs
+/config.prop
+/update.sh
+/dict.txt
 
 # Built binaries
 native/out
@@ -17,4 +16,3 @@ native/out
 /.idea
 /build
 /captures
-.externalNativeBuild

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/topjohnwu/ndk-busybox.git
 [submodule "dtc"]
 	path = native/jni/external/dtc
-	url = https://github.com/dgibson/dtc
+	url = https://github.com/dgibson/dtc.git
 [submodule "lz4"]
 	path = native/jni/external/lz4
 	url = https://github.com/lz4/lz4.git
@@ -19,3 +19,24 @@
 [submodule "nanopb"]
 	path = native/jni/external/nanopb
 	url = https://github.com/nanopb/nanopb.git
+[submodule "mincrypt"]
+	path = native/jni/external/mincrypt
+	url = https://github.com/topjohnwu/mincrypt.git
+[submodule "pcre"]
+	path = native/jni/external/pcre
+	url = https://android.googlesource.com/platform/external/pcre
+[submodule "libcxx"]
+	path = native/jni/external/libcxx
+	url = https://github.com/topjohnwu/libcxx.git
+[submodule "zlib"]
+	path = native/jni/external/zlib
+	url = https://android.googlesource.com/platform/external/zlib
+[submodule "parallel-hashmap"]
+	path = native/jni/external/parallel-hashmap
+	url = https://github.com/greg7mdp/parallel-hashmap.git
+[submodule "termux-elf-cleaner"]
+	path = tools/termux-elf-cleaner
+	url = https://github.com/termux/termux-elf-cleaner.git
+[submodule "zopfli"]
+	path = native/jni/external/zopfli
+	url = https://github.com/google/zopfli.git

README.MD

@@ -1,35 +1,86 @@
-# Magisk
+![](docs/images/logo.png)
 
-## Building Environment Requirements
+[![Downloads](https://img.shields.io/badge/dynamic/json?color=green&label=Downloads&query=totalString&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk-files%2Fcount%2Fcount.json&cacheSeconds=1800)](https://raw.githubusercontent.com/topjohnwu/magisk-files/count/count.json)
 
-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
+#### This is not an officially supported Google product
 
-## Building Notes and Instructions
-1. Building is supported on macOS, Linux, and Windows using the custom NDK: [FrankeNDK](https://github.com/topjohnwu/FrankeNDK).
-2. Set configurations in `config.prop`. A sample file `config.prop.sample` is provided as an example.
-3. Run `build.py` with argument `-h` to see the built-in help message. The `-h` option also works for each supported actions, e.g. `./build.py binary -h`
-4. By default, `build.py` build binaries and Magisk Manager in debug mode. If you want to build Magisk Manager in release mode (via the `-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
 
-## Documentation
-[Link to Documentation](docs/README.MD)
+Magisk is a suite of open source software for customizing Android, supporting devices higher than Android 5.0.<br>
+Some highlight features:
+
+- **MagiskSU**: Provide root access for applications
+- **Magisk Modules**: Modify read-only partitions by installing modules
+- **MagiskBoot**: The most complete tool for unpacking and repacking Android boot images
+- **Zygisk**: Run code in every Android applications' processes
+
+## Downloads
+
+[Github](https://github.com/topjohnwu/Magisk/) is the only source where you can get official Magisk information and downloads.
+
+[![](https://img.shields.io/badge/Magisk-v24.3-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v24.3)
+[![](https://img.shields.io/badge/Magisk%20Beta-v25.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v25.0)
+[![](https://img.shields.io/badge/Magisk-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-release.apk)
+[![](https://img.shields.io/badge/Magisk-Debug-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-debug.apk)
+
+## Useful Links
+
+- [Installation Instruction](https://topjohnwu.github.io/Magisk/install.html)
+- [Magisk Documentation](https://topjohnwu.github.io/Magisk/)
+- [Magisk Troubleshoot Wiki](https://www.didgeridoohan.com/magisk/HomePage) (by [@Didgeridoohan](https://github.com/Didgeridoohan))
+
+## Bug Reports
+
+**Only bug reports from Debug builds will be accepted.**
+
+For installation issues, upload both boot image and install logs.<br>
+For Magisk issues, upload boot logcat or dmesg.<br>
+For Magisk app crashes, record and upload the logcat when the crash occurs.
+
+## Building and Development
+
+- Magisk builds on any OS Android Studio supports. Install Android Studio and do the initial setups.
+- Clone sources: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git`
+- Install Python 3.6+ \
+  (Windows only: select **'Add Python to PATH'** in installer, and run `pip install colorama` after install)
+- Configure to use the JDK bundled in Android Studio:
+  - macOS: `export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/Contents/Home"`
+  - Linux: `export PATH="/path/to/androidstudio/jre/bin:$PATH"`
+  - Windows: Add `C:\Path\To\Android Studio\jre\bin` to environment variable `PATH`
+- Set environment variable `ANDROID_SDK_ROOT` to the Android SDK folder (can be found in Android Studio settings)
+- Run `./build.py ndk` to let the script download and install NDK for you
+- To start building, run `build.py` to see your options. \
+  For each action, use `-h` to access help (e.g. `./build.py all -h`)
+- To start development, open the project with Android Studio. The IDE can be used for both app (Kotlin/Java) and native (C++/C) sources.
+- Optionally, set custom configs with `config.prop`. A sample `config.prop.sample` is provided.
+
+## Signing and Distribution
+
+- The certificate of the key used to sign the final Magisk APK product is also directly embedded into some executables. In release builds, Magisk's root daemon will enforce this certificate check and reject and forcefully uninstall any non-matching Magisk apps to protect users from malicious and unverified Magisk APKs.
+- To do any development on Magisk itself, switch to an **official debug build and reinstall Magisk** to bypass the signature check.
+- To distribute your own Magisk builds signed with your own keys, set your signing configs in `config.prop`.
+- Check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key) for more details on generating your own key.
+
+## Translation Contributions
+
+Default string resources for the Magisk app and its stub APK are located here:
+
+- `app/src/main/res/values/strings.xml`
+- `stub/src/main/res/values/strings.xml`
+
+Translate each and place them in the respective locations (`[module]/src/main/res/values-[lang]/strings.xml`).
 
 ## 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,7 @@
 app/release
 *.hprof
 .externalNativeBuild/
-src/full/res/raw/util_functions.sh
-public.certificate.x509.pem
-private.key.pk8
 *.apk
+src/main/assets
+src/main/jniLibs
+src/main/resources

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,83 +0,0 @@
-apply plugin: 'com.android.application'
-
-def configProps = new Properties()
-configProps.load(new FileInputStream(rootProject.file('config.prop')))
-
-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']
-        }
-    }
-
-    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"
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    dexOptions {
-        preDexLibraries true
-        javaMaxHeapSize "2g"
-    }
-    lintOptions {
-        disable 'MissingTranslation'
-    }
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    fullImplementation project(':utils')
-    implementation "com.android.support:support-core-utils:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:preference-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
-    fullImplementation 'com.github.topjohnwu:libsu:2.0.1'
-    fullImplementation 'com.atlassian.commonmark:commonmark:0.11.0'
-    fullImplementation 'org.kamranzafar:jtar:2.3'
-    fullImplementation 'com.jakewharton:butterknife:8.8.1'
-    fullAnnotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
-}

app/build.gradle.kts

@@ -0,0 +1,120 @@
+plugins {
+    id("com.android.application")
+    kotlin("android")
+    kotlin("plugin.parcelize")
+    kotlin("kapt")
+    id("androidx.navigation.safeargs.kotlin")
+}
+
+kapt {
+    correctErrorTypes = true
+    useBuildCache = true
+    mapDiagnosticLocations = true
+    javacOptions {
+        option("-Xmaxerrs", 1000)
+    }
+    arguments {
+        arg("room.incremental", "true")
+    }
+}
+
+android {
+    namespace = "com.topjohnwu.magisk"
+
+    defaultConfig {
+        applicationId = "com.topjohnwu.magisk"
+        vectorDrawables.useSupportLibrary = true
+        versionName = Config.version
+        versionCode = Config.versionCode
+        ndk.abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles("proguard-rules.pro")
+        }
+    }
+
+    buildFeatures {
+        dataBinding = true
+    }
+
+    packagingOptions {
+        resources {
+            excludes += "/META-INF/*"
+            excludes += "/org/bouncycastle/**"
+            excludes += "/kotlin/**"
+            excludes += "/kotlinx/**"
+            excludes += "/okhttp3/**"
+            excludes += "/*.txt"
+            excludes += "/*.bin"
+            excludes += "/*.json"
+        }
+        jniLibs {
+            keepDebugSymbols += "**/*.so"
+        }
+    }
+}
+
+setupApp()
+
+configurations.all {
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
+}
+
+dependencies {
+    implementation(project(":app:shared"))
+
+    implementation("com.github.topjohnwu:jtar:1.0.0")
+    implementation("com.github.topjohnwu:indeterminate-checkbox:1.0.7")
+    implementation("com.github.topjohnwu:lz4-java:1.7.1")
+    implementation("com.jakewharton.timber:timber:5.0.1")
+    implementation("org.bouncycastle:bcpkix-jdk18on:1.71")
+    implementation("dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0")
+    implementation("dev.rikka.rikkax.insets:insets:1.2.0")
+    implementation("dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1")
+    implementation("io.noties.markwon:core:4.6.2")
+
+    val vLibsu = "5.0.2"
+    implementation("com.github.topjohnwu.libsu:core:${vLibsu}")
+    implementation("com.github.topjohnwu.libsu:service:${vLibsu}")
+    implementation("com.github.topjohnwu.libsu:nio:${vLibsu}")
+
+    val vRetrofit = "2.9.0"
+    implementation("com.squareup.retrofit2:retrofit:${vRetrofit}")
+    implementation("com.squareup.retrofit2:converter-moshi:${vRetrofit}")
+    implementation("com.squareup.retrofit2:converter-scalars:${vRetrofit}")
+
+    val vOkHttp = "4.9.3"
+    implementation("com.squareup.okhttp3:okhttp:${vOkHttp}")
+    implementation("com.squareup.okhttp3:logging-interceptor:${vOkHttp}")
+    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:${vOkHttp}")
+
+    val vMoshi = "1.13.0"
+    implementation("com.squareup.moshi:moshi:${vMoshi}")
+    kapt("com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}")
+
+    val vRoom = "2.5.0-alpha02"
+    implementation("androidx.room:room-runtime:${vRoom}")
+    implementation("androidx.room:room-ktx:${vRoom}")
+    kapt("androidx.room:room-compiler:${vRoom}")
+
+    val vNav = "2.5.0-rc01"
+    implementation("androidx.navigation:navigation-fragment-ktx:${vNav}")
+    implementation("androidx.navigation:navigation-ui-ktx:${vNav}")
+
+    implementation("androidx.biometric:biometric:1.1.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+    implementation("androidx.appcompat:appcompat:1.4.2")
+    implementation("androidx.preference:preference:1.2.0")
+    implementation("androidx.recyclerview:recyclerview:1.2.1")
+    implementation("androidx.fragment:fragment-ktx:1.4.1")
+    implementation("androidx.transition:transition:1.4.1")
+    implementation("androidx.core:core-ktx:1.8.0")
+    implementation("androidx.core:core-splashscreen:1.0.0-rc01")
+    implementation("com.google.android.material:material:1.6.1")
+}

app/proguard-rules.pro

@@ -1,34 +1,49 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/topjohnwu/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Don't obfuscate, we are open source anyway :)
--dontobfuscate
-
-# 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.**
-
-# Gson
--keepattributes Signature
-
-# Strip logging
--assumenosideeffects class com.topjohnwu.magisk.utils.Logger {
-  public *** debug(...);
+# Parcelable
+-keepclassmembers class * implements android.os.Parcelable {
+    public static final ** CREATOR;
 }
+
+# Kotlin
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+	public static void check*(...);
+	public static void throw*(...);
+}
+-assumenosideeffects class java.util.Objects {
+    public static ** requireNonNull(...);
+}
+
+# Stub
+-keep class com.topjohnwu.magisk.core.App { <init>(java.lang.Object); }
+-keepclassmembers class androidx.appcompat.app.AppCompatDelegateImpl {
+  boolean mActivityHandlesUiModeChecked;
+  boolean mActivityHandlesUiMode;
+}
+
+# main
+-keep,allowoptimization public class com.topjohnwu.magisk.signing.SignBoot {
+    public static void main(java.lang.String[]);
+}
+
+# Strip Timber verbose and debug logging
+-assumenosideeffects class timber.log.Timber$Tree {
+  public void v(**);
+  public void d(**);
+}
+
+# Excessive obfuscation
+-repackageclasses 'a'
+-allowaccessmodification
+
+-obfuscationdictionary ../dict.txt
+-classobfuscationdictionary ../dict.txt
+-packageobfuscationdictionary ../dict.txt
+
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.commonmark.ext.gfm.strikethrough.Strikethrough
+-dontwarn org.conscrypt.Conscrypt*
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE

app/shared/build.gradle.kts

@@ -0,0 +1,13 @@
+plugins {
+    id("com.android.library")
+}
+
+setupCommon()
+
+android {
+    namespace = "com.topjohnwu.shared"
+}
+
+dependencies {
+    api("io.michaelrocks:paranoid-core:0.3.7")
+}

app/shared/src/debug/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:usesCleartextTraffic="true"
+        tools:ignore="UnusedAttribute" />
+
+</manifest>

app/shared/src/main/AndroidManifest.xml

@@ -0,0 +1,27 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.topjohnwu.shared"
+    android:installLocation="internalOnly">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29"
+        tools:ignore="ScopedStorage" />
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+
+    <application
+        android:allowBackup="false"
+        android:label="Magisk"
+        android:requestLegacyExternalStorage="true"
+        android:supportsRtl="true"
+        android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+
+</manifest>

app/shared/src/main/java/com/topjohnwu/magisk/ProviderInstaller.java

@@ -0,0 +1,24 @@
+package com.topjohnwu.magisk;
+
+import android.content.Context;
+
+import io.michaelrocks.paranoid.Obfuscate;
+
+@Obfuscate
+public class ProviderInstaller {
+
+    public static boolean install(Context context) {
+        try {
+            // Try installing new SSL provider from Google Play Service
+            Context gms = context.createPackageContext("com.google.android.gms",
+                    Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY);
+            gms.getClassLoader()
+                    .loadClass("com.google.android.gms.common.security.ProviderInstallerImpl")
+                    .getMethod("insertProvider", Context.class)
+                    .invoke(null, gms);
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+}

app/shared/src/main/java/com/topjohnwu/magisk/StubApk.java

@@ -0,0 +1,109 @@
+package com.topjohnwu.magisk;
+
+import static android.os.Build.VERSION.SDK_INT;
+import static android.os.ParcelFileDescriptor.MODE_READ_ONLY;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.res.AssetManager;
+import android.content.res.Resources;
+import android.content.res.loader.ResourcesLoader;
+import android.content.res.loader.ResourcesProvider;
+import android.os.ParcelFileDescriptor;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+import io.michaelrocks.paranoid.Obfuscate;
+
+@Obfuscate
+public class StubApk {
+    private static File dynDir;
+    private static Method addAssetPath;
+
+    private static File getDynDir(ApplicationInfo info) {
+        if (dynDir == null) {
+            final String dataDir;
+            if (SDK_INT >= 24) {
+                // Use device protected path to allow directBootAware
+                dataDir = info.deviceProtectedDataDir;
+            } else {
+                dataDir = info.dataDir;
+            }
+            dynDir = new File(dataDir, "dyn");
+            dynDir.mkdirs();
+        }
+        return dynDir;
+    }
+
+    public static File current(Context c) {
+        return new File(getDynDir(c.getApplicationInfo()), "current.apk");
+    }
+
+    public static File current(ApplicationInfo info) {
+        return new File(getDynDir(info), "current.apk");
+    }
+
+    public static File update(Context c) {
+        return new File(getDynDir(c.getApplicationInfo()), "update.apk");
+    }
+
+    public static File update(ApplicationInfo info) {
+        return new File(getDynDir(info), "update.apk");
+    }
+
+    public static void addAssetPath(Resources res, String path) {
+        if (SDK_INT >= 30) {
+            try (var fd = ParcelFileDescriptor.open(new File(path), MODE_READ_ONLY)) {
+                var loader = new ResourcesLoader();
+                loader.addProvider(ResourcesProvider.loadFromApk(fd));
+                res.addLoaders(loader);
+            } catch (IOException ignored) {}
+        } else {
+            AssetManager asset = res.getAssets();
+            try {
+                if (addAssetPath == null)
+                    addAssetPath = AssetManager.class.getMethod("addAssetPath", String.class);
+                addAssetPath.invoke(asset, path);
+            } catch (Exception ignored) {}
+        }
+    }
+
+    public static void restartProcess(Activity activity) {
+        Intent intent = activity.getPackageManager()
+                .getLaunchIntentForPackage(activity.getPackageName());
+        activity.finishAffinity();
+        activity.startActivity(intent);
+        Runtime.getRuntime().exit(0);
+    }
+
+    public static class Data {
+        // Indices of the object array
+        private static final int STUB_VERSION = 0;
+        private static final int CLASS_COMPONENT_MAP = 1;
+        private static final int ROOT_SERVICE = 2;
+        private static final int ARR_SIZE = 3;
+
+        private final Object[] arr;
+
+        public Data() { arr = new Object[ARR_SIZE]; }
+        public Data(Object o) { arr = (Object[]) o; }
+        public Object getObject() { return arr; }
+
+        public int getVersion() { return (int) arr[STUB_VERSION]; }
+        public void setVersion(int version) { arr[STUB_VERSION] = version; }
+        public Map<String, String> getClassToComponent() {
+            // noinspection unchecked
+            return (Map<String, String>) arr[CLASS_COMPONENT_MAP];
+        }
+        public void setClassToComponent(Map<String, String> map) {
+            arr[CLASS_COMPONENT_MAP] = map;
+        }
+        public Class<?> getRootService() { return (Class<?>) arr[ROOT_SERVICE]; }
+        public void setRootService(Class<?> service) { arr[ROOT_SERVICE] = service; }
+    }
+}

app/shared/src/main/java/com/topjohnwu/magisk/utils/APKInstall.java

@@ -0,0 +1,174 @@
+package com.topjohnwu.magisk.utils;
+
+import static android.content.pm.PackageInstaller.EXTRA_SESSION_ID;
+import static android.content.pm.PackageInstaller.EXTRA_STATUS;
+import static android.content.pm.PackageInstaller.STATUS_FAILURE_INVALID;
+import static android.content.pm.PackageInstaller.STATUS_PENDING_USER_ACTION;
+import static android.content.pm.PackageInstaller.STATUS_SUCCESS;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageInstaller.SessionParams;
+import android.net.Uri;
+import android.os.Build;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import io.michaelrocks.paranoid.Obfuscate;
+
+@Obfuscate
+public final class APKInstall {
+
+    public static void transfer(InputStream in, OutputStream out) throws IOException {
+        int size = 8192;
+        var buffer = new byte[size];
+        int read;
+        while ((read = in.read(buffer, 0, size)) >= 0) {
+            out.write(buffer, 0, read);
+        }
+    }
+
+    public static Session startSession(Context context) {
+        return startSession(context, null, null, null);
+    }
+
+    public static Session startSession(Context context, String pkg,
+                                       Runnable onFailure, Runnable onSuccess) {
+        var receiver = new InstallReceiver(pkg, onSuccess, onFailure);
+        context = context.getApplicationContext();
+        if (pkg != null) {
+            // If pkg is not null, look for package added event
+            var filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
+            filter.addDataScheme("package");
+            context.registerReceiver(receiver, filter);
+        }
+        context.registerReceiver(receiver, new IntentFilter(receiver.sessionId));
+        return receiver;
+    }
+
+    public interface Session {
+        // @WorkerThread
+        OutputStream openStream(Context context) throws IOException;
+        // @WorkerThread
+        void install(Context context, File apk) throws IOException;
+        // @WorkerThread @Nullable
+        Intent waitIntent();
+    }
+
+    private static class InstallReceiver extends BroadcastReceiver implements Session {
+        private final String packageName;
+        private final Runnable onSuccess;
+        private final Runnable onFailure;
+        private final CountDownLatch latch = new CountDownLatch(1);
+        private Intent userAction = null;
+
+        final String sessionId = UUID.randomUUID().toString();
+
+        private InstallReceiver(String packageName, Runnable onSuccess, Runnable onFailure) {
+            this.packageName = packageName;
+            this.onSuccess = onSuccess;
+            this.onFailure = onFailure;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) {
+                Uri data = intent.getData();
+                if (data == null)
+                    return;
+                String pkg = data.getSchemeSpecificPart();
+                if (pkg.equals(packageName)) {
+                    onSuccess(context);
+                }
+            } else if (sessionId.equals(intent.getAction())) {
+                int status = intent.getIntExtra(EXTRA_STATUS, STATUS_FAILURE_INVALID);
+                switch (status) {
+                    case STATUS_PENDING_USER_ACTION:
+                        userAction = intent.getParcelableExtra(Intent.EXTRA_INTENT);
+                        break;
+                    case STATUS_SUCCESS:
+                        if (packageName == null) {
+                            onSuccess(context);
+                        }
+                        break;
+                    default:
+                        int id = intent.getIntExtra(EXTRA_SESSION_ID, 0);
+                        if (id > 0) {
+                            var installer = context.getPackageManager().getPackageInstaller();
+                            var info = installer.getSessionInfo(id);
+                            if (info != null) {
+                                installer.abandonSession(info.getSessionId());
+                            }
+                        }
+                        if (onFailure != null) {
+                            onFailure.run();
+                        }
+                        context.getApplicationContext().unregisterReceiver(this);
+                }
+                latch.countDown();
+            }
+        }
+
+        private void onSuccess(Context context) {
+            if (onSuccess != null)
+                onSuccess.run();
+            context.getApplicationContext().unregisterReceiver(this);
+        }
+
+        @Override
+        public Intent waitIntent() {
+            try {
+                // noinspection ResultOfMethodCallIgnored
+                latch.await(5, TimeUnit.SECONDS);
+            } catch (Exception ignored) {}
+            return userAction;
+        }
+
+        @Override
+        public OutputStream openStream(Context context) throws IOException {
+            // noinspection InlinedApi
+            var flag = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE;
+            var intent = new Intent(sessionId).setPackage(context.getPackageName());
+            var pending = PendingIntent.getBroadcast(context, 0, intent, flag);
+
+            var installer = context.getPackageManager().getPackageInstaller();
+            var params = new SessionParams(SessionParams.MODE_FULL_INSTALL);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                params.setRequireUserAction(SessionParams.USER_ACTION_NOT_REQUIRED);
+            }
+            var session = installer.openSession(installer.createSession(params));
+            var out = session.openWrite(sessionId, 0, -1);
+            return new FilterOutputStream(out) {
+                @Override
+                public void write(byte[] b, int off, int len) throws IOException {
+                    out.write(b, off, len);
+                }
+                @Override
+                public void close() throws IOException {
+                    super.close();
+                    session.commit(pending.getIntentSender());
+                    session.close();
+                }
+            };
+        }
+
+        @Override
+        public void install(Context context, File apk) throws IOException {
+            try (var src = new FileInputStream(apk);
+                 var out = openStream(context)) {
+                transfer(src, out);
+            }
+        }
+    }
+}

app/shared/src/main/java/com/topjohnwu/magisk/utils/CompoundEnumeration.java

@@ -0,0 +1,35 @@
+package com.topjohnwu.magisk.utils;
+
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+
+public class CompoundEnumeration<E> implements Enumeration<E> {
+    private Enumeration<E>[] enums;
+    private int index = 0;
+
+    @SafeVarargs
+    public CompoundEnumeration(Enumeration<E> ...enums) {
+        this.enums = enums;
+    }
+
+    private boolean next() {
+        while (index < enums.length) {
+            if (enums[index] != null && enums[index].hasMoreElements()) {
+                return true;
+            }
+            index++;
+        }
+        return false;
+    }
+
+    public boolean hasMoreElements() {
+        return next();
+    }
+
+    public E nextElement() {
+        if (!next()) {
+            throw new NoSuchElementException();
+        }
+        return enums[index].nextElement();
+    }
+}

app/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java

@@ -0,0 +1,63 @@
+package com.topjohnwu.magisk.utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+
+import dalvik.system.BaseDexClassLoader;
+
+public class DynamicClassLoader extends BaseDexClassLoader {
+
+    public DynamicClassLoader(File apk) {
+        this(apk, getSystemClassLoader());
+    }
+
+    public DynamicClassLoader(File apk, ClassLoader parent) {
+        // Set optimizedDirectory to null to bypass DexFile's security checks
+        super(apk.getPath(), null, null, parent);
+    }
+
+    @Override
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        // First check if already loaded
+        Class<?> cls = findLoadedClass(name);
+        if (cls != null)
+            return cls;
+
+        try {
+            // Then check boot classpath
+            return getSystemClassLoader().loadClass(name);
+        } catch (ClassNotFoundException ignored) {
+            try {
+                // Next try current dex
+                return findClass(name);
+            } catch (ClassNotFoundException fromSuper) {
+                try {
+                    // Finally try parent
+                    return getParent().loadClass(name);
+                } catch (ClassNotFoundException e) {
+                    throw fromSuper;
+                }
+            }
+        }
+    }
+
+    @Override
+    public URL getResource(String name) {
+        URL resource = getSystemClassLoader().getResource(name);
+        if (resource != null)
+            return resource;
+        resource = findResource(name);
+        if (resource != null)
+            return resource;
+        resource = getParent().getResource(name);
+        return resource;
+    }
+
+    @Override
+    public Enumeration<URL> getResources(String name) throws IOException {
+        return new CompoundEnumeration<>(getSystemClassLoader().getResources(name),
+                findResources(name), getParent().getResources(name));
+    }
+}

app/src/full/AndroidManifest.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    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=".MagiskManager"
-        android:theme="@style/AppTheme">
-
-        <activity
-            android:name=".MainActivity"
-            android:configChanges="orientation|screenSize"
-            android:exported="true" />
-        <activity
-            android:name=".SplashActivity"
-            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=".AboutActivity"
-            android:theme="@style/AppTheme.StatusBar" />
-        <activity
-            android:name=".DonationActivity"
-            android:theme="@style/AppTheme.StatusBar"/>
-        <activity
-            android:name=".FlashActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="nosensor"
-            android:theme="@style/AppTheme.StatusBar" />
-        <activity
-            android:name=".NoUIActivity"
-            android:theme="@style/AppTheme.Translucent" />
-        <activity
-            android:name=".superuser.RequestActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity="internal.superuser"
-            android:theme="@style/SuRequest" />
-
-        <receiver android:name=".superuser.SuReceiver" />
-        <receiver android:name=".receivers.BootReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".receivers.PackageReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
-                <data android:scheme="package" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".receivers.ManagerUpdate" />
-        <receiver android:name=".receivers.RebootReceiver" />
-        <receiver android:name=".receivers.ShortcutReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.LOCALE_CHANGED" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name=".services.OnBootService"
-            android:exported="true"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service
-            android:name=".services.UpdateCheckService"
-            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/com/topjohnwu/magisk/AboutActivity.java

@@ -1,73 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
-import android.view.View;
-
-import com.topjohnwu.magisk.asyncs.MarkDownWindow;
-import com.topjohnwu.magisk.components.AboutCardRow;
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.util.Locale;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class AboutActivity extends BaseActivity {
-
-    @BindView(R.id.toolbar) Toolbar toolbar;
-    @BindView(R.id.app_version_info) AboutCardRow appVersionInfo;
-    @BindView(R.id.app_changelog) AboutCardRow appChangelog;
-    @BindView(R.id.app_translators) AboutCardRow appTranslators;
-    @BindView(R.id.app_source_code) AboutCardRow appSourceCode;
-    @BindView(R.id.support_thread) AboutCardRow supportThread;
-    @BindView(R.id.follow_twitter) 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);
-        ButterKnife.bind(this);
-
-        setSupportActionBar(toolbar);
-        toolbar.setNavigationOnClickListener(view -> finish());
-
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setTitle(R.string.about);
-            ab.setDisplayHomeAsUpEnabled(true);
-        }
-
-        appVersionInfo.setSummary(String.format(Locale.US, "%s (%d) (%s)",
-                BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, getPackageName()));
-
-        appChangelog.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,159 +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 NOTIFY_NORMAL_LOG = 0;
-        public static final int NOTIFY_USER_TOASTS = 1;
-        public static final int NOTIFY_USER_TO_OWNER = 2;
-        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,187 +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.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;
-
-public class Data {
-    // Global app instance
-    public static WeakReference<MagiskManager> weakApp;
-    public static Handler mainHandler = new Handler(Looper.getMainLooper());
-
-    // 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;
-
-    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,45 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
-
-import com.topjohnwu.magisk.components.AboutCardRow;
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.utils.Utils;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class DonationActivity extends BaseActivity {
-
-    @BindView(R.id.toolbar) Toolbar toolbar;
-    @BindView(R.id.paypal) AboutCardRow paypal;
-    @BindView(R.id.patreon) 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);
-        ButterKnife.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,169 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.Manifest;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.asyncs.FlashZip;
-import com.topjohnwu.magisk.asyncs.InstallMagisk;
-import com.topjohnwu.magisk.components.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 butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-public class FlashActivity extends BaseActivity {
-
-    @BindView(R.id.toolbar) Toolbar toolbar;
-    @BindView(R.id.txtLog) TextView flashLogs;
-    @BindView(R.id.button_panel) public LinearLayout buttonPanel;
-    @BindView(R.id.reboot) public Button reboot;
-    @BindView(R.id.scrollView) ScrollView sv;
-
-    private List<String> logs;
-
-    @OnClick(R.id.no_thanks)
-    void dismiss() {
-        finish();
-    }
-
-    @OnClick(R.id.reboot)
-    void reboot() {
-        Shell.su("/system/bin/reboot").submit();
-    }
-
-    @OnClick(R.id.save_logs)
-    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);
-        ButterKnife.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:
-                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,218 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-import com.topjohnwu.magisk.components.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 butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class MainActivity extends BaseActivity
-        implements NavigationView.OnNavigationItemSelectedListener, Topic.Subscriber {
-
-    private final Handler mDrawerHandler = new Handler();
-    private int mDrawerItem;
-    private static boolean fromShortcut = false;
-
-    @BindView(R.id.drawer_layout) DrawerLayout drawer;
-    @BindView(R.id.toolbar) public Toolbar toolbar;
-    @BindView(R.id.nav_view) public 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, SplashActivity.class));
-            finish();
-        }
-
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        ButterKnife.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 int[] getSubscribedTopics() {
-        return new int[] {Topic.RELOAD_ACTIVITY};
-    }
-
-    @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, AboutActivity.class));
-                mDrawerItem = bak;
-                break;
-            case R.id.donation:
-                startActivity(new Intent(this, 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 android.support.annotation.NonNull;
-
-import com.topjohnwu.magisk.components.BaseActivity;
-
-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, 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, 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();
-    }
-}