Bump version

Hi,

Update, translations and typo fix

Merge please

Thank you

.gitignore

@@ -3,6 +3,9 @@
 /local.properties
 .idea/
 /build
-app/app-release.apk
+app/release
 *.hprof
 app/.externalNativeBuild/
+*.sh
+public.certificate.x509.pem
+private.key.pk8

README.md

@@ -1,4 +1,7 @@
 # Magisk Manager
-The project can only be compiled on Android Studio Version 2.2.0+  
-I use Java 8 features, which requires Jack compiler and that's only available in 2.2.0+
-Also, you need to install CMake and NDK to build the zipadjust library for zip preprocessing
+This is one of the submodules used in Magisk. The project is licensed under GPL v3 (or newer).
+More info are written in the [Magisk Main Repo](https://github.com/topjohnwu/Magisk)
+
+## Building Notes
+You need to install CMake and NDK to build the zipadjust library.
+There are several files required to let Magisk Manager work properly, and they can be copied by using the build script in the [Magisk Main Repo](https://github.com/topjohnwu/Magisk). These files are: `magisk_uninstaller.sh`, `util_functions.sh`, `public.certificate.x509.pem`, and `private.key.pk8` under the `app/src/main/assets` folder.

app/CMakeLists.txt

@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 3.6)
-add_library(zipadjust SHARED src/main/jni/zipadjust.c)
-find_library(libz z)
-find_library(liblog log)
-target_link_libraries(zipadjust ${libz} ${liblog})

app/build.gradle

@@ -1,31 +1,30 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.topjohnwu.magisk"
         minSdkVersion 21
-        targetSdkVersion 25
-        versionCode 11
-        versionName "3.0"
-        jackOptions {
-            enabled true
-        }
+        targetSdkVersion 26
+        versionCode 52
+        versionName "5.2.0"
         ndk {
             moduleName 'zipadjust'
-            abiFilters 'x86', 'x86_64', 'armeabi', 'arm64-v8a'
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+        }
+        javaCompileOptions {
+            annotationProcessorOptions {
+                argument('butterknife.debuggable', 'false')
+            }
         }
-    }
-
-    compileOptions {
-        incremental false
     }
 
     buildTypes {
         release {
             minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -34,31 +33,34 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     dexOptions {
-        preDexLibraries = false
+        preDexLibraries true
+        javaMaxHeapSize "2g"
     }
     externalNativeBuild {
         cmake {
-            path 'CMakeLists.txt'
+            path 'src/main/jni/CMakeLists.txt'
         }
     }
+    lintOptions {
+        disable 'MissingTranslation'
+    }
 }
 repositories {
     jcenter()
     maven { url "https://jitpack.io" }
+    maven { url "https://maven.google.com" }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:recyclerview-v7:25.1.0'
-    compile 'com.android.support:cardview-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
-    compile 'com.jakewharton:butterknife:8.4.0'
-    compile 'com.google.code.gson:gson:2.8.0'
-    compile 'com.github.clans:fab:1.6.4'
-    compile 'com.madgag.spongycastle:core:1.54.0.0'
-    compile 'com.madgag.spongycastle:prov:1.54.0.0'
-    compile 'com.madgag.spongycastle:pkix:1.54.0.0'
-    compile 'com.madgag.spongycastle:pg:1.54.0.0'
-    compile 'com.google.android.gms:play-services-safetynet:9.0.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:recyclerview-v7:26.0.0'
+    implementation 'com.android.support:cardview-v7:26.0.0'
+    implementation 'com.android.support:design:26.0.0'
+    implementation 'com.android.support:support-v4:26.0.0'
+    implementation 'com.jakewharton:butterknife:8.8.1'
+    implementation 'com.atlassian.commonmark:commonmark:0.9.0'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.57'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.57'
+    implementation 'com.google.android.gms:play-services-safetynet:9.0.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 }

app/proguard-rules.pro

@@ -16,31 +16,10 @@
 #   public *;
 #}
 
-# Gson uses generic type information stored in a class file when working with fields. Proguard
-# removes such information by default, so configure it to keep all of it.
--keepattributes Signature
+# BouncyCastle
+-keep class org.bouncycastle.** { *; }
+-dontwarn javax.naming.**
 
-# For using GSON @Expose annotation
--keepattributes *Annotation*
+-dontwarn android.content.**
+-dontwarn android.animation.**
 
-# Gson specific classes
--keep class sun.misc.Unsafe { *; }
--keep class com.google.gson.** { *; }
-
-# Application classes that will be serialized/deserialized over Gson
--keep class com.topjohnwu.magisk.module.** { *; }
--keep class com.topjohnwu.magisk.utils.ModuleHelper$ValueSortedMap { *; }
-
-# Prevent proguard from stripping interface information from TypeAdapterFactory,
-# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
-
--keep class android.support.v7.internal.** { *; }
--keep interface android.support.v7.internal.** { *; }
--keep class android.support.v7.** { *; }
--keep interface android.support.v7.** { *; }
-
-# SpongyCastle
--keep class org.spongycastle.** {*;}

app/src/main/AndroidManifest.xml

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.topjohnwu.magisk"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-
-          xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.topjohnwu.magisk">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission
-        android:name="android.permission.PACKAGE_USAGE_STATS"
-        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
+        android:name=".MagiskManager"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -22,8 +21,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize"
-            android:exported="true"/>
-
+            android:exported="true" />
         <activity
             android:name=".SplashActivity"
             android:configChanges="orientation|screenSize"
@@ -31,16 +29,55 @@
             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.Transparent"/>
+            android:theme="@style/AppTheme.Transparent" />
         <activity
             android:name=".SettingsActivity"
             android:theme="@style/AppTheme.Transparent" />
+        <activity
+            android:name=".FlashActivity"
+            android:screenOrientation="nosensor"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme.Transparent" />
+
+        <activity
+            android:name=".superuser.RequestActivity"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
+            android:taskAffinity="internal.superuser"
+            android:theme="@android:style/Theme.NoDisplay" />
+        <activity
+            android:name=".superuser.SuRequestActivity"
+            android:excludeFromRecents="true"
+            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" />
+
+        <service android:name=".services.OnBootIntentService" />
+        <service
+            android:name=".services.UpdateCheckService"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <provider
             android:name="android.support.v4.content.FileProvider"
@@ -58,4 +95,4 @@
 
     </application>
 
-</manifest>
+</manifest>

app/src/main/assets/public.certificate.x509.pem

@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEqDCCA5CgAwIBAgIJAJNurL4H8gHfMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
-VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE
-AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
-Fw0wODAyMjkwMTMzNDZaFw0zNTA3MTcwMTMzNDZaMIGUMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G
-A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p
-ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI
-hvcNAQEBBQADggENADCCAQgCggEBANaTGQTexgskse3HYuDZ2CU+Ps1s6x3i/waM
-qOi8qM1r03hupwqnbOYOuw+ZNVn/2T53qUPn6D1LZLjk/qLT5lbx4meoG7+yMLV4
-wgRDvkxyGLhG9SEVhvA4oU6Jwr44f46+z4/Kw9oe4zDJ6pPQp8PcSvNQIg1QCAcy
-4ICXF+5qBTNZ5qaU7Cyz8oSgpGbIepTYOzEJOmc3Li9kEsBubULxWBjf/gOBzAzU
-RNps3cO4JFgZSAGzJWQTT7/emMkod0jb9WdqVA2BVMi7yge54kdVMxHEa5r3b97s
-zI5p58ii0I54JiCUP5lyfTwE/nKZHZnfm644oLIXf6MdW2r+6R8CAQOjgfwwgfkw
-HQYDVR0OBBYEFEhZAFY9JyxGrhGGBaR0GawJyowRMIHJBgNVHSMEgcEwgb6AFEhZ
-AFY9JyxGrhGGBaR0GawJyowRoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE
-CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH
-QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG
-CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJAJNurL4H8gHfMAwGA1Ud
-EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHqvlozrUMRBBVEY0NqrrwFbinZa
-J6cVosK0TyIUFf/azgMJWr+kLfcHCHJsIGnlw27drgQAvilFLAhLwn62oX6snb4Y
-LCBOsVMR9FXYJLZW2+TcIkCRLXWG/oiVHQGo/rWuWkJgU134NDEFJCJGjDbiLCpe
-+ZTWHdcwauTJ9pUbo8EvHRkU3cYfGmLaLfgn9gP+pWA7LFQNvXwBnDa6sppCccEX
-31I828XzgXpJ4O+mDL1/dBd+ek8ZPUP0IgdyZm5MTYPhvVqGCHzzTy3sIeJFymwr
-sBbmg2OAUNLEMO6nwmocSdN2ClirfxqCzJOLSDE4QyS9BAH6EhY6UFcOaE0=
------END CERTIFICATE-----

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

@@ -3,21 +3,20 @@ package com.topjohnwu.magisk;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.TextView;
 
-import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.components.AboutCardRow;
+import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.components.AlertDialogBuilder;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,11 +24,12 @@ import java.io.InputStream;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class AboutActivity extends AppCompatActivity {
+public class AboutActivity extends Activity {
 
-    private static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/MagiskManager";
+    private static final String DONATION_URL = "https://www.paypal.me/topjohnwu";
     private static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382";
-    private static final String DONATION_URL = "http://topjohnwu.github.io/donate";
+    private static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/MagiskManager";
+
     @BindView(R.id.toolbar) Toolbar toolbar;
     @BindView(R.id.app_version_info) AboutCardRow appVersionInfo;
     @BindView(R.id.app_changelog) AboutCardRow appChangelog;
@@ -38,15 +38,12 @@ public class AboutActivity extends AppCompatActivity {
     @BindView(R.id.app_source_code) AboutCardRow appSourceCode;
     @BindView(R.id.support_thread) AboutCardRow supportThread;
     @BindView(R.id.donation) AboutCardRow donation;
-    private AlertDialog.Builder builder;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        String theme = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("theme", "");
-        Logger.dev("AboutActivity: Theme is " + theme);
-        if (theme.equals("Dark")) {
-            setTheme(R.style.AppTheme_dh);
+        if (getApplicationContext().isDarkTheme) {
+            setTheme(R.style.AppTheme_Transparent_Dark);
         }
         setContentView(R.layout.activity_about);
         ButterKnife.bind(this);
@@ -63,24 +60,17 @@ public class AboutActivity extends AppCompatActivity {
         appVersionInfo.setSummary(BuildConfig.VERSION_NAME);
 
         String changes = null;
-        try {
-            InputStream is = getAssets().open("changelog.html");
+        try (InputStream is = getAssets().open("changelog.html")) {
             int size = is.available();
 
             byte[] buffer = new byte[size];
             is.read(buffer);
-            is.close();
 
             changes = new String(buffer);
         } catch (IOException ignored) {
         }
 
         appChangelog.removeSummary();
-        if (theme.equals("Dark")) {
-            builder = new AlertDialog.Builder(this, R.style.AlertDialog_dh);
-        } else {
-            builder = new AlertDialog.Builder(this);
-        }
         if (changes == null) {
             appChangelog.setVisibility(View.GONE);
         } else {
@@ -91,13 +81,11 @@ public class AboutActivity extends AppCompatActivity {
                 result = Html.fromHtml(changes);
             }
             appChangelog.setOnClickListener(v -> {
-                AlertDialog d = builder
+                AlertDialog d = new AlertDialogBuilder(this)
                         .setTitle(R.string.app_changelog)
                         .setMessage(result)
                         .setPositiveButton(android.R.string.ok, null)
-                        .create();
-
-                d.show();
+                        .show();
 
                 //noinspection ConstantConditions
                 ((TextView) d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
@@ -112,7 +100,7 @@ public class AboutActivity extends AppCompatActivity {
             } else {
                 result = Html.fromHtml(getString(R.string.app_developers_));
             }
-            AlertDialog d = builder
+            AlertDialog d = new AlertDialogBuilder(this)
                     .setTitle(R.string.app_developers)
                     .setMessage(result)
                     .setPositiveButton(android.R.string.ok, null)
@@ -142,18 +130,4 @@ public class AboutActivity extends AppCompatActivity {
         setFloating();
     }
 
-    public 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);
-        }
-    }
-
 }

app/src/main/java/com/topjohnwu/magisk/FABBehavior.java

@@ -1,113 +0,0 @@
-package com.topjohnwu.magisk;
-
-
-import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPropertyAnimatorCompat;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.github.clans.fab.FloatingActionMenu;
-
-import java.util.List;
-
-/**
- * Created by Matteo on 08/08/2015.
- *
- * Floating Action Menu Behavior for Clans.FloatingActionButton
- * https://github.com/Clans/FloatingActionButton/
- *
- * Use this behavior as your app:layout_behavior attribute in your Floating Action Menu to use the
- * FabMenu in a Coordinator Layout.
- *
- * Remember to use the correct namespace for the fab:
- * xmlns:fab="http://schemas.android.com/apk/res-auto"
- */
-public class FABBehavior extends CoordinatorLayout.Behavior {
-    private float mTranslationY;
-
-    public FABBehavior(Context context, AttributeSet attrs) {
-        super();
-    }
-
-    @Override
-    public boolean layoutDependsOn(CoordinatorLayout parent, View child, View dependency) {
-        return dependency instanceof Snackbar.SnackbarLayout;
-    }
-
-    @Override
-    public boolean onDependentViewChanged(CoordinatorLayout parent, View child, View dependency) {
-        if (dependency instanceof Snackbar.SnackbarLayout) {
-            updateTranslation(parent, child);
-        }
-
-        return false;
-    }
-
-    @Override
-    public void onDependentViewRemoved(CoordinatorLayout parent, View child, View dependency) {
-        if (dependency instanceof Snackbar.SnackbarLayout) {
-            revertTranslation(child);
-        }
-    }
-
-    private void updateTranslation(CoordinatorLayout parent, View child) {
-        float translationY = getTranslationY(parent, child);
-        if (translationY != mTranslationY) {
-            ViewPropertyAnimatorCompat anim = ViewCompat.animate(child);
-            anim.cancel();
-            anim.translationY(translationY).setDuration(100);
-            mTranslationY = translationY;
-        }
-    }
-
-    private void revertTranslation(View child) {
-        if (mTranslationY != 0) {
-            ViewPropertyAnimatorCompat anim = ViewCompat.animate(child);
-            anim.cancel();
-            anim.translationY(0).setDuration(100);
-            mTranslationY = 0;
-        }
-    }
-
-    private float getTranslationY(CoordinatorLayout parent, View child) {
-        float minOffset = 0.0F;
-        List dependencies = parent.getDependencies(child);
-        int i = 0;
-
-        for (int z = dependencies.size(); i < z; ++i) {
-            View view = (View) dependencies.get(i);
-            if (view instanceof Snackbar.SnackbarLayout && parent.doViewsOverlap(child, view)) {
-                minOffset = Math.min(minOffset, ViewCompat.getTranslationY(view) - (float) view.getHeight());
-            }
-        }
-
-        return minOffset;
-    }
-
-    /**
-     * onStartNestedScroll and onNestedScroll will hide/show the FabMenu when a scroll is detected.
-     */
-    @Override
-    public boolean onStartNestedScroll(CoordinatorLayout coordinatorLayout, View child,
-                                       View directTargetChild, View target, int nestedScrollAxes) {
-        return nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL ||
-                super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target,
-                        nestedScrollAxes);
-    }
-
-    @Override
-    public void onNestedScroll(CoordinatorLayout coordinatorLayout, View child, View target,
-                               int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
-        super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed,
-                dyUnconsumed);
-        FloatingActionMenu fabMenu = (FloatingActionMenu) child;
-        if (dyConsumed > 0 && !fabMenu.isMenuButtonHidden()) {
-            fabMenu.hideMenuButton(true);
-        } else if (dyConsumed < 0 && fabMenu.isMenuButtonHidden()) {
-            fabMenu.showMenuButton(true);
-        }
-    }
-}

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

@@ -0,0 +1,98 @@
+package com.topjohnwu.magisk;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.topjohnwu.magisk.asyncs.FlashZip;
+import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.utils.AdaptiveList;
+import com.topjohnwu.magisk.utils.Shell;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class FlashActivity extends Activity {
+
+    @BindView(R.id.toolbar) Toolbar toolbar;
+    @BindView(R.id.flash_logs) RecyclerView flashLogs;
+    @BindView(R.id.button_panel) LinearLayout buttonPanel;
+
+    private AdaptiveList<String> rootShellOutput;
+
+    @OnClick(R.id.no_thanks)
+    public void dismiss() {
+        finish();
+    }
+
+    @OnClick(R.id.reboot)
+    public void reboot() {
+        Shell.getShell(this).su_raw("reboot");
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_flash);
+        ButterKnife.bind(this);
+        rootShellOutput = new AdaptiveList<>(flashLogs);
+        setSupportActionBar(toolbar);
+        ActionBar ab = getSupportActionBar();
+        if (ab != null) {
+            ab.setTitle(R.string.flashing);
+        }
+        setFloating();
+
+        flashLogs.setAdapter(new FlashLogAdapter());
+
+        // We must receive a Uri of the target zip
+        Uri uri = getIntent().getData();
+
+        new FlashZip(this, uri, rootShellOutput)
+                .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
+                .exec();
+    }
+
+    @Override
+    public void onBackPressed() {
+        // Prevent user accidentally press back button
+    }
+
+    private class FlashLogAdapter extends RecyclerView.Adapter<ViewHolder> {
+
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.list_item_flashlog, parent, false);
+            return new ViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(ViewHolder holder, int position) {
+            holder.text.setText(rootShellOutput.get(position));
+        }
+
+        @Override
+        public int getItemCount() {
+            return rootShellOutput.size();
+        }
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.textView) TextView text;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/InstallFragment.java

@@ -1,105 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.CardView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.receivers.MagiskDlReceiver;
-import com.topjohnwu.magisk.utils.CallbackHandler;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class InstallFragment extends Fragment implements CallbackHandler.EventListener {
-
-    public static final CallbackHandler.Event blockDetectionDone = new CallbackHandler.Event();
-
-    public static List<String> blockList;
-    public static String bootBlock = null;
-
-    @BindView(R.id.install_title) TextView installTitle;
-    @BindView(R.id.block_spinner) Spinner spinner;
-    @BindView(R.id.detect_bootimage) Button detectButton;
-    @BindView(R.id.flash_button) CardView flashButton;
-    @BindView(R.id.keep_force_enc) CheckBox keepEncChkbox;
-    @BindView(R.id.keep_verity) CheckBox keepVerityChkbox;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.install_fragment, container, false);
-        ButterKnife.bind(this, v);
-        detectButton.setOnClickListener(v1 -> toAutoDetect());
-        installTitle.setText(getString(R.string.install_magisk_title, StatusFragment.remoteMagiskVersion));
-        flashButton.setOnClickListener(v1 -> {
-            String bootImage = bootBlock;
-            if (bootImage == null) {
-                bootImage = blockList.get(spinner.getSelectedItemPosition() - 1);
-            }
-            String filename = "Magisk-v" + String.valueOf(StatusFragment.remoteMagiskVersion) + ".zip";
-            String finalBootImage = bootImage;
-            MainActivity.alertBuilder
-                    .setTitle(getString(R.string.repo_install_title, getString(R.string.magisk)))
-                    .setMessage(getString(R.string.repo_install_msg, filename))
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.download_install, (dialogInterface, i) -> Utils.dlAndReceive(
-                            getActivity(),
-                            new MagiskDlReceiver(finalBootImage, keepEncChkbox.isChecked(), keepVerityChkbox.isChecked()),
-                            StatusFragment.magiskLink,
-                            Utils.getLegalFilename(filename)))
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
-        });
-        if (blockDetectionDone.isTriggered) {
-            updateUI();
-        }
-        return v;
-    }
-
-    @Override
-    public void onTrigger(CallbackHandler.Event event) {
-        updateUI();
-    }
-
-    private void updateUI() {
-        List<String> items = new ArrayList<>(blockList);
-        items.add(0, getString(R.string.auto_detect, bootBlock));
-        ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
-                android.R.layout.simple_spinner_item, items);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(adapter);
-        toAutoDetect();
-    }
-
-    private void toAutoDetect() {
-        if (bootBlock != null) {
-            spinner.setSelection(0);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        getActivity().setTitle(R.string.install);
-        CallbackHandler.register(blockDetectionDone, this);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        CallbackHandler.unRegister(blockDetectionDone, this);
-    }
-}

app/src/main/java/com/topjohnwu/magisk/MagiskHideFragment.java

@@ -1,11 +1,7 @@
 package com.topjohnwu.magisk;
 
-import android.app.Fragment;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -16,121 +12,85 @@ import android.view.ViewGroup;
 import android.widget.SearchView;
 
 import com.topjohnwu.magisk.adapters.ApplicationAdapter;
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.Shell;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.utils.Topic;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
-public class MagiskHideFragment extends Fragment {
+public class MagiskHideFragment extends Fragment implements Topic.Subscriber {
 
+    private Unbinder unbinder;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
 
-    private PackageManager packageManager;
-    private View mView;
-    private List<ApplicationInfo> listApps = new ArrayList<>(), fListApps = new ArrayList<>();
-    private List<String> hideList = new ArrayList<>();
-    private ApplicationAdapter appAdapter = new ApplicationAdapter(fListApps, hideList);
+    private ApplicationAdapter appAdapter;
 
     private SearchView.OnQueryTextListener searchListener;
+    private String lastFilter;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
 
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        mView = inflater.inflate(R.layout.magisk_hide_fragment, container, false);
-        ButterKnife.bind(this, mView);
-
-        packageManager = getActivity().getPackageManager();
+        View view = inflater.inflate(R.layout.fragment_magisk_hide, container, false);
+        unbinder = ButterKnife.bind(this, view);
+        lastFilter = "";
 
         mSwipeRefreshLayout.setRefreshing(true);
-        mSwipeRefreshLayout.setOnRefreshListener(() -> {
-            recyclerView.setVisibility(View.GONE);
-            new LoadApps().exec();
-        });
+        mSwipeRefreshLayout.setOnRefreshListener(() -> appAdapter.refresh());
 
+        appAdapter = new ApplicationAdapter(getActivity());
         recyclerView.setAdapter(appAdapter);
 
         searchListener = new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
+                lastFilter = query;
+                appAdapter.filter(query);
                 return false;
             }
 
             @Override
             public boolean onQueryTextChange(String newText) {
-                new FilterApps().exec(newText);
+                lastFilter = newText;
+                appAdapter.filter(newText);
                 return false;
             }
         };
 
-        new LoadApps().exec();
-        return mView;
+        getActivity().setTitle(R.string.magiskhide);
+
+        return view;
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_magiskhide, menu);
-        SearchView search = (SearchView) MenuItemCompat.getActionView(menu.findItem(R.id.app_search));
+        SearchView search = (SearchView) menu.findItem(R.id.app_search).getActionView();
         search.setOnQueryTextListener(searchListener);
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        setHasOptionsMenu(true);
-        mView = this.getView();
-        getActivity().setTitle(R.string.magiskhide);
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
     }
 
