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

app/build.gradle

@@ -70,17 +70,19 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.core:core:1.0.1'
     fullImplementation project(':utils')
-    implementation "androidx.core:core:${rootProject.ext.androidXVersion}"
+    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.0.2'
+    fullImplementation 'com.github.topjohnwu:libsu:2.1.2'
     fullImplementation 'com.atlassian.commonmark:commonmark:0.11.0'
     fullImplementation 'org.kamranzafar:jtar:2.3'
 
-    def butterKnifeVersion = '9.0.0-rc1'
+    def butterKnifeVersion = '9.0.0-rc2'
     if (properties.containsKey('android.injected.invoked.from.ide')) {
         fullImplementation "com.jakewharton:butterknife-reflect:${butterKnifeVersion}"
     } else {

app/proguard-rules.pro

@@ -17,14 +17,17 @@
 #}
 
 # 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.**
 
 # 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(...);
@@ -33,3 +36,4 @@
 # Excessive obfuscation
 -repackageclasses 'a'
 -allowaccessmodification
+-optimizationpasses 6

app/src/full/AndroidManifest.xml

@@ -47,7 +47,7 @@
         <!-- Superuser -->
 
         <activity
-            android:name="a.p"
+            android:name="a.m"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
             android:taskAffinity="internal.superuser"
@@ -68,17 +68,13 @@
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
-        </receiver>
-        <receiver android:name="a.i">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
                 <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
-        <receiver android:name="a.j" />
-        <receiver android:name="a.k" />
-        <receiver android:name="a.l">
+        <receiver android:name="a.i">
             <intent-filter>
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
             </intent-filter>
@@ -87,11 +83,11 @@
         <!-- Service -->
 
         <service
-            android:name="a.m"
+            android:name="a.j"
             android:exported="true"
             android:permission="android.permission.BIND_JOB_SERVICE" />
         <service
-            android:name="a.n"
+            android:name="a.k"
             android:exported="true"
             android:permission="android.permission.BIND_JOB_SERVICE" />
 

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,22 @@
 package a;
 
-import com.topjohnwu.magisk.receivers.ShortcutReceiver;
+import android.content.Context;
+import android.util.AttributeSet;
 
-public class l extends ShortcutReceiver {
+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

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

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk;
 
+import android.os.Environment;
 import android.os.Process;
 
 import java.io.File;
@@ -9,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
@@ -18,26 +18,25 @@ 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 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;
-    }
+    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(
@@ -48,10 +47,11 @@ public class Const {
     public static final int USER_ID = Process.myUid() / 100000;
 
     public static final class MAGISK_VER {
-        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 {
@@ -64,20 +64,23 @@ public class Const {
         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 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 REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&sort=pushed&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 PAYPAL_URL = "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=CC7FZ7526MNGG";
+        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";
     }
 
 
@@ -95,10 +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 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";

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

@@ -6,14 +6,10 @@ import android.os.Looper;
 import android.util.Xml;
 
 import com.topjohnwu.magisk.components.AboutCardRow;
-import com.topjohnwu.magisk.receivers.BootReceiver;
-import com.topjohnwu.magisk.receivers.ManagerUpdate;
-import com.topjohnwu.magisk.receivers.PackageReceiver;
-import com.topjohnwu.magisk.receivers.RebootReceiver;
+import com.topjohnwu.magisk.receivers.GeneralReceiver;
 import com.topjohnwu.magisk.receivers.ShortcutReceiver;
 import com.topjohnwu.magisk.services.OnBootService;
 import com.topjohnwu.magisk.services.UpdateCheckService;
-import com.topjohnwu.magisk.utils.FingerprintHelper;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.ShellUtils;
@@ -51,8 +47,6 @@ public class Data {
     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;
@@ -62,12 +56,9 @@ public class Data {
     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 multiuserState = -1;
     public static int suResponseType;
     public static int suNotificationType;
-    public static int suNamespaceMode;
     public static int updateChannel;
     public static int repoOrder;
 
@@ -79,15 +70,12 @@ public class Data {
         classMap.put(DonationActivity.class, a.e.class);
         classMap.put(FlashActivity.class, a.f.class);
         classMap.put(NoUIActivity.class, a.g.class);
-        classMap.put(BootReceiver.class, a.h.class);
-        classMap.put(PackageReceiver.class, a.i.class);
-        classMap.put(ManagerUpdate.class, a.j.class);
-        classMap.put(RebootReceiver.class, a.k.class);
-        classMap.put(ShortcutReceiver.class, a.l.class);
-        classMap.put(OnBootService.class, a.m.class);
-        classMap.put(UpdateCheckService.class, a.n.class);
-        classMap.put(AboutCardRow.class, a.o.class);
-        classMap.put(SuRequestActivity.class, a.p.class);
+        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);
 
     }
 
@@ -95,8 +83,12 @@ public class Data {
         try {
             magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":")[0];
             magiskVersionCode = Integer.parseInt(ShellUtils.fastCmd("magisk -V"));
-            String s = ShellUtils.fastCmd(("resetprop -p ") + Const.MAGISKHIDE_PROP);
-            magiskHide = s.isEmpty() || Integer.parseInt(s) != 0;
+            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) {}
     }
 
@@ -110,12 +102,12 @@ public class Data {
         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();
+        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(Utils.fmt("/data/user/%d/%s", Const.USER_ID, Const.MANAGER_CONFIGS));
+        SuFile config = new SuFile("/data/user/0/" + Const.MANAGER_CONFIGS);
         if (config.exists()) {
             SharedPreferences.Editor editor = mm.prefs.edit();
             try {
@@ -180,15 +172,6 @@ public class Data {
         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);
@@ -200,15 +183,10 @@ public class Data {
         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)

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

@@ -15,7 +15,6 @@ 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;
@@ -59,7 +58,7 @@ public class FlashActivity extends BaseActivity {
                     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);
+            File logFile = new File(Const.EXTERNAL_PATH, filename);
             try (FileWriter writer = new FileWriter(logFile)) {
                 for (String s : logs) {
                     writer.write(s);

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

@@ -1,12 +1,10 @@
 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.MagiskDB;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
 import com.topjohnwu.magisk.utils.LocaleManager;
 import com.topjohnwu.magisk.utils.RootUtils;
@@ -22,7 +20,7 @@ public class MagiskManager extends ContainerApp {
 
     // Global resources
     public SharedPreferences prefs;
-    public MagiskDatabaseHelper mDB;
+    public MagiskDB mDB;
     public RepoDatabaseHelper repoDB;
 
     public MagiskManager() {
@@ -36,22 +34,11 @@ public class MagiskManager extends ContainerApp {
         Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER);
         Shell.Config.verboseLogging(BuildConfig.DEBUG);
         Shell.Config.setInitializer(RootUtils.class);
+        Shell.Config.setTimeout(2);
 
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        mDB = MagiskDatabaseHelper.getInstance();
-
-        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) {}
-        }
+        mDB = MagiskDB.getInstance();
+        repoDB = new RepoDatabaseHelper(this);
 
         LocaleManager.setLocale(this);
         Data.loadConfig();

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

@@ -18,6 +18,7 @@ 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;
@@ -124,8 +125,7 @@ public class MainActivity extends BaseActivity
         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));
+        menu.findItem(R.id.superuser).setVisible(Utils.showSuperUser());
     }
 
     public void navigate(String item) {

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

@@ -1,18 +1,18 @@
 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.UpdateRepos;
 import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.components.Notifications;
 import com.topjohnwu.magisk.receivers.ShortcutReceiver;
 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;
 
@@ -22,6 +22,19 @@ public class SplashActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        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();
+        }
+        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() && Data.magiskVersionCode > 0) {
             // Update check service
@@ -30,18 +43,13 @@ public class SplashActivity extends BaseActivity {
             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);
-        }
+        Notifications.setup(this);
 
         // Setup shortcuts
         sendBroadcast(new Intent(this, Data.classMap.get(ShortcutReceiver.class)));

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

@@ -22,9 +22,7 @@ import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
 import com.topjohnwu.magisk.utils.SuConnector;
 
-import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 
 import androidx.annotation.Nullable;
 import butterknife.BindView;
@@ -48,6 +46,11 @@ public class SuRequestActivity extends BaseActivity {
     class SuConnectorV1 extends SuConnector {
 
         SuConnectorV1(String name) throws IOException {
+            super(name);
+        }
+
+        @Override
+        public void connect(String name) throws IOException {
             socket.connect(new LocalSocketAddress(name, LocalSocketAddress.Namespace.FILESYSTEM));
             new FileObserver(name) {
                 @Override
@@ -60,28 +63,25 @@ public class SuRequestActivity extends BaseActivity {
         }
 
         @Override
-        public void response() {
-            try (OutputStream out = getOutputStream()) {
-                out.write((policy.policy == Policy.ALLOW ? "socket:ALLOW" : "socket:DENY").getBytes());
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+        public void onResponse() throws IOException {
+            out.write((policy.policy == Policy.ALLOW ? "socket:ALLOW" : "socket:DENY").getBytes());
         }
     }
 
     class SuConnectorV2 extends SuConnector {
 
         SuConnectorV2(String name) throws IOException {
+            super(name);
+        }
+
+        @Override
+        public void connect(String name) throws IOException {
             socket.connect(new LocalSocketAddress(name, LocalSocketAddress.Namespace.ABSTRACT));
         }
 
         @Override
-        public void response() {
-            try (DataOutputStream out = getOutputStream()) {
-                out.writeInt(policy.policy);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+        public void onResponse() throws IOException {
+            out.writeInt(policy.policy);
         }
     }
 
@@ -119,9 +119,9 @@ public class SuRequestActivity extends BaseActivity {
         // Get policy
         Intent intent = getIntent();
         try {
+            String socketName = intent.getStringExtra("socket");
             connector =  intent.getIntExtra("version", 1) == 1 ?
-                    new SuConnectorV1(intent.getStringExtra("socket")) :
-                    new SuConnectorV2(intent.getStringExtra("socket"));
+                    new SuConnectorV1(socketName) : new SuConnectorV2(socketName);
             Bundle bundle = connector.readSocketInput();
             int uid = Integer.parseInt(bundle.getString("uid"));
             policy = mm.mDB.getPolicy(uid);
@@ -135,7 +135,7 @@ public class SuRequestActivity extends BaseActivity {
         }
 
         // Never allow com.topjohnwu.magisk (could be malware)
-        if (TextUtils.equals(policy.packageName, Const.ORIG_PKG_NAME)) {
+        if (TextUtils.equals(policy.packageName, BuildConfig.APPLICATION_ID)) {
             finish();
             return;
         }
@@ -181,9 +181,9 @@ public class SuRequestActivity extends BaseActivity {
             }
         };
 
-        boolean useFingerprint = Data.suFingerprint && FingerprintHelper.canUseFingerprint();
+        boolean useFP = FingerprintHelper.useFingerPrint();
 
-        if (useFingerprint) {
+        if (useFP) {
             try {
                 fingerprintHelper = new FingerprintHelper() {
                     @Override
@@ -209,11 +209,11 @@ public class SuRequestActivity extends BaseActivity {
                 fingerprintHelper.authenticate();
             } catch (Exception e) {
                 e.printStackTrace();
-                useFingerprint = false;
+                useFP = false;
             }
         }
 
-        if (!useFingerprint) {
+        if (!useFP) {
             grant_btn.setOnClickListener(v -> {
                 handleAction(Policy.ALLOW);
                 timer.cancel();
@@ -221,8 +221,8 @@ public class SuRequestActivity extends BaseActivity {
             grant_btn.requestFocus();
         }
 
-        grant_btn.setVisibility(useFingerprint ? View.GONE : View.VISIBLE);
-        fingerprintImg.setVisibility(useFingerprint ? View.VISIBLE : View.GONE);
+        grant_btn.setVisibility(useFP ? View.GONE : View.VISIBLE);
+        fingerprintImg.setVisibility(useFP ? View.VISIBLE : View.GONE);
 
         deny_btn.setOnClickListener(v -> {
             handleAction(Policy.DENY);
@@ -252,7 +252,7 @@ public class SuRequestActivity extends BaseActivity {
         policy.policy = action;
         if (time >= 0) {
             policy.until = (time == 0) ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
-            mm.mDB.addPolicy(policy);
+            mm.mDB.updatePolicy(policy);
         }
         handleAction();
     }

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

@@ -10,13 +10,12 @@ import android.widget.Switch;
 import android.widget.TextView;
 
 import com.google.android.material.snackbar.Snackbar;
-import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.CustomAlertDialog;
 import com.topjohnwu.magisk.components.ExpandableView;
 import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.container.Policy;
-import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
+import com.topjohnwu.magisk.database.MagiskDB;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
 
 import java.util.HashSet;
@@ -30,11 +29,11 @@ import butterknife.BindView;
 public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder> {
 
     private List<Policy> policyList;
-    private MagiskDatabaseHelper dbHelper;
+    private MagiskDB dbHelper;
     private PackageManager pm;
     private Set<Policy> expandList = new HashSet<>();
 
-    public PolicyAdapter(List<Policy> list, MagiskDatabaseHelper db, PackageManager pm) {
+    public PolicyAdapter(List<Policy> list, MagiskDB db, PackageManager pm) {
         policyList = list;
         dbHelper = db;
         this.pm = pm;
@@ -86,7 +85,7 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
                     dbHelper.updatePolicy(policy);
                 }
             };
-            if (Data.suFingerprint) {
+            if (FingerprintHelper.useFingerPrint()) {
                 holder.masterSwitch.setChecked(!isChecked);
                 FingerprintHelper.showAuthDialog((Activity) v.getContext(), () -> {
                     holder.masterSwitch.setChecked(isChecked);

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

@@ -12,8 +12,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.asyncs.DownloadModule;
 import com.topjohnwu.magisk.asyncs.MarkDownWindow;
-import com.topjohnwu.magisk.asyncs.ProcessRepoZip;
 import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.components.CustomAlertDialog;
 import com.topjohnwu.magisk.container.Module;
@@ -105,16 +105,15 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
 
         holder.downloadImage.setOnClickListener(v -> {
             new CustomAlertDialog((BaseActivity) context)
-                    .setTitle(context.getString(R.string.repo_install_title, repo.getName()))
-                    .setMessage(context.getString(R.string.repo_install_msg, repo.getDownloadFilename()))
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.install, (d, i) ->
-                        new ProcessRepoZip((BaseActivity) context, repo, true).exec()
-                    )
-                    .setNeutralButton(R.string.download, (d, i) ->
-                        new ProcessRepoZip((BaseActivity) context, repo, false).exec())
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
+                .setTitle(context.getString(R.string.repo_install_title, repo.getName()))
+                .setMessage(context.getString(R.string.repo_install_msg, repo.getDownloadFilename()))
+                .setCancelable(true)
+                .setPositiveButton(R.string.install, (d, i) ->
+                        DownloadModule.exec((BaseActivity) context, repo, true))
+                .setNeutralButton(R.string.download, (d, i) ->
+                        DownloadModule.exec((BaseActivity) context, repo, false))
+                .setNegativeButton(R.string.no_thanks, null)
+                .show();
         });
     }
 

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

@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.adapters;
 
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 public abstract class SectionedAdapter<S extends RecyclerView.ViewHolder, C extends RecyclerView.ViewHolder>
@@ -9,8 +10,9 @@ public abstract class SectionedAdapter<S extends RecyclerView.ViewHolder, C exte
 
     private static final int SECTION_TYPE = Integer.MIN_VALUE;
 
+    @NonNull
     @Override
-    final public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    final public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         if (viewType == SECTION_TYPE)
             return onCreateSectionViewHolder(parent);
         return onCreateItemViewHolder(parent, viewType);
@@ -18,7 +20,7 @@ public abstract class SectionedAdapter<S extends RecyclerView.ViewHolder, C exte
 
     @Override
     @SuppressWarnings("unchecked")
-    final public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+    final public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         PositionInfo info = getPositionInfo(position);
         if (info.position == -1)
             onBindSectionViewHolder((S) holder, info.section);

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

@@ -1,6 +1,5 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.database.Cursor;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,7 +11,7 @@ import android.widget.TextView;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.ExpandableView;
 import com.topjohnwu.magisk.container.SuLogEntry;
-import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
+import com.topjohnwu.magisk.database.MagiskDB;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -24,26 +23,25 @@ import butterknife.BindView;
 
 public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, SuLogAdapter.LogViewHolder> {
 
-    private List<List<Integer>> logEntryList;
+    private List<List<SuLogEntry>> logEntries;
     private Set<Integer> itemExpanded, sectionExpanded;
-    private MagiskDatabaseHelper suDB;
-    private Cursor suLogCursor = null;
+    private MagiskDB suDB;
 
-    public SuLogAdapter(MagiskDatabaseHelper db) {
+    public SuLogAdapter(MagiskDB db) {
         suDB = db;
-        logEntryList = Collections.emptyList();
+        logEntries = Collections.emptyList();
         sectionExpanded = new HashSet<>();
         itemExpanded = new HashSet<>();
     }
 
     @Override
     public int getSectionCount() {
-        return logEntryList.size();
+        return logEntries.size();
     }
 
     @Override
     public int getItemCount(int section) {
-        return sectionExpanded.contains(section) ? logEntryList.get(section).size() : 0;
+        return sectionExpanded.contains(section) ? logEntries.get(section).size() : 0;
     }
 
     @Override
@@ -60,8 +58,7 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
 
     @Override
     public void onBindSectionViewHolder(SectionHolder holder, int section) {
-        suLogCursor.moveToPosition(logEntryList.get(section).get(0));
-        SuLogEntry entry = new SuLogEntry(suLogCursor);
+        SuLogEntry entry = logEntries.get(section).get(0);
         holder.arrow.setRotation(sectionExpanded.contains(section) ? 180 : 0);
         holder.itemView.setOnClickListener(v -> {
             RotateAnimation rotate;
@@ -69,11 +66,11 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
                 holder.arrow.setRotation(0);
                 rotate = new RotateAnimation(180, 0, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
                 sectionExpanded.remove(section);
-                notifyItemRangeRemoved(getItemPosition(section, 0), logEntryList.get(section).size());
+                notifyItemRangeRemoved(getItemPosition(section, 0), logEntries.get(section).size());
             } else {
                 rotate = new RotateAnimation(0, 180, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
                 sectionExpanded.add(section);
-                notifyItemRangeInserted(getItemPosition(section, 0), logEntryList.get(section).size());
+                notifyItemRangeInserted(getItemPosition(section, 0), logEntries.get(section).size());
             }
             rotate.setDuration(300);
             rotate.setFillAfter(true);
@@ -84,17 +81,16 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
 
     @Override
     public void onBindItemViewHolder(LogViewHolder holder, int section, int position) {
-        int sqlPosition = logEntryList.get(section).get(position);
-        suLogCursor.moveToPosition(sqlPosition);
-        SuLogEntry entry = new SuLogEntry(suLogCursor);
-        holder.setExpanded(itemExpanded.contains(sqlPosition));
+        SuLogEntry entry = logEntries.get(section).get(position);
+        int realIdx = getItemPosition(section, position);
+        holder.setExpanded(itemExpanded.contains(realIdx));
         holder.itemView.setOnClickListener(view -> {
             if (holder.isExpanded()) {
                 holder.collapse();
-                itemExpanded.remove(sqlPosition);
+                itemExpanded.remove(realIdx);
             } else {
                 holder.expand();
-                itemExpanded.add(sqlPosition);
+                itemExpanded.add(realIdx);
             }
         });
         holder.appName.setText(entry.appName);
@@ -106,10 +102,7 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
     }
 
     public void notifyDBChanged() {
-        if (suLogCursor != null)
-            suLogCursor.close();
-        suLogCursor = suDB.getLogCursor();
-        logEntryList = suDB.getLogStructure();
+        logEntries = suDB.getLogs();
         itemExpanded.clear();
         sectionExpanded.clear();
         sectionExpanded.add(0);

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

@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.asyncs;
 
 import android.app.Activity;
 
+import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.utils.ISafetyNetHelper;
 import com.topjohnwu.magisk.utils.Topic;
@@ -32,7 +33,7 @@ public class CheckSafetyNet extends ParallelTask<Void, Void, Void> {
     private void dlSnet() throws Exception {
         Shell.sh("rm -rf " + dexPath.getParent()).exec();
         dexPath.getParentFile().mkdir();
-        HttpURLConnection conn = WebService.mustRequest(Data.snetLink, null);
+        HttpURLConnection conn = WebService.mustRequest(Const.Url.SNET_URL);
         try (
                 OutputStream out = new BufferedOutputStream(new FileOutputStream(dexPath));
                 InputStream in = new BufferedInputStream(conn.getInputStream())) {
@@ -51,7 +52,7 @@ public class CheckSafetyNet extends ParallelTask<Void, Void, Void> {
                 .invoke(null, ISafetyNetHelper.class, dexPath.getPath(), getActivity(),
                         (ISafetyNetHelper.Callback) code ->
                                 Topic.publish(false, Topic.SNET_CHECK_DONE, code));
-        if (helper.getVersion() < Data.snetVersionCode) {
+        if (helper.getVersion() < Const.SNET_EXT_VER) {
             throw new Exception();
         }
     }

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

@@ -1,13 +1,13 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.os.AsyncTask;
-
+import com.androidnetworking.AndroidNetworking;
+import com.androidnetworking.error.ANError;
+import com.androidnetworking.interfaces.JSONObjectRequestListener;
 import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.Data;
-import com.topjohnwu.magisk.utils.NotificationMgr;
+import com.topjohnwu.magisk.components.Notifications;
 import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.WebService;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -42,64 +42,66 @@ public class CheckUpdates {
         }
     }
 
-    public static void fetchUpdates() {
-        String jsonStr = "";
+    public static void check(Runnable cb) {
+        String url;
         switch (Data.updateChannel) {
             case Const.Value.STABLE_CHANNEL:
-                jsonStr = WebService.getString(Const.Url.STABLE_URL);
+                url = Const.Url.STABLE_URL;
                 break;
             case Const.Value.BETA_CHANNEL:
-                jsonStr = WebService.getString(Const.Url.BETA_URL);
+                url = Const.Url.BETA_URL;
                 break;
             case Const.Value.CUSTOM_CHANNEL:
-                jsonStr = WebService.getString(Data.MM().prefs.getString(Const.Key.CUSTOM_CHANNEL, ""));
+                url = Data.MM().prefs.getString(Const.Key.CUSTOM_CHANNEL, "");
                 break;
+            default:
+                return;
         }
-
-        JSONObject json;
-        try {
-            json = new JSONObject(jsonStr);
-        } catch (JSONException e) {
-            return;
-        }
-
-        JSONObject magisk = getJson(json, "magisk");
-        Data.remoteMagiskVersionString = getString(magisk, "version", null);
-        Data.remoteMagiskVersionCode = getInt(magisk, "versionCode", -1);
-        Data.magiskLink = getString(magisk, "link", null);
-        Data.magiskNoteLink = getString(magisk, "note", null);
-        Data.magiskMD5 = getString(magisk, "md5", null);
-
-        JSONObject manager = getJson(json, "app");
-        Data.remoteManagerVersionString = getString(manager, "version", null);
-        Data.remoteManagerVersionCode = getInt(manager, "versionCode", -1);
-        Data.managerLink = getString(manager, "link", null);
-        Data.managerNoteLink = getString(manager, "note", null);
-
-        JSONObject uninstaller = getJson(json, "uninstaller");
-        Data.uninstallerLink = getString(uninstaller, "link", null);
-
-        JSONObject snet = getJson(json, "snet");
-        Data.snetVersionCode = getInt(snet, "versionCode", -1);
-        Data.snetLink = getString(snet, "link", null);
-    }
-
-    public static void check(Runnable cb) {
-        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
-            fetchUpdates();
-            if (cb != null) {
-                if (BuildConfig.VERSION_CODE < Data.remoteManagerVersionCode) {
-                    NotificationMgr.managerUpdate();
-                } else if (Data.magiskVersionCode < Data.remoteMagiskVersionCode) {
-                    NotificationMgr.magiskUpdate();
-                }
-                cb.run();
-            }
-            Topic.publish(Topic.UPDATE_CHECK_DONE);
-        });
+        AndroidNetworking.get(url).build().getAsJSONObject(new UpdateListener(cb));
     }
 
     public static void check() {
         check(null);
     }
+
+    private static class UpdateListener implements JSONObjectRequestListener {
+
+        private Runnable cb;
+
+        UpdateListener(Runnable callback) {
+            cb = callback;
+        }
+
+        @Override
+        public void onResponse(JSONObject json) {
+            JSONObject magisk = getJson(json, "magisk");
+            Data.remoteMagiskVersionString = getString(magisk, "version", null);
+            Data.remoteMagiskVersionCode = getInt(magisk, "versionCode", -1);
+            Data.magiskLink = getString(magisk, "link", null);
+            Data.magiskNoteLink = getString(magisk, "note", null);
+            Data.magiskMD5 = getString(magisk, "md5", null);
+
+            JSONObject manager = getJson(json, "app");
+            Data.remoteManagerVersionString = getString(manager, "version", null);
+            Data.remoteManagerVersionCode = getInt(manager, "versionCode", -1);
+            Data.managerLink = getString(manager, "link", null);
+            Data.managerNoteLink = getString(manager, "note", null);
+
+            JSONObject uninstaller = getJson(json, "uninstaller");
+            Data.uninstallerLink = getString(uninstaller, "link", null);
+
+            if (cb != null) {
+                if (BuildConfig.VERSION_CODE < Data.remoteManagerVersionCode) {
+                    Notifications.managerUpdate();
+                } else if (Data.magiskVersionCode < Data.remoteMagiskVersionCode) {
+                    Notifications.magiskUpdate();
+                }
+                cb.run();
+            }
+            Topic.publish(Topic.UPDATE_CHECK_DONE);
+        }
+
+        @Override
+        public void onError(ANError anError) {}
+    }
 }

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

@@ -0,0 +1,125 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.Manifest;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.AsyncTask;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.FlashActivity;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.components.ProgressNotification;
+import com.topjohnwu.magisk.container.Repo;
+import com.topjohnwu.magisk.utils.WebService;
+import com.topjohnwu.superuser.ShellUtils;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+public class DownloadModule {
+
+    public static void exec(BaseActivity activity, Repo repo, boolean install) {
+        activity.runWithPermission(new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE },
+                () -> AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> dlProcessInstall(repo, install)));
+    }
+
+    private static void dlProcessInstall(Repo repo, boolean install) {
+        File output = new File(Const.EXTERNAL_PATH, repo.getDownloadFilename());
+        ProgressNotification progress = new ProgressNotification(output.getName());
+        try {
+            MagiskManager mm = Data.MM();
+            HttpURLConnection conn = WebService.mustRequest(repo.getZipUrl());
+            ProgressInputStream pis = new ProgressInputStream(conn.getInputStream(),
+                    conn.getContentLength(), progress);
+            removeTopFolder(new BufferedInputStream(pis),
+                    new BufferedOutputStream(new FileOutputStream(output)));
+            conn.disconnect();
+            if (install) {
+                progress.dismiss();
+                Intent intent = new Intent(mm, Data.classMap.get(FlashActivity.class));
+                intent.setData(Uri.fromFile(output))
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP);
+                mm.startActivity(intent);
+            } else {
+                progress.getNotification().setContentTitle(output.getName());
+                progress.dlDone();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            progress.dlFail();
+        }
+    }
+
+    private static void removeTopFolder(InputStream in, OutputStream out) throws IOException {
+        try (ZipInputStream zin = new ZipInputStream(in);
+             ZipOutputStream zout = new ZipOutputStream(out)) {
+            ZipEntry entry;
+            int off = -1;
+            while ((entry = zin.getNextEntry()) != null) {
+                if (off < 0)
+                    off = entry.getName().indexOf('/') + 1;
+                String path = entry.getName().substring(off);
+                if (path.isEmpty())
+                    continue;
+                zout.putNextEntry(new ZipEntry(path));
+                if (!entry.isDirectory())
+                    ShellUtils.pump(zin, zout);
+            }
+        }
+    }
+
+    private static class ProgressInputStream extends FilterInputStream {
+
+        private long totalBytes;
+        private long bytesDownloaded;
+        private ProgressNotification progress;
+
+        protected ProgressInputStream(InputStream in, long size, ProgressNotification p) {
+            super(in);
+            totalBytes = size;
+            progress = p;
+        }
+
+        private void updateProgress() {
+            progress.onProgress(bytesDownloaded, totalBytes);
+        }
+
+        @Override
+        public int read() throws IOException {
+            int b = super.read();
+            if (b >= 0) {
+                bytesDownloaded++;
+                updateProgress();
+            }
+            return b;
+        }
+
+        @Override
+        public int read(byte[] b) throws IOException {
+            return read(b, 0, b.length);
+        }
+
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            int sz = super.read(b, off, len);
+            if (sz > 0) {
+                bytesDownloaded += sz;
+                updateProgress();
+            }
+            return sz;
+        }
+    }
+}

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

@@ -14,7 +14,6 @@ import com.topjohnwu.magisk.FlashActivity;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.container.TarEntry;
-import com.topjohnwu.magisk.utils.Download;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.WebService;
 import com.topjohnwu.magisk.utils.ZipUtils;
@@ -136,7 +135,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
 
         if (!ShellUtils.checkSum("MD5", zip, Data.magiskMD5)) {
             console.add("- Downloading zip");
-            HttpURLConnection conn = WebService.mustRequest(Data.magiskLink, null);
+            HttpURLConnection conn = WebService.mustRequest(Data.magiskLink);
             buf = new BufferedInputStream(new ProgressStream(conn), conn.getContentLength());
             buf.mark(conn.getContentLength() + 1);
             try (OutputStream out = new FileOutputStream(zip)) {
@@ -243,7 +242,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
         switch (mode) {
             case PATCH_MODE:
                 String fmt = mm.prefs.getString(Const.Key.BOOT_FORMAT, ".img");
-                File dest = new File(Download.EXTERNAL_PATH, "patched_boot" + fmt);
+                File dest = new File(Const.EXTERNAL_PATH, "patched_boot" + fmt);
                 dest.getParentFile().mkdirs();
                 OutputStream out;
                 switch (fmt) {

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

@@ -6,7 +6,7 @@ import android.webkit.WebView;
 import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.WebService;
+import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.ShellUtils;
 
 import org.commonmark.node.Node;
@@ -43,7 +43,7 @@ public class MarkDownWindow extends ParallelTask<Void, Void, String> {
         MagiskManager mm = Data.MM();
         String md;
         if (mUrl != null) {
-            md = WebService.getString(mUrl);
+            md = Utils.dlString(mUrl);
         } else {
             try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
                 ShellUtils.pump(is, out);

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

@@ -1,41 +1,53 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.app.Activity;
-import android.app.ProgressDialog;
 import android.os.AsyncTask;
 import android.widget.Toast;
 
+import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.Notifications;
 import com.topjohnwu.magisk.utils.RootUtils;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.io.SuFile;
-import com.topjohnwu.superuser.io.SuFileOutputStream;
 import com.topjohnwu.utils.JarMap;
 import com.topjohnwu.utils.SignAPK;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.CharBuffer;
+import java.nio.IntBuffer;
 import java.security.SecureRandom;
 import java.util.jar.JarEntry;
 
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+
 public class PatchAPK {
 
+    public static final String LOWERALPHA = "abcdefghijklmnopqrstuvwxyz";
+    public static final String UPPERALPHA = LOWERALPHA.toUpperCase();
+    public static final String ALPHA = LOWERALPHA + UPPERALPHA;
+    public static final String DIGITS = "0123456789";
+    public static final String ALPHANUM = ALPHA + DIGITS;
+    public static final String ALPHANUMDOTS = ALPHANUM + "............";
+
     private static String genPackageName(String prefix, int length) {
         StringBuilder builder = new StringBuilder(length);
         builder.append(prefix);
         length -= prefix.length();
         SecureRandom random = new SecureRandom();
-        String base = "abcdefghijklmnopqrstuvwxyz";
-        String alpha = base + base.toUpperCase();
-        String full = alpha + "0123456789..........";
-        char next, prev = '\0';
+        char next, prev = '.';
         for (int i = 0; i < length; ++i) {
-            if (prev == '.' || i == length - 1 || i == 0) {
-                next = alpha.charAt(random.nextInt(alpha.length()));
+            if (prev == '.' || i == length - 1) {
+                next = ALPHA.charAt(random.nextInt(ALPHA.length()));
             } else {
-                next = full.charAt(random.nextInt(full.length()));
+                next = ALPHANUMDOTS.charAt(random.nextInt(ALPHANUMDOTS.length()));
             }
             builder.append(next);
             prev = next;
@@ -43,89 +55,81 @@ public class PatchAPK {
         return builder.toString();
     }
 
-    private static int findOffset(byte buf[], byte pattern[]) {
+    private static boolean findAndPatch(byte xml[], String a, String b) {
+        if (a.length() != b.length())
+            return false;
+        char[] from = a.toCharArray(), to = b.toCharArray();
+        CharBuffer buf = ByteBuffer.wrap(xml).order(ByteOrder.LITTLE_ENDIAN).asCharBuffer();
         int offset = -1;
-        for (int i = 0; i < buf.length - pattern.length; ++i) {
+        for (int i = 0; i < buf.length() - from.length; ++i) {
             boolean match = true;
-            for (int j = 0; j < pattern.length; ++j) {
-                if (buf[i + j] != pattern[j]) {
+            for (int j = 0; j < from.length; ++j) {
+                if (buf.get(i + j) != from[j]) {
                     match = false;
                     break;
                 }
             }
-            if (match) {
+            // Make sure it is null terminated
+            if (match && buf.get(i + from.length) == '\0') {
                 offset = i;
                 break;
             }
         }
-        return offset;
-    }
-
-    /* It seems that AAPT sometimes generate another type of string format */
-    private static boolean fallbackPatch(byte xml[], String from, String to) {
-
-        byte[] target = new byte[from.length() * 2 + 2];
-        for (int i = 0; i < from.length(); ++i) {
-            target[i * 2] = (byte) from.charAt(i);
-        }
-        int offset = findOffset(xml, target);
         if (offset < 0)
             return false;
-        byte[] dest = new byte[target.length - 2];
-        for (int i = 0; i < to.length(); ++i) {
-            dest[i * 2] = (byte) to.charAt(i);
-        }
-        System.arraycopy(dest, 0, xml, offset, dest.length);
+        buf.position(offset);
+        buf.put(to);
         return true;
     }
 
-    private static boolean findAndPatch(byte xml[], String from, String to) {
-        byte target[] = (from + '\0').getBytes();
-        int offset = findOffset(xml, target);
-        if (offset < 0)
-            return fallbackPatch(xml, from, to);
-        System.arraycopy(to.getBytes(), 0, xml, offset, to.length());
-        return true;
+    private static boolean findAndPatch(byte xml[], int a, int b) {
+        IntBuffer buf = ByteBuffer.wrap(xml).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer();
+        int len = xml.length / 4;
+        for (int i = 0; i < len; ++i) {
+            if (buf.get(i) == a) {
+                buf.put(i, b);
+                return true;
+            }
+        }
+        return false;
     }
 
     private static boolean patchAndHide() {
         MagiskManager mm = Data.MM();
 
         // Generate a new app with random package name
-        SuFile repack = new SuFile("/data/local/tmp/repack.apk");
-        String pkg = genPackageName("com.", Const.ORIG_PKG_NAME.length());
+        File repack = new File(mm.getFilesDir(), "patched.apk");
+        String pkg = genPackageName("com.", BuildConfig.APPLICATION_ID.length());
 
         try {
             JarMap apk = new JarMap(mm.getPackageCodePath());
-            if (!patchPackageID(apk, Const.ORIG_PKG_NAME, pkg))
+            if (!patch(apk, pkg))
                 return false;
-            SignAPK.sign(apk, new SuFileOutputStream(repack));
+            SignAPK.sign(apk, new BufferedOutputStream(new FileOutputStream(repack)));
         } catch (Exception e) {
             return false;
         }
 
         // Install the application
+        repack.setReadable(true, false);
         if (!ShellUtils.fastCmdResult("pm install " + repack))
-            return false;
-
-        repack.delete();
+            return false;;
 
         mm.mDB.setStrings(Const.Key.SU_MANAGER, pkg);
-        mm.mDB.flush();
         Data.exportPrefs();
-        RootUtils.uninstallPkg(Const.ORIG_PKG_NAME);
+        RootUtils.rmAndLaunch(BuildConfig.APPLICATION_ID, pkg);
 
         return true;
     }
 
-    public static boolean patchPackageID(JarMap apk, String from, String to) {
+    public static boolean patch(JarMap apk, String pkg) {
         try {
             JarEntry je = apk.getJarEntry(Const.ANDROID_MANIFEST);
             byte xml[] = apk.getRawData(je);
 
-            if (!findAndPatch(xml, from, to))
-                return false;
-            if (!findAndPatch(xml, from + ".provider", to + ".provider"))
+            if (!findAndPatch(xml, BuildConfig.APPLICATION_ID, pkg) ||
+                    !findAndPatch(xml, BuildConfig.APPLICATION_ID + ".provider", pkg + ".provider") ||
+                    !findAndPatch(xml, R.string.app_name, R.string.re_app_name))
                 return false;
 
             // Write in changes
@@ -137,18 +141,16 @@ public class PatchAPK {
         return true;
     }
 
-    public static void hideManager(Activity activity) {
-        ProgressDialog dialog = ProgressDialog.show(activity,
-                activity.getString(R.string.hide_manager_toast),
-                activity.getString(R.string.hide_manager_toast2));
+    public static void hideManager() {
         AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+            MagiskManager mm = Data.MM();
+            NotificationCompat.Builder progress =
+                    Notifications.progress(mm.getString(R.string.hide_manager_title));
+            NotificationManagerCompat mgr = NotificationManagerCompat.from(mm);
+            mgr.notify(Const.ID.HIDE_MANAGER_NOTIFICATION_ID, progress.build());
             boolean b = patchAndHide();
-            Data.mainHandler.post(() -> {
-                dialog.cancel();
-                if (!b) {
-                    Utils.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
-                }
-            });
+            mgr.cancel(Const.ID.HIDE_MANAGER_NOTIFICATION_ID);
+            if (!b) Utils.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
         });
     }
 }

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

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