Bump version

Prevent hiding Magisk Manager on old Magisk versions
Update strings.xml
2025-10-26 02:22:14 +01:00 · 2017-11-23 01:06:19 +08:00 · 2017-11-23 01:06:18 +08:00 · 2017-11-23 00:12:23 +08:00 · 2017-11-22 14:03:15 +08:00 · 2017-11-21 21:49:40 +08:00
132 changed files with 3545 additions and 2842 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.1"

    defaultConfig {
        applicationId "com.topjohnwu.magisk"
        minSdkVersion 21
-        targetSdkVersion 26
-        versionCode 57
-        versionName "5.4.0"
+        targetSdkVersion 27
+        versionCode 63
+        versionName "5.4.2"
        ndk {
            moduleName 'zipadjust'
            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
@@ -45,20 +45,20 @@ android {
        disable 'MissingTranslation'
    }
 }
+
 repositories {
    jcenter()
+    google()
    maven { url "https://jitpack.io" }
-    maven { url "https://maven.google.com" }
 }

 dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation project(':common')
-    implementation project(':jarsigner')
-    implementation 'com.android.support:recyclerview-v7:26.1.0'
-    implementation 'com.android.support:cardview-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support:support-v4:26.1.0'
+    implementation project(':crypto')
+    implementation 'com.android.support:recyclerview-v7:27.0.1'
+    implementation 'com.android.support:cardview-v7:27.0.1'
+    implementation 'com.android.support:design:27.0.1'
+    implementation 'com.android.support:support-v4:27.0.1'
    implementation 'com.jakewharton:butterknife:8.8.1'
    implementation 'com.atlassian.commonmark:commonmark:0.10.0'
    implementation 'org.kamranzafar:jtar:2.3'
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
        android:name=".MagiskManager"
        android:allowBackup="true"
        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
        android:label="@string/app_name"
        android:supportsRtl="true"
        android:theme="@style/AppTheme"
@@ -73,6 +74,7 @@
            </intent-filter>
        </receiver>
        <receiver android:name=".receivers.ManagerUpdate" />
+        <receiver android:name=".receivers.RebootReceiver" />

        <service android:name=".services.OnBootIntentService" />
        <service
@@ -93,7 +95,7 @@
        <!-- Hardcode GMS version -->
        <meta-data
            android:name="com.google.android.gms.version"
-            android:value="11400000" />
+            android:value="11717000" />

    </application>

--- a/app/src/main/ic_launcher-web.png
+++ b/app/src/main/ic_launcher-web.png
--- a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
@@ -17,6 +17,7 @@ import android.widget.TextView;
 import com.topjohnwu.magisk.components.AboutCardRow;
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.utils.Const;

 import java.io.IOException;
 import java.io.InputStream;
@@ -27,10 +28,6 @@ import butterknife.ButterKnife;

 public class AboutActivity extends Activity {

-    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 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;
@@ -120,13 +117,13 @@ public class AboutActivity extends Activity {
        }

        appSourceCode.removeSummary();
-        appSourceCode.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(SOURCE_CODE_URL))));
+        appSourceCode.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.SOURCE_CODE_URL))));

        supportThread.removeSummary();
-        supportThread.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(XDA_THREAD))));
+        supportThread.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.XDA_THREAD))));

        donation.removeSummary();
-        donation.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(DONATION_URL))));
+        donation.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.DONATION_URL))));

        setFloating();
    }
--- a/app/src/main/java/com/topjohnwu/magisk/FlashActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/FlashActivity.java
@@ -4,22 +4,29 @@ import android.content.Intent;
 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.text.TextUtils;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
+import android.widget.Toast;

 import com.topjohnwu.magisk.asyncs.FlashZip;
 import com.topjohnwu.magisk.asyncs.InstallMagisk;
 import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.container.AdaptiveList;
+import com.topjohnwu.magisk.container.CallbackList;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Shell;