-    private class LoadApps extends Async.RootTask<Void, Void, Void> {
-        @Override
-        protected Void doInBackground(Void... voids) {
-            listApps.clear();
-            hideList.clear();
-            fListApps.clear();
-            listApps.addAll(packageManager.getInstalledApplications(PackageManager.GET_META_DATA));
-            Collections.sort(listApps, (a, b) -> a.loadLabel(packageManager).toString().toLowerCase()
-                    .compareTo(b.loadLabel(packageManager).toString().toLowerCase()));
-            hideList.addAll(Shell.su(Async.MAGISK_HIDE_PATH + "list"));
-            fListApps.addAll(listApps);
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void aVoid) {
-            updateUI();
-        }
-    }
-
-    private class FilterApps extends Async.NormalTask<String, Void, Void> {
-        @Override
-        protected Void doInBackground(String... strings) {
-            String newText = strings[0];
-            fListApps.clear();
-            for (ApplicationInfo info : listApps) {
-                if (info.loadLabel(packageManager).toString().toLowerCase().contains(newText.toLowerCase())
-                        || info.packageName.toLowerCase().contains(newText.toLowerCase())) {
-                    fListApps.add(info);
-                }
-            }
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            appAdapter.notifyDataSetChanged();
-        }
-    }
-
-    private void updateUI() {
-        appAdapter.notifyDataSetChanged();
-        recyclerView.setVisibility(View.VISIBLE);
+    @Override
+    public void onTopicPublished(Topic topic) {
         mSwipeRefreshLayout.setRefreshing(false);
+        appAdapter.filter(lastFilter);
     }
 
-}
+    @Override
+    public Topic[] getSubscription() {
+        return new Topic[] { getApplication().magiskHideDone };
+    }
+}

