Fix strings

Please change the name of the language to Azərbaycanca

.gitignore

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

README.MD

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

app/.gitignore

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

app/README.md

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

app/build.gradle

@@ -1,83 +1,51 @@
 apply plugin: 'com.android.application'
 
-def configProps = new Properties()
-configProps.load(new FileInputStream(rootProject.file('config.prop')))
-
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
     defaultConfig {
-        applicationId "com.topjohnwu.magisk"
-        minSdkVersion 21
-        targetSdkVersion rootProject.ext.compileSdkVersion
-    }
-
-    signingConfigs {
-        config {
-            storeFile rootProject.file('release-key.jks')
-            storePassword configProps['keyStorePass']
-            keyAlias configProps['keyAlias']
-            keyPassword configProps['keyPass']
+        applicationId 'com.topjohnwu.magisk'
+        vectorDrawables.useSupportLibrary = true
+        versionName rootProject.ext.configProps['appVersion']
+        versionCode rootProject.ext.configProps['appVersionCode'] as Integer
+        javaCompileOptions {
+            annotationProcessorOptions {
+                argument('butterknife.debuggable', 'false')
+            }
         }
     }
 
     buildTypes {
-        debug {
-            // If keystore exists, sign the APK with custom signature
-            if (signingConfigs.config.storeFile.exists())
-                signingConfig signingConfigs.config
-        }
         release {
-            minifyEnabled true
-            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.config
         }
     }
-
-    flavorDimensions "mode"
-
-    productFlavors {
-        full {
-            versionName configProps['appVersion']
-            versionCode configProps['appVersionCode'] as Integer
-            javaCompileOptions {
-                annotationProcessorOptions {
-                    argument('butterknife.debuggable', 'false')
-                }
-            }
-        }
-        stub {
-            versionCode 1
-            versionName "stub"
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    dexOptions {
-        preDexLibraries true
-        javaMaxHeapSize "2g"
-    }
-    lintOptions {
-        disable 'MissingTranslation'
-    }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    fullImplementation project(':utils')
-    implementation "com.android.support:support-core-utils:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:preference-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
-    fullImplementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
-    fullImplementation 'com.github.topjohnwu:libsu:2.0.1'
-    fullImplementation 'com.atlassian.commonmark:commonmark:0.11.0'
-    fullImplementation 'org.kamranzafar:jtar:2.3'
-    fullImplementation 'com.jakewharton:butterknife:8.8.1'
-    fullAnnotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    implementation project(':net')
+    implementation project(':shared')
+    implementation project(':signing')
+    implementation 'ru.noties:markwon:2.0.1'
+    implementation 'com.caverock:androidsvg-aar:1.3'
+    implementation 'org.kamranzafar:jtar:2.3'
+    implementation 'net.sourceforge.streamsupport:android-retrostreams:1.7.0'
+    implementation 'com.github.sevar83:indeterminate-checkbox:1.0.5'
+
+    def androidXVersion = "1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation "androidx.preference:preference:${androidXVersion}"
+    implementation "androidx.recyclerview:recyclerview:${androidXVersion}"
+    implementation "androidx.cardview:cardview:${androidXVersion}"
+    implementation "com.google.android.material:material:${androidXVersion}"
+    implementation 'androidx.work:work-runtime:2.0.0'
+    implementation 'androidx.transition:transition:1.1.0-alpha02'
+
+    def libsuVersion = '2.3.2'
+    implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
+    implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
+
+    def butterKnifeVersion = '10.1.0'
+    implementation "com.jakewharton:butterknife-runtime:${butterKnifeVersion}"
+    annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
 }

app/proguard-rules.pro

@@ -16,19 +16,34 @@
 #   public *;
 #}
 
-# Don't obfuscate, we are open source anyway :)
--dontobfuscate
-
 # BouncyCastle
--keep class org.bouncycastle.jcajce.provider.asymmetric.rsa.**SHA1** { *; }
--keep class org.bouncycastle.jcajce.provider.asymmetric.RSA** { *; }
--keep class org.bouncycastle.jcajce.provider.digest.SHA1** { *; }
+-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
+-keepclassmembers class com.topjohnwu.magisk.utils.ISafetyNetHelper { *; }
+-keep,allowobfuscation interface com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback
+-keepclassmembers class * implements com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback {
+  void onResponse(int);
+}
+
+# BootSigner
+-keepclassmembers class com.topjohnwu.signing.BootSigner { *; }
+
+# SVG
+-dontwarn com.caverock.androidsvg.SVGAndroidRenderer
+
+# RetroStreams
+-dontwarn java9.**
 
 # Strip logging
 -assumenosideeffects class com.topjohnwu.magisk.utils.Logger {
   public *** debug(...);
 }
+
+# Excessive obfuscation
+-repackageclasses 'a'
+-allowaccessmodification
+-optimizationpasses 6

app/src/full/AndroidManifest.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.topjohnwu.magisk">
-
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <application
-        android:name=".MagiskManager"
-        android:theme="@style/AppTheme">
-
-        <activity
-            android:name=".MainActivity"
-            android:configChanges="orientation|screenSize"
-            android:exported="true" />
-        <activity
-            android:name=".SplashActivity"
-            android:configChanges="orientation|screenSize"
-            android:exported="true"
-            android:theme="@style/SplashTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".AboutActivity"
-            android:theme="@style/AppTheme.StatusBar" />
-        <activity
-            android:name=".DonationActivity"
-            android:theme="@style/AppTheme.StatusBar"/>
-        <activity
-            android:name=".FlashActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="nosensor"
-            android:theme="@style/AppTheme.StatusBar" />
-        <activity
-            android:name=".NoUIActivity"
-            android:theme="@style/AppTheme.Translucent" />
-        <activity
-            android:name=".superuser.RequestActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity="internal.superuser"
-            android:theme="@style/SuRequest" />
-
-        <receiver android:name=".superuser.SuReceiver" />
-        <receiver android:name=".receivers.BootReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".receivers.PackageReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
-                <data android:scheme="package" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".receivers.ManagerUpdate" />
-        <receiver android:name=".receivers.RebootReceiver" />
-        <receiver android:name=".receivers.ShortcutReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.LOCALE_CHANGED" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name=".services.OnBootService"
-            android:exported="true"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service
-            android:name=".services.UpdateCheckService"
-            android:exported="true"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
-        <!-- Hardcode GMS version -->
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="12451000" />
-
-    </application>
-
-</manifest>

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

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

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

@@ -1,158 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.os.Process;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
-public class Const {
-
-    public static final String DEBUG_TAG = "MagiskManager";
-    public static final String ORIG_PKG_NAME = BuildConfig.APPLICATION_ID;
-    public static final String MAGISKHIDE_PROP = "persist.magisk.hide";
-
-    // APK content
-    public static final String ANDROID_MANIFEST = "AndroidManifest.xml";
-
-    public static final String SU_KEYSTORE_KEY = "su_key";
-
-    // Paths
-    public static File MAGISK_PATH;
-    public static File MAGISK_DISABLE_FILE;
-    public static File MAGISK_HOST_FILE;
-
-    static {
-        /* Prevent crashing on unrooted devices */
-        MAGISK_PATH = MAGISK_DISABLE_FILE = MAGISK_HOST_FILE = new File("xxx");
-    }
-
-    public static final String BUSYBOX_PATH = "/sbin/.core/busybox";
-    public static final String TMP_FOLDER_PATH = "/dev/tmp";
-    public static final String MAGISK_LOG = "/cache/magisk.log";
-    public static final String MANAGER_CONFIGS = ".tmp.magisk.config";
-
-    // Versions
-    public static final int UPDATE_SERVICE_VER = 1;
-
-    public static int MIN_MODULE_VER() {
-        return Data.magiskVersionCode >= MAGISK_VER.REMOVE_LEGACY_LINK ? 1500 : 1400;
-    }
-
-    /* A list of apps that should not be shown as hide-able */
-    public static final List<String> HIDE_BLACKLIST =  Arrays.asList(
-            "android",
-            Data.MM().getPackageName(),
-            "com.google.android.gms"
-    );
-
-    public static final int USER_ID = Process.myUid() / 100000;
-
-    public static final class MAGISK_VER {
-        public static final int UNIFIED = 1300;
-        public static final int FBE_AWARE = 1410;
-        public static final int RESETPROP_PERSIST = 1436;
-        public static final int MANAGER_HIDE = 1440;
-        public static final int HIDDEN_PATH = 1460;
-        public static final int REMOVE_LEGACY_LINK = 1630;
-        public static final int SEPOL_REFACTOR = 1640;
-        public static final int FIX_ENV = 1650;
-    }
-
-    public static class ID {
-        public static final int UPDATE_SERVICE_ID = 1;
-        public static final int FETCH_ZIP = 2;
-        public static final int SELECT_BOOT = 3;
-        public static final int ONBOOT_SERVICE_ID = 6;
-
-        // notifications
-        public static final int MAGISK_UPDATE_NOTIFICATION_ID = 4;
-        public static final int APK_UPDATE_NOTIFICATION_ID = 5;
-        public static final int DTBO_NOTIFICATION_ID = 7;
-        public static final String NOTIFICATION_CHANNEL = "magisk_notification";
-    }
-
-    public static class Url {
-        public static final String STABLE_URL = "https://raw.githubusercontent.com/topjohnwu/magisk_files/master/stable.json";
-        public static final String BETA_URL = "https://raw.githubusercontent.com/topjohnwu/magisk_files/master/beta.json";
-        public static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&sort=pushed&page=%d";
-        public static final String FILE_URL = "https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s";
-        public static final String ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip";
-        public static final String PAYPAL_URL = "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=CC7FZ7526MNGG";
-        public static final String PATREON_URL = "https://www.patreon.com/topjohnwu";
-        public static final String TWITTER_URL = "https://twitter.com/topjohnwu";
-        public static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382";
-        public static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk";
-    }
-
-
-    public static class Key {
-        // su
-        public static final String ROOT_ACCESS = "root_access";
-        public static final String SU_MULTIUSER_MODE = "multiuser_mode";
-        public static final String SU_MNT_NS = "mnt_ns";
-        public static final String SU_MANAGER = "requester";
-        public static final String SU_REQUEST_TIMEOUT = "su_request_timeout";
-        public static final String SU_AUTO_RESPONSE = "su_auto_response";
-        public static final String SU_NOTIFICATION = "su_notification";
-        public static final String SU_REAUTH = "su_reauth";
-        public static final String SU_FINGERPRINT = "su_fingerprint";
-
-        // intents
-        public static final String OPEN_SECTION = "section";
-        public static final String INTENT_SET_FILENAME = "filename";
-        public static final String INTENT_SET_LINK = "link";
-        public static final String FLASH_ACTION = "action";
-        public static final String FLASH_SET_BOOT = "boot";
-
-        // others
-        public static final String CHECK_UPDATES = "check_update";
-        public static final String UPDATE_CHANNEL = "update_channel";
-        public static final String CUSTOM_CHANNEL = "custom_channel";
-        public static final String BOOT_FORMAT = "boot_format";
-        public static final String UPDATE_SERVICE_VER = "update_service_version";
-        public static final String APP_VER = "app_version";
-        public static final String MAGISKHIDE = "magiskhide";
-        public static final String HOSTS = "hosts";
-        public static final String COREONLY = "disable";
-        public static final String LOCALE = "locale";
-        public static final String DARK_THEME = "dark_theme";
-        public static final String ETAG_KEY = "ETag";
-        public static final String LINK_KEY = "Link";
-        public static final String IF_NONE_MATCH = "If-None-Match";
-        public static final String REPO_ORDER = "repo_order";
-    }
-
-
-    public static class Value {
-        public static final int STABLE_CHANNEL = 0;
-        public static final int BETA_CHANNEL = 1;
-        public static final int CUSTOM_CHANNEL = 2;
-        public static final int ROOT_ACCESS_DISABLED = 0;
-        public static final int ROOT_ACCESS_APPS_ONLY = 1;
-        public static final int ROOT_ACCESS_ADB_ONLY = 2;
-        public static final int ROOT_ACCESS_APPS_AND_ADB = 3;
-        public static final int MULTIUSER_MODE_OWNER_ONLY = 0;
-        public static final int MULTIUSER_MODE_OWNER_MANAGED = 1;
-        public static final int MULTIUSER_MODE_USER = 2;
-        public static final int NAMESPACE_MODE_GLOBAL = 0;
-        public static final int NAMESPACE_MODE_REQUESTER = 1;
-        public static final int NAMESPACE_MODE_ISOLATE = 2;
-        public static final int NO_NOTIFICATION = 0;
-        public static final int NOTIFICATION_TOAST = 1;
-        public static final int NOTIFY_NORMAL_LOG = 0;
-        public static final int NOTIFY_USER_TOASTS = 1;
-        public static final int NOTIFY_USER_TO_OWNER = 2;
-        public static final int SU_PROMPT = 0;
-        public static final int SU_AUTO_DENY = 1;
-        public static final int SU_AUTO_ALLOW = 2;
-        public static final String FLASH_ZIP = "flash";
-        public static final String PATCH_BOOT = "patch";
-        public static final String FLASH_MAGISK = "magisk";
-        public static final String FLASH_INACTIVE_SLOT = "slot";
-        public static final String UNINSTALL = "uninstall";
-        public static final int[] timeoutList = {0, -1, 10, 20, 30, 60};
-        public static final int ORDER_NAME = 0;
-        public static final int ORDER_DATE = 1;
-    }
-}

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

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

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

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

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

@@ -1,169 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.Manifest;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.asyncs.FlashZip;
-import com.topjohnwu.magisk.asyncs.InstallMagisk;
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.utils.Download;
-import com.topjohnwu.magisk.utils.RootUtils;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.CallbackList;
-import com.topjohnwu.superuser.Shell;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Locale;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-public class FlashActivity extends BaseActivity {
-
-    @BindView(R.id.toolbar) Toolbar toolbar;
-    @BindView(R.id.txtLog) TextView flashLogs;
-    @BindView(R.id.button_panel) public LinearLayout buttonPanel;
-    @BindView(R.id.reboot) public Button reboot;
-    @BindView(R.id.scrollView) ScrollView sv;
-
-    private List<String> logs;
-
-    @OnClick(R.id.no_thanks)
-    void dismiss() {
-        finish();
-    }
-
-    @OnClick(R.id.reboot)
-    void reboot() {
-        Shell.su("/system/bin/reboot").submit();
-    }
-
-    @OnClick(R.id.save_logs)
-    void saveLogs() {
-        runWithPermission(new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, () -> {
-            Calendar now = Calendar.getInstance();
-            String filename = String.format(Locale.US,
-                    "magisk_install_log_%04d%02d%02d_%02d%02d%02d.log",
-                    now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
-                    now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
-                    now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
-
-            File logFile = new File(Download.EXTERNAL_PATH, filename);
-            try (FileWriter writer = new FileWriter(logFile)) {
-                for (String s : logs) {
-                    writer.write(s);
-                    writer.write('\n');
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-            Utils.toast(logFile.getPath(), Toast.LENGTH_LONG);
-        });
-    }
-
-    @Override
-    public int getDarkTheme() {
-        return R.style.AppTheme_StatusBar_Dark;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_flash);
-        ButterKnife.bind(this);
-        setSupportActionBar(toolbar);
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setTitle(R.string.flashing);
-        }
-        setFloating();
-        setFinishOnTouchOutside(false);
-        if (!Shell.rootAccess())
-            reboot.setVisibility(View.GONE);
-
-        logs = new ArrayList<>();
-        CallbackList<String> console = new CallbackList<String>(new ArrayList<>()) {
-
-            private void updateUI() {
-                flashLogs.setText(TextUtils.join("\n", this));
-                sv.postDelayed(() -> sv.fullScroll(ScrollView.FOCUS_DOWN), 10);
-            }
-
-            @Override
-            public void onAddElement(String s) {
-                logs.add(s);
-                updateUI();
-            }
-
-            @Override
-            public String set(int i, String s) {
-                String ret = super.set(i, s);
-                Data.mainHandler.post(this::updateUI);
-                return ret;
-            }
-        };
-
-        // We must receive a Uri of the target zip
-        Intent intent = getIntent();
-        Uri uri = intent.getData();
-
-        switch (intent.getStringExtra(Const.Key.FLASH_ACTION)) {
-            case Const.Value.FLASH_ZIP:
-                new FlashZip(this, uri, console, logs).exec();
-                break;
-            case Const.Value.UNINSTALL:
-                new UninstallMagisk(this, uri, console, logs).exec();
-                break;
-            case Const.Value.FLASH_MAGISK:
-                new InstallMagisk(this, console, logs, InstallMagisk.DIRECT_MODE).exec();
-                break;
-            case Const.Value.FLASH_INACTIVE_SLOT:
-                new InstallMagisk(this, console, logs, InstallMagisk.SECOND_SLOT_MODE).exec();
-                break;
-            case Const.Value.PATCH_BOOT:
-                new InstallMagisk(this, console, logs,
-                        intent.getParcelableExtra(Const.Key.FLASH_SET_BOOT)).exec();
-                break;
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        // Prevent user accidentally press back button
-    }
-
-    private static class UninstallMagisk extends FlashZip {
-
-        private UninstallMagisk(BaseActivity context, Uri uri, List<String> console, List<String> logs) {
-            super(context, uri, console, logs);
-        }
-
-        @Override
-        protected void onPostExecute(Integer result) {
-            if (result == 1) {
-                Data.mainHandler.postDelayed(() ->
-                        RootUtils.uninstallPkg(getActivity().getPackageName()), 3000);
-            } else {
-                super.onPostExecute(result);
-            }
-        }
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,188 +0,0 @@
-package com.topjohnwu.magisk.adapters;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.util.Pair;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.MarkDownWindow;
-import com.topjohnwu.magisk.asyncs.ProcessRepoZip;
-import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.components.CustomAlertDialog;
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.container.Repo;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, ReposAdapter.RepoHolder> {
-
-    private static final int UPDATES = 0;
-    private static final int INSTALLED = 1;
-    private static final int OTHERS = 2;
-
-    private Cursor repoCursor = null;
-    private Map<String, Module> moduleMap;
-    private RepoDatabaseHelper repoDB;
-    private List<Pair<Integer, List<Repo>>> repoPairs;
-
-    public ReposAdapter(RepoDatabaseHelper db, Map<String, Module> map) {
-        repoDB = db;
-        moduleMap = map;
-        repoPairs = new ArrayList<>();
-        notifyDBChanged();
-    }
-
-
-    @Override
-    public int getSectionCount() {
-        return repoPairs.size();
-    }
-
-    @Override
-    public int getItemCount(int section) {
-        return repoPairs.get(section).second.size();
-    }
-
-    @Override
-    public SectionHolder onCreateSectionViewHolder(ViewGroup parent) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.section, parent, false);
-        return new SectionHolder(v);
-    }
-
-    @Override
-    public RepoHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_repo, parent, false);
-        return new RepoHolder(v);
-    }
-
-    @Override
-    public void onBindSectionViewHolder(SectionHolder holder, int section) {
-        switch (repoPairs.get(section).first) {
-            case UPDATES:
-                holder.sectionText.setText(R.string.update_available);
-                break;
-            case INSTALLED:
-                holder.sectionText.setText(R.string.installed);
-                break;
-            case OTHERS:
-                holder.sectionText.setText(R.string.not_installed);
-                break;
-        }
-    }
-
-    @Override
-    public void onBindItemViewHolder(RepoHolder holder, int section, int position) {
-        Repo repo = repoPairs.get(section).second.get(position);
-        Context context = holder.itemView.getContext();
-
-        holder.title.setText(repo.getName());
-        holder.versionName.setText(repo.getVersion());
-        String author = repo.getAuthor();
-        holder.author.setText(TextUtils.isEmpty(author) ? null : context.getString(R.string.author, author));
-        holder.description.setText(repo.getDescription());
-        holder.updateTime.setText(context.getString(R.string.updated_on, repo.getLastUpdateString()));
-
-        holder.infoLayout.setOnClickListener(v ->
-                new MarkDownWindow((BaseActivity) context, null, repo.getDetailUrl()).exec());
-
-        holder.downloadImage.setOnClickListener(v -> {
-            new CustomAlertDialog((BaseActivity) context)
-                    .setTitle(context.getString(R.string.repo_install_title, repo.getName()))
-                    .setMessage(context.getString(R.string.repo_install_msg, repo.getDownloadFilename()))
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.install, (d, i) ->
-                        new ProcessRepoZip((BaseActivity) context, repo, true).exec()
-                    )
-                    .setNeutralButton(R.string.download, (d, i) ->
-                        new ProcessRepoZip((BaseActivity) context, repo, false).exec())
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
-        });
-    }
-
-    public void notifyDBChanged() {
-        if (repoCursor != null)
-            repoCursor.close();
-        repoCursor = repoDB.getRepoCursor();
-        filter("");
-    }
-
-    public void filter(String s) {
-        List<Repo> updates = new ArrayList<>();
-        List<Repo> installed = new ArrayList<>();
-        List<Repo> others = new ArrayList<>();
-
-        repoPairs.clear();
-        while (repoCursor.moveToNext()) {
-            Repo repo = new Repo(repoCursor);
-            if (repo.getName().toLowerCase().contains(s.toLowerCase())
-                    || repo.getAuthor().toLowerCase().contains(s.toLowerCase())
-                    || repo.getDescription().toLowerCase().contains(s.toLowerCase())
-                    ) {
-                // Passed the repoFilter
-                Module module = moduleMap.get(repo.getId());
-                if (module != null) {
-                    if (repo.getVersionCode() > module.getVersionCode()) {
-                        // Updates
-                        updates.add(repo);
-                    } else {
-                        installed.add(repo);
-                    }
-                } else {
-                    others.add(repo);
-                }
-            }
-        }
-        repoCursor.moveToFirst();
-
-        if (!updates.isEmpty())
-            repoPairs.add(new Pair<>(UPDATES, updates));
-        if (!installed.isEmpty())
-            repoPairs.add(new Pair<>(INSTALLED, installed));
-        if (!others.isEmpty())
-            repoPairs.add(new Pair<>(OTHERS, others));
-
-        notifyDataSetChanged();
-    }
-
-    static class SectionHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.section_text) TextView sectionText;
-
-        SectionHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-        }
-    }
-
-    static class RepoHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.title) TextView title;
-        @BindView(R.id.version_name) TextView versionName;
-        @BindView(R.id.description) TextView description;
-        @BindView(R.id.author) TextView author;
-        @BindView(R.id.info_layout) LinearLayout infoLayout;
-        @BindView(R.id.download) ImageView downloadImage;
-        @BindView(R.id.update_time) TextView updateTime;
-
-        RepoHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-        }
-
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,196 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.Manifest;
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.net.Uri;
-import android.support.annotation.NonNull;
-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;
-
-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, FlashActivity.class);
-                intent.setData(uri).putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP);
-                activity.startActivity(intent);
-            } else {
-                SnackbarMaker.showUri(activity, uri);
-            }
-        } else {
-            Utils.toast(R.string.process_error, Toast.LENGTH_LONG);
-        }
-        super.onPostExecute(result);
-    }
-
-    @Override
-    public void exec(Void... voids) {
-        getActivity().runWithPermission(
-                new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, super::exec);
-    }
-
-    private class ProgressInputStream extends FilterInputStream {
-
-        ProgressInputStream(InputStream in) {
-            super(in);
-        }
-
-        private void updateDlProgress(int step) {
-            progress += step;
-            progressDialog.setMessage(getActivity().getString(R.string.zip_download_msg,
-                    (int) (100 * (double) progress / total + 0.5)));
-        }
-
-        @Override
-        public synchronized int read() throws IOException {
-            int b = super.read();
-            if (b > 0) {
-                Data.mainHandler.post(() -> updateDlProgress(1));
-            }
-            return b;
-        }
-
-        @Override
-        public int read(@NonNull byte[] b) throws IOException {
-            return read(b, 0, b.length);
-        }
-
-        @Override
-        public synchronized int read(@NonNull byte[] b, int off, int len) throws IOException {
-            int read = super.read(b, off, len);
-            if (read > 0) {
-                Data.mainHandler.post(() -> updateDlProgress(read));
-            }
-            return read;
-        }
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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