Hardcode snet extension URL and version

Nobody should be using the signature verification in recoveries

.gitignore

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

README.MD

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

app/README.md

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

app/build.gradle

@@ -1,5 +1,9 @@
 apply plugin: 'com.android.application'
 
+def configProps = new Properties()
+def configPath = project.hasProperty('configPath') ? project.configPath : rootProject.file('config.prop')
+configProps.load(new FileInputStream(configPath))
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -8,18 +12,28 @@ android {
         applicationId "com.topjohnwu.magisk"
         minSdkVersion 21
         targetSdkVersion rootProject.ext.compileSdkVersion
-        javaCompileOptions {
-            annotationProcessorOptions {
-                argument('butterknife.debuggable', 'false')
-            }
+    }
+
+    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
         }
     }
 
@@ -27,8 +41,13 @@ android {
 
     productFlavors {
         full {
-            versionCode 129
-            versionName "5.8.3"
+            versionName configProps['appVersion']
+            versionCode configProps['appVersionCode'] as Integer
+            javaCompileOptions {
+                annotationProcessorOptions {
+                    argument('butterknife.debuggable', 'false')
+                }
+            }
         }
         stub {
             versionCode 1
@@ -51,15 +70,23 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.core:core:1.0.1'
     fullImplementation project(':utils')
-    implementation "com.android.support:support-core-utils:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:preference-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
-    fullImplementation 'com.github.topjohnwu:libsu:1.3.0'
+    fullImplementation 'com.amitshekhar.android:android-networking:1.0.2'
+    fullImplementation 'androidx.appcompat:appcompat:1.0.2'
+    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.1.2'
     fullImplementation 'com.atlassian.commonmark:commonmark:0.11.0'
     fullImplementation 'org.kamranzafar:jtar:2.3'
-    fullImplementation 'com.jakewharton:butterknife:8.8.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+
+    def butterKnifeVersion = '9.0.0-rc2'
+    if (properties.containsKey('android.injected.invoked.from.ide')) {
+        fullImplementation "com.jakewharton:butterknife-reflect:${butterKnifeVersion}"
+    } else {
+        fullImplementation "com.jakewharton:butterknife-runtime:${butterKnifeVersion}"
+        fullAnnotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
+    }
 }

app/proguard-rules.pro

@@ -16,14 +16,24 @@
 #   public *;
 #}
 
-# Keep all names, we are open source anyway :)
--keepnames class ** { *; }
-
 # BouncyCastle
--keep class org.bouncycastle.jcajce.provider.asymmetric.rsa.**SHA1** { *; }
--keep class org.bouncycastle.jcajce.provider.asymmetric.RSA** { *; }
--keep class org.bouncycastle.jcajce.provider.digest.SHA1** { *; }
+-keep,allowoptimization class org.bouncycastle.jcajce.provider.asymmetric.rsa.**SHA1** { *; }
+-keep,allowoptimization class org.bouncycastle.jcajce.provider.asymmetric.RSA** { *; }
+-keep,allowoptimization class org.bouncycastle.jcajce.provider.digest.SHA1** { *; }
 -dontwarn javax.naming.**
 
-# Gson
--keepattributes Signature
+# Snet extention
+-keepclassmembers class com.topjohnwu.magisk.utils.ISafetyNetHelper { *; }
+
+# Fast Android Networking Library
+-dontwarn okhttp3.**
+
+# Strip logging
+-assumenosideeffects class com.topjohnwu.magisk.utils.Logger {
+  public *** debug(...);
+}
+
+# Excessive obfuscation
+-repackageclasses 'a'
+-allowaccessmodification
+-optimizationpasses 6

app/src/full/AndroidManifest.xml

@@ -1,21 +1,26 @@
 <?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=".MagiskManager"
-        android:theme="@style/AppTheme">
+        android:name="a.q"
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
+
+        <!-- Activities -->
 
         <activity
-            android:name=".MainActivity"
+            android:name="a.b"
             android:configChanges="orientation|screenSize"
             android:exported="true" />
         <activity
-            android:name=".SplashActivity"
+            android:name="a.c"
             android:configChanges="orientation|screenSize"
             android:exported="true"
             android:theme="@style/SplashTheme">
@@ -25,57 +30,71 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".AboutActivity"
+            android:name="a.d"
             android:theme="@style/AppTheme.StatusBar" />
         <activity
-            android:name=".SettingsActivity"
-            android:theme="@style/AppTheme.StatusBar" />
+            android:name="a.e"
+            android:theme="@style/AppTheme.StatusBar"/>
         <activity
-            android:name=".FlashActivity"
+            android:name="a.f"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="nosensor"
             android:theme="@style/AppTheme.StatusBar" />
         <activity
-            android:name=".NoUIActivity"
+            android:name="a.g"
             android:theme="@style/AppTheme.Translucent" />
+
+        <!-- Superuser -->
+
         <activity
-            android:name=".superuser.RequestActivity"
+            android:name="a.m"
             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 android:name=".receivers.BootReceiver">
+
+        <!-- Receiver -->
+
+        <receiver android:name="a.h">
             <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">
+        <receiver android:name="a.i">
             <intent-filter>
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
             </intent-filter>
         </receiver>
 
-        <service android:name=".services.OnBootIntentService" />
+        <!-- Service -->
+
         <service
-            android:name=".services.UpdateCheckService"
+            android:name="a.j"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <service
+            android:name="a.k"
             android:exported="true"
             android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <!-- Hardcode GMS version -->
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="7095000" />
+            android:value="12451000" />
 
     </application>
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,25 +1,23 @@
 package com.topjohnwu.magisk;
 
-import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
 
 import com.topjohnwu.magisk.asyncs.MarkDownWindow;
 import com.topjohnwu.magisk.components.AboutCardRow;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Const;
+import 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;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
-public class AboutActivity extends Activity {
+public class AboutActivity extends BaseActivity {
 
     @BindView(R.id.toolbar) Toolbar toolbar;
     @BindView(R.id.app_version_info) AboutCardRow appVersionInfo;
@@ -27,7 +25,7 @@ public class AboutActivity extends Activity {
     @BindView(R.id.app_translators) AboutCardRow appTranslators;
     @BindView(R.id.app_source_code) AboutCardRow appSourceCode;
     @BindView(R.id.support_thread) AboutCardRow supportThread;
-    @BindView(R.id.donation) AboutCardRow donation;
+    @BindView(R.id.follow_twitter) AboutCardRow twitter;
 
     @Override
     public int getDarkTheme() {
@@ -38,7 +36,7 @@ public class AboutActivity extends Activity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-        ButterKnife.bind(this);
+        new AboutActivity_ViewBinding(this);
 
         setSupportActionBar(toolbar);
         toolbar.setNavigationOnClickListener(view -> finish());
@@ -52,7 +50,6 @@ public class AboutActivity extends Activity {
         appVersionInfo.setSummary(String.format(Locale.US, "%s (%d) (%s)",
                 BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, getPackageName()));
 
-        appChangelog.removeSummary();
         appChangelog.setOnClickListener(v -> {
             new MarkDownWindow(this, getString(R.string.app_changelog),
                     getResources().openRawResource(R.raw.changelog)).exec();
@@ -65,14 +62,9 @@ public class AboutActivity extends Activity {
             appTranslators.setSummary(translators);
         }
 
-        appSourceCode.removeSummary();
-        appSourceCode.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.SOURCE_CODE_URL))));
-
-        supportThread.removeSummary();
-        supportThread.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.XDA_THREAD))));
-
-        donation.removeSummary();
-        donation.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.DONATION_URL))));
+        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,11 +1,8 @@
-package com.topjohnwu.magisk.utils;
+package com.topjohnwu.magisk;
 
 import android.os.Environment;
 import android.os.Process;
 