app/src/main/java/com/topjohnwu/magisk/MagiskLogFragment.java

@@ -0,0 +1,249 @@
+package com.topjohnwu.magisk;
+
+import android.annotation.SuppressLint;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ProgressBar;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.asyncs.ParallelTask;
+import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.components.SnackbarMaker;
+import com.topjohnwu.magisk.utils.Shell;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Calendar;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+public class MagiskLogFragment extends Fragment {
+
+    private static final String MAGISK_LOG = "/cache/magisk.log";
+
+    private Unbinder unbinder;
+    @BindView(R.id.txtLog) TextView txtLog;
+    @BindView(R.id.svLog) ScrollView svLog;
+    @BindView(R.id.hsvLog) HorizontalScrollView hsvLog;
+
+    @BindView(R.id.progressBar) ProgressBar progressBar;
+
+    private MenuItem mClickedMenuItem;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_magisk_log, container, false);
+        unbinder = ButterKnife.bind(this, view);
+
+        txtLog.setTextIsSelectable(true);
+
+        new LogManager().read();
+
+        return view;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        getActivity().setTitle(R.string.log);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        new LogManager().read();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_log, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        mClickedMenuItem = item;
+        switch (item.getItemId()) {
+            case R.id.menu_refresh:
+                new LogManager().read();
+                return true;
+            case R.id.menu_save:
+                new LogManager().save();
+                return true;
+            case R.id.menu_clear:
+                new LogManager().clear();
+                return true;
+            default:
+                return true;
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == 0) {
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                if (mClickedMenuItem != null) {
+                    new Handler().postDelayed(() -> onOptionsItemSelected(mClickedMenuItem), 500);
+                }
+            } else {
+                SnackbarMaker.make(txtLog, R.string.permissionNotGranted, Snackbar.LENGTH_LONG).show();
+            }
+        }
+    }
+
+    private class LogManager extends ParallelTask<Object, Void, Object> {
+
+        private int mode;
+        private File targetFile;
+
+        @SuppressLint("DefaultLocale")
+        @Override
+        protected Object doInBackground(Object... params) {
+            MagiskManager magiskManager = MagiskLogFragment.this.getApplication();
+            mode = (int) params[0];
+            switch (mode) {
+                case 0:
+                    StringBuildingList logList = new StringBuildingList();
+                    Shell.getShell(magiskManager).su(logList, "cat " + MAGISK_LOG);
+                    return logList.toString();
+
+                case 1:
+                    Shell.getShell(magiskManager).su_raw("echo > " + MAGISK_LOG);
+                    SnackbarMaker.make(txtLog, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
+                    return "";
+
+                case 2:
+                    Calendar now = Calendar.getInstance();
+                    String filename = String.format(
+                            "magisk_%s_%04d%02d%02d_%02d%02d%02d.log", "error",
+                            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));
+
+                    targetFile = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/MagiskManager/" + filename);
+
+                    if ((!targetFile.getParentFile().exists() && !targetFile.getParentFile().mkdirs())
+                            || (targetFile.exists() && !targetFile.delete())) {
+                        return false;
+                    }
+
+                    try (FileWriter out = new FileWriter(targetFile)) {
+                        FileWritingList fileWritingList = new FileWritingList(out);
+                        Shell.getShell(magiskManager).su(fileWritingList, "cat " + MAGISK_LOG);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        return false;
+                    }
+                    return true;
+            }
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Object o) {
+            if (o == null) return;
+            switch (mode) {
+                case 0:
+                case 1:
+                    String llog = (String) o;
+                    progressBar.setVisibility(View.GONE);
+                    if (TextUtils.isEmpty(llog))
+                        txtLog.setText(R.string.log_is_empty);
+                    else
+                        txtLog.setText(llog);
+                    svLog.post(() -> svLog.scrollTo(0, txtLog.getHeight()));
+                    hsvLog.post(() -> hsvLog.scrollTo(0, 0));
+                    break;
+                case 2:
+                    boolean bool = (boolean) o;
+                    if (bool) {
+                        MagiskLogFragment.this.getApplication().toast(targetFile.toString(), Toast.LENGTH_LONG);
+                    } else {
+                        MagiskLogFragment.this.getApplication().toast(R.string.logs_save_failed, Toast.LENGTH_LONG);
+                    }
+                    break;
+            }
+        }
+
+        void read() {
+            exec(0);
+        }
+
+        void clear() {
+            exec(1);
+        }
+
+        void save() {
+            exec(2);
+        }
+    }
+
+    private static class StringBuildingList extends Shell.AbstractList<String> {
+
+        StringBuilder builder;
+
+        StringBuildingList() {
+            builder = new StringBuilder();
+        }
+
+        @Override
+        public boolean add(String s) {
+            builder.append(s).append("\n");
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return builder.toString();
+        }
+    }
+
+    private static class FileWritingList extends Shell.AbstractList<String> {
+
+        private FileWriter writer;
+
+        FileWritingList(FileWriter out) {
+            writer = out;
+        }
+
+        @Override
+        public boolean add(String s) {
+            try {
+                writer.write(s + "\n");
+            } catch (IOException ignored) {}
+            return true;
+        }
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java

@@ -1,9 +1,7 @@
 package com.topjohnwu.magisk;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -13,49 +11,47 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.github.clans.fab.FloatingActionButton;
 import com.topjohnwu.magisk.adapters.ModulesAdapter;
+import com.topjohnwu.magisk.asyncs.LoadModules;
+import com.topjohnwu.magisk.components.Fragment;
 import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.CallbackHandler;
 import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.ModuleHelper;
+import com.topjohnwu.magisk.utils.Topic;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.Unbinder;
 
-public class ModulesFragment extends Fragment implements CallbackHandler.EventListener {
-
-    public static final CallbackHandler.Event moduleLoadDone = new CallbackHandler.Event();
+public class ModulesFragment extends Fragment implements Topic.Subscriber {
 
     private static final int FETCH_ZIP_CODE = 2;
 
+    private Unbinder unbinder;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
-    @BindView(R.id.empty_rv) TextView emptyTv;
-    @BindView(R.id.fab) FloatingActionButton fabio;
+    @BindView(R.id.empty_rv) TextView emptyRv;
+    @OnClick(R.id.fab)
+    public void selectFile() {
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.setType("application/zip");
+        startActivityForResult(intent, FETCH_ZIP_CODE);
+    }
 
     private List<Module> listModules = new ArrayList<>();
-    private View mView;
 
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        mView = inflater.inflate(R.layout.modules_fragment, container, false);
-        ButterKnife.bind(this, mView);
-
-        fabio.setOnClickListener(v -> {
-            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-            intent.setType("application/zip");
-            startActivityForResult(intent, FETCH_ZIP_CODE);
-        });
+        View view = inflater.inflate(R.layout.fragment_modules, container, false);
+        unbinder = ButterKnife.bind(this, view);
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
             recyclerView.setVisibility(View.GONE);
-            new Async.LoadModules().exec();
+            new LoadModules(getActivity()).exec();
         });
 
         recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@@ -70,50 +66,46 @@ public class ModulesFragment extends Fragment implements CallbackHandler.EventLi
             }
         });
 