+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Locale;

 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -27,28 +34,45 @@ import butterknife.OnClick;

 public class FlashActivity extends Activity {

-    public static final String SET_ACTION = "action";
-    public static final String SET_BOOT = "boot";
-    public static final String SET_ENC = "enc";
-    public static final String SET_VERITY = "verity";
-
-    public static final String FLASH_ZIP = "flash";
-    public static final String PATCH_BOOT = "patch";
-    public static final String FLASH_MAGISK = "magisk";
-
    @BindView(R.id.toolbar) Toolbar toolbar;
-    @BindView(R.id.flash_logs) RecyclerView flashLogs;
-    @BindView(R.id.button_panel) LinearLayout buttonPanel;
-    @BindView(R.id.reboot) Button reboot;
+    @BindView(R.id.txtLog) TextView flashLogs;
+    @BindView(R.id.button_panel) public LinearLayout buttonPanel;
+    @BindView(R.id.reboot) public Button reboot;
+    @BindView(R.id.scrollView) ScrollView sv;
+
+    private List<String> logs;

    @OnClick(R.id.no_thanks)
-    public void dismiss() {
+    void dismiss() {
        finish();
    }

    @OnClick(R.id.reboot)
-    public void reboot() {
-        getShell().su_raw("reboot");
+    void reboot() {
+        Shell.su_raw("/system/bin/reboot");
+    }
+
+    @OnClick(R.id.save_logs)
+    void saveLogs() {
+        Calendar now = Calendar.getInstance();
+        String filename = String.format(Locale.US,
+                "install_log_%04d%02d%02d_%02d:%02d:%02d.log",
+                now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
+                now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
+                now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
+
+        File logFile = new File(Const.EXTERNAL_PATH + "/logs", filename);
+        logFile.getParentFile().mkdirs();
+        try (FileWriter writer = new FileWriter(logFile)) {
+            for (String s : logs) {
+                writer.write(s);
+                writer.write('\n');
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return;
+        }
+        MagiskManager.toast(logFile.getPath(), Toast.LENGTH_LONG);
    }

    @Override
@@ -56,7 +80,6 @@ public class FlashActivity extends Activity {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_flash);
        ButterKnife.bind(this);
-        AdaptiveList<String> rootShellOutput = new AdaptiveList<>(flashLogs);
        setSupportActionBar(toolbar);
        ActionBar ab = getSupportActionBar();
        if (ab != null) {
@@ -67,45 +90,35 @@ public class FlashActivity extends Activity {
        if (!Shell.rootAccess())
            reboot.setVisibility(View.GONE);

-        flashLogs.setAdapter(new FlashLogAdapter(rootShellOutput));
+        logs = new ArrayList<>();
+        List<String> console = new CallbackList<String>() {
+            @Override
+            public synchronized void onAddElement(String e) {
+                logs.add(e);
+                flashLogs.setText(TextUtils.join("\n", this));
+                sv.postDelayed(() -> sv.fullScroll(ScrollView.FOCUS_DOWN), 10);
+            }
+        };

        // We must receive a Uri of the target zip
        Intent intent = getIntent();
        Uri uri = intent.getData();

-        boolean keepEnc = intent.getBooleanExtra(SET_ENC, false);
-        boolean keepVerity = intent.getBooleanExtra(SET_VERITY, false);
+        boolean keepEnc = intent.getBooleanExtra(Const.Key.FLASH_SET_ENC, false);
+        boolean keepVerity = intent.getBooleanExtra(Const.Key.FLASH_SET_VERITY, false);

-        switch (getIntent().getStringExtra(SET_ACTION)) {
-            case FLASH_ZIP:
-                new FlashZip(this, uri, rootShellOutput)
-                        .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
+        switch (intent.getStringExtra(Const.Key.FLASH_ACTION)) {
+            case Const.Value.FLASH_ZIP:
+                new FlashZip(this, uri, console, logs).exec();
+                break;
+            case Const.Value.PATCH_BOOT:
+                new InstallMagisk(this, console, logs, uri, keepEnc, keepVerity, (Uri) intent.getParcelableExtra(Const.Key.FLASH_SET_BOOT))
                        .exec();
                break;
-            case PATCH_BOOT:
-                new InstallMagisk(this, rootShellOutput, uri, keepEnc, keepVerity, (Uri) intent.getParcelableExtra(SET_BOOT))
-                        .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
+            case Const.Value.FLASH_MAGISK:
+                new InstallMagisk(this, console, logs, uri, keepEnc, keepVerity, intent.getStringExtra(Const.Key.FLASH_SET_BOOT))
                        .exec();
                break;
-            case FLASH_MAGISK:
-                String boot = intent.getStringExtra(SET_BOOT);
-                if (getMagiskManager().remoteMagiskVersionCode < 1370) {
-                    // Use legacy installation method
-                    getShell().su_raw(
-                            "echo \"BOOTIMAGE=" + boot + "\" > /dev/.magisk",
-                            "echo \"KEEPFORCEENCRYPT=" + keepEnc + "\" >> /dev/.magisk",
-                            "echo \"KEEPVERITY=" + keepVerity + "\" >> /dev/.magisk"
-                    );
-                    new FlashZip(this, uri, rootShellOutput)
-                            .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
-                            .exec();
-                } else {
-                    // Use new installation method
-                    new InstallMagisk(this, rootShellOutput, uri, keepEnc, keepVerity, boot)
-                            .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
-                            .exec();
-                }
-                break;
        }
    }

@@ -113,41 +126,4 @@ public class FlashActivity extends Activity {
    public void onBackPressed() {
        // Prevent user accidentally press back button
    }
-
-    private static class FlashLogAdapter extends RecyclerView.Adapter<ViewHolder> {
-
-        private List<String> mList;
-
-        FlashLogAdapter(List<String> list) {
-            mList = list;
-        }
-
-        @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(mList.get(position));
-        }
-
-        @Override
-        public int getItemCount() {
-            return mList.size();
-        }
-    }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.textView) TextView text;
-
-        public ViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-        }
-    }
-
 }
--- a/app/src/main/java/com/topjohnwu/magisk/LogFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/LogFragment.java
@@ -33,13 +33,10 @@ public class LogFragment extends Fragment {

        TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());

-        if (getApplication().isSuClient) {
-            adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
-            tab.setupWithViewPager(viewPager);
-            tab.setVisibility(View.VISIBLE);
-        }
-
+        adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
        adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
+        tab.setupWithViewPager(viewPager);
+        tab.setVisibility(View.VISIBLE);

        viewPager.setAdapter(adapter);

--- a/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java
@@ -5,19 +5,16 @@ import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
 import android.support.v4.widget.SwipeRefreshLayout;
 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.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
-import android.widget.Spinner;
+import android.widget.RelativeLayout;
 import android.widget.TextView;

 import com.topjohnwu.magisk.asyncs.CheckSafetyNet;
@@ -25,14 +22,11 @@ import com.topjohnwu.magisk.asyncs.CheckUpdates;
 import com.topjohnwu.magisk.components.AlertDialogBuilder;
 import com.topjohnwu.magisk.components.ExpandableView;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.ShowUI;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;

-import java.util.ArrayList;
-import java.util.List;
-
 import butterknife.BindColor;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -42,12 +36,13 @@ import butterknife.Unbinder;
 public class MagiskFragment extends Fragment
        implements Topic.Subscriber, SwipeRefreshLayout.OnRefreshListener, ExpandableView {

-    public static final int CAUSE_SERVICE_DISCONNECTED = 0x00001;
-    public static final int CAUSE_NETWORK_LOST = 0x00010;
-    public static final int RESPONSE_ERR = 0x00100;
+    private static final int CAUSE_SERVICE_DISCONNECTED = 0x01;
+    private static final int CAUSE_NETWORK_LOST = 0x02;
+    private static final int RESPONSE_ERR = 0x04;
+    private static final int CONNECTION_FAIL = 0x08;

-    public static final int BASIC_PASS = 0x01000;
-    public static final int CTS_PASS = 0x10000;
+    private static final int BASIC_PASS = 0x10;
+    private static final int CTS_PASS = 0x20;

    private Container expandableContainer = new Container();

@@ -57,15 +52,12 @@ public class MagiskFragment extends Fragment

    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;

-    @BindView(R.id.magisk_update_card) CardView magiskUpdateCard;
+    @BindView(R.id.magisk_update) RelativeLayout magiskUpdate;
    @BindView(R.id.magisk_update_icon) ImageView magiskUpdateIcon;
    @BindView(R.id.magisk_update_status) TextView magiskUpdateText;
    @BindView(R.id.magisk_update_progress) ProgressBar magiskUpdateProgress;
-
    @BindView(R.id.magisk_status_icon) ImageView magiskStatusIcon;
    @BindView(R.id.magisk_version) TextView magiskVersionText;
-    @BindView(R.id.root_status_icon) ImageView rootStatusIcon;
-    @BindView(R.id.root_status) TextView rootStatusText;

    @BindView(R.id.safetyNet_card) CardView safetyNetCard;
    @BindView(R.id.safetyNet_refresh) ImageView safetyNetRefreshIcon;
@@ -77,9 +69,6 @@ public class MagiskFragment extends Fragment
    @BindView(R.id.basic_status_icon) ImageView basicStatusIcon;
    @BindView(R.id.basic_status) TextView basicStatusText;

-    @BindView(R.id.bootimage_card) CardView bootImageCard;
-    @BindView(R.id.block_spinner) Spinner spinner;
-    @BindView(R.id.detect_bootimage) Button detectButton;
    @BindView(R.id.install_option_card) CardView installOptionCard;
    @BindView(R.id.keep_force_enc) CheckBox keepEncChkbox;
    @BindView(R.id.keep_verity) CheckBox keepVerityChkbox;
@@ -123,18 +112,18 @@ public class MagiskFragment extends Fragment

        // Show Manager update first
        if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-            Utils.showManagerInstallDialog(getActivity());
+            ShowUI.managerInstallDialog(getActivity());
            return;
        }

        ((NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE)).cancelAll();
-        Utils.showMagiskInstallDialog(this,
+        ShowUI.magiskInstallDialog(getActivity(),
                keepEncChkbox.isChecked(), keepVerityChkbox.isChecked());
    }

    @OnClick(R.id.uninstall_button)
    void uninstall() {
-        Utils.showUninstallDialog(this);
+        ShowUI.uninstallDialog(getActivity());
    }

    @Nullable
@@ -157,7 +146,7 @@ public class MagiskFragment extends Fragment

    @Override
    public void onRefresh() {
-        mm.getMagiskInfo();
+        mm.loadMagiskInfo();
        updateUI();

        magiskUpdateText.setText(R.string.checking_for_updates);
@@ -175,8 +164,8 @@ public class MagiskFragment extends Fragment
        shownDialog = false;

        // Trigger state check
-        if (Utils.checkNetworkStatus(mm)) {
-            new CheckUpdates(getActivity()).exec();
+        if (Utils.checkNetworkStatus()) {
+            new CheckUpdates().exec();
        } else {
            mSwipeRefreshLayout.setRefreshing(false);
        }
@@ -207,35 +196,15 @@ public class MagiskFragment extends Fragment
        return expandableContainer;
    }

-    public String getSelectedBootImage() {
-        if (Shell.rootAccess()) {
-            if (mm.bootBlock != null) {
-                return mm.bootBlock;
-            } else {
-                int idx = spinner.getSelectedItemPosition();
-                if (idx > 0)  {
-                    return mm.blockList.get(idx - 1);
-                } else {
-                    SnackbarMaker.make(getActivity(),
-                            R.string.manual_boot_image, Snackbar.LENGTH_LONG).show();
-                    return null;
-                }
-            }
-        } else {
-            return null;
-        }
-    }
-
    private void updateUI() {
        ((MainActivity) getActivity()).checkHideSection();

-        boolean hasNetwork = Utils.checkNetworkStatus(getActivity());
+        boolean hasNetwork = Utils.checkNetworkStatus();
        boolean hasRoot = Shell.rootAccess();
        boolean isUpToDate = mm.magiskVersionCode > 1300;

-        magiskUpdateCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
+        magiskUpdate.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
        safetyNetCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
-        bootImageCard.setVisibility(hasNetwork && hasRoot ? View.VISIBLE : View.GONE);
        installOptionCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
        uninstallButton.setVisibility(isUpToDate && hasRoot ? View.VISIBLE : View.GONE);

@@ -253,43 +222,6 @@ public class MagiskFragment extends Fragment

        magiskStatusIcon.setImageResource(image);
        magiskStatusIcon.setColorFilter(color);
-
-        switch (Shell.rootStatus) {
-            case 0:
-                color = colorBad;
-                image = R.drawable.ic_cancel;
-                rootStatusText.setText(R.string.not_rooted);
-                break;
-            case 1:
-                if (mm.suVersion != null) {
-                    color = colorOK;
-                    image = R.drawable.ic_check_circle;
-                    rootStatusText.setText(mm.suVersion);
-                    break;
-                }
-            case -1:
-            default:
-                color = colorNeutral;
-                image = R.drawable.ic_help;
-                rootStatusText.setText(R.string.root_error);
-        }
-
-        rootStatusIcon.setImageResource(image);
-        rootStatusIcon.setColorFilter(color);
-
-        List<String> items = new ArrayList<>();
-        if (mm.bootBlock != null) {
-            items.add(getString(R.string.auto_detect, mm.bootBlock));
-            spinner.setEnabled(false);
-        } else {
-            items.add(getString(R.string.cannot_auto_detect));
-            if (mm.blockList != null)
-                items.addAll(mm.blockList);
-        }
-        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);
    }

    private void updateCheckUI() {
@@ -298,20 +230,20 @@ public class MagiskFragment extends Fragment
        if (mm.remoteMagiskVersionCode < 0) {
            color = colorNeutral;
            image = R.drawable.ic_help;
-            magiskUpdateText.setText(R.string.cannot_check_updates);
+            magiskUpdateText.setText(R.string.invalid_update_channel);
+            installButton.setVisibility(View.GONE);
        } else {
            color = colorOK;
            image = R.drawable.ic_check_circle;
            magiskUpdateText.setText(getString(R.string.install_magisk_title, "v" + mm.remoteMagiskVersionString));
-        }
-
-        installButton.setVisibility(View.VISIBLE);
-        if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-            installText.setText(getString(R.string.update, getString(R.string.app_name)));
-        } else if (mm.magiskVersionCode > 0 && mm.remoteMagiskVersionCode > mm.magiskVersionCode) {
-            installText.setText(getString(R.string.update, getString(R.string.magisk)));
-        } else {
-            installText.setText(R.string.install);
+            installButton.setVisibility(View.VISIBLE);
+            if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
+                installText.setText(getString(R.string.update, getString(R.string.app_name)));
+            } else if (mm.magiskVersionCode > 0 && mm.remoteMagiskVersionCode > mm.magiskVersionCode) {
+                installText.setText(getString(R.string.update, getString(R.string.magisk)));
+            } else {
+                installText.setText(R.string.install);
+            }
        }

        if (!shownDialog && (mm.remoteMagiskVersionCode > mm.magiskVersionCode
@@ -330,9 +262,7 @@ public class MagiskFragment extends Fragment
    private void updateSafetyNetUI(int response) {
        safetyNetProgress.setVisibility(View.GONE);
        safetyNetRefreshIcon.setVisibility(View.VISIBLE);
-        if (response < 0) {
-            safetyNetStatusText.setText(R.string.safetyNet_api_error);
-        } else if ((response & 0x111) == 0) {
+        if ((response & 0x0F) == 0) {
            safetyNetStatusText.setText(R.string.safetyNet_check_success);

            boolean b;
@@ -357,9 +287,12 @@ public class MagiskFragment extends Fragment
                    resid = R.string.safetyNet_service_disconnected;
                    break;
                case RESPONSE_ERR:
-                default:
                    resid = R.string.safetyNet_res_invalid;
                    break;
+                case CONNECTION_FAIL:
+                default:
+                    resid = R.string.safetyNet_api_error;
+                    break;
            }
            safetyNetStatusText.setText(resid);
        }
--- a/app/src/main/java/com/topjohnwu/magisk/MagiskLogFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MagiskLogFragment.java
@@ -1,9 +1,7 @@
 package com.topjohnwu.magisk;

 import android.Manifest;
-import android.annotation.SuppressLint;
 import android.os.Bundle;
-import android.os.Environment;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.text.TextUtils;
@@ -22,6 +20,7 @@ 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.Const;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;

@@ -29,6 +28,7 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Calendar;
+import java.util.Locale;

 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -36,8 +36,6 @@ 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;
@@ -110,30 +108,29 @@ public class MagiskLogFragment extends Fragment {
            super(MagiskLogFragment.this.getActivity());
        }

-        @SuppressLint("DefaultLocale")
        @Override
        protected Object doInBackground(Object... params) {
            mode = (int) params[0];
            switch (mode) {
                case 0:
                    StringBuildingList logList = new StringBuildingList();
-                    getShell().su(logList, "cat " + MAGISK_LOG);
-                    return logList.toString();
+                    Shell.su(logList, "cat " + Const.MAGISK_LOG + " | tail -n 1000");
+                    return logList.getCharSequence();

                case 1:
-                    getShell().su_raw("echo -n > " + MAGISK_LOG);
+                    Shell.su_raw("echo -n > " + Const.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",
+                    String filename = String.format(Locale.US,
+                            "magisk_log_%04d%02d%02d_%02d:%02d:%02d.log",
                            now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
                            now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
                            now.get(Calendar.MINUTE), now.get(Calendar.SECOND));

-                    targetFile = new File(Environment.getExternalStorageDirectory() + "/MagiskManager/" + filename);
+                    targetFile = new File(Const.EXTERNAL_PATH + "/logs", filename);

                    if ((!targetFile.getParentFile().exists() && !targetFile.getParentFile().mkdirs())
                            || (targetFile.exists() && !targetFile.delete())) {
@@ -142,7 +139,7 @@ public class MagiskLogFragment extends Fragment {

                    try (FileWriter out = new FileWriter(targetFile)) {
                        FileWritingList fileWritingList = new FileWritingList(out);
-                        getShell().su(fileWritingList, "cat " + MAGISK_LOG);
+                        Shell.su(fileWritingList, "cat " + Const.MAGISK_LOG);
                    } catch (IOException e) {
                        e.printStackTrace();
                        return false;
@@ -158,21 +155,21 @@ public class MagiskLogFragment extends Fragment {
            switch (mode) {
                case 0:
                case 1:
-                    String llog = (String) o;
+                    CharSequence llog = (CharSequence) 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));
+                    svLog.postDelayed(() -> svLog.fullScroll(ScrollView.FOCUS_DOWN), 100);
+                    hsvLog.postDelayed(() -> hsvLog.fullScroll(ScrollView.FOCUS_LEFT), 100);
                    break;
                case 2:
                    boolean bool = (boolean) o;
                    if (bool) {
-                        getMagiskManager().toast(targetFile.toString(), Toast.LENGTH_LONG);
+                        MagiskManager.toast(targetFile.getPath(), Toast.LENGTH_LONG);
                    } else {
-                        getMagiskManager().toast(R.string.logs_save_failed, Toast.LENGTH_LONG);
+                        MagiskManager.toast(R.string.logs_save_failed, Toast.LENGTH_LONG);
                    }
                    break;
            }
@@ -205,9 +202,8 @@ public class MagiskLogFragment extends Fragment {
            return true;
        }

-        @Override
-        public String toString() {
-            return builder.toString();
+        public CharSequence getCharSequence() {
+            return builder;
        }
    }

--- a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
--- a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.widget.DrawerLayout;
@@ -16,6 +17,7 @@ import android.view.MenuItem;
 import android.view.View;

 import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
@@ -38,11 +40,27 @@ public class MainActivity extends Activity

    @Override
    protected void onCreate(final Bundle savedInstanceState) {
-        getMagiskManager().startup();

-        prefs = getMagiskManager().prefs;
+        MagiskManager mm = getMagiskManager();

-        if (getMagiskManager().isDarkTheme) {
+        if (!mm.hasInit) {
+            Intent intent = new Intent(this, SplashActivity.class);
+            String section = getIntent().getStringExtra(Const.Key.OPEN_SECTION);
+            if (section != null) {
+                intent.putExtra(Const.Key.OPEN_SECTION, section);
+            }
+            startActivity(intent);
+            finish();
+        }
+
+        String perm = getIntent().getStringExtra(Const.Key.INTENT_PERM);
+        if (perm != null) {
+            ActivityCompat.requestPermissions(this, new String[] { perm }, 0);
+        }
+
+        prefs = mm.prefs;
+
+        if (mm.isDarkTheme) {
            setTheme(R.style.AppTheme_Dark);
        }
        super.onCreate(savedInstanceState);
@@ -70,10 +88,9 @@ public class MainActivity extends Activity
        toggle.syncState();

        if (savedInstanceState == null)
-            navigate(getIntent().getStringExtra(MagiskManager.INTENT_SECTION));
+            navigate(getIntent().getStringExtra(Const.Key.OPEN_SECTION));

        navigationView.setNavigationItemSelectedListener(this);
-
    }

    @Override
@@ -112,17 +129,18 @@ public class MainActivity extends Activity
    }

    public void checkHideSection() {
+        MagiskManager mm = getMagiskManager();
        Menu menu = navigationView.getMenu();
        menu.findItem(R.id.magiskhide).setVisible(
-                Shell.rootAccess() && getMagiskManager().magiskVersionCode >= 1300
-                        && prefs.getBoolean("magiskhide", false));
+                Shell.rootAccess() && mm.magiskVersionCode >= 1300
+                        && prefs.getBoolean(Const.Key.MAGISKHIDE, false));
        menu.findItem(R.id.modules).setVisible(
-                Shell.rootAccess() && getMagiskManager().magiskVersionCode >= 0);
-        menu.findItem(R.id.downloads).setVisible(Utils.checkNetworkStatus(this) &&
-                Shell.rootAccess() && getMagiskManager().magiskVersionCode >= 0);
+                Shell.rootAccess() && mm.magiskVersionCode >= 0);
+        menu.findItem(R.id.downloads).setVisible(Utils.checkNetworkStatus() &&
+                Shell.rootAccess() && mm.magiskVersionCode >= 0);
+        menu.setGroupVisible(R.id.second_group, !mm.coreOnly);
        menu.findItem(R.id.log).setVisible(Shell.rootAccess());
-        menu.findItem(R.id.superuser).setVisible(
-                Shell.rootAccess() && getMagiskManager().isSuClient);
+        menu.findItem(R.id.superuser).setVisible(Shell.rootAccess());
    }

    public void navigate(String item) {
@@ -176,7 +194,7 @@ public class MainActivity extends Activity
                displayFragment(new ReposFragment(), "downloads", true);
                break;
            case R.id.magiskhide:
-                displayFragment(new MagiskHideFragment(), "magiskhide", true);
+                displayFragment(new MagiskHideFragment(), Const.Key.MAGISKHIDE, true);
                break;
            case R.id.log:
                displayFragment(new LogFragment(), "log", false);
--- a/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
@@ -16,6 +16,7 @@ import com.topjohnwu.magisk.adapters.ModulesAdapter;
 import com.topjohnwu.magisk.asyncs.LoadModules;
 import com.topjohnwu.magisk.components.Fragment;
 import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;

@@ -29,8 +30,6 @@ import butterknife.Unbinder;

 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;
@@ -40,7 +39,7 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
        Utils.runWithPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE, () -> {
            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
            intent.setType("application/zip");
-            startActivityForResult(intent, FETCH_ZIP_CODE);
+            startActivityForResult(intent, Const.ID.FETCH_ZIP);
        });
    }

@@ -54,7 +53,7 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {

        mSwipeRefreshLayout.setOnRefreshListener(() -> {
            recyclerView.setVisibility(View.GONE);
-            new LoadModules(getActivity()).exec();
+            new LoadModules().exec();
        });

        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@@ -86,10 +85,10 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {

    @Override
    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == FETCH_ZIP_CODE && resultCode == Activity.RESULT_OK && data != null) {
+        if (requestCode == Const.ID.FETCH_ZIP && resultCode == Activity.RESULT_OK && data != null) {
            // Get the URI of the selected file
            Intent intent = new Intent(getActivity(), FlashActivity.class);
-            intent.setData(data.getData()).putExtra(FlashActivity.SET_ACTION, FlashActivity.FLASH_ZIP);
+            intent.setData(data.getData()).putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP);
            startActivity(intent);
        }
    }
--- a/app/src/main/java/com/topjohnwu/magisk/ReposFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/ReposFragment.java
@@ -47,7 +47,7 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
        mSwipeRefreshLayout.setOnRefreshListener(() -> {
            recyclerView.setVisibility(View.VISIBLE);
            emptyRv.setVisibility(View.GONE);
-            new UpdateRepos(getActivity(), true).exec();
+            new UpdateRepos(true).exec();
        });

        getActivity().setTitle(R.string.downloads);
--- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
--- a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
@@ -1,9 +1,27 @@
 package com.topjohnwu.magisk;

+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.job.JobInfo;
+import android.app.job.JobScheduler;
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;

+import com.topjohnwu.magisk.asyncs.CheckUpdates;
+import com.topjohnwu.magisk.asyncs.LoadModules;
+import com.topjohnwu.magisk.asyncs.ParallelTask;
+import com.topjohnwu.magisk.asyncs.UpdateRepos;
 import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.database.SuDatabaseHelper;
+import com.topjohnwu.magisk.services.UpdateCheckService;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
+
+import java.util.List;

 public class SplashActivity extends Activity {

@@ -11,14 +29,106 @@ public class SplashActivity extends Activity {
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        getMagiskManager().startup();
+        MagiskManager mm = getMagiskManager();
+
+        // Dynamic detect all locales
+        new LoadLocale().exec();
+
+        // Create notification channel on Android O
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel channel = new NotificationChannel(Const.ID.NOTIFICATION_CHANNEL,
+                    getString(R.string.magisk_updates), NotificationManager.IMPORTANCE_DEFAULT);
+            getSystemService(NotificationManager.class).createNotificationChannel(channel);
+        }
+
+        mm.loadMagiskInfo();
+        LoadModules loadModuleTask = new LoadModules();
+
+        if (Utils.checkNetworkStatus()) {
+
+            // Fire update check
+            new CheckUpdates().exec();
+
+            // Add repo update check
+            loadModuleTask.setCallBack(() -> new UpdateRepos(false).exec());
+        }
+
+        // Magisk working as expected
+        if (Shell.rootAccess() && mm.magiskVersionCode > 0) {
+
+            List<String> ret = Shell.su("echo \"$BOOTIMAGE\"");
+            if (Utils.isValidShellResponse(ret)) {
+                mm.bootBlock = ret.get(0);
+            }
+
+            // Setup suDB
+            SuDatabaseHelper.setupSuDB();
+
+            // Check alternative Magisk Manager
+            String pkg;
+            if (getPackageName().equals(Const.ORIG_PKG_NAME) &&
+                    (pkg = mm.suDB.getStrings(Const.Key.SU_REQUESTER, null)) != null) {
+                Shell.su_raw("pm uninstall " + pkg);
+                mm.suDB.setStrings(Const.Key.SU_REQUESTER, null);
+            }
+
+            // Add update checking service
+            if (Const.Value.UPDATE_SERVICE_VER > mm.updateServiceVersion) {
+                ComponentName service = new ComponentName(this, UpdateCheckService.class);
+                JobInfo info = new JobInfo.Builder(Const.ID.UPDATE_SERVICE_ID, service)
+                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                        .setPersisted(true)
+                        .setPeriodic(8 * 60 * 60 * 1000)
+                        .build();
+                ((JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE)).schedule(info);
+                mm.updateServiceVersion = Const.Value.UPDATE_SERVICE_VER;
+            }
+
+            // Fire asynctasks
+            loadModuleTask.exec();
+
+            // Check dtbo status
+            Utils.patchDTBO();
+        }
+
+        // Write back default values
+        mm.prefs.edit()
+                .putBoolean(Const.Key.DARK_THEME, mm.isDarkTheme)
+                .putBoolean(Const.Key.MAGISKHIDE, mm.magiskHide)
+                .putBoolean(Const.Key.UPDATE_NOTIFICATION, mm.updateNotification)
+                .putBoolean(Const.Key.HOSTS, Utils.itemExist(Const.MAGISK_HOST_FILE()))
+                .putBoolean(Const.Key.DISABLE, Utils.itemExist(Const.MAGISK_DISABLE_FILE))
+                .putBoolean(Const.Key.SU_REAUTH, mm.suReauth)
+                .putString(Const.Key.SU_REQUEST_TIMEOUT, String.valueOf(mm.suRequestTimeout))
+                .putString(Const.Key.SU_AUTO_RESPONSE, String.valueOf(mm.suResponseType))
+                .putString(Const.Key.SU_NOTIFICATION, String.valueOf(mm.suNotificationType))
+                .putString(Const.Key.ROOT_ACCESS, String.valueOf(mm.suAccessState))
+                .putString(Const.Key.SU_MULTIUSER_MODE, String.valueOf(mm.multiuserMode))
+                .putString(Const.Key.SU_MNT_NS, String.valueOf(mm.suNamespaceMode))
+                .putString(Const.Key.UPDATE_CHANNEL, String.valueOf(mm.updateChannel))
+                .putString(Const.Key.LOCALE, mm.localeConfig)
+                .putString(Const.Key.BOOT_FORMAT, mm.bootFormat)
+                .putInt(Const.Key.UPDATE_SERVICE_VER, mm.updateServiceVersion)
+                .apply();
+
+        mm.hasInit = true;

        Intent intent = new Intent(this, MainActivity.class);
-        String section = getIntent().getStringExtra(MagiskManager.INTENT_SECTION);
-        if (section != null) {
-            intent.putExtra(MagiskManager.INTENT_SECTION, section);
-        }
+        intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION));
+        intent.putExtra(Const.Key.INTENT_PERM, getIntent().getStringExtra(Const.Key.INTENT_PERM));
        startActivity(intent);
        finish();
    }
+
+    static class LoadLocale extends ParallelTask<Void, Void, Void> {
+        @Override
+        protected Void doInBackground(Void... voids) {
+            MagiskManager.get().locales = Utils.getAvailableLocale();
+            return null;
+        }
+        @Override
+        protected void onPostExecute(Void aVoid) {
+            MagiskManager.get().localeDone.publish();
+        }
+    }
 }
--- a/app/src/main/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
+++ b/app/src/main/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
@@ -5,6 +5,7 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.support.design.widget.Snackbar;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,12 +17,12 @@ import android.widget.TextView;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.components.SnackbarMaker;
+import com.topjohnwu.magisk.utils.Const;
 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;
@@ -31,23 +32,11 @@ import butterknife.ButterKnife;

 public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.ViewHolder> {

-    public static final List<String> BLACKLIST =  Arrays.asList(
-            "android",
-            "com.topjohnwu.magisk",
-            "com.google.android.gms"
-    );
-
-    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();
@@ -55,10 +44,13 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
        filter = new ApplicationFilter();
        pm = context.getPackageManager();
        magiskHideDone = Utils.getMagiskManager(context).magiskHideDone;
-        shell = Shell.getShell(context);
        new LoadApps().exec();
    }

+    private boolean lowercaseContains(CharSequence string, CharSequence nonNullLowercaseSearch) {
+        return !TextUtils.isEmpty(string) && string.toString().toLowerCase().contains(nonNullLowercaseSearch);
+    }
+
    @Override
    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
        View mView = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_app, parent, false);
@@ -77,7 +69,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
        holder.itemView.setOnClickListener(null);
        holder.checkBox.setOnCheckedChangeListener(null);

-        if (SNLIST.contains(info.packageName)) {
+        if (Const.SN_DEFAULTLIST.contains(info.packageName)) {
            holder.checkBox.setChecked(true);
            holder.checkBox.setEnabled(false);
            holder.itemView.setOnClickListener(v ->
@@ -89,10 +81,10 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
            holder.checkBox.setChecked(mHideList.contains(info.packageName));
            holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
                if (isChecked) {
-                    Utils.addMagiskHide(shell, info.packageName);
+                    Shell.su_raw("magiskhide --add " + info.packageName);
                    mHideList.add(info.packageName);
                } else {
-                    Utils.rmMagiskHide(shell, info.packageName);
+                    Shell.su_raw("magiskhide --rm " + info.packageName);
                    mHideList.remove(info.packageName);
                }
            });
@@ -135,8 +127,8 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
                mList = new ArrayList<>();
                String filter = constraint.toString().toLowerCase();
                for (ApplicationInfo info : mOriginalList) {
-                    if (Utils.lowercaseContains(info.loadLabel(pm), filter)
-                            || Utils.lowercaseContains(info.packageName, filter)) {
+                    if (lowercaseContains(info.loadLabel(pm), filter)
+                            || lowercaseContains(info.packageName, filter)) {
                        mList.add(info);
                    }
                }
@@ -157,13 +149,13 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
            mOriginalList = pm.getInstalledApplications(0);
            for (Iterator<ApplicationInfo> i = mOriginalList.iterator(); i.hasNext(); ) {
                ApplicationInfo info = i.next();
-                if (ApplicationAdapter.BLACKLIST.contains(info.packageName) || !info.enabled) {
+                if (Const.SN_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);
+            mHideList = Shell.su("magiskhide --ls");
            return null;
        }

--- a/app/src/main/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java
+++ b/app/src/main/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java
@@ -38,7 +38,6 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
    @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);

        String version = module.getVersion();
@@ -56,10 +55,10 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
        holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
            int snack;
            if (isChecked) {
-                module.removeDisableFile(rootShell);
+                module.removeDisableFile();
                snack = R.string.disable_file_removed;
            } else {
-                module.createDisableFile(rootShell);
+                module.createDisableFile();
                snack = R.string.disable_file_created;
            }
            SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
@@ -69,10 +68,10 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
            boolean removed = module.willBeRemoved();
            int snack;
            if (removed) {
-                module.deleteRemoveFile(rootShell);
+                module.deleteRemoveFile();
                snack = R.string.remove_file_deleted;
            } else {
-                module.createRemoveFile(rootShell);
+                module.createRemoveFile();
                snack = R.string.remove_file_created;
            }
            SnackbarMaker.make(holder.itemView, snack, Snackbar.LENGTH_SHORT).show();
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/CheckSafetyNet.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/CheckSafetyNet.java
@@ -1,14 +1,18 @@
 package com.topjohnwu.magisk.asyncs;

-import android.support.v4.app.FragmentActivity;
+import android.app.Activity;

-import com.topjohnwu.jarsigner.ByteArrayStream;
 import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.WebService;

+import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Proxy;
 import java.net.HttpURLConnection;
@@ -17,42 +21,36 @@ import dalvik.system.DexClassLoader;

 public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {

-    public static final int SNET_VER = 2;
-
-    private static final String SNET_URL = "https://github.com/topjohnwu/MagiskManager/releases/download/v5.4.0/snet.apk";
-    private static final String PKG = "com.topjohnwu.snet";
-
    private File dexPath;
    private DexClassLoader loader;

-    public CheckSafetyNet(FragmentActivity activity) {
+    public CheckSafetyNet(Activity activity) {
        super(activity);
        dexPath = new File(activity.getCacheDir().getParent() + "/snet", "snet.apk");
    }

    @Override
    protected void onPreExecute() {
-        MagiskManager mm = getMagiskManager();
-        if (mm.snet_version != CheckSafetyNet.SNET_VER) {
-            getShell().sh("rm -rf " + dexPath.getParent());
+        MagiskManager mm = MagiskManager.get();
+        if (mm.snet_version != Const.Value.SNET_VER) {
+            Shell.sh("rm -rf " + dexPath.getParent());
        }
-        mm.snet_version = CheckSafetyNet.SNET_VER;
-        mm.prefs.edit().putInt("snet_version", CheckSafetyNet.SNET_VER).apply();
+        mm.snet_version = Const.Value.SNET_VER;
+        mm.prefs.edit().putInt(Const.Key.SNET_VER, Const.Value.SNET_VER).apply();
    }

    @Override
    protected Exception doInBackground(Void... voids) {
        try {
            if (!dexPath.exists()) {
-                HttpURLConnection conn = WebService.request(SNET_URL, null);
-                ByteArrayStream bas = new ByteArrayStream();
-                bas.readFrom(conn.getInputStream());
-                conn.disconnect();
+                HttpURLConnection conn = WebService.request(Const.Url.SNET_URL, null);
                dexPath.getParentFile().mkdir();
-                try (OutputStream out = new BufferedOutputStream(new FileOutputStream(dexPath))) {
-                    bas.writeTo(out);
-                    out.flush();
+                try (
+                        OutputStream out = new BufferedOutputStream(new FileOutputStream(dexPath));
+                        InputStream in = new BufferedInputStream(conn.getInputStream())) {
+                    Utils.inToOut(in, out);
                }
+                conn.disconnect();
            }
            loader = new DexClassLoader(dexPath.toString(), dexPath.getParent(),
                    null, ClassLoader.getSystemClassLoader());
@@ -64,20 +62,21 @@ public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {

    @Override
    protected void onPostExecute(Exception err) {
+        MagiskManager mm = MagiskManager.get();
        try {
            if (err != null) throw err;
-            Class<?> helperClazz = loader.loadClass(PKG + ".SafetyNetHelper");
-            Class<?> callbackClazz = loader.loadClass(PKG + ".SafetyNetCallback");
+            Class<?> helperClazz = loader.loadClass(Const.SNET_PKG + ".SafetyNetHelper");
+            Class<?> callbackClazz = loader.loadClass(Const.SNET_PKG + ".SafetyNetCallback");
            Object helper = helperClazz.getConstructors()[0].newInstance(
-                    getActivity(), Proxy.newProxyInstance(
+                    getActivity(), dexPath.getPath(), Proxy.newProxyInstance(
                            loader, new Class[] { callbackClazz }, (proxy, method, args) -> {
-                                getMagiskManager().safetyNetDone.publish(false, args[0]);
+                                mm.safetyNetDone.publish(false, args[0]);
                                return null;
                            }));
            helperClazz.getMethod("attest").invoke(helper);
        } catch (Exception e) {
            e.printStackTrace();
-            getMagiskManager().safetyNetDone.publish(false, -1);
+            mm.safetyNetDone.publish(false, -1);
        }
        super.onPostExecute(err);
    }
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
@@ -1,10 +1,9 @@
 package com.topjohnwu.magisk.asyncs;

-import android.content.Context;
-
 import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.ShowUI;
 import com.topjohnwu.magisk.utils.WebService;

 import org.json.JSONException;
@@ -12,37 +11,30 @@ import org.json.JSONObject;

 public class CheckUpdates extends ParallelTask<Void, Void, Void> {

-    public static final int STABLE_CHANNEL = 0;
-    public static final int BETA_CHANNEL = 1;
+    private boolean showNotification;

-    private static final String STABLE_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/stable.json";
-    private static final String BETA_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/beta.json";
-
-    private boolean showNotification = false;
-
-    public CheckUpdates(Context context) {
-        super(context);
+    public CheckUpdates() {
+        this(false);
    }

-    public CheckUpdates(Context context, boolean b) {
-        super(context);
+    public CheckUpdates(boolean b) {
        showNotification = b;
    }

    @Override
    protected Void doInBackground(Void... voids) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return null;
-        String jsonStr;
+        MagiskManager mm = MagiskManager.get();
+        String jsonStr = "";
        switch (mm.updateChannel) {
-            case STABLE_CHANNEL:
-                jsonStr = WebService.getString(STABLE_URL);
+            case Const.Value.STABLE_CHANNEL:
+                jsonStr = WebService.getString(Const.Url.STABLE_URL);
                break;
-            case BETA_CHANNEL:
-                jsonStr = WebService.getString(BETA_URL);
+            case Const.Value.BETA_CHANNEL:
+                jsonStr = WebService.getString(Const.Url.BETA_URL);
+                break;
+            case Const.Value.CUSTOM_CHANNEL:
+                jsonStr = WebService.getString(mm.customChannelUrl);
                break;
-            default:
-                jsonStr = null;
        }
        try {
            JSONObject json = new JSONObject(jsonStr);
@@ -61,13 +53,12 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {

    @Override
    protected void onPostExecute(Void v) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return;
+        MagiskManager mm = MagiskManager.get();
        if (showNotification && mm.updateNotification) {
            if (BuildConfig.VERSION_CODE < mm.remoteManagerVersionCode) {
-                Utils.showManagerUpdateNotification(mm);
+                ShowUI.managerUpdateNotification();
            } else if (mm.magiskVersionCode < mm.remoteMagiskVersionCode) {
-                Utils.showMagiskUpdateNotification(mm);
+                ShowUI.magiskUpdateNotification();
            }
        }
        mm.updateCheckDone.publish();
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/DownloadBusybox.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/DownloadBusybox.java
@@ -1,64 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.content.Context;
-import android.os.Build;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.WebService;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-
-public class DownloadBusybox extends ParallelTask<Void, Void, Void> {
-
-    private static final String BUSYBOX_ARM = "https://github.com/topjohnwu/ndk-busybox/releases/download/1.27.2/busybox-arm";
-    private static final String BUSYBOX_X86 = "https://github.com/topjohnwu/ndk-busybox/releases/download/1.27.2/busybox-x86";
-
-    private File busybox;
-
-    public DownloadBusybox(Context context) {
-        super(context);
-        busybox = new File(context.getCacheDir(), "busybox");
-    }
-
-    @Override
-    protected Void doInBackground(Void... voids) {
-        Context context = getMagiskManager();
-        Utils.removeItem(getShell(), context.getApplicationInfo().dataDir + "/busybox");
-        try {
-            FileOutputStream out  = new FileOutputStream(busybox);
-            HttpURLConnection conn = WebService.request(
-                    Build.SUPPORTED_32_BIT_ABIS[0].contains("x86") ?
-                            BUSYBOX_X86 :
-                            BUSYBOX_ARM,
-                    null
-            );
-            if (conn == null) throw new IOException();
-            BufferedInputStream bis = new BufferedInputStream(conn.getInputStream());
-            byte[] buffer = new byte[4096];
-            int len;
-            while ((len = bis.read(buffer)) != -1) {
-                out.write(buffer, 0, len);
-            }
-            out.close();
-            conn.disconnect();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        if (busybox.exists()) {
-            getShell().su(
-                    "rm -rf " + MagiskManager.BUSYBOXPATH,
-                    "mkdir -p " + MagiskManager.BUSYBOXPATH,
-                    "cp " + busybox + " " + MagiskManager.BUSYBOXPATH,
-                    "chmod -R 755 " + MagiskManager.BUSYBOXPATH,
-                    MagiskManager.BUSYBOXPATH + "/busybox --install -s " + MagiskManager.BUSYBOXPATH
-            );
-            busybox.delete();
-        }
-        return null;
-    }
-}
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java
@@ -3,10 +3,12 @@ package com.topjohnwu.magisk.asyncs;
 import android.app.Activity;
 import android.net.Uri;
 import android.text.TextUtils;
+import android.view.View;

+import com.topjohnwu.magisk.FlashActivity;
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.container.AdaptiveList;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.ZipUtils;

@@ -24,38 +26,27 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {

    private Uri mUri;
    private File mCachedFile;
-    private AdaptiveList<String> mList;
+    private List<String> console, logs;

-    public FlashZip(Activity context, Uri uri, AdaptiveList<String> list) {
+    public FlashZip(Activity context, Uri uri, List<String> console, List<String> logs) {
        super(context);
        mUri = uri;
-        mList = list;
+        this.console = console;
+        this.logs = logs;
        mCachedFile = new File(context.getCacheDir(), "install.zip");
    }

    private boolean unzipAndCheck() throws Exception {
        ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android", true);
-        List<String> ret = Utils.readFile(getShell(), new File(mCachedFile.getParentFile(), "updater-script").getPath());
+        List<String> ret = Utils.readFile(new File(mCachedFile.getParentFile(), "updater-script").getPath());
        return Utils.isValidShellResponse(ret) && ret.get(0).contains("#MAGISK");
    }

-    @Override
-    protected void onPreExecute() {
-        // UI updates must run in the UI thread
-        mList.setCallback(this::publishProgress);
-    }
-
-    @Override
-    protected void onProgressUpdate(Void... values) {
-        mList.updateView();
-    }
-
    @Override
    protected Integer doInBackground(Void... voids) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return -1;
+        MagiskManager mm = MagiskManager.get();
        try {
-            mList.add("- Copying zip to temp directory");
+            console.add("- Copying zip to temp directory");

            mCachedFile.delete();
            try (
@@ -64,54 +55,54 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {
            ) {
                if (in == null) throw new FileNotFoundException();
                InputStream buf= new BufferedInputStream(in);
-                byte buffer[] = new byte[4096];
-                int length;
-                while ((length = buf.read(buffer)) > 0)
-                    out.write(buffer, 0, length);
+                Utils.inToOut(buf, out);
            } catch (FileNotFoundException e) {
-                mList.add("! Invalid Uri");
+                console.add("! Invalid Uri");
                throw e;
            } catch (IOException e) {
-                mList.add("! Cannot copy to cache");
+                console.add("! Cannot copy to cache");
                throw e;
            }
            if (!unzipAndCheck()) return 0;
-            mList.add("- Installing " + Utils.getNameFromUri(mm, mUri));
-            getShell().su(mList,
+            console.add("- Installing " + Utils.getNameFromUri(mm, mUri));
+            Shell.getShell().run(console, logs,
                    "cd " + mCachedFile.getParent(),
-                    "BOOTMODE=true sh update-binary dummy 1 " + mCachedFile +
-                            " && echo 'Success!' || echo 'Failed!'"
+                    "BOOTMODE=true sh update-binary dummy 1 " + mCachedFile + " || echo 'Failed!'"
            );
-            if (TextUtils.equals(mList.get(mList.size() - 1), "Success!"))
-                return 1;
+
+            if (TextUtils.equals(console.get(console.size() - 1), "Failed!"))
+                return -1;
+
        } catch (Exception e) {
            e.printStackTrace();
+            return -1;
        }
-        return -1;
+        console.add("- All done!");
+        return 1;
    }

    // -1 = error, manual install; 0 = invalid zip; 1 = success
    @Override
    protected void onPostExecute(Integer result) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return;
-        getShell().su_raw(
+        FlashActivity activity = (FlashActivity) getActivity();
+        Shell.su_raw(
                "rm -rf " + mCachedFile.getParent(),
-                "rm -rf " + MagiskManager.TMP_FOLDER_PATH
+                "rm -rf " + Const.TMP_FOLDER_PATH
        );
        switch (result) {
            case -1:
-                mList.add(mm.getString(R.string.install_error));
+                console.add("! Installation failed");
                Utils.showUriSnack(getActivity(), mUri);
                break;
            case 0:
-                mList.add(mm.getString(R.string.invalid_zip));
+                console.add("! This zip is not a Magisk Module!");
                break;
            case 1:
                // Success
-                new LoadModules(mm).exec();
+                new LoadModules().exec();
                break;
        }
-        super.onPostExecute(result);
+        activity.reboot.setVisibility(result > 0 ? View.VISIBLE : View.GONE);
+        activity.buttonPanel.setVisibility(View.VISIBLE);
    }
 }
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/HideManager.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/HideManager.java
@@ -1,114 +1,145 @@
 package com.topjohnwu.magisk.asyncs;

-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Environment;
 import android.widget.Toast;

-import com.topjohnwu.jarsigner.JarMap;
+import com.topjohnwu.crypto.JarMap;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.container.Policy;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.ZipUtils;

 import java.io.File;
+import java.io.FileInputStream;
+import java.security.SecureRandom;
 import java.util.List;
+import java.util.Locale;
 import java.util.jar.JarEntry;

 public class HideManager extends ParallelTask<Void, Void, Boolean> {

-    private static final String UNHIDE_APK = "unhide.apk";
-    private static final String ANDROID_MANIFEST = "AndroidManifest.xml";
-    private static final byte[] UNHIDE_PKG_NAME = "com.topjohnwu.unhide\0".getBytes();
+    private String genPackageName(String prefix, int length) {
+        StringBuilder builder = new StringBuilder(length);
+        builder.append(prefix);
+        length -= prefix.length();
+        SecureRandom random = new SecureRandom();
+        String base = "abcdefghijklmnopqrstuvwxyz";
+        String alpha = base + base.toUpperCase();
+        String full = alpha + "0123456789..........";
+        char next, prev = '\0';
+        for (int i = 0; i < length; ++i) {
+            if (prev == '.' || i == length - 1 || i == 0) {
+                next = alpha.charAt(random.nextInt(alpha.length()));
+            } else {
+                next = full.charAt(random.nextInt(full.length()));
+            }
+            builder.append(next);
+            prev = next;
+        }
+        return builder.toString();
+    }

-    public HideManager(Context context) {
-        super(context);
+    private int findOffset(byte buf[], byte pattern[]) {
+        int offset = -1;
+        for (int i = 0; i < buf.length - pattern.length; ++i) {
+            boolean match = true;
+            for (int j = 0; j < pattern.length; ++j) {
+                if (buf[i + j] != pattern[j]) {
+                    match = false;
+                    break;
+                }
+            }
+            if (match) {
+                offset = i;
+                break;
+            }
+        }
+        return offset;
+    }
+
+    /* It seems that AAPT sometimes generate another type of string format */
+    private boolean fallbackPatch(byte xml[], String from, String to) {
+
+        byte[] target = new byte[from.length() * 2 + 2];
+        for (int i = 0; i < from.length(); ++i) {
+            target[i * 2] = (byte) from.charAt(i);
+        }
+        int offset = findOffset(xml, target);
+        if (offset < 0)
+            return false;
+        byte[] dest = new byte[target.length - 2];
+        for (int i = 0; i < to.length(); ++i) {
+            dest[i * 2] = (byte) to.charAt(i);
+        }
+        System.arraycopy(dest, 0, xml, offset, dest.length);
+        return true;
+    }
+
+    private boolean findAndPatch(byte xml[], String from, String to) {
+        byte target[] = (from + '\0').getBytes();
+        int offset = findOffset(xml, target);
+        if (offset < 0)
+            return fallbackPatch(xml, from, to);
+        System.arraycopy(to.getBytes(), 0, xml, offset, to.length());
+        return true;
    }

    @Override
    protected void onPreExecute() {
-        getMagiskManager().toast(R.string.hide_manager_toast, Toast.LENGTH_SHORT);
+        MagiskManager.toast(R.string.hide_manager_toast, Toast.LENGTH_SHORT);
+        MagiskManager.toast(R.string.hide_manager_toast2, Toast.LENGTH_LONG);
    }

    @Override
    protected Boolean doInBackground(Void... voids) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null)
-            return false;
+        MagiskManager mm = MagiskManager.get();

        // Generate a new unhide app with random package name
-        File unhideAPK = new File(Environment.getExternalStorageDirectory() + "/MagiskManager", "unhide.apk");
-        unhideAPK.getParentFile().mkdirs();
-        String pkg;
+        File repack = new File(Const.EXTERNAL_PATH, "repack.apk");
+        repack.getParentFile().mkdirs();
+        String pkg = genPackageName("com.", Const.ORIG_PKG_NAME.length());

        try {
-            JarMap asset = new JarMap(mm.getAssets().open(UNHIDE_APK));
-            JarEntry je = new JarEntry(ANDROID_MANIFEST);
-            byte xml[] = asset.getRawData(je);
-            int offset = -1;
+            // Read whole APK into memory
+            JarMap apk = new JarMap(new FileInputStream(mm.getPackageCodePath()));
+            JarEntry je = new JarEntry(Const.ANDROID_MANIFEST);
+            byte xml[] = apk.getRawData(je);

-            // Linear search pattern offset
-            for (int i = 0; i < xml.length - UNHIDE_PKG_NAME.length; ++i) {
-                boolean match = true;
-                for (int j = 0; j < UNHIDE_PKG_NAME.length; ++j) {
-                    if (xml[i + j] != UNHIDE_PKG_NAME[j]) {
-                        match = false;
-                        break;
-                    }
-                }
-                if (match) {
-                    offset = i;
-                    break;
-                }
-            }
-            if (offset < 0)
+            if (!findAndPatch(xml, Const.ORIG_PKG_NAME, pkg))
+                return false;
+            if (!findAndPatch(xml, Const.ORIG_PKG_NAME + ".provider", pkg + ".provider"))
                return false;

-            // Patch binary XML with new package name
-            pkg = Utils.genPackageName("com.", UNHIDE_PKG_NAME.length - 1);
-            System.arraycopy(pkg.getBytes(), 0, xml, offset, pkg.length());
-            asset.getOutputStream(je).write(xml);
+            // Write in changes
+            apk.getOutputStream(je).write(xml);

            // Sign the APK
-            ZipUtils.signZip(mm, asset, unhideAPK, false);
+            ZipUtils.signZip(apk, repack, false);
        } catch (Exception e) {
            e.printStackTrace();
            return false;
        }

        // Install the application
-        List<String> ret = getShell().su("pm install " + unhideAPK + ">/dev/null && echo true || echo false");
-        unhideAPK.delete();
+
+        List<String> ret = Shell.su(String.format(Locale.US,
+                "pm install --user %d %s >/dev/null && echo true || echo false",
+                mm.userId, repack));
+        repack.delete();
        if (!Utils.isValidShellResponse(ret) || !Boolean.parseBoolean(ret.get(0)))
            return false;

-        try {
-            // Allow the application to gain root by default
-            PackageManager pm = mm.getPackageManager();
-            int uid = pm.getApplicationInfo(pkg, 0).uid;
-            Policy policy = new Policy(uid, pm);
-            policy.policy = Policy.ALLOW;
-            policy.notification = false;
-            policy.logging = false;
-            mm.suDB.addPolicy(policy);
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-            return false;
-        }
+        mm.suDB.setStrings(Const.Key.SU_REQUESTER, pkg);
+        Shell.su_raw(String.format(Locale.US, "pm uninstall --user %d %s", mm.userId, mm.getPackageName()));

-        // Hide myself!
-        getShell().su_raw("pm hide " + mm.getPackageName());
        return true;
    }

    @Override
    protected void onPostExecute(Boolean b) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null)
-            return;
        if (!b) {
-            mm.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
+            MagiskManager.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
        }
        super.onPostExecute(b);
    }
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/LoadModules.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/LoadModules.java
@@ -1,26 +1,27 @@
 package com.topjohnwu.magisk.asyncs;

-import android.content.Context;
-
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.container.ValueSortedMap;
-import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Shell;
+
+import java.util.List;

 public class LoadModules extends ParallelTask<Void, Void, Void> {

-    public LoadModules(Context context) {
-        super(context);
+    private List<String> getModList() {
+        String command = "ls -d " + Const.MAGISK_PATH() + "/* | grep -v lost+found";
+        return Shell.su(command);
    }

    @Override
    protected Void doInBackground(Void... voids) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return null;
+        MagiskManager mm = MagiskManager.get();
        mm.moduleMap = new ValueSortedMap<>();

-        for (String path : Utils.getModList(getShell(), MagiskManager.MAGISK_PATH)) {
-            Module module = new Module(getShell(), path);
+        for (String path : getModList()) {
+            Module module = new Module(path);
            mm.moduleMap.put(module.getId(), module);
        }

@@ -29,9 +30,7 @@ public class LoadModules extends ParallelTask<Void, Void, Void> {

    @Override
    protected void onPostExecute(Void v) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return;
-        mm.moduleLoadDone.publish();
+        MagiskManager.get().moduleLoadDone.publish();
        super.onPostExecute(v);
    }
 }
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/MarkDownWindow.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/MarkDownWindow.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.support.v7.app.AlertDialog;
 import android.webkit.WebView;

+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.WebService;

@@ -29,7 +30,7 @@ public class MarkDownWindow extends ParallelTask<Void, Void, String> {
        Node doc = parser.parse(md);
        return String.format(
                "<link rel='stylesheet' type='text/css' href='file:///android_asset/%s.css'/> %s",
-                getMagiskManager().isDarkTheme ? "dark" : "light", renderer.render(doc));
+                MagiskManager.get().isDarkTheme ? "dark" : "light", renderer.render(doc));
    }

    @Override
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/ParallelTask.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/ParallelTask.java
@@ -1,30 +1,19 @@
 package com.topjohnwu.magisk.asyncs;

 import android.app.Activity;
-import android.content.Context;
 import android.os.AsyncTask;

-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-
 import java.lang.ref.WeakReference;

 public abstract class ParallelTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {

    private WeakReference<Activity> weakActivity;
-    private WeakReference<MagiskManager> weakMagiskManager;

    private Runnable callback = null;

    public ParallelTask() {}

-    public ParallelTask(Context context) {
-        weakMagiskManager = new WeakReference<>(Utils.getMagiskManager(context));
-    }
-
    public ParallelTask(Activity context) {
-        this((Context) context);
        weakActivity = new WeakReference<>(context);
    }

@@ -32,15 +21,6 @@ public abstract class ParallelTask<Params, Progress, Result> extends AsyncTask<P
        return weakActivity.get();
    }

-    protected MagiskManager getMagiskManager() {
-        return weakMagiskManager.get();
-    }
-
-    protected Shell getShell() {
-        MagiskManager magiskManager = getMagiskManager();
-        return magiskManager == null ? null : Shell.getShell(magiskManager);
-    }
-
    @SuppressWarnings("unchecked")
    public ParallelTask<Params, Progress, Result> exec(Params... params) {
        executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, params);
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java
@@ -5,13 +5,15 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Environment;
+import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.widget.Toast;

 import com.topjohnwu.magisk.FlashActivity;
+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.container.InputStreamWrapper;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.WebService;
@@ -37,43 +39,38 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
    private String mLink;
    private File mFile;
    private int progress = 0, total = -1;
-
-    private static final int UPDATE_DL_PROG = 0;
-    private static final int SHOW_PROCESSING = 1;
+    private Handler mHandler;

    public ProcessRepoZip(Activity context, String link, String filename, boolean install) {
        super(context);
        mLink = link;
-        mFile = new File(Environment.getExternalStorageDirectory() + "/MagiskManager", filename);
+        mFile = new File(Const.EXTERNAL_PATH, filename);
        mInstall = install;
+        mHandler = new Handler();
    }

-    private void removeTopFolder(InputStream in, File output) throws IOException {
-        JarInputStream source = new JarInputStream(in);
-        JarOutputStream dest = new JarOutputStream(new BufferedOutputStream(new FileOutputStream(output)));
+    private void removeTopFolder(File input, File output) throws IOException {
        JarEntry entry;
-        String path;
-        int size;
-        byte buffer[] = new byte[4096];
-        while ((entry = source.getNextJarEntry()) != null) {
-            // Remove the top directory from the path
-            path = entry.getName().substring(entry.getName().indexOf("/") + 1);
-            // If it's the top folder, ignore it
-            if (path.isEmpty()) {
-                continue;
-            }
-            // Don't include placeholder
-            if (path.equals("system/placeholder")) {
-                continue;
-            }
-            dest.putNextEntry(new JarEntry(path));
-            while((size = source.read(buffer)) != -1) {
-                dest.write(buffer, 0, size);
+        try (
+            JarInputStream in = new JarInputStream(new BufferedInputStream(new FileInputStream(input)));
+            JarOutputStream out = new JarOutputStream(new BufferedOutputStream(new FileOutputStream(output)))
+        ) {
+            String path;
+            while ((entry = in.getNextJarEntry()) != null) {
+                // Remove the top directory from the path
+                path = entry.getName().substring(entry.getName().indexOf("/") + 1);
+                // If it's the top folder, ignore it
+                if (path.isEmpty()) {
+                    continue;
+                }
+                // Don't include placeholder
+                if (path.equals("system/placeholder")) {
+                    continue;
+                }
+                out.putNextEntry(new JarEntry(path));
+                Utils.inToOut(in, out);
            }
        }
-        source.close();
-        dest.close();
-        in.close();
    }

    @Override
@@ -83,28 +80,11 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
        progressDialog = ProgressDialog.show(activity, activity.getString(R.string.zip_download_title), activity.getString(R.string.zip_download_msg, 0));
    }

-    @Override
-    protected void onProgressUpdate(Object... values) {
-        int mode = (int) values[0];
-        switch (mode) {
-            case UPDATE_DL_PROG:
-                int add = (int) values[1];
-                progress += add;
-                progressDialog.setMessage(getActivity().getString(R.string.zip_download_msg, 100 * progress / total));
-                break;
-            case SHOW_PROCESSING:
-                progressDialog.setTitle(R.string.zip_process_title);
-                progressDialog.setMessage(getActivity().getString(R.string.zip_process_msg));
-                break;
-        }
-    }
-
    @Override
    protected Boolean doInBackground(Void... params) {
        Activity activity = getActivity();
        if (activity == null) return null;
        try {
-
            // Request zip from Internet
            HttpURLConnection conn;
            do {
@@ -117,37 +97,37 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
                    break;
            } while (true);

-            InputStream in = new BufferedInputStream(new ProgressInputStream(conn.getInputStream()));
-
            // Temp files
            File temp1 = new File(activity.getCacheDir(), "1.zip");
            File temp2 = new File(temp1.getParentFile(), "2.zip");
            temp1.getParentFile().mkdir();

-            // First remove top folder in Github source zip, Web -> temp1
-            removeTopFolder(in, temp1);
-
-            conn.disconnect();
-            publishProgress(SHOW_PROCESSING);
-
-            // Then sign the zip for the first time, temp1 -> temp2
-            ZipUtils.signZip(activity, temp1, temp2, false);
-
-            // Adjust the zip to prevent unzip issues, temp2 -> temp1
-            ZipUtils.zipAdjust(temp2.getPath(), temp1.getPath());
-
-            // Finally, sign the whole zip file again, temp1 -> temp2
-            ZipUtils.signZip(activity, temp1, temp2, true);
-
-            // Write it to the target zip, temp2 -> file
-            try (OutputStream out = new BufferedOutputStream(new FileOutputStream(mFile));
-                 InputStream source = new BufferedInputStream(new FileInputStream(temp2))
+            // First download the zip, Web -> temp1
+            try (
+                InputStream in = new BufferedInputStream(new ProgressInputStream(conn.getInputStream()));
+                OutputStream out = new BufferedOutputStream(new FileOutputStream(temp1))
            ) {
-                byte[] buffer = new byte[4096];
-                int length;
-                while ((length = source.read(buffer)) > 0)
-                    out.write(buffer, 0, length);
+                Utils.inToOut(in, out);
+                in.close();
            }
+            conn.disconnect();
+
+            mHandler.post(() -> {
+                progressDialog.setTitle(R.string.zip_process_title);
+                progressDialog.setMessage(getActivity().getString(R.string.zip_process_msg));
+            });
+
+            // First remove top folder in Github source zip, temp1 -> temp2
+            removeTopFolder(temp1, temp2);
+
+            // Then sign the zip for the first time, temp2 -> temp1
+            ZipUtils.signZip(temp2, temp1, false);
+
+            // Adjust the zip to prevent unzip issues, temp1 -> temp2
+            ZipUtils.zipAdjust(temp1.getPath(), temp2.getPath());
+
+            // Finally, sign the whole zip file again, temp2 -> target
+            ZipUtils.signZip(temp2, mFile, true);

            // Delete temp files
            temp1.delete();
@@ -165,17 +145,17 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
        Activity activity = getActivity();
        if (activity == null) return;
        progressDialog.dismiss();
-        Uri uri = Uri.fromFile(mFile);
        if (result) {
+            Uri uri = Uri.fromFile(mFile);
            if (Shell.rootAccess() && mInstall) {
-                Intent intent = new Intent(getActivity(), FlashActivity.class);
-                intent.setData(uri).putExtra(FlashActivity.SET_ACTION, FlashActivity.FLASH_ZIP);
+                Intent intent = new Intent(activity, FlashActivity.class);
+                intent.setData(uri).putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP);
                activity.startActivity(intent);
            } else {
                Utils.showUriSnack(activity, uri);
            }
        } else {
-            Utils.getMagiskManager(activity).toast(R.string.process_error, Toast.LENGTH_LONG);
+            MagiskManager.toast(R.string.process_error, Toast.LENGTH_LONG);
        }
        super.onPostExecute(result);
    }
@@ -193,10 +173,18 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
            super(in);
        }

+        private void updateDlProgress(int step) {
+            progress += step;
+            progressDialog.setMessage(getActivity().getString(R.string.zip_download_msg, (int) (100 * (double) progress / total + 0.5)));
+        }
+
        @Override
        public synchronized int read() throws IOException {
-            publishProgress(UPDATE_DL_PROG, 1);
-            return super.read();
+            int b = super.read();
+            if (b > 0) {
+                mHandler.post(() -> updateDlProgress(1));
+            }
+            return b;
        }

        @Override
@@ -207,7 +195,9 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
        @Override
        public synchronized int read(@NonNull byte[] b, int off, int len) throws IOException {
            int read = super.read(b, off, len);
-            publishProgress(UPDATE_DL_PROG, read);
+            if (read > 0) {
+                mHandler.post(() -> updateDlProgress(read));
+            }
            return read;
        }
    }
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/RestoreStockBoot.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/RestoreStockBoot.java
@@ -1,40 +1,40 @@
 package com.topjohnwu.magisk.asyncs;

-import android.content.Context;
 import android.widget.Toast;

+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;

 import java.util.List;

 public class RestoreStockBoot extends ParallelTask<Void, Void, Boolean> {

-    private String mBoot;
-
-    public RestoreStockBoot(Context context, String boot) {
-        super(context);
-        mBoot = boot;
-    }
-
    @Override
    protected Boolean doInBackground(Void... voids) {
-        List<String> ret = getShell().su("cat /init.magisk.rc | grep STOCKSHA1");
-        if (!Utils.isValidShellResponse(ret))
-            return false;
-        String stock_boot = "/data/stock_boot_" + ret.get(0).substring(ret.get(0).indexOf('=') + 1) + ".img.gz";
-        if (!Utils.itemExist(getShell(), stock_boot))
-            return false;
-        getShell().su_raw("flash_boot_image " + stock_boot + " " + mBoot);
-        return true;
+        String sha1;
+        List<String> ret = Utils.readFile("/.backup/.sha1");
+        if (Utils.isValidShellResponse(ret)) {
+            sha1 = ret.get(0);
+        } else {
+            ret = Shell.su("cat /init.magisk.rc | grep STOCKSHA1");
+            if (!Utils.isValidShellResponse(ret))
+                return false;
+            sha1 = ret.get(0).substring(ret.get(0).indexOf('=') + 1);
+        }
+
+        ret = Shell.su("restore_imgs " + sha1 + " && echo true || echo false");
+
+        return Utils.isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(ret.size() - 1));
    }

    @Override
    protected void onPostExecute(Boolean result) {
        if (result) {
-            getMagiskManager().toast(R.string.restore_done, Toast.LENGTH_SHORT);
+            MagiskManager.toast(R.string.restore_done, Toast.LENGTH_SHORT);
        } else {
-            getMagiskManager().toast(R.string.restore_fail, Toast.LENGTH_LONG);
+            MagiskManager.toast(R.string.restore_fail, Toast.LENGTH_LONG);
        }
    }
 }
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java
@@ -1,6 +1,5 @@
 package com.topjohnwu.magisk.asyncs;

-import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;

@@ -8,6 +7,7 @@ import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.ReposFragment;
 import com.topjohnwu.magisk.container.Repo;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.WebService;

@@ -27,12 +27,6 @@ import java.util.Map;

 public class UpdateRepos extends ParallelTask<Void, Void, Void> {

-    private static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&page=%d";
-
-    public static final String ETAG_KEY = "ETag";
-    private static final String IF_NONE_MATCH = "If-None-Match";
-    private static final String LINK_KEY = "Link";
-
    private static final int CHECK_ETAG = 0;
    private static final int LOAD_NEXT = 1;
    private static final int LOAD_PREV = 2;
@@ -44,16 +38,16 @@ public class UpdateRepos extends ParallelTask<Void, Void, Void> {

    private int tasks = 0;

-    public UpdateRepos(Context context, boolean force) {
-        super(context);
-        prefs = getMagiskManager().prefs;
-        repoDB = getMagiskManager().repoDB;
-        getMagiskManager().repoLoadDone.hasPublished = false;
+    public UpdateRepos(boolean force) {
+        MagiskManager mm = MagiskManager.get();
+        prefs = mm.prefs;
+        repoDB = mm.repoDB;
+        mm.repoLoadDone.hasPublished = false;
        // Legacy data cleanup
-        File old = new File(context.getApplicationInfo().dataDir + "/shared_prefs", "RepoMap.xml");
+        File old = new File(mm.getApplicationInfo().dataDir + "/shared_prefs", "RepoMap.xml");
        if (old.exists() || prefs.getString("repomap", null) != null) {
            old.delete();
-            prefs.edit().remove("version").remove("repomap").remove(ETAG_KEY).apply();
+            prefs.edit().remove("version").remove("repomap").remove(Const.Key.ETAG_KEY).apply();
            repoDB.clearRepo();
        }
        forceUpdate = force;
@@ -112,8 +106,8 @@ public class UpdateRepos extends ParallelTask<Void, Void, Void> {
        if (mode == CHECK_ETAG && page < etags.size()) {
            etag = etags.get(page);
        }
-        header.put(IF_NONE_MATCH, etag);
-        String url = String.format(Locale.US, REPO_URL, page + 1);
+        header.put(Const.Key.IF_NONE_MATCH, etag);
+        String url = String.format(Locale.US, Const.Url.REPO_URL, page + 1);
        HttpURLConnection conn = WebService.request(url, header);

        try {
@@ -130,11 +124,11 @@ public class UpdateRepos extends ParallelTask<Void, Void, Void> {
        }

        // Update ETAG
-        etag = header.get(ETAG_KEY);
+        etag = header.get(Const.Key.ETAG_KEY);
        etag = etag.substring(etag.indexOf('\"'), etag.lastIndexOf('\"') + 1);
        newEtags.add(etag);

-        String links = header.get(LINK_KEY);
+        String links = header.get(Const.Key.LINK_KEY);
        if (links != null) {
            for (String s : links.split(", ")) {
                if (mode != LOAD_PREV && s.contains("next")) {
@@ -168,7 +162,7 @@ public class UpdateRepos extends ParallelTask<Void, Void, Void> {

    @Override
    protected Void doInBackground(Void... voids) {
-        etags = new ArrayList<>(Arrays.asList(prefs.getString(ETAG_KEY, "").split(",")));
+        etags = new ArrayList<>(Arrays.asList(prefs.getString(Const.Key.ETAG_KEY, "").split(",")));
        cached = repoDB.getRepoIDList();

        if (!loadPage(0, CHECK_ETAG)) {
@@ -205,15 +199,13 @@ public class UpdateRepos extends ParallelTask<Void, Void, Void> {
            if (i != 0) etagBuilder.append(",");
            etagBuilder.append(newEtags.get(i));
        }
-        prefs.edit().putString(ETAG_KEY, etagBuilder.toString()).apply();
+        prefs.edit().putString(Const.Key.ETAG_KEY, etagBuilder.toString()).apply();
        return null;
    }

    @Override
    protected void onPostExecute(Void v) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return;
-        mm.repoLoadDone.publish();
+        MagiskManager.get().repoLoadDone.publish();
        super.onPostExecute(v);
    }
 }
--- a/app/src/main/java/com/topjohnwu/magisk/components/Activity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/components/Activity.java
@@ -1,8 +1,12 @@
 package com.topjohnwu.magisk.components;

+import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.AssetManager;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.support.annotation.Keep;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
@@ -10,12 +14,14 @@ import android.view.WindowManager;

 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;

 public class Activity extends AppCompatActivity {

-    private Runnable permissionGrantCallback;
+    private AssetManager mAssetManager = null;
+    private Resources mResources = null;
+    private ActivityResultListener activityResultListener;

    public Activity() {
        super();
@@ -42,26 +48,29 @@ public class Activity extends AppCompatActivity {

    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        MagiskManager mm = getMagiskManager();
        if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            if (permissionGrantCallback != null) {
-                permissionGrantCallback.run();
+            if (mm.permissionGrantCallback != null) {
+                mm.permissionGrantCallback.run();
            }
        }
-        permissionGrantCallback = null;
+        mm.permissionGrantCallback = null;
    }

-    public void setPermissionGrantCallback(Runnable callback) {
-        permissionGrantCallback = callback;
+    @Override
+    public AssetManager getAssets() {
+        return mAssetManager == null ? super.getAssets() : mAssetManager;
+    }
+
+    @Override
+    public Resources getResources() {
+        return mResources == null ? super.getResources() : mResources;
    }

    public MagiskManager getMagiskManager() {
        return (MagiskManager) super.getApplicationContext();
    }

-    public Shell getShell() {
-        return Shell.getShell(this);
-    }
-
    protected void setFloating() {
        boolean isTablet = getResources().getBoolean(R.bool.isTablet);
        if (isTablet) {
@@ -76,4 +85,41 @@ public class Activity extends AppCompatActivity {
        }
    }

+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (activityResultListener != null)
+            activityResultListener.onActivityResult(requestCode, resultCode, data);
+        activityResultListener = null;
+    }
+
+    @Override
+    public void startActivityForResult(Intent intent, int requestCode) {
+        startActivityForResult(intent, requestCode, this::onActivityResult);
+    }
+
+    public void startActivityForResult(Intent intent, int requestCode, ActivityResultListener listener) {
+        activityResultListener = listener;
+        super.startActivityForResult(intent, requestCode);
+    }
+
+    @Keep
+    public void swapResources(String dexPath) {
+        mAssetManager = Utils.getAssets(dexPath);
+        if (mAssetManager == null)
+            return;
+        Resources res = super.getResources();
+        mResources = new Resources(mAssetManager, res.getDisplayMetrics(), res.getConfiguration());
+        mResources.newTheme().setTo(super.getTheme());
+    }
+
+    @Keep
+    public void restoreResources() {
+        mAssetManager = null;
+        mResources = null;
+    }
+
+    public interface ActivityResultListener {
+        void onActivityResult(int requestCode, int resultCode, Intent data);
+    }
+
 }
--- a/app/src/main/java/com/topjohnwu/magisk/components/Fragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/components/Fragment.java
@@ -3,22 +3,15 @@ package com.topjohnwu.magisk.components;
 import android.content.Intent;

 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;

 public class Fragment extends android.support.v4.app.Fragment {

-    private ActivityResultListener activityResultListener;
-
    public MagiskManager getApplication() {
        return Utils.getMagiskManager(getActivity());
    }

-    public Shell getShell() {
-        return Shell.getShell(getActivity());
-    }
-
    @Override
    public void onResume() {
        super.onResume();
@@ -36,18 +29,11 @@ public class Fragment extends android.support.v4.app.Fragment {
    }

    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (activityResultListener != null)
-            activityResultListener.onActivityResult(requestCode, resultCode, data);
-        activityResultListener = null;
+    public void startActivityForResult(Intent intent, int requestCode) {
+        startActivityForResult(intent, requestCode, this::onActivityResult);
    }

-    public void startActivityForResult(Intent intent, int requestCode, ActivityResultListener listener) {
-        activityResultListener = listener;
-        super.startActivityForResult(intent, requestCode);
-    }
-
-    public interface ActivityResultListener {
-        void onActivityResult(int requestCode, int resultCode, Intent data);
+    public void startActivityForResult(Intent intent, int requestCode, Activity.ActivityResultListener listener) {
+        ((Activity) getActivity()).startActivityForResult(intent, requestCode, listener);
    }
 }
--- a/app/src/main/java/com/topjohnwu/magisk/container/AdaptiveList.java
+++ b/app/src/main/java/com/topjohnwu/magisk/container/AdaptiveList.java
@@ -1,36 +0,0 @@
-package com.topjohnwu.magisk.container;
-
-import android.support.v7.widget.RecyclerView;
-
-import java.util.ArrayList;
-
-public class AdaptiveList<E> extends ArrayList<E> {
-
-    private Runnable callback;
-    private RecyclerView mView;
-
-    public AdaptiveList(RecyclerView v) {
-        mView = v;
-    }
-
-    public void updateView() {
-        mView.getAdapter().notifyDataSetChanged();
-        mView.scrollToPosition(mView.getAdapter().getItemCount() - 1);
-    }
-
-    public void setCallback(Runnable cb) {
-        callback = cb;
-    }
-
-    public boolean add(E e) {
-        boolean ret = super.add(e);
-        if (ret) {
-            if (callback == null) {
-                updateView();
-            } else {
-                callback.run();
-            }
-        }
-        return ret;
-    }
-}
--- a/app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java
+++ b/app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java
@@ -10,7 +10,7 @@ import java.util.List;
 public abstract class BaseModule implements Comparable<BaseModule> {

    private String mId = null, mName, mVersion, mAuthor, mDescription;
-    private int mVersionCode = -1, templateVersion = -1;
+    private int mVersionCode = -1, minMagiskVersion = -1;

    protected BaseModule() {}

@@ -21,7 +21,7 @@ public abstract class BaseModule implements Comparable<BaseModule> {
        mVersionCode = c.getInt(c.getColumnIndex("versionCode"));
        mAuthor = c.getString(c.getColumnIndex("author"));
        mDescription = c.getString(c.getColumnIndex("description"));
-        templateVersion = c.getInt(c.getColumnIndex("template"));
+        minMagiskVersion = c.getInt(c.getColumnIndex("minMagisk"));
    }

    public ContentValues getContentValues() {
@@ -32,7 +32,7 @@ public abstract class BaseModule implements Comparable<BaseModule> {
        values.put("versionCode", mVersionCode);
        values.put("author", mAuthor);
        values.put("description", mDescription);
-        values.put("template", templateVersion);
+        values.put("minMagisk", minMagiskVersion);
        return values;
    }

@@ -67,8 +67,9 @@ public abstract class BaseModule implements Comparable<BaseModule> {
                case "description":
                    mDescription = prop[1];
                    break;
+                case "minMagisk":
                case "template":
-                    templateVersion = Integer.parseInt(prop[1]);
+                    minMagiskVersion = Integer.parseInt(prop[1]);
                    break;
                default:
                    break;
@@ -108,8 +109,8 @@ public abstract class BaseModule implements Comparable<BaseModule> {
        return mVersionCode;
    }

-    public int getTemplateVersion() {
-        return templateVersion;
+    public int getMinMagiskVersion() {
+        return minMagiskVersion;
    }

    @Override
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
topjohnwu	47ccf4b1f5	Bump version	2017-11-23 01:06:19 +08:00
topjohnwu	a356b21895	Prevent hiding Magisk Manager on old Magisk versions	2017-11-23 01:06:18 +08:00
dark-basic #DarkBasic BasicHD	614a36c888	Update strings.xml New Lines added.	2017-11-23 00:12:23 +08:00
topjohnwu	f520fe36bd	Update to use new paths	2017-11-22 14:03:15 +08:00
vvb2060	7273a1c34d	Update zh-rCN translation	2017-11-21 21:49:40 +08:00
Oliver Cervera	dc45cbce37	Update Italians strings All new strings translated + clean-up!	2017-11-21 21:49:28 +08:00
topjohnwu	708d8f75c0	Notify su db corruption	2017-11-21 02:21:37 +08:00
dark-basic #DarkBasic BasicHD	bd37d90228	Update strings.xml	2017-11-21 02:15:14 +08:00
topjohnwu	b1ad691464	Several small fixes	2017-11-21 02:15:13 +08:00
topjohnwu	f4e7baf31e	Update snet.apk link	2017-11-21 00:43:13 +08:00
topjohnwu	c0e60c41f2	Update snet extension pack	2017-11-21 00:40:05 +08:00
topjohnwu	c8dad43e00	Fix boot patching	2017-11-21 00:34:25 +08:00
topjohnwu	a8f124704d	Allow custom update channels	2017-11-20 03:09:08 +08:00
vvb2060	eed2816491	Update zh-rCN translation	2017-11-19 22:48:29 +08:00
linar10	a6334b3e35	Update strings.xml	2017-11-19 22:48:20 +08:00
topjohnwu	334beebfeb	Not all devices work well with streaming	2017-11-19 06:17:31 +08:00
topjohnwu	13dad848bd	Fix download progress bug for modules larger than 20MB	2017-11-18 14:17:26 +08:00
topjohnwu	e518f4cef8	Crash proof database: reset if error occurs	2017-11-18 05:17:06 +08:00
topjohnwu	c8fd5da2da	Remove unused strings	2017-11-18 05:17:06 +08:00
topjohnwu	3a74729ecc	Add saving logs feature for installation	2017-11-18 05:17:06 +08:00
topjohnwu	49c672ac4d	Add STDERR support	2017-11-18 05:17:06 +08:00
topjohnwu	b570cb5b77	Extract external path	2017-11-18 05:17:06 +08:00
topjohnwu	97bf388471	Support new module specification	2017-11-18 05:17:05 +08:00
topjohnwu	1a32aaea6f	Drawer rearrangement	2017-11-18 05:17:05 +08:00
topjohnwu	4635883dec	Update to use adaptive icons	2017-11-18 03:56:34 +08:00
topjohnwu	3ba6db4a50	Update Trad. Chinese translation	2017-11-17 02:28:51 +08:00
Xorok	2f1de25747	Fix color of LogFragment menu items when using dark theme I set the color directly in the ic_*.xml files instead of using android:iconTint in menu_log.xml (as seen in fragment_magisk.xml) because iconTint is API26+.	2017-11-17 02:14:13 +08:00
daveyannihilation	f60fd42ac0	Expose Flashing colours for themes	2017-11-17 02:03:35 +08:00
RoySchutte	ecc8f9c792	Update strings.xml	2017-11-17 01:45:05 +08:00
dark-basic #DarkBasic BasicHD	e295dfdcf7	Update strings.xml	2017-11-17 01:44:56 +08:00
Oliver Cervera	fc42c25390	Update IT translation for new strings Updating Italian translation for new strings that have just been pushed.	2017-11-17 01:44:47 +08:00
topjohnwu	27d5858e06	Fix file selection for module install	2017-11-17 01:39:34 +08:00
Generator	e1ef732b60	update pt_PT translation	2017-11-15 05:44:13 +08:00
RoySchutte	9840b95c21	Update strings.xml	2017-11-15 05:44:05 +08:00
linar10	a6f8446d81	Update strings.xml	2017-11-15 05:43:56 +08:00
Oliver Cervera	c1c844c830	Update strings Italian Urgent correction! Many strings contain the following character ' It needs a backslash \ typed in front, otherwise sentences are cut!	2017-11-15 05:43:46 +08:00
topjohnwu	389299afd1	Remove apps from hidelist if uninstalled	2017-11-15 05:36:57 +08:00
topjohnwu	826543a291	Fully support dtbo.img patching	2017-11-15 05:36:57 +08:00
topjohnwu	4ac83cfded	Small UI improvement	2017-11-15 00:38:38 +08:00
topjohnwu	64c363ce53	Update repo download progress report	2017-11-09 02:12:55 +08:00
topjohnwu	cca4347bf9	Use handler instead of weird callbacks	2017-11-09 01:43:29 +08:00
topjohnwu	3ae3d4926a	Small adjustments to UI	2017-11-09 01:11:50 +08:00
topjohnwu	36025d6d9f	Use direct path	2017-11-09 00:03:37 +08:00
topjohnwu	e171362e3e	Improve snet.apk downloading	2017-11-07 00:39:48 +08:00
topjohnwu	3e0bf2ae15	Bump version	2017-11-06 23:21:05 +08:00
dark-basic #DarkBasic BasicHD	07aa9f4b8b	Update strings.xml new lines added	2017-11-06 23:04:59 +08:00
Oliver Cervera	b2d9f3fc64	Update Italian IT strings	2017-11-06 23:04:46 +08:00
Taras Korzhak	5fb3e9167e	Updated Ukrainian translation	2017-11-06 23:04:28 +08:00
topjohnwu	99c74b31be	Improve dynamic permissions	2017-11-06 05:40:41 +08:00
topjohnwu	ce5b13824e	Organize application initialization	2017-11-06 04:47:24 +08:00
topjohnwu	c39170c42e	Organize constants	2017-11-06 04:41:23 +08:00
topjohnwu	fd19fbf300	Improve Magisk direct install	2017-11-04 04:01:58 +08:00
topjohnwu	166469827f	Support new sha1 location	2017-11-03 05:02:14 +08:00
topjohnwu	a34ed538b6	Fix potential bug	2017-11-03 02:25:42 +08:00
topjohnwu	5f22d3e055	Support new xml binary format	2017-10-31 22:48:48 +08:00
topjohnwu	fdd700f3e5	Update boot signing in InstallMagisk	2017-10-31 16:31:58 +08:00
topjohnwu	adf930f126	Finalize bootsigner commandline	2017-10-31 02:55:50 +08:00
topjohnwu	05f41928cd	Add boot signing	2017-10-30 03:45:22 +08:00
topjohnwu	2ee0829871	Fix strings.xml	2017-10-30 03:44:03 +08:00
Dmitry Val'd	743560825d	Update RU translation Added new lines from original + corrected mistakes of the previous version of translation	2017-10-29 19:05:22 +08:00
Antoine	e3d84ac349	Update french translation	2017-10-29 19:05:12 +08:00
Dino Dugandžija	266c832b30	Created Croatian translation I've translated the Magisk Manager app strings.xml to Croatian language. If anything else is needed, please let me know.	2017-10-29 19:04:55 +08:00
topjohnwu	f5374a024e	Improve dynamic loading snet package	2017-10-29 14:43:43 +08:00
topjohnwu	4956d826fb	Fix UID stored in multiuser mode	2017-10-28 16:19:53 +08:00
topjohnwu	f5cc2af5d0	Repackage Magisk Manager for hiding	2017-10-28 16:19:53 +08:00
topjohnwu	5880d4a6ec	Use global su database	2017-10-28 15:50:17 +08:00
topjohnwu	ae05dce958	Improve Shell and logging	2017-10-21 02:28:44 +08:00
topjohnwu	9ebe372a9a	Simplify flash log screen	2017-10-21 02:28:44 +08:00
topjohnwu	e6e04cc5b3	Add reference ASAP	2017-10-16 11:51:34 +08:00
topjohnwu	12352510fd	Fix strings	2017-10-16 11:47:07 +08:00
vvb2060	2b3d927937	Update zh-rCN translation	2017-10-16 11:11:27 +08:00
Madis	a8890740f5	Created Estonian translation I translated Magisk Manager to Estonian with the help of an app called Stringlate.	2017-10-16 11:11:19 +08:00
dark-basic #DarkBasic BasicHD	f60d7ee54b	Fix Strings.xml Translation Mistakes corrected.	2017-10-16 11:11:10 +08:00
topjohnwu	896ca2ef6b	Cleanup contexts	2017-10-16 00:54:48 +08:00
topjohnwu	c036f6d529	Cleanup Utils	2017-10-15 23:54:34 +08:00
topjohnwu	6f457c0c59	Refactor shell (again)	2017-10-15 23:02:44 +08:00