-import com.topjohnwu.magisk.BuildConfig;
-import com.topjohnwu.magisk.MagiskManager;
-
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
@@ -13,7 +10,6 @@ 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
@@ -22,73 +18,69 @@ public class Const {
     public static final String SU_KEYSTORE_KEY = "su_key";
 
     // Paths
-    public static File MAGISK_PATH;
+    public static final String MAGISK_PATH = "/sbin/.magisk/img";
+    public static final File EXTERNAL_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");
+        MAGISK_DISABLE_FILE = new File("xxx");
+        EXTERNAL_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+        EXTERNAL_PATH.mkdirs();
     }
 
-    public static final String BUSYBOX_PATH = "/sbin/.core/busybox";
+    public static final String BUSYBOX_PATH = "/sbin/.magisk/busybox";
     public static final String TMP_FOLDER_PATH = "/dev/tmp";
     public static final String MAGISK_LOG = "/cache/magisk.log";
-    public static final File EXTERNAL_PATH = new File(Environment.getExternalStorageDirectory(), "MagiskManager");
     public static final String MANAGER_CONFIGS = ".tmp.magisk.config";
 
     // Versions
     public static final int UPDATE_SERVICE_VER = 1;
-    public static final int SNET_VER = 8;
-
-    public static int MIN_MODULE_VER() {
-        return MagiskManager.get().magiskVersionCode >= MAGISK_VER.REMOVE_LEGACY_LINK ? 1500 : 1400;
-    }
+    public static final int MIN_MODULE_VER = 1500;
+    public static final int SNET_EXT_VER = 12;
 
     /* A list of apps that should not be shown as hide-able */
     public static final List<String> HIDE_BLACKLIST =  Arrays.asList(
-            "android",
-            MagiskManager.get().getPackageName(),
+            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 DTBO_SUPPORT = 1446;
-        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 final int CMDLINE_DB = 17305;
+        public static final int HIDE_STATUS = 17315;
     }
 
     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 ONBOOT_NOTIFICATION_ID = 6;
         public static final int DTBO_NOTIFICATION_ID = 7;