-        if (moduleLoadDone.isTriggered) {
-            updateUI();
-        }
+        getActivity().setTitle(R.string.modules);
 
-        return mView;
+        return view;
     }
 
     @Override
-    public void onTrigger(CallbackHandler.Event event) {
+    public void onTopicPublished(Topic topic) {
         Logger.dev("ModulesFragment: UI refresh triggered");
         updateUI();
     }
 
+    @Override
+    public Topic[] getSubscription() {
+        return new Topic[] { getApplication().moduleLoadDone };
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == FETCH_ZIP_CODE && resultCode == Activity.RESULT_OK && data != null) {
             // Get the URI of the selected file
-            final Uri uri = data.getData();
-            new Async.FlashZIP(getActivity(), uri).exec();
+            Intent intent = new Intent(getActivity(), FlashActivity.class);
+            intent.setData(data.getData()).putExtra("ACTION", "flash");
+            startActivity(intent);
         }
-
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        mView = this.getView();
-        CallbackHandler.register(moduleLoadDone, this);
-        getActivity().setTitle(R.string.modules);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        CallbackHandler.unRegister(moduleLoadDone, this);
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
     }
 
     private void updateUI() {
-        ModuleHelper.getModuleList(listModules);
+        listModules.clear();
+        listModules.addAll(getApplication().moduleMap.values());
         if (listModules.size() == 0) {
-            emptyTv.setVisibility(View.VISIBLE);
+            emptyRv.setVisibility(View.VISIBLE);
             recyclerView.setVisibility(View.GONE);
         } else {
-            emptyTv.setVisibility(View.GONE);
+            emptyRv.setVisibility(View.GONE);
             recyclerView.setVisibility(View.VISIBLE);
             recyclerView.setAdapter(new ModulesAdapter(listModules));
         }

app/src/main/java/com/topjohnwu/magisk/ReposFragment.java

@@ -1,9 +1,7 @@
 package com.topjohnwu.magisk;
 
-import android.app.Fragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -15,65 +13,70 @@ import android.widget.SearchView;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.adapters.ReposAdapter;
-import com.topjohnwu.magisk.adapters.SimpleSectionedRecyclerViewAdapter;
-import com.topjohnwu.magisk.module.Repo;
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.CallbackHandler;
+import com.topjohnwu.magisk.asyncs.UpdateRepos;
+import com.topjohnwu.magisk.components.Fragment;
 import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.ModuleHelper;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.topjohnwu.magisk.utils.Topic;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
-public class ReposFragment extends Fragment implements CallbackHandler.EventListener {
-
-    public static final CallbackHandler.Event repoLoadDone = new CallbackHandler.Event();
+public class ReposFragment extends Fragment implements Topic.Subscriber {
 
+    private Unbinder unbinder;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
-    @BindView(R.id.empty_rv) TextView emptyTv;
+    @BindView(R.id.empty_rv) TextView emptyRv;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
 
-    private List<Repo> mUpdateRepos = new ArrayList<>();
-    private List<Repo> mInstalledRepos = new ArrayList<>();
-    private List<Repo> mOthersRepos = new ArrayList<>();
-    private List<Repo> fUpdateRepos = new ArrayList<>();
-    private List<Repo> fInstalledRepos = new ArrayList<>();
-    private List<Repo> fOthersRepos = new ArrayList<>();
-
-    private SimpleSectionedRecyclerViewAdapter mSectionedAdapter;
-
-    private SearchView.OnQueryTextListener searchListener;
-
-    @Nullable
+    private ReposAdapter adapter;
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.repos_fragment, container, false);
+        View view = inflater.inflate(R.layout.fragment_repos, container, false);
+        unbinder = ButterKnife.bind(this, view);
 
-        ButterKnife.bind(this, view);
-
-        mSectionedAdapter = new
-                SimpleSectionedRecyclerViewAdapter(getActivity(), R.layout.section,
-                R.id.section_text, new ReposAdapter(fUpdateRepos, fInstalledRepos, fOthersRepos));
-
-        recyclerView.setAdapter(mSectionedAdapter);
+        adapter = new ReposAdapter(getApplication().repoDB, getApplication().moduleMap);
+        recyclerView.setAdapter(adapter);
 
         mSwipeRefreshLayout.setRefreshing(true);
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
             recyclerView.setVisibility(View.GONE);
-            new Async.LoadRepos(getActivity()).exec();
+            new UpdateRepos(getActivity()).exec();
         });
 