-        public static final String NOTIFICATION_CHANNEL = "magisk_notification";
+        public static final int HIDE_MANAGER_NOTIFICATION_ID = 8;
+        public static final String UPDATE_NOTIFICATION_CHANNEL = "update";
+        public static final String PROGRESS_NOTIFICATION_CHANNEL = "progress";
     }
 
     public static 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 SNET_URL = "https://github.com/topjohnwu/magisk_files/raw/727aa3a8642bf5f0982e5ea89b3f818bd783d5a2/snet.apk";
-        public static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&page=%d";
+        public static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&sort=pushed";
         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 DONATION_URL = "https://www.paypal.me/topjohnwu";
+        public static final String PAYPAL_URL = "https://www.paypal.me/topjohnwu";
+        public static final String PATREON_URL = "https://www.patreon.com/topjohnwu";
+        public static final String TWITTER_URL = "https://twitter.com/topjohnwu";
         public static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382";
         public static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk";
+        public static final String SNET_URL = "https://raw.githubusercontent.com/topjohnwu/magisk_files/b66b1a914978e5f4c4bbfd74a59f4ad371bac107/snet.apk";
     }
 
 
@@ -106,11 +98,12 @@ public class Const {
 
         // intents
         public static final String OPEN_SECTION = "section";
-        public static final String INTENT_SET_FILENAME = "filename";
+        public static final String INTENT_SET_NAME = "filename";
         public static final String INTENT_SET_LINK = "link";
-        public static final String INTENT_PERM = "perm_dialog";
         public static final String FLASH_ACTION = "action";
         public static final String FLASH_SET_BOOT = "boot";
+        public static final String BROADCAST_MANAGER_UPDATE = "manager_update";
+        public static final String BROADCAST_REBOOT = "reboot";
 
         // others
         public static final String CHECK_UPDATES = "check_update";
@@ -147,16 +140,13 @@ public class Const {
         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_SECOND_SLOT = "slot";
+        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;

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

@@ -0,0 +1,195 @@
+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.GeneralReceiver;
+import com.topjohnwu.magisk.receivers.ShortcutReceiver;
+import com.topjohnwu.magisk.services.OnBootService;
+import com.topjohnwu.magisk.services.UpdateCheckService;
+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;
+
+    // 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 multiuserState = -1;
+    public static int suResponseType;
+    public static int suNotificationType;
+    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(GeneralReceiver.class, a.h.class);
+        classMap.put(ShortcutReceiver.class, a.i.class);
+        classMap.put(OnBootService.class, a.j.class);
+        classMap.put(UpdateCheckService.class, a.k.class);
+        classMap.put(AboutCardRow.class, a.l.class);
+        classMap.put(SuRequestActivity.class, a.m.class);
+
+    }
+
+    public static void loadMagiskInfo() {
+        try {
+            magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":")[0];
+            magiskVersionCode = Integer.parseInt(ShellUtils.fastCmd("magisk -V"));
+            if (magiskVersionCode >= Const.MAGISK_VER.HIDE_STATUS) {
+                magiskHide = Shell.su("magiskhide --status").exec().isSuccess();
+            } else {
+                String s = ShellUtils.fastCmd(("resetprop -p ") + 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("cat %s > /data/user/0/%s", xml, Const.MANAGER_CONFIGS)).exec();
+    }
+
+    public static void importPrefs() {
+        MagiskManager mm = MM();
+        SuFile config = new SuFile("/data/user/0/" + 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);
+
+        // 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.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
+                .putString(Const.Key.SU_REQUEST_TIMEOUT, String.valueOf(suRequestTimeout))
+                .putString(Const.Key.SU_AUTO_RESPONSE, String.valueOf(suResponseType))
+                .putString(Const.Key.SU_NOTIFICATION, String.valueOf(suNotificationType))
+                .putString(Const.Key.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

@@ -0,0 +1,44 @@
+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;
+import butterknife.BindView;
+
+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);
+        new DonationActivity_ViewBinding(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,11 +1,9 @@
 package com.topjohnwu.magisk;
 
+import android.Manifest;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
@@ -16,9 +14,9 @@ import android.widget.Toast;
 
 import com.topjohnwu.magisk.asyncs.FlashZip;
 import com.topjohnwu.magisk.asyncs.InstallMagisk;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.CallbackList;
 import com.topjohnwu.superuser.Shell;
 
@@ -30,11 +28,12 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-public class FlashActivity extends Activity {
+public class FlashActivity extends BaseActivity {
 
     @BindView(R.id.toolbar) Toolbar toolbar;
     @BindView(R.id.txtLog) TextView flashLogs;
@@ -44,37 +43,33 @@ public class FlashActivity extends Activity {
 
     private List<String> logs;
 
-    @OnClick(R.id.no_thanks)
-    void dismiss() {
-        finish();
-    }
-
     @OnClick(R.id.reboot)
     void reboot() {
-        Shell.Async.su("/system/bin/reboot");
+        Shell.su("/system/bin/reboot").submit();
     }
 
     @OnClick(R.id.save_logs)
     void saveLogs() {
-        Calendar now = Calendar.getInstance();
-        String filename = String.format(Locale.US,
-                "install_log_%04d%02d%02d_%02d%02d%02d.log",
-                now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
-                now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
-                now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
+        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(Const.EXTERNAL_PATH + "/logs", filename);
-        logFile.getParentFile().mkdirs();
-        try (FileWriter writer = new FileWriter(logFile)) {
-            for (String s : logs) {
-                writer.write(s);
-                writer.write('\n');
+            File logFile = new File(Const.EXTERNAL_PATH, filename);
+            try (FileWriter writer = new FileWriter(logFile)) {
+                for (String s : logs) {
+                    writer.write(s);
+                    writer.write('\n');
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+                return;
             }
-        } catch (IOException e) {
-            e.printStackTrace();
-            return;
-        }
-        MagiskManager.toast(logFile.getPath(), Toast.LENGTH_LONG);
+            Utils.toast(logFile.getPath(), Toast.LENGTH_LONG);
+        });
     }
 
     @Override
@@ -86,7 +81,8 @@ public class FlashActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_flash);
-        ButterKnife.bind(this);
+        new FlashActivity_ViewBinding(this);
+
         setSupportActionBar(toolbar);
         ActionBar ab = getSupportActionBar();
         if (ab != null) {
@@ -99,11 +95,23 @@ public class FlashActivity extends Activity {
 
         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);
-                flashLogs.setText(TextUtils.join("\n", this));
-                sv.postDelayed(() -> sv.fullScroll(ScrollView.FOCUS_DOWN), 10);
+                updateUI();
+            }
+
+            @Override
+            public String set(int i, String s) {
+                String ret = super.set(i, s);
+                Data.mainHandler.post(this::updateUI);
+                return ret;
             }
         };
 
@@ -119,18 +127,24 @@ public class FlashActivity extends Activity {
                 new UninstallMagisk(this, uri, console, logs).exec();
                 break;
             case Const.Value.FLASH_MAGISK:
-                new InstallMagisk(this, console, logs, uri, InstallMagisk.DIRECT_MODE).exec();
+                new InstallMagisk(this, console, logs, InstallMagisk.DIRECT_MODE).exec();
                 break;
-            case Const.Value.FLASH_SECOND_SLOT:
-                new InstallMagisk(this, console, logs, uri, InstallMagisk.SECOND_SLOT_MODE).exec();
+            case Const.Value.FLASH_INACTIVE_SLOT:
+                new InstallMagisk(this, console, logs, InstallMagisk.SECOND_SLOT_MODE).exec();
                 break;
             case Const.Value.PATCH_BOOT:
-                new InstallMagisk(this, console, logs, uri,
+                new InstallMagisk(this, console, logs,
                         intent.getParcelableExtra(Const.Key.FLASH_SET_BOOT)).exec();
                 break;
         }
     }
 
+    @OnClick(R.id.close)
+    @Override
+    public void finish() {
+        super.finish();
+    }
+
     @Override
     public void onBackPressed() {
         // Prevent user accidentally press back button
@@ -138,14 +152,14 @@ public class FlashActivity extends Activity {
 
     private static class UninstallMagisk extends FlashZip {
 
-        private UninstallMagisk(Activity context, Uri uri, List<String> console, List<String> logs) {
+        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) {
-                new Handler().postDelayed(() ->
+                Data.mainHandler.postDelayed(() ->
                         RootUtils.uninstallPkg(getActivity().getPackageName()), 3000);
             } else {
                 super.onPostExecute(result);

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

@@ -3,37 +3,42 @@ 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.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Const;
+import com.google.android.material.navigation.NavigationView;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.fragments.LogFragment;
+import com.topjohnwu.magisk.fragments.MagiskFragment;
+import com.topjohnwu.magisk.fragments.MagiskHideFragment;
+import com.topjohnwu.magisk.fragments.ModulesFragment;
+import com.topjohnwu.magisk.fragments.ReposFragment;
+import com.topjohnwu.magisk.fragments.SettingsFragment;
+import com.topjohnwu.magisk.fragments.SuperuserFragment;
+import com.topjohnwu.magisk.utils.Download;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
-public class MainActivity extends Activity
+public class MainActivity extends BaseActivity
         implements NavigationView.OnNavigationItemSelectedListener, Topic.Subscriber {
 
     private final Handler mDrawerHandler = new Handler();
     private int mDrawerItem;
-    private boolean fromShortcut = true;
+    private static boolean fromShortcut = false;
 
-    @BindView(R.id.toolbar) Toolbar toolbar;
+    @BindView(R.id.toolbar) public Toolbar toolbar;
     @BindView(R.id.drawer_layout) DrawerLayout drawer;
-    @BindView(R.id.nav_view) public NavigationView navigationView;
+    @BindView(R.id.nav_view) NavigationView navigationView;
 
     private float toolbarElevation;
 
@@ -44,27 +49,14 @@ public class MainActivity extends Activity
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
-
-        MagiskManager mm = getMagiskManager();
-
         if (!mm.hasInit) {
-            Intent intent = new Intent(this, SplashActivity.class);
-            String section = getIntent().getStringExtra(Const.Key.OPEN_SECTION);
-            if (section != null) {
-                intent.putExtra(Const.Key.OPEN_SECTION, section);
-            }
-            startActivity(intent);
+            startActivity(new Intent(this, Data.classMap.get(SplashActivity.class)));
             finish();
         }
 
-        String perm = getIntent().getStringExtra(Const.Key.INTENT_PERM);
-        if (perm != null) {
-            ActivityCompat.requestPermissions(this, new String[] { perm }, 0);
-        }
-
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ButterKnife.bind(this);
+        new MainActivity_ViewBinding(this);
 
         setSupportActionBar(toolbar);
 
@@ -86,8 +78,11 @@ public class MainActivity extends Activity
         drawer.addDrawerListener(toggle);
         toggle.syncState();
 
-        if (savedInstanceState == null)
-            navigate(getIntent().getStringExtra(Const.Key.OPEN_SECTION));
+        if (savedInstanceState == null) {
+            String section = getIntent().getStringExtra(Const.Key.OPEN_SECTION);
+            fromShortcut = section != null;
+            navigate(section);
+        }
 
         navigationView.setNavigationItemSelectedListener(this);
     }
@@ -118,28 +113,19 @@ public class MainActivity extends Activity
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
+    public void onPublish(int topic, Object[] result) {
         recreate();
     }
 
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { getMagiskManager().reloadActivity };
-    }
-
     public void checkHideSection() {
-        MagiskManager mm = getMagiskManager();
         Menu menu = navigationView.getMenu();
-        menu.findItem(R.id.magiskhide).setVisible(
-                Shell.rootAccess() && mm.magiskVersionCode >= Const.MAGISK_VER.UNIFIED
-                        && mm.prefs.getBoolean(Const.Key.MAGISKHIDE, false));
-        menu.findItem(R.id.modules).setVisible(!mm.prefs.getBoolean(Const.Key.COREONLY, false) &&
-                Shell.rootAccess() && mm.magiskVersionCode >= 0);
-        menu.findItem(R.id.downloads).setVisible(!mm.prefs.getBoolean(Const.Key.COREONLY, false)
-                && Utils.checkNetworkStatus() && Shell.rootAccess() && mm.magiskVersionCode >= 0);
+        menu.findItem(R.id.magiskhide).setVisible(Shell.rootAccess() &&
+                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 && mm.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED));
+        menu.findItem(R.id.superuser).setVisible(Utils.showSuperUser());
     }
 
     public void navigate(String item) {
@@ -167,6 +153,9 @@ public class MainActivity extends Activity
                 case "about":
                     itemId = R.id.app_about;
                     break;
+                case "donation":
+                    itemId = R.id.donation;
+                    break;
             }
         }
         navigate(itemId);
@@ -197,11 +186,14 @@ public class MainActivity extends Activity
                 displayFragment(new LogFragment(), false);
                 break;
             case R.id.settings:
-                startActivity(new Intent(this, SettingsActivity.class));
-                mDrawerItem = bak;
+                displayFragment(new SettingsFragment(), true);
                 break;
             case R.id.app_about:
-                startActivity(new Intent(this, AboutActivity.class));
+                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;
         }

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

@@ -1,23 +1,10 @@
 package com.topjohnwu.magisk;
 
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
+import com.topjohnwu.magisk.components.BaseActivity;
 
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Const;
-
-public class NoUIActivity extends Activity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        String[] perms = getIntent().getStringArrayExtra(Const.Key.INTENT_PERM);
-        if (perms != null) {
-            ActivityCompat.requestPermissions(this, perms, 0);
-        }
-    }
+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);

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

@@ -1,88 +1,75 @@
 package com.topjohnwu.magisk;
 
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
 import android.content.Intent;
-import android.os.Build;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.text.TextUtils;
 
 import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.asyncs.LoadModules;
-import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.asyncs.UpdateRepos;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.components.Notifications;
 import com.topjohnwu.magisk.receivers.ShortcutReceiver;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Download;
+import com.topjohnwu.magisk.utils.LocaleManager;
 import com.topjohnwu.magisk.utils.RootUtils;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 
-public class SplashActivity extends Activity {
+public class SplashActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        RootUtils.init();
-        MagiskManager mm = getMagiskManager();
-
-        mm.repoDB = new RepoDatabaseHelper(this);
-        mm.loadMagiskInfo();
-        mm.getDefaultInstallFlags();
-        mm.loadPrefs();
-
-        // Dynamic detect all locales
-        new LoadLocale().exec();
-
-        // 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);
+        String pkg = mm.mDB.getStrings(Const.Key.SU_MANAGER, null);
+        if (pkg != null && getPackageName().equals(BuildConfig.APPLICATION_ID)) {
+            mm.mDB.setStrings(Const.Key.SU_MANAGER, null);
+            Shell.su("pm uninstall " + pkg).exec();
         }
-
-        // Setup shortcuts
-        sendBroadcast(new Intent(this, ShortcutReceiver.class));
-
-        LoadModules loadModuleTask = new LoadModules();
-
-        if (Utils.checkNetworkStatus()) {
-            // Fire update check
-            new CheckUpdates().exec();
-            // Add repo update check
-            loadModuleTask.setCallBack(() -> new UpdateRepos(false).exec());
+        if (TextUtils.equals(pkg, getPackageName())) {
+            try {
+                // We are the manager, remove com.topjohnwu.magisk as it could be malware
+                getPackageManager().getApplicationInfo(BuildConfig.APPLICATION_ID, 0);
+                RootUtils.uninstallPkg(BuildConfig.APPLICATION_ID);
+            } catch (PackageManager.NameNotFoundException ignored) {}
         }
 
         // Magisk working as expected
-        if (Shell.rootAccess() && mm.magiskVersionCode > 0) {
+        if (Shell.rootAccess() && Data.magiskVersionCode > 0) {
             // Update check service
-            mm.setupUpdateCheck();
-            // Fire asynctasks
-            loadModuleTask.exec();
+            Utils.setupUpdateCheck();
+            // Load modules
+            Utils.loadModules();
+        }
+
+        Data.importPrefs();
+
+        // Dynamic detect all locales
+        LocaleManager.loadAvailableLocales();
+
+        // Create notification channel on Android O
+        Notifications.setup(this);
+
+        // 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
-        mm.writeConfig();
+        Data.writeConfig();
 
         mm.hasInit = true;
 
-        Intent intent = new Intent(this, MainActivity.class);
+        Intent intent = new Intent(this, Data.classMap.get(MainActivity.class));
         intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION));
-        intent.putExtra(Const.Key.INTENT_PERM, getIntent().getStringExtra(Const.Key.INTENT_PERM));
+        intent.putExtra(BaseActivity.INTENT_PERM, getIntent().getStringExtra(BaseActivity.INTENT_PERM));
         startActivity(intent);
         finish();
     }
-
-    static class LoadLocale extends ParallelTask<Void, Void, Void> {
-        @Override
-        protected Void doInBackground(Void... voids) {
-            MagiskManager.get().locales = Utils.getAvailableLocale();
-            return null;
-        }
-        @Override
-        protected void onPostExecute(Void aVoid) {
-            MagiskManager.get().localeDone.publish();
-        }
-    }
 }

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

@@ -1,8 +1,9 @@
 package com.topjohnwu.magisk.adapters;
 
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.support.v7.widget.RecyclerView;
+import android.os.AsyncTask;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,10 +13,10 @@ import android.widget.Filter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.ParallelTask;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 
 import java.util.ArrayList;
@@ -23,8 +24,9 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.ViewHolder> {
 
@@ -33,36 +35,61 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
     private PackageManager pm;
     private ApplicationFilter filter;
 
-    public ApplicationAdapter() {
+    public ApplicationAdapter(Context context) {
         fullList = showList = Collections.emptyList();
         hideList = Collections.emptyList();
         filter = new ApplicationFilter();
-        pm = MagiskManager.get().getPackageManager();
-        new LoadApps().exec();
+        pm = context.getPackageManager();
+        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 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 || info.uid == 1000) {
+                i.remove();
+            }
+        }
+        Collections.sort(fullList, (a, b) -> {
+            boolean ah = hideList.contains(a.packageName);
+            boolean bh = hideList.contains(b.packageName);
+            if (ah == bh) {
+                return Utils.getAppLabel(a, pm).toLowerCase()
+                        .compareTo(Utils.getAppLabel(b, pm).toLowerCase());
+            } else if (ah) {
+                return -1;
+            } else {
+                return 1;
+            }
+        });
+        Topic.publish(false, Topic.MAGISK_HIDE_DONE);
     }
 
     @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View mView = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_app, parent, false);
-        return new ViewHolder(mView);
-    }
-
-    @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         ApplicationInfo info = showList.get(position);
 
         holder.appIcon.setImageDrawable(info.loadIcon(pm));
-        holder.appName.setText(info.loadLabel(pm));
+        holder.appName.setText(Utils.getAppLabel(info, pm));
         holder.appPackage.setText(info.packageName);
 
         holder.checkBox.setOnCheckedChangeListener(null);
         holder.checkBox.setChecked(hideList.contains(info.packageName));
         holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
             if (isChecked) {
-                Shell.Async.su("magiskhide --add " + info.packageName);
+                Shell.su("magiskhide --add " + info.packageName).submit();
                 hideList.add(info.packageName);
             } else {
-                Shell.Async.su("magiskhide --rm " + info.packageName);
+                Shell.su("magiskhide --rm " + info.packageName).submit();
                 hideList.remove(info.packageName);
             }
         });