-        if (repoLoadDone.isTriggered) {
-            reloadRepos();
-            updateUI();
-        }
+        getActivity().setTitle(R.string.downloads);
 
-        searchListener = new SearchView.OnQueryTextListener() {
+        return view;
+    }
+
+    @Override
+    public void onTopicPublished(Topic topic) {
+        Logger.dev("ReposFragment: UI refresh triggered");
+        mSwipeRefreshLayout.setRefreshing(false);
+        adapter.notifyDBChanged();
+        recyclerView.setVisibility(adapter.getItemCount() == 0 ? View.GONE : View.VISIBLE);
+        emptyRv.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
+    }
+
+    @Override
+    public Topic[] getSubscription() {
+        return new Topic[] { getApplication().repoLoadDone };
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_repo, menu);
+        SearchView search = (SearchView) menu.findItem(R.id.repo_search).getActionView();
+        search.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
                 return false;
@@ -81,113 +84,15 @@ public class ReposFragment extends Fragment implements CallbackHandler.EventList
 
             @Override
             public boolean onQueryTextChange(String newText) {
-                new FilterApps().exec(newText);
+                adapter.filter(newText);
                 return false;
             }
-        };
-
-        return view;
+        });
     }
 
     @Override
-    public void onTrigger(CallbackHandler.Event event) {
-        Logger.dev("ReposFragment: UI refresh triggered");
-        reloadRepos();
-        updateUI();
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
     }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_repo, menu);
-        SearchView search = (SearchView) MenuItemCompat.getActionView(menu.findItem(R.id.repo_search));
-        search.setOnQueryTextListener(searchListener);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        setHasOptionsMenu(true);
-        CallbackHandler.register(repoLoadDone, this);
-        getActivity().setTitle(R.string.downloads);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        CallbackHandler.unRegister(repoLoadDone, this);
-    }
-
-    private void reloadRepos() {
-        ModuleHelper.getRepoLists(mUpdateRepos, mInstalledRepos, mOthersRepos);
-        fUpdateRepos.clear();
-        fInstalledRepos.clear();
-        fOthersRepos.clear();
-        fUpdateRepos.addAll(mUpdateRepos);
-        fInstalledRepos.addAll(mInstalledRepos);
-        fOthersRepos.addAll(mOthersRepos);
-    }
-
-    private void updateUI() {
-        if (fUpdateRepos.size() + fInstalledRepos.size() + fOthersRepos.size() == 0) {
-            emptyTv.setVisibility(View.VISIBLE);
-            recyclerView.setVisibility(View.GONE);
-        } else {
-            List<SimpleSectionedRecyclerViewAdapter.Section> sections = new ArrayList<>();
-            if (!fUpdateRepos.isEmpty()) {
-                sections.add(new SimpleSectionedRecyclerViewAdapter.Section(0, getString(R.string.update_available)));
-            }
-            if (!fInstalledRepos.isEmpty()) {
-                sections.add(new SimpleSectionedRecyclerViewAdapter.Section(fUpdateRepos.size(), getString(R.string.installed)));
-            }
-            if (!fOthersRepos.isEmpty()) {
-                sections.add(new SimpleSectionedRecyclerViewAdapter.Section(fUpdateRepos.size() + fInstalledRepos.size(), getString(R.string.not_installed)));
-            }
-            SimpleSectionedRecyclerViewAdapter.Section[] array = sections.toArray(new SimpleSectionedRecyclerViewAdapter.Section[sections.size()]);
-            mSectionedAdapter.setSections(array);
-            emptyTv.setVisibility(View.GONE);
-            recyclerView.setVisibility(View.VISIBLE);
-        }
-        mSwipeRefreshLayout.setRefreshing(false);
-    }
-
-    private class FilterApps extends Async.NormalTask<String, Void, Void> {
-        @Override
-        protected Void doInBackground(String... strings) {
-            String newText = strings[0];
-            fUpdateRepos.clear();
-            fInstalledRepos.clear();
-            fOthersRepos.clear();
-            for (Repo repo: mUpdateRepos) {
-                if (repo.getName().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getAuthor().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getDescription().toLowerCase().contains(newText.toLowerCase())
-                        ) {
-                    fUpdateRepos.add(repo);
-                }
-            }
-            for (Repo repo: mInstalledRepos) {
-                if (repo.getName().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getAuthor().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getDescription().toLowerCase().contains(newText.toLowerCase())
-                        ) {
-                    fInstalledRepos.add(repo);
-                }
-            }
-            for (Repo repo: mOthersRepos) {
-                if (repo.getName().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getAuthor().toLowerCase().contains(newText.toLowerCase())
-                        || repo.getDescription().toLowerCase().contains(newText.toLowerCase())
-                        ) {
-                    fOthersRepos.add(repo);
-                }
-            }
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            updateUI();
-        }
-    }
-
 }

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

@@ -1,50 +1,60 @@
 package com.topjohnwu.magisk;
 
+import android.app.job.JobInfo;
+import android.app.job.JobScheduler;
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
 
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.asyncs.LoadModules;
+import com.topjohnwu.magisk.asyncs.UpdateRepos;
+import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.services.UpdateCheckService;
 import com.topjohnwu.magisk.utils.Utils;
 
-public class SplashActivity extends AppCompatActivity {
+public class SplashActivity extends Activity{
+
+    private static final int UPDATE_SERVICE_ID = 1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplication());
-        if (prefs.getString("theme", "").equals("Dark")) {
-            setTheme(R.style.AppTheme_dh);
+
+        MagiskManager magiskManager = getApplicationContext();
+
+        // Init the info and configs and root sh
+        magiskManager.init();
+
+        // Get possible additional info from intent
+        magiskManager.remoteMagiskVersionString = getIntent().getStringExtra(MagiskManager.INTENT_VERSION);
+        magiskManager.magiskLink = getIntent().getStringExtra(MagiskManager.INTENT_LINK);
+
+        LoadModules loadModuleTask = new LoadModules(this);
+
+        if (Utils.checkNetworkStatus(this)) {
+            // Initialize the update check service, notify every 8 hours
+            if (!TextUtils.equals("install", getIntent().getStringExtra(MagiskManager.INTENT_SECTION))) {
+                ComponentName service = new ComponentName(this, UpdateCheckService.class);
+                JobInfo jobInfo = new JobInfo.Builder(UPDATE_SERVICE_ID, service)
+                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                        .setPersisted(true)
+                        .setPeriodic(8 * 60 * 60 * 1000)
+                        .build();
+                ((JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE)).schedule(jobInfo);
+            }
+            loadModuleTask.setCallBack(() -> new UpdateRepos(getApplication()).exec());
         }
 
-        Logger.devLog = prefs.getBoolean("developer_logging", false);
-        Logger.logShell = prefs.getBoolean("shell_logging", false);
+        loadModuleTask.exec();
 
-        // Initialize prefs
-        prefs.edit()
-                .putBoolean("magiskhide", Utils.itemExist(false, "/magisk/.core/magiskhide/enable"))
-                .putBoolean("busybox", Utils.commandExists("busybox"))
-                .putBoolean("hosts", Utils.itemExist(false, "/magisk/.core/hosts"))
-                .apply();
-
-        // Start all async tasks
-        new Async.GetBootBlocks().exec();
-        new Async.CheckUpdates().exec();
-        Async.checkSafetyNet(getApplicationContext());
-        new Async.LoadModules() {
-            @Override
-            protected void onPostExecute(Void v) {
-                super.onPostExecute(v);
-                new Async.LoadRepos(getApplicationContext()).exec();
-            }
-        }.exec();
-
-        // Start main activity
-        Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+        Intent intent = new Intent(this, MainActivity.class);
+        String section = getIntent().getStringExtra(MagiskManager.INTENT_SECTION);
+        if (section != null) {
+            intent.putExtra(MagiskManager.INTENT_SECTION, section);
+        }
         startActivity(intent);
         finish();
     }

app/src/main/java/com/topjohnwu/magisk/StatusFragment.java

@@ -1,246 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.utils.Async;
-import com.topjohnwu.magisk.utils.CallbackHandler;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Shell;
-
-import java.util.List;
-
-import butterknife.BindColor;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class StatusFragment extends Fragment implements CallbackHandler.EventListener {
-
-    public static double magiskVersion, remoteMagiskVersion = -1;
-    public static String magiskVersionString, magiskLink, magiskChangelog;
-    public static int SNCheckResult = -1;
-
-    public static final CallbackHandler.Event updateCheckDone = new CallbackHandler.Event();
-    public static final CallbackHandler.Event safetyNetDone = new CallbackHandler.Event();
-
-    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
-
-    @BindView(R.id.magisk_status_container) View magiskStatusContainer;
-    @BindView(R.id.magisk_status_icon) ImageView magiskStatusIcon;
-    @BindView(R.id.magisk_version) TextView magiskVersionText;
-    @BindView(R.id.magisk_update_status) TextView magiskUpdateText;
-    @BindView(R.id.magisk_check_updates_progress) ProgressBar magiskCheckUpdatesProgress;
-
-    @BindView(R.id.root_status_container) View rootStatusContainer;
-    @BindView(R.id.root_status_icon) ImageView rootStatusIcon;
-    @BindView(R.id.root_status) TextView rootStatusText;
-    @BindView(R.id.root_info) TextView rootInfoText;
-
-    @BindView(R.id.safetyNet_container) View safetyNetContainer;
-    @BindView(R.id.safetyNet_icon) ImageView safetyNetIcon;
-    @BindView(R.id.safetyNet_status) TextView safetyNetStatusText;
-    @BindView(R.id.safetyNet_check_progress) ProgressBar safetyNetProgress;
-
-    @BindColor(R.color.red500) int colorBad;
-    @BindColor(R.color.green500) int colorOK;
-    @BindColor(R.color.yellow500) int colorWarn;
-    @BindColor(R.color.grey500) int colorNeutral;
-    @BindColor(R.color.blue500) int colorInfo;
-    @BindColor(android.R.color.transparent) int trans;
-
-    static {
-        checkMagiskInfo();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.status_fragment, container, false);
-        ButterKnife.bind(this, v);
-
-        mSwipeRefreshLayout.setOnRefreshListener(() -> {
-            magiskStatusContainer.setBackgroundColor(trans);
-            magiskStatusIcon.setImageResource(0);
-            magiskUpdateText.setText(R.string.checking_for_updates);
-            magiskCheckUpdatesProgress.setVisibility(View.VISIBLE);
-
-            safetyNetProgress.setVisibility(View.VISIBLE);
-            safetyNetContainer.setBackgroundColor(trans);
-            safetyNetIcon.setImageResource(0);
-            safetyNetStatusText.setText(R.string.checking_safetyNet_status);
-
-            updateUI();
-            new Async.CheckUpdates().exec();
-            Async.checkSafetyNet(getActivity());
-        });
-
-        updateUI();
-        if (updateCheckDone.isTriggered) {
-            updateCheckUI();
-        }
-        if (safetyNetDone.isTriggered) {
-            updateSafetyNetUI();
-        }
-
-        if (magiskVersion < 0 && Shell.rootAccess()) {
-            MainActivity.alertBuilder
-                    .setTitle(R.string.no_magisk_title)
-                    .setMessage(R.string.no_magisk_msg)
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.goto_install, (dialogInterface, i) -> {
-                        ((MainActivity) getActivity()).navigationView.setCheckedItem(R.id.install);
-                        FragmentTransaction transaction = getFragmentManager().beginTransaction();
-                        transaction.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);
-                        try {
-                            transaction.replace(R.id.content_frame, new InstallFragment(), "install").commit();
-                        } catch (IllegalStateException ignored) {}
-                    })
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .show();
-        }
-
-        return v;
-    }
-
-    @Override
-    public void onTrigger(CallbackHandler.Event event) {
-        if (event == updateCheckDone) {
-            Logger.dev("StatusFragment: Update Check UI refresh triggered");
-            updateCheckUI();
-        } else if (event == safetyNetDone) {
-            Logger.dev("StatusFragment: SafetyNet UI refresh triggered");
-            updateSafetyNetUI();
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        CallbackHandler.register(updateCheckDone, this);
-        CallbackHandler.register(safetyNetDone, this);
-        getActivity().setTitle(R.string.status);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        CallbackHandler.unRegister(updateCheckDone, this);
-        CallbackHandler.unRegister(safetyNetDone, this);
-    }
-
-    private static void checkMagiskInfo() {
-        List<String> ret = Shell.sh("getprop magisk.version");
-        if (ret.get(0).length() == 0) {
-            magiskVersion = -1;
-        } else {
-            try {
-                magiskVersionString = ret.get(0);
-                magiskVersion = Double.parseDouble(ret.get(0));
-            } catch (NumberFormatException e) {
-                // Custom version don't need to receive updates
-                magiskVersion = Double.POSITIVE_INFINITY;
-            }
-        }
-    }
-
-    private void updateUI() {
-        int image, color;
-
-        checkMagiskInfo();
-
-        if (magiskVersion < 0) {
-            magiskVersionText.setText(R.string.magisk_version_error);
-        } else {
-            magiskVersionText.setText(getString(R.string.magisk_version, magiskVersionString));
-        }
-
-        if (Shell.rootStatus == 1) {
-            color = colorOK;
-            image = R.drawable.ic_check_circle;
-            rootStatusText.setText(R.string.proper_root);
-            rootInfoText.setText(Shell.sh("su -v").get(0));
-
-        } else {
-            rootInfoText.setText(R.string.root_info_warning);
-            if (Shell.rootStatus == 0) {
-                color = colorBad;
-                image = R.drawable.ic_cancel;
-                rootStatusText.setText(R.string.not_rooted);
-            } else {
-                color = colorNeutral;
-                image = R.drawable.ic_help;
-                rootStatusText.setText(R.string.root_error);
-            }
-        }
-        rootStatusContainer.setBackgroundColor(color);
-        rootStatusText.setTextColor(color);
-        rootInfoText.setTextColor(color);
-        rootStatusIcon.setImageResource(image);
-    }
-
-    private void updateCheckUI() {
-        int image, color;
-
-        if (remoteMagiskVersion < 0) {
-            color = colorNeutral;
-            image = R.drawable.ic_help;
-            magiskUpdateText.setText(R.string.cannot_check_updates);
-        } else if (remoteMagiskVersion > magiskVersion) {
-            color = colorInfo;
-            image = R.drawable.ic_update;
-            magiskUpdateText.setText(getString(R.string.magisk_update_available, remoteMagiskVersion));
-        } else {
-            color = colorOK;
-            image = R.drawable.ic_check_circle;
-            magiskUpdateText.setText(getString(R.string.up_to_date, getString(R.string.magisk)));
-        }
-
-        if (magiskVersion < 0) {
-            color = colorBad;
-            image = R.drawable.ic_cancel;
-        }
-        magiskStatusContainer.setBackgroundColor(color);
-        magiskVersionText.setTextColor(color);
-        magiskUpdateText.setTextColor(color);
-        magiskStatusIcon.setImageResource(image);
-
-        magiskCheckUpdatesProgress.setVisibility(View.GONE);
-        mSwipeRefreshLayout.setRefreshing(false);
-    }
-
-    private void updateSafetyNetUI() {
-        int image, color;
-        safetyNetProgress.setVisibility(View.GONE);
-        switch (SNCheckResult) {
-            case -1:
-                color = colorNeutral;
-                image = R.drawable.ic_help;
-                safetyNetStatusText.setText(R.string.safetyNet_error);
-                break;
-            case 0:
-                color = colorBad;
-                image = R.drawable.ic_cancel;
-                safetyNetStatusText.setText(R.string.safetyNet_fail);
-                break;
-            case 1:
-            default:
-                color = colorOK;
-                image = R.drawable.ic_check_circle;
-                safetyNetStatusText.setText(R.string.safetyNet_pass);
-                break;
-        }
-        safetyNetContainer.setBackgroundColor(color);
-        safetyNetStatusText.setTextColor(color);
-        safetyNetIcon.setImageResource(image);
-    }
-}
-