@@ -78,7 +105,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
     }
 
     public void refresh() {
-        new LoadApps().exec();
+        AsyncTask.THREAD_POOL_EXECUTOR.execute(this::loadApps);
     }
 
     static class ViewHolder extends RecyclerView.ViewHolder {
@@ -90,11 +117,11 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
 
         ViewHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new ApplicationAdapter$ViewHolder_ViewBinding(this, itemView);
         }
     }
 
-    private class ApplicationFilter extends Filter {
+    class ApplicationFilter extends Filter {
 
         private boolean lowercaseContains(String s, CharSequence filter) {
             return !TextUtils.isEmpty(s) && s.toLowerCase().contains(filter);
@@ -108,7 +135,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
                 showList = new ArrayList<>();
                 String filter = constraint.toString().toLowerCase();
                 for (ApplicationInfo info : fullList) {
-                    if (lowercaseContains(info.loadLabel(pm).toString(), filter)
+                    if (lowercaseContains(Utils.getAppLabel(info, pm), filter)
                             || lowercaseContains(info.packageName, filter)) {
                         showList.add(info);
                     }
@@ -122,37 +149,4 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
             notifyDataSetChanged();
         }
     }
-
-    private class LoadApps extends ParallelTask<Void, Void, Void> {
-
-        @Override
-        protected Void doInBackground(Void... voids) {
-            fullList = pm.getInstalledApplications(0);
-            hideList = Shell.Sync.su("magiskhide --ls");
-            for (Iterator<ApplicationInfo> i = fullList.iterator(); i.hasNext(); ) {
-                ApplicationInfo info = i.next();
-                if (Const.HIDE_BLACKLIST.contains(info.packageName) || !info.enabled) {
-                    i.remove();
-                }
-            }
-            Collections.sort(fullList, (a, b) -> {
-                boolean ah = hideList.contains(a.packageName);
-                boolean bh = hideList.contains(b.packageName);
-                if (ah == bh) {
-                    return a.loadLabel(pm).toString().toLowerCase().compareTo(
-                            b.loadLabel(pm).toString().toLowerCase());
-                } else if (ah) {
-                    return -1;
-                } else {
-                    return 1;
-                }
-            });
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            MagiskManager.get().magiskHideDone.publish(false);
-        }
-    }
 }