app/src/main/java/com/topjohnwu/magisk/SuLogFragment.java

@@ -0,0 +1,89 @@
+package com.topjohnwu.magisk;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.topjohnwu.magisk.adapters.SuLogAdapter;
+import com.topjohnwu.magisk.components.Fragment;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+public class SuLogFragment extends Fragment {
+
+    @BindView(R.id.empty_rv) TextView emptyRv;
+    @BindView(R.id.recyclerView) RecyclerView recyclerView;
+
+    private Unbinder unbinder;
+    private MagiskManager magiskManager;
+    private SuLogAdapter adapter;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_log, menu);
+        menu.findItem(R.id.menu_save).setVisible(false);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View v = inflater.inflate(R.layout.fragment_su_log, container, false);
+        unbinder = ButterKnife.bind(this, v);
+        magiskManager = getApplication();
+        adapter = new SuLogAdapter(magiskManager.suDB);
+        recyclerView.setAdapter(adapter);
+
+        updateList();
+
+        return v;
+    }
+
+    private void updateList() {
+        adapter.notifyDBChanged();
+
+        if (adapter.getSectionCount() == 0) {
+            emptyRv.setVisibility(View.VISIBLE);
+            recyclerView.setVisibility(View.GONE);
+        } else {
+            emptyRv.setVisibility(View.GONE);
+            recyclerView.setVisibility(View.VISIBLE);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_refresh:
+                updateList();
+                return true;
+            case R.id.menu_clear:
+                magiskManager.suDB.clearLogs();
+                updateList();
+                return true;
+            default:
+                return true;
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+}

app/src/main/java/com/topjohnwu/magisk/SuperuserFragment.java

@@ -0,0 +1,63 @@
+package com.topjohnwu.magisk;
+
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.topjohnwu.magisk.adapters.PolicyAdapter;
+import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.superuser.Policy;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+public class SuperuserFragment extends Fragment {
+
+    private Unbinder unbinder;
+    @BindView(R.id.recyclerView) RecyclerView recyclerView;
+    @BindView(R.id.empty_rv) TextView emptyRv;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_superuser, container, false);
+        unbinder = ButterKnife.bind(this, view);
+
+        PackageManager pm = getActivity().getPackageManager();
+        MagiskManager magiskManager = getApplication();
+
+        List<Policy> policyList = magiskManager.suDB.getPolicyList(pm);
+
+        if (policyList.size() == 0) {
+            emptyRv.setVisibility(View.VISIBLE);
+            recyclerView.setVisibility(View.GONE);
+        } else {
+            recyclerView.setAdapter(new PolicyAdapter(policyList, magiskManager.suDB, pm));
+            emptyRv.setVisibility(View.GONE);
+            recyclerView.setVisibility(View.VISIBLE);
+        }
+
+        return view;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        getActivity().setTitle(getString(R.string.superuser));
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+}

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

@@ -3,20 +3,27 @@ package com.topjohnwu.magisk.adapters;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.support.design.widget.Snackbar;
 import android.support.v7.widget.RecyclerView;
-import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.CheckBox;
+import android.widget.Filter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Async;
+import com.topjohnwu.magisk.asyncs.ParallelTask;
+import com.topjohnwu.magisk.components.SnackbarMaker;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 import butterknife.BindView;
@@ -24,32 +31,37 @@ import butterknife.ButterKnife;
 
 public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.ViewHolder> {
 
-    private List<ApplicationInfo> mList;
-    private List<String> mHideList;
-    private Context context;
-    private PackageManager packageManager;
-
-    // Don't show in list...
-    private static final String[] blackList = {
+    public static final List<String> BLACKLIST =  Arrays.asList(
+            "android",
             "com.topjohnwu.magisk",
             "com.google.android.gms"
-    };
+    );
 
-    public ApplicationAdapter(List<ApplicationInfo> list, List<String> hideList) {
-        mList = list;
-        mHideList = hideList;
-        List<String> bl = Arrays.asList(blackList);
-        for (int i = 0; i < mList.size(); ++i)
-            if (bl.contains(mList.get(i).packageName))
-                mList.remove(i);
+    private static final List<String> SNLIST =  Arrays.asList(
+            "com.google.android.apps.walletnfcrel",
+            "com.nianticlabs.pokemongo"
+    );
+
+    private List<ApplicationInfo> mOriginalList, mList;
+    private List<String> mHideList;
+    private PackageManager pm;
+    private ApplicationFilter filter;
+    private Topic magiskHideDone;
+    private Shell shell;
+
+    public ApplicationAdapter(Context context) {
+        mOriginalList = mList = Collections.emptyList();
+        mHideList = Collections.emptyList();
+        filter = new ApplicationFilter();
+        pm = context.getPackageManager();
+        magiskHideDone = Utils.getMagiskManager(context).magiskHideDone;
+        shell = Shell.getShell(context);
+        new LoadApps().exec();
     }
 
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View mView = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_app, parent, false);
-        context = parent.getContext();
-        packageManager = context.getPackageManager();
-        ButterKnife.bind(this, mView);
         return new ViewHolder(mView);
     }
 
@@ -57,29 +69,34 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
     public void onBindViewHolder(final ViewHolder holder, int position) {
         ApplicationInfo info = mList.get(position);
 
-        holder.appIcon.setImageDrawable(info.loadIcon(packageManager));
-        holder.appName.setText(info.loadLabel(packageManager));
+        holder.appIcon.setImageDrawable(info.loadIcon(pm));
+        holder.appName.setText(info.loadLabel(pm));
         holder.appPackage.setText(info.packageName);
-        holder.checkBox.setChecked(false);
 
-        for (String hidePackage : mHideList) {
-            if (info.packageName.contains(hidePackage)) {
-                holder.checkBox.setChecked(true);
-                break;
-            }
+        // Remove all listeners
+        holder.itemView.setOnClickListener(null);
+        holder.checkBox.setOnCheckedChangeListener(null);
+
+        if (SNLIST.contains(info.packageName)) {
+            holder.checkBox.setChecked(true);
+            holder.checkBox.setEnabled(false);
+            holder.itemView.setOnClickListener(v ->
+                SnackbarMaker.make(holder.itemView,
+                        R.string.safetyNet_hide_notice, Snackbar.LENGTH_LONG).show()
+            );
+        } else {
+            holder.checkBox.setEnabled(true);
+            holder.checkBox.setChecked(mHideList.contains(info.packageName));
+            holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
+                if (isChecked) {
+                    Utils.addMagiskHide(shell, info.packageName);
+                    mHideList.add(info.packageName);
+                } else {
+                    Utils.rmMagiskHide(shell, info.packageName);
+                    mHideList.remove(info.packageName);
+                }
+            });
         }
-
-        holder.checkBox.setOnClickListener(v -> {
-            CheckBox chkbox = (CheckBox) v;
-            if (chkbox.isChecked()) {
-                new Async.MagiskHide().add(info.packageName);
-                mHideList.add(info.packageName);
-            }
-            else {
-                new Async.MagiskHide().rm(info.packageName);
-                mHideList.remove(info.packageName);
-            }
-        });
     }
 
     @Override
@@ -87,19 +104,72 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
         return mList.size();
     }
 
-    class ViewHolder extends RecyclerView.ViewHolder {
+    public void filter(String constraint) {
+        filter.filter(constraint);
+    }
+
+    public void refresh() {
+        new LoadApps().exec();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
 
         @BindView(R.id.app_icon) ImageView appIcon;
         @BindView(R.id.app_name) TextView appName;
         @BindView(R.id.app_package) TextView appPackage;
         @BindView(R.id.checkbox) CheckBox checkBox;
 
-        public ViewHolder(View itemView) {
+        ViewHolder(View itemView) {
             super(itemView);
-            WindowManager windowmanager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
             ButterKnife.bind(this, itemView);
-            DisplayMetrics dimension = new DisplayMetrics();
-            windowmanager.getDefaultDisplay().getMetrics(dimension);
         }
     }
-}
+
+    private class ApplicationFilter extends Filter {
+
+        @Override
+        protected FilterResults performFiltering(CharSequence constraint) {
+            if (constraint == null || constraint.length() == 0) {
+                mList = mOriginalList;
+            } else {
+                mList = new ArrayList<>();
+                String filter = constraint.toString().toLowerCase();
+                for (ApplicationInfo info : mOriginalList) {
+                    if (Utils.lowercaseContains(info.loadLabel(pm), filter)
+                            || Utils.lowercaseContains(info.packageName, filter)) {
+                        mList.add(info);
+                    }
+                }
+            }
+            return null;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            notifyDataSetChanged();
+        }
+    }
+
+    private class LoadApps extends ParallelTask<Void, Void, Void> {
+
+        @Override
+        protected Void doInBackground(Void... voids) {
+            mOriginalList = pm.getInstalledApplications(0);
+            for (Iterator<ApplicationInfo> i = mOriginalList.iterator(); i.hasNext(); ) {
+                ApplicationInfo info = i.next();
+                if (ApplicationAdapter.BLACKLIST.contains(info.packageName) || !info.enabled) {
+                    i.remove();
+                }
+            }
+            Collections.sort(mOriginalList, (a, b) -> a.loadLabel(pm).toString().toLowerCase()
+                    .compareTo(b.loadLabel(pm).toString().toLowerCase()));
+            mHideList = Utils.listMagiskHide(shell);
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void v) {
+            magiskHideDone.publish(false);
+        }
+    }
+}

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

@@ -3,18 +3,17 @@ package com.topjohnwu.magisk.adapters;
 import android.content.Context;
 import android.support.design.widget.Snackbar;
 import android.support.v7.widget.RecyclerView;
-import android.util.DisplayMetrics;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.utils.Async;
 import com.topjohnwu.magisk.utils.Shell;
 
 import java.util.List;
@@ -25,7 +24,6 @@ import butterknife.ButterKnife;
 public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHolder> {
 
     private final List<Module> mList;
-    private Context context;
 
     public ModulesAdapter(List<Module> list) {
         mList = list;
@@ -34,90 +32,51 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_module, parent, false);
-        context = parent.getContext();
-        ButterKnife.bind(this, view);
         return new ViewHolder(view);
     }
 
     @Override
     public void onBindViewHolder(final ViewHolder holder, int position) {
+        Context context = holder.itemView.getContext();
+        Shell rootShell = Shell.getShell(context);
         final Module module = mList.get(position);
-        holder.title.setText(module.getName());
+
+        String version = module.getVersion();
         String author = module.getAuthor();
-        String versionName = module.getVersion();
         String description = module.getDescription();
-        if (versionName != null) {
-            holder.versionName.setText(versionName);
-        }
-        if (author != null) {
-            holder.author.setText(context.getString(R.string.author, author));
-        }
-        if (description != null) {
-            holder.description.setText(description);
-        }
+        String noInfo = context.getString(R.string.no_info_provided);
 
+        holder.title.setText(module.getName());
+        holder.versionName.setText( TextUtils.isEmpty(version) ? noInfo : version);
+        holder.author.setText( TextUtils.isEmpty(author) ? noInfo : context.getString(R.string.author, author));
+        holder.description.setText( TextUtils.isEmpty(description) ? noInfo : description);
+
+        holder.checkBox.setOnCheckedChangeListener(null);
         holder.checkBox.setChecked(module.isEnabled());
-        holder.checkBox.setOnClickListener((v) -> {
-            CheckBox checkBox = (CheckBox) v;
-            if (checkBox.isChecked()) {
-                new Async.RootTask<Void, Void, Void>() {
-                    @Override
-                    protected Void doInBackground(Void... voids) {
-                        module.removeDisableFile();
-                        return null;
-                    }
-
-                    @Override
-                    protected void onPostExecute(Void v) {
-                        Snackbar.make(holder.title, R.string.disable_file_removed, Snackbar.LENGTH_SHORT).show();
-                    }
-                }.exec();
+        holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
+            int snack;
+            if (isChecked) {
+                module.removeDisableFile(rootShell);
+                snack = R.string.disable_file_removed;
             } else {
-                new Async.RootTask<Void, Void, Void>() {
-                    @Override
-                    protected Void doInBackground(Void... voids) {
-                        module.createDisableFile();
-                        return null;
-                    }
-
-                    @Override
-                    protected void onPostExecute(Void v) {
-                        Snackbar.make(holder.title, R.string.disable_file_created, Snackbar.LENGTH_SHORT).show();
-                    }
-                }.exec();
+                module.createDisableFile(rootShell);
+                snack = R.string.disable_file_created;
             }
+            SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
         });
 
         holder.delete.setOnClickListener(v -> {
-            if (module.willBeRemoved()) {
-                new Async.RootTask<Void, Void, Void>() {
-                    @Override
-                    protected Void doInBackground(Void... voids) {
-                        module.deleteRemoveFile();
-                        return null;
-                    }
-
-                    @Override
-                    protected void onPostExecute(Void v) {
-                        Snackbar.make(holder.title, R.string.remove_file_deleted, Snackbar.LENGTH_SHORT).show();
-                        updateDeleteButton(holder, module);
-                    }
-                }.exec();
+            boolean removed = module.willBeRemoved();
+            int snack;
+            if (removed) {
+                module.deleteRemoveFile(rootShell);
+                snack = R.string.remove_file_deleted;
             } else {
-                new Async.RootTask<Void, Void, Void>() {
-                    @Override
-                    protected Void doInBackground(Void... voids) {
-                        module.createRemoveFile();
-                        return null;
-                    }
-
-                    @Override
-                    protected void onPostExecute(Void v) {
-                        Snackbar.make(holder.title, R.string.remove_file_created, Snackbar.LENGTH_SHORT).show();
-                        updateDeleteButton(holder, module);
-                    }
-                }.exec();
+                module.createRemoveFile(rootShell);
+                snack = R.string.remove_file_created;
             }
+            SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
+            updateDeleteButton(holder, module);
         });
 
         if (module.isUpdated()) {
@@ -144,7 +103,7 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
         return mList.size();
     }
 
-    class ViewHolder extends RecyclerView.ViewHolder {
+    static class ViewHolder extends RecyclerView.ViewHolder {
 
         @BindView(R.id.title) TextView title;
         @BindView(R.id.version_name) TextView versionName;
@@ -154,12 +113,9 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
         @BindView(R.id.author) TextView author;
         @BindView(R.id.delete) ImageView delete;
 
-        public ViewHolder(View itemView) {
+        ViewHolder(View itemView) {
             super(itemView);
-            WindowManager windowmanager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
             ButterKnife.bind(this, itemView);
-            DisplayMetrics dimension = new DisplayMetrics();
-            windowmanager.getDefaultDisplay().getMetrics(dimension);
 
             if (!Shell.rootAccess()) {
                 checkBox.setEnabled(false);

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

@@ -0,0 +1,144 @@
+package com.topjohnwu.magisk.adapters;
+
+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.AlertDialogBuilder;
+import com.topjohnwu.magisk.components.ExpandableViewHolder;
+import com.topjohnwu.magisk.components.SnackbarMaker;
+import com.topjohnwu.magisk.database.SuDatabaseHelper;
+import com.topjohnwu.magisk.superuser.Policy;
+
+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 SuDatabaseHelper dbHelper;
+    private PackageManager pm;
+    private Set<Policy> expandList = new HashSet<>();
+
+    public PolicyAdapter(List<Policy> list, SuDatabaseHelper 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.mExpanded) {
+                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 AlertDialogBuilder(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 ExpandableViewHolder {
+
+        @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.delete) ImageView delete;
+        @BindView(R.id.more_info) ImageView moreInfo;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+        }
+
+        @Override
+        public void setExpandLayout(View itemView) {
+            expandLayout = itemView.findViewById(R.id.expand_layout);
+        }
+    }
+}