Bump version

Serbian translation

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.1"
 
     defaultConfig {
         applicationId "com.topjohnwu.magisk"
         minSdkVersion 21
-        targetSdkVersion 26
-        versionCode 55
-        versionName "5.3.5"
+        targetSdkVersion 27
+        versionCode 64
+        versionName "5.4.3"
         ndk {
             moduleName 'zipadjust'
             abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
@@ -45,24 +45,22 @@ 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(':resource')
-    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.9.0'
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.57'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.57'
+    implementation 'com.atlassian.commonmark:commonmark:0.10.0'
     implementation 'org.kamranzafar:jtar:2.3'
-    implementation 'com.google.android.gms:play-services-safetynet:9.0.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 }

app/proguard-rules.pro

@@ -16,10 +16,9 @@
 #   public *;
 #}
 
+# Keep all names, we are open source anyway :)
+-keepnames class ** { *; }
+
 # BouncyCastle
--keep class org.bouncycastle.** { *; }
+-keep class org.bouncycastle.jcajce.provider.** { *; }
 -dontwarn javax.naming.**
-
--dontwarn android.content.**
--dontwarn android.animation.**
-

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
@@ -90,9 +92,10 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
+        <!-- Hardcode GMS version -->
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
+            android:value="11717000" />
 
     </application>
 

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

@@ -17,19 +17,17 @@ 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;
+import java.util.Locale;
 
 import butterknife.BindView;
 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;
@@ -57,7 +55,7 @@ public class AboutActivity extends Activity {
             ab.setDisplayHomeAsUpEnabled(true);
         }
 
-        appVersionInfo.setSummary(BuildConfig.VERSION_NAME);
+        appVersionInfo.setSummary(String.format(Locale.US, "%s (%d)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
 
         String changes = null;
         try (InputStream is = getAssets().open("changelog.html")) {
@@ -119,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();
     }

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.utils.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,55 +80,45 @@ 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) {
             ab.setTitle(R.string.flashing);
         }
         setFloating();
+        setFinishOnTouchOutside(false);
         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;
         }
     }
 
@@ -112,40 +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);
-        }
-    }
 }

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);
 

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

@@ -4,32 +4,29 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
+import android.support.annotation.StringRes;
 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;
 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;
@@ -39,6 +36,14 @@ import butterknife.Unbinder;
 public class MagiskFragment extends Fragment
         implements Topic.Subscriber, SwipeRefreshLayout.OnRefreshListener, ExpandableView {
 
+    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;
+
+    private static final int BASIC_PASS = 0x10;
+    private static final int CTS_PASS = 0x20;
+
     private Container expandableContainer = new Container();
 
     private MagiskManager mm;
@@ -47,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;
@@ -67,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;
@@ -85,11 +84,26 @@ public class MagiskFragment extends Fragment
 
     @OnClick(R.id.safetyNet_title)
     void safetyNet() {
-        safetyNetProgress.setVisibility(View.VISIBLE);
-        safetyNetRefreshIcon.setVisibility(View.GONE);
-        safetyNetStatusText.setText(R.string.checking_safetyNet_status);
-        Utils.checkSafetyNet(getActivity());
-        collapse();
+        Runnable task = () -> {
+            safetyNetProgress.setVisibility(View.VISIBLE);
+            safetyNetRefreshIcon.setVisibility(View.GONE);
+            safetyNetStatusText.setText(R.string.checking_safetyNet_status);
+            new CheckSafetyNet(getActivity()).exec();
+            collapse();
+        };
+        if (mm.snet_version < 0) {
+            // Show dialog
+            new AlertDialogBuilder(getActivity())
+                    .setTitle(R.string.proprietary_title)
+                    .setMessage(R.string.proprietary_notice)
+                    .setCancelable(true)
+                    .setPositiveButton(R.string.yes, (d, i) -> task.run())
+                    .setNegativeButton(R.string.no_thanks, null)
+                    .show();
+        } else {
+            task.run();
+        }
+
     }
 
     @OnClick(R.id.install_button)
@@ -98,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
@@ -132,7 +146,7 @@ public class MagiskFragment extends Fragment
 
     @Override
     public void onRefresh() {
-        mm.getMagiskInfo();
+        mm.loadMagiskInfo();
         updateUI();
 
         magiskUpdateText.setText(R.string.checking_for_updates);
@@ -150,19 +164,19 @@ 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);
         }
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
+    public void onTopicPublished(Topic topic, Object result) {
         if (topic == mm.updateCheckDone) {
             updateCheckUI();
         } else if (topic == mm.safetyNetDone) {
-            updateSafetyNetUI();
+            updateSafetyNetUI((int) result);
         }
     }
 
@@ -182,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);
 
@@ -228,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() {
@@ -273,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
@@ -302,37 +259,42 @@ public class MagiskFragment extends Fragment
         mSwipeRefreshLayout.setRefreshing(false);
     }
 
-    private void updateSafetyNetUI() {
-        int image, color;
+    private void updateSafetyNetUI(int response) {
         safetyNetProgress.setVisibility(View.GONE);
         safetyNetRefreshIcon.setVisibility(View.VISIBLE);
-        if (mm.SNCheckResult.failed) {
-            safetyNetStatusText.setText(mm.SNCheckResult.errmsg);
-            collapse();
-        } else {
+        if ((response & 0x0F) == 0) {
             safetyNetStatusText.setText(R.string.safetyNet_check_success);
-            if (mm.SNCheckResult.ctsProfile) {
-                color = colorOK;
-                image = R.drawable.ic_check_circle;
-            } else {
-                color = colorBad;
-                image = R.drawable.ic_cancel;
-            }
-            ctsStatusText.setText("ctsProfile: " + mm.SNCheckResult.ctsProfile);
-            ctsStatusIcon.setImageResource(image);
-            ctsStatusIcon.setColorFilter(color);
 
-            if (mm.SNCheckResult.basicIntegrity) {
-                color = colorOK;
-                image = R.drawable.ic_check_circle;
-            } else {
-                color = colorBad;
-                image = R.drawable.ic_cancel;
-            }
-            basicStatusText.setText("basicIntegrity: " + mm.SNCheckResult.basicIntegrity);
-            basicStatusIcon.setImageResource(image);
-            basicStatusIcon.setColorFilter(color);
+            boolean b;
+            b = (response & CTS_PASS) != 0;
+            ctsStatusText.setText("ctsProfile: " + b);
+            ctsStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
+            ctsStatusIcon.setColorFilter(b ? colorOK : colorBad);
+
+            b = (response & BASIC_PASS) != 0;
+            basicStatusText.setText("basicIntegrity: " + b);
+            basicStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
+            basicStatusIcon.setColorFilter(b ? colorOK : colorBad);
+
             expand();
+        } else {
+            @StringRes int resid;
+            switch (response) {
+                case CAUSE_SERVICE_DISCONNECTED:
+                    resid = R.string.safetyNet_network_loss;
+                    break;
+                case CAUSE_NETWORK_LOST:
+                    resid = R.string.safetyNet_service_disconnected;
+                    break;
+                case RESPONSE_ERR:
+                    resid = R.string.safetyNet_res_invalid;
+                    break;
+                case CONNECTION_FAIL:
+                default:
+                    resid = R.string.safetyNet_api_error;
+                    break;
+            }
+            safetyNetStatusText.setText(resid);
         }
     }
 }

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

@@ -84,7 +84,7 @@ public class MagiskHideFragment extends Fragment implements Topic.Subscriber {
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
+    public void onTopicPublished(Topic topic, Object result) {
         mSwipeRefreshLayout.setRefreshing(false);
         appAdapter.filter(lastFilter);
     }

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;
         }
     }
 

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

@@ -1,57 +1,31 @@
 package com.topjohnwu.magisk;
 
 import android.app.Application;
-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.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.os.Build;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.widget.Toast;
 
-import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.asyncs.DownloadBusybox;
-import com.topjohnwu.magisk.asyncs.LoadModules;
-import com.topjohnwu.magisk.asyncs.ParallelTask;
-import com.topjohnwu.magisk.asyncs.UpdateRepos;
+import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
 import com.topjohnwu.magisk.database.SuDatabaseHelper;
-import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.services.UpdateCheckService;
-import com.topjohnwu.magisk.superuser.SuReceiver;
-import com.topjohnwu.magisk.superuser.SuRequestActivity;
-import com.topjohnwu.magisk.utils.SafetyNetHelper;
+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.io.IOException;
-import java.io.InputStream;
+import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
 
 public class MagiskManager extends Application {
 
-    public static final String MAGISK_DISABLE_FILE = "/cache/.disable_magisk";
-    public static final String MAGISK_HOST_FILE = "/magisk/.core/hosts";
-    public static final String TMP_FOLDER_PATH = "/dev/tmp";
-    public static final String MAGISK_PATH = "/magisk";
-    public static final String INTENT_SECTION = "section";
-    public static final String INTENT_VERSION = "version";
-    public static final String INTENT_LINK = "link";
-    public static final String MAGISKHIDE_PROP = "persist.magisk.hide";
-    public static final String DISABLE_INDICATION_PROP = "ro.magisk.disable";
-    public static final String NOTIFICATION_CHANNEL = "magisk_update_notice";
-    public static final String BUSYBOXPATH = "/dev/magisk/bin";
-    public static final int UPDATE_SERVICE_ID = 1;
+    // Global weak reference to self
+    private static WeakReference<MagiskManager> weakSelf;
 
     // Topics
     public final Topic magiskHideDone = new Topic();
@@ -63,6 +37,8 @@ public class MagiskManager extends Application {
     public final Topic localeDone = new Topic();
 
     // Info
+    public boolean hasInit = false;
+    public int userId;
     public String magiskVersionString;
     public int magiskVersionCode = -1;
     public String remoteMagiskVersionString;
@@ -72,20 +48,15 @@ public class MagiskManager extends Application {
     public String remoteManagerVersionString;
     public int remoteManagerVersionCode = -1;
     public String managerLink;
-    public SafetyNetHelper.Result SNCheckResult;
     public String bootBlock = null;
-    public boolean isSuClient = false;
-    public String suVersion = null;
-    public boolean disabled;
+    public int snet_version;
+    public int updateServiceVersion;
 
     // Data
     public Map<String, Module> moduleMap;
-    public List<String> blockList;
     public List<Locale> locales;
 
     // Configurations
-    public static boolean shellLogging;
-    public static boolean devLogging;
     public static Locale locale;
     public static Locale defaultLocale;
 
@@ -93,6 +64,7 @@ public class MagiskManager extends Application {
     public boolean isDarkTheme;
     public boolean updateNotification;
     public boolean suReauth;
+    public boolean coreOnly;
     public int suRequestTimeout;
     public int suLogTimeout = 14;
     public int suAccessState;
@@ -103,44 +75,41 @@ public class MagiskManager extends Application {
     public String localeConfig;
     public int updateChannel;
     public String bootFormat;
+    public String customChannelUrl;
 
     // Global resources
     public SharedPreferences prefs;
     public SuDatabaseHelper suDB;
     public RepoDatabaseHelper repoDB;
     public Shell shell;
+    public Runnable permissionGrantCallback = null;
 
     private static Handler mHandler = new Handler();
-    private boolean started = false;
 
-    private static class LoadLocale extends ParallelTask<Void, Void, Void> {
-
-        LoadLocale(Context context) {
-            super(context);
-        }
-
-        @Override
-        protected Void doInBackground(Void... voids) {
-            getMagiskManager().locales = Utils.getAvailableLocale(getMagiskManager());
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void aVoid) {
-            getMagiskManager().localeDone.publish();
-        }
+    public MagiskManager() {
+        weakSelf = new WeakReference<>(this);
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        userId = getApplicationInfo().uid / 100000;
 
-        if (getDatabasePath(SuDatabaseHelper.DB_NAME).exists()) {
+        if (Utils.getDatabasePath(this, SuDatabaseHelper.DB_NAME).exists()) {
             // Don't migrate yet, wait and check Magisk version
             suDB = new SuDatabaseHelper(this);
         } else {
-            suDB = new SuDatabaseHelper(Utils.getEncContext(this));
+            suDB = new SuDatabaseHelper();
+        }
+
+        // If detect original package, self destruct!
+        if (!getPackageName().equals(Const.ORIG_PKG_NAME)) {
+            try {
+                getPackageManager().getApplicationInfo(Const.ORIG_PKG_NAME, 0);
+                Shell.su(String.format(Locale.US, "pm uninstall --user %d %s", userId, getPackageName()));
+                return;
+            } catch (PackageManager.NameNotFoundException ignored) { /* Expected*/ }
         }
 
         repoDB = new RepoDatabaseHelper(this);
@@ -149,8 +118,12 @@ public class MagiskManager extends Application {
         loadConfig();
     }
 
+    public static MagiskManager get() {
+        return weakSelf.get();
+    }
+
     public void setLocale() {
-        localeConfig = prefs.getString("locale", "");
+        localeConfig = prefs.getString(Const.Key.LOCALE, "");
         if (localeConfig.isEmpty()) {
             locale = defaultLocale;
         } else {
@@ -163,145 +136,39 @@ public class MagiskManager extends Application {
     }
 
     public void loadConfig() {
-        isDarkTheme = prefs.getBoolean("dark_theme", false);
-        if (BuildConfig.DEBUG) {
-            devLogging = prefs.getBoolean("developer_logging", false);
-            shellLogging = prefs.getBoolean("shell_logging", false);
-        } else {
-            devLogging = false;
-            shellLogging = false;
-        }
+        isDarkTheme = prefs.getBoolean(Const.Key.DARK_THEME, false);
 
         // su
-        suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
-        suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", SuRequestActivity.PROMPT);
-        suNotificationType = Utils.getPrefsInt(prefs, "su_notification", SuReceiver.TOAST);
-        suReauth = prefs.getBoolean("su_reauth", false);
-        suAccessState = suDB.getSettings(SuDatabaseHelper.ROOT_ACCESS, SuDatabaseHelper.ROOT_ACCESS_APPS_AND_ADB);
-        multiuserMode = suDB.getSettings(SuDatabaseHelper.MULTIUSER_MODE, SuDatabaseHelper.MULTIUSER_MODE_OWNER_ONLY);
-        suNamespaceMode = suDB.getSettings(SuDatabaseHelper.MNT_NS, SuDatabaseHelper.NAMESPACE_MODE_REQUESTER);
+        suRequestTimeout = Utils.getPrefsInt(prefs, Const.Key.SU_REQUEST_TIMEOUT, Const.Value.timeoutList[2]);
+        suResponseType = Utils.getPrefsInt(prefs, Const.Key.SU_AUTO_RESPONSE, Const.Value.SU_PROMPT);
+        suNotificationType = Utils.getPrefsInt(prefs, Const.Key.SU_NOTIFICATION, Const.Value.NOTIFICATION_TOAST);
+        suReauth = prefs.getBoolean(Const.Key.SU_REAUTH, false);
+        suAccessState = suDB.getSettings(Const.Key.ROOT_ACCESS, Const.Value.ROOT_ACCESS_APPS_AND_ADB);
+        multiuserMode = suDB.getSettings(Const.Key.SU_MULTIUSER_MODE, Const.Value.MULTIUSER_MODE_OWNER_ONLY);
+        suNamespaceMode = suDB.getSettings(Const.Key.SU_MNT_NS, Const.Value.NAMESPACE_MODE_REQUESTER);
 
-        updateNotification = prefs.getBoolean("notification", true);
-        updateChannel = Utils.getPrefsInt(prefs, "update_channel", CheckUpdates.STABLE_CHANNEL);
-        bootFormat = prefs.getString("boot_format", ".img");
+        coreOnly = prefs.getBoolean(Const.Key.DISABLE, false);
+        updateNotification = prefs.getBoolean(Const.Key.UPDATE_NOTIFICATION, true);
+        updateChannel = Utils.getPrefsInt(prefs, Const.Key.UPDATE_CHANNEL, Const.Value.STABLE_CHANNEL);
+        bootFormat = prefs.getString(Const.Key.BOOT_FORMAT, ".img");
+        snet_version = prefs.getInt(Const.Key.SNET_VER, -1);
+        updateServiceVersion = prefs.getInt(Const.Key.UPDATE_SERVICE_VER, -1);
+        customChannelUrl = prefs.getString(Const.Key.CUSTOM_CHANNEL, "");
     }
 
-    public void toast(String msg, int duration) {
-        mHandler.post(() -> Toast.makeText(this, msg, duration).show());
+    public static void toast(String msg, int duration) {
+        mHandler.post(() -> Toast.makeText(weakSelf.get(), msg, duration).show());
     }
 
-    public void toast(int resId, int duration) {
-        mHandler.post(() -> Toast.makeText(this, resId, duration).show());
+    public static void toast(int resId, int duration) {
+        mHandler.post(() -> Toast.makeText(weakSelf.get(), resId, duration).show());
     }
 
-    public void startup() {
-        if (started)
-            return;
-        started = true;
-
-        boolean hasNetwork = Utils.checkNetworkStatus(this);
-
-        getMagiskInfo();
-
-        // Check if we need to migrate suDB
-        if (getDatabasePath(SuDatabaseHelper.DB_NAME).exists() && Utils.useFDE(this)) {
-            if (magiskVersionCode >= 1410) {
-                suDB.close();
-                Context de = createDeviceProtectedStorageContext();
-                de.moveDatabaseFrom(this, SuDatabaseHelper.DB_NAME);
-                suDB = new SuDatabaseHelper(de);
-            }
-        }
-
-        new LoadLocale(this).exec();
-
-        // Root actions
-        if (Shell.rootAccess()) {
-            if (hasNetwork && !Utils.itemExist(shell, BUSYBOXPATH + "/busybox")) {
-                try {
-                    // Force synchronous, make sure we have busybox to use
-                    new DownloadBusybox(this).exec().get();
-                } catch (InterruptedException | ExecutionException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            try (InputStream in  = getAssets().open(Utils.UTIL_FUNCTIONS)) {
-                shell.loadInputStream(in);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            shell.su_raw(
-                    "export PATH=" + BUSYBOXPATH + ":$PATH",
-                    "mount_partitions",
-                    "BOOTIMAGE=",
-                    "find_boot_image",
-                    "migrate_boot_backup"
-            );
-
-            List<String> res = shell.su("echo \"$BOOTIMAGE\"");
-            if (Utils.isValidShellResponse(res)) {
-                bootBlock = res.get(0);
-            } else {
-                blockList = shell.su("find /dev/block -type b | grep -vE 'dm|ram|loop'");
-            }
-        }
-
-        // Write back default values
-        prefs.edit()
-                .putBoolean("dark_theme", isDarkTheme)
-                .putBoolean("magiskhide", magiskHide)
-                .putBoolean("notification", updateNotification)
-                .putBoolean("hosts", Utils.itemExist(shell, MAGISK_HOST_FILE))
-                .putBoolean("disable", Utils.itemExist(shell, MAGISK_DISABLE_FILE))
-                .putBoolean("su_reauth", suReauth)
-                .putString("su_request_timeout", String.valueOf(suRequestTimeout))
-                .putString("su_auto_response", String.valueOf(suResponseType))
-                .putString("su_notification", String.valueOf(suNotificationType))
-                .putString("su_access", String.valueOf(suAccessState))
-                .putString("multiuser_mode", String.valueOf(multiuserMode))
-                .putString("mnt_ns", String.valueOf(suNamespaceMode))
-                .putString("update_channel", String.valueOf(updateChannel))
-                .putString("locale", localeConfig)
-                .putString("boot_format", bootFormat)
-                .apply();
-
-        // Create notification channel on Android O
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL,
-                    getString(R.string.magisk_updates), NotificationManager.IMPORTANCE_DEFAULT);
-            getSystemService(NotificationManager.class).createNotificationChannel(channel);
-        }
-
-        LoadModules loadModuleTask = new LoadModules(this);
-        // Start update check job
-        if (hasNetwork) {
-            ComponentName service = new ComponentName(this, UpdateCheckService.class);
-            JobInfo jobInfo = new JobInfo.Builder(UPDATE_SERVICE_ID, service)
-                    .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-                    .setPersisted(true)
-                    .setPeriodic(8 * 60 * 60 * 1000)
-                    .build();
-            ((JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE)).schedule(jobInfo);
-            loadModuleTask.setCallBack(() -> new UpdateRepos(this).exec());
-        }
-        // Fire asynctasks
-        loadModuleTask.exec();
-
-    }
-
-    public void getMagiskInfo() {
+    public void loadMagiskInfo() {
         List<String> ret;
-        Shell.getShell(this);
-        ret = shell.sh("su -v");
-        if (Utils.isValidShellResponse(ret)) {
-            suVersion = ret.get(0);
-            isSuClient = suVersion.toUpperCase().contains("MAGISK");
-        }
-        ret = shell.sh("magisk -v");
+        ret = Shell.sh("magisk -v");
         if (!Utils.isValidShellResponse(ret)) {
-            ret = shell.sh("getprop magisk.version");
+            ret = Shell.sh("getprop magisk.version");
             if (Utils.isValidShellResponse(ret)) {
                 try {
                     magiskVersionString = ret.get(0);
@@ -310,22 +177,24 @@ public class MagiskManager extends Application {
             }
         } else {
             magiskVersionString = ret.get(0).split(":")[0];
-            ret = shell.sh("magisk -V");
+            ret = Shell.sh("magisk -V");
             try {
                 magiskVersionCode = Integer.parseInt(ret.get(0));
             } catch (NumberFormatException ignored) {}
         }
-        ret = shell.sh("getprop " + DISABLE_INDICATION_PROP);
-        try {
-            disabled = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0;
-        } catch (NumberFormatException e) {
-            disabled = false;
+        if (magiskVersionCode > 1435) {
+            ret = Shell.su("resetprop -p " + Const.MAGISKHIDE_PROP);
+        } else {
+            ret = Shell.sh("getprop " + Const.MAGISKHIDE_PROP);
         }
-        ret = shell.sh("getprop " + MAGISKHIDE_PROP);
         try {
             magiskHide = !Utils.isValidShellResponse(ret) || Integer.parseInt(ret.get(0)) != 0;
         } catch (NumberFormatException e) {
             magiskHide = true;
         }
     }
+
+    public void setPermissionGrantCallback(Runnable callback) {
+        permissionGrantCallback = callback;
+    }
 }

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
@@ -102,7 +119,7 @@ public class MainActivity extends Activity
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
+    public void onTopicPublished(Topic topic, Object result) {
         recreate();
     }
 
@@ -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);

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

@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,9 +15,10 @@ import android.widget.TextView;
 import com.topjohnwu.magisk.adapters.ModulesAdapter;
 import com.topjohnwu.magisk.asyncs.LoadModules;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,17 +30,17 @@ 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;
     @BindView(R.id.empty_rv) TextView emptyRv;
     @OnClick(R.id.fab)
     public void selectFile() {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("application/zip");
-        startActivityForResult(intent, FETCH_ZIP_CODE);
+        Utils.runWithPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE, () -> {
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.setType("application/zip");
+            startActivityForResult(intent, Const.ID.FETCH_ZIP);
+        });
     }
 
     private List<Module> listModules = new ArrayList<>();
@@ -51,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() {
@@ -72,8 +74,7 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
-        Logger.dev("ModulesFragment: UI refresh triggered");
+    public void onTopicPublished(Topic topic, Object result) {
         updateUI();
     }
 
@@ -84,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);
         }
     }

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

@@ -15,7 +15,6 @@ import android.widget.TextView;
 import com.topjohnwu.magisk.adapters.ReposAdapter;
 import com.topjohnwu.magisk.asyncs.UpdateRepos;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.Topic;
 
 import butterknife.BindView;
@@ -29,7 +28,7 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
     @BindView(R.id.empty_rv) TextView emptyRv;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
 
-    private ReposAdapter adapter;
+    public static ReposAdapter adapter;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -43,14 +42,12 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
         View view = inflater.inflate(R.layout.fragment_repos, container, false);
         unbinder = ButterKnife.bind(this, view);
 
-        adapter = new ReposAdapter(getApplication().repoDB, getApplication().moduleMap);
-        recyclerView.setAdapter(adapter);
-
         mSwipeRefreshLayout.setRefreshing(true);
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
-            recyclerView.setVisibility(View.GONE);
-            new UpdateRepos(getActivity()).exec();
+            recyclerView.setVisibility(View.VISIBLE);
+            emptyRv.setVisibility(View.GONE);
+            new UpdateRepos(true).exec();
         });
 
         getActivity().setTitle(R.string.downloads);
@@ -59,10 +56,21 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
-        Logger.dev("ReposFragment: UI refresh triggered");
+    public void onResume() {
+        adapter = new ReposAdapter(getApplication().repoDB, getApplication().moduleMap);
+        recyclerView.setAdapter(adapter);
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        adapter = null;
+    }
+
+    @Override
+    public void onTopicPublished(Topic topic, Object result) {
         mSwipeRefreshLayout.setRefreshing(false);
-        adapter.notifyDBChanged();
         recyclerView.setVisibility(adapter.getItemCount() == 0 ? View.GONE : View.VISIBLE);
         emptyRv.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
     }

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

@@ -8,18 +8,20 @@ import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
+import android.text.InputType;
+import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.topjohnwu.magisk.asyncs.CheckUpdates;
 import com.topjohnwu.magisk.asyncs.HideManager;
 import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.database.SuDatabaseHelper;
-import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
@@ -62,7 +64,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
+    public void onTopicPublished(Topic topic, Object result) {
         recreate();
     }
 
@@ -72,8 +74,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
     }
 
     public static class SettingsFragment extends PreferenceFragment
-            implements SharedPreferences.OnSharedPreferenceChangeListener,
-            Topic.Subscriber {
+            implements SharedPreferences.OnSharedPreferenceChangeListener, Topic.Subscriber {
 
         private SharedPreferences prefs;
         private PreferenceScreen prefScreen;
@@ -87,32 +88,59 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             addPreferencesFromResource(R.xml.app_settings);
-            prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
-            prefScreen = getPreferenceScreen();
             mm = Utils.getMagiskManager(getActivity());
+            prefs = mm.prefs;
+            prefScreen = getPreferenceScreen();
 
             generalCatagory = (PreferenceCategory) findPreference("general");
             PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
             PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
-            PreferenceCategory developer = (PreferenceCategory) findPreference("developer");
-
-            updateChannel = (ListPreference) findPreference("update_channel");
-            suAccess = (ListPreference) findPreference("su_access");
-            autoRes = (ListPreference) findPreference("su_auto_response");
-            requestTimeout = (ListPreference) findPreference("su_request_timeout");
-            suNotification = (ListPreference) findPreference("su_notification");
-            multiuserMode = (ListPreference) findPreference("multiuser_mode");
-            namespaceMode = (ListPreference) findPreference("mnt_ns");
-            SwitchPreference reauth = (SwitchPreference) findPreference("su_reauth");
             Preference hideManager = findPreference("hide");
+            findPreference("clear").setOnPreferenceClickListener((pref) -> {
+                prefs.edit().remove(Const.Key.ETAG_KEY).apply();
+                mm.repoDB.clearRepo();
+                MagiskManager.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT);
+                return true;
+            });
+
+            updateChannel = (ListPreference) findPreference(Const.Key.UPDATE_CHANNEL);
+            suAccess = (ListPreference) findPreference(Const.Key.ROOT_ACCESS);
+            autoRes = (ListPreference) findPreference(Const.Key.SU_AUTO_RESPONSE);
+            requestTimeout = (ListPreference) findPreference(Const.Key.SU_REQUEST_TIMEOUT);
+            suNotification = (ListPreference) findPreference(Const.Key.SU_NOTIFICATION);
+            multiuserMode = (ListPreference) findPreference(Const.Key.SU_MULTIUSER_MODE);
+            namespaceMode = (ListPreference) findPreference(Const.Key.SU_MNT_NS);
+            SwitchPreference reauth = (SwitchPreference) findPreference(Const.Key.SU_REAUTH);
+
+            updateChannel.setOnPreferenceChangeListener((pref, o) -> {
+                mm.updateChannel = Integer.parseInt((String) o);
+                if (mm.updateChannel == Const.Value.CUSTOM_CHANNEL) {
+                    LinearLayout layout = new LinearLayout(getActivity());
+                    EditText url = new EditText(getActivity());
+                    url.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
+                    url.setText(mm.customChannelUrl);
+                    layout.setOrientation(LinearLayout.VERTICAL);
+                    layout.addView(url);
+                    LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) url.getLayoutParams();
+                    params.setMargins(Utils.dpInPx(15), 0, Utils.dpInPx(15), 0);
+                    new AlertDialogBuilder(getActivity())
+                        .setTitle(R.string.settings_update_custom)
+                        .setMessage(R.string.settings_update_custom_msg)
+                        .setView(layout)
+                        .setPositiveButton(R.string.ok, (d, i) -> {
+                            prefs.edit().putString(Const.Key.CUSTOM_CHANNEL, url.getText().toString()).apply();
+                        })
+                        .setNegativeButton(R.string.close, null)
+                        .show();
+                }
+                return true;
+            });
 
             setSummary();
 
             // Disable dangerous settings in user mode if selected owner manage
-            if (getActivity().getApplicationInfo().uid > 99999) {
-                prefScreen.removePreference(magiskCategory);
-                prefScreen.removePreference(suCategory);
-                generalCatagory.removePreference(hideManager);
+            if (mm.userId > 0) {
+                suCategory.removePreference(multiuserMode);
             }
 
             // Remove re-authentication option on Android O, it will not work
@@ -120,33 +148,23 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
                 suCategory.removePreference(reauth);
             }
 
-            findPreference("clear").setOnPreferenceClickListener((pref) -> {
-                Utils.clearRepoCache(getActivity());
-                return true;
-            });
-
-            hideManager.setOnPreferenceClickListener((pref) -> {
-                Utils.runWithPermission(getActivity(),
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        () -> new HideManager(getActivity()).exec());
-                return true;
-            });
-
-            if (!BuildConfig.DEBUG) {
-                prefScreen.removePreference(developer);
+            if (mm.getPackageName().equals(Const.ORIG_PKG_NAME) && mm.magiskVersionCode >= 1440) {
+                hideManager.setOnPreferenceClickListener((pref) -> {
+                    Utils.runWithPermission(getActivity(),
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                            () -> new HideManager().exec());
+                    return true;
+                });
+            } else {
+                generalCatagory.removePreference(hideManager);
             }
 
             if (!Shell.rootAccess()) {
                 prefScreen.removePreference(magiskCategory);
                 prefScreen.removePreference(suCategory);
                 generalCatagory.removePreference(hideManager);
-            } else {
-                if (!mm.isSuClient) {
-                    prefScreen.removePreference(suCategory);
-                }
-                if (mm.magiskVersionCode < 1300) {
-                    prefScreen.removePreference(magiskCategory);
-                }
+            } else if (mm.magiskVersionCode < 1300) {
+                prefScreen.removePreference(magiskCategory);
             }
         }
 
@@ -167,7 +185,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
             lp.setEntries(entries);
             lp.setEntryValues(entryValues);
             lp.setTitle(R.string.language);
-            lp.setKey("locale");
+            lp.setKey(Const.Key.LOCALE);
             lp.setSummary(MagiskManager.locale.getDisplayName(MagiskManager.locale));
             if (isNew) {
                 generalCatagory.addPreference(lp);
@@ -190,71 +208,65 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
 
         @Override
         public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
-            Logger.dev("Settings: Prefs change " + key);
             boolean enabled;
 
             switch (key) {
-                case "dark_theme":
-                    enabled = prefs.getBoolean("dark_theme", false);
+                case Const.Key.DARK_THEME:
+                    enabled = prefs.getBoolean(Const.Key.DARK_THEME, false);
                     if (mm.isDarkTheme != enabled) {
                         mm.reloadActivity.publish(false);
                     }
                     break;
-                case "disable":
-                    enabled = prefs.getBoolean("disable", false);
+                case Const.Key.DISABLE:
+                    enabled = prefs.getBoolean(Const.Key.DISABLE, false);
                     if (enabled) {
-                        Utils.createFile(getShell(), MagiskManager.MAGISK_DISABLE_FILE);
+                        Utils.createFile(Const.MAGISK_DISABLE_FILE);
                     } else {
-                        Utils.removeItem(getShell(), MagiskManager.MAGISK_DISABLE_FILE);
+                        Utils.removeItem(Const.MAGISK_DISABLE_FILE);
                     }
                     Toast.makeText(getActivity(), R.string.settings_reboot_toast, Toast.LENGTH_LONG).show();
                     break;
-                case "magiskhide":
-                    enabled = prefs.getBoolean("magiskhide", false);
+                case Const.Key.MAGISKHIDE:
+                    enabled = prefs.getBoolean(Const.Key.MAGISKHIDE, false);
                     if (enabled) {
-                        Utils.enableMagiskHide(getShell());
+                        Shell.su_raw("magiskhide --enable");
                     } else {
-                        Utils.disableMagiskHide(getShell());
+                        Shell.su_raw("magiskhide --disable");
                     }
                     break;
-                case "hosts":
-                    enabled = prefs.getBoolean("hosts", false);
+                case Const.Key.HOSTS:
+                    enabled = prefs.getBoolean(Const.Key.HOSTS, false);
                     if (enabled) {
-                        getShell().su_raw(
-                                "cp -af /system/etc/hosts " + MagiskManager.MAGISK_HOST_FILE,
-                                "mount -o bind " + MagiskManager.MAGISK_HOST_FILE + " /system/etc/hosts");
+                        Shell.su_raw(
+                                "cp -af /system/etc/hosts " + Const.MAGISK_HOST_FILE(),
+                                "mount -o bind " + Const.MAGISK_HOST_FILE() + " /system/etc/hosts");
                     } else {
-                        getShell().su_raw(
+                        Shell.su_raw(
                                 "umount -l /system/etc/hosts",
-                                "rm -f " + MagiskManager.MAGISK_HOST_FILE);
+                                "rm -f " + Const.MAGISK_HOST_FILE());
                     }
                     break;
-                case "su_access":
-                    mm.suDB.setSettings(SuDatabaseHelper.ROOT_ACCESS, Utils.getPrefsInt(prefs, "su_access"));
+                case Const.Key.ROOT_ACCESS:
+                    mm.suDB.setSettings(Const.Key.ROOT_ACCESS, Utils.getPrefsInt(prefs, Const.Key.ROOT_ACCESS));
                     break;
-                case "multiuser_mode":
-                    mm.suDB.setSettings(SuDatabaseHelper.MULTIUSER_MODE, Utils.getPrefsInt(prefs, "multiuser_mode"));
+                case Const.Key.SU_MULTIUSER_MODE:
+                    mm.suDB.setSettings(Const.Key.SU_MULTIUSER_MODE, Utils.getPrefsInt(prefs, Const.Key.SU_MULTIUSER_MODE));
                     break;
-                case "mnt_ns":
-                    mm.suDB.setSettings(SuDatabaseHelper.MNT_NS, Utils.getPrefsInt(prefs, "mnt_ns"));
+                case Const.Key.SU_MNT_NS:
+                    mm.suDB.setSettings(Const.Key.SU_MNT_NS, Utils.getPrefsInt(prefs, Const.Key.SU_MNT_NS));
                     break;
-                case "locale":
+                case Const.Key.LOCALE:
                     mm.setLocale();
                     mm.reloadActivity.publish(false);
                     break;
-                case "update_channel":
-                    mm.updateChannel = Utils.getPrefsInt(prefs, "update_channel");
-                    new CheckUpdates(mm, true).exec();
+                case Const.Key.UPDATE_CHANNEL:
+                    new CheckUpdates().exec();
                     break;
             }
             mm.loadConfig();
             setSummary();
         }
 
-        private Shell getShell() {
-            return Shell.getShell(getActivity());
-        }
-
         private void setSummary() {
             updateChannel.setSummary(getResources()
                     .getStringArray(R.array.update_channel)[mm.updateChannel]);
@@ -265,7 +277,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
             suNotification.setSummary(getResources()
                     .getStringArray(R.array.su_notification)[mm.suNotificationType]);
             requestTimeout.setSummary(
-                    getString(R.string.request_timeout_summary, prefs.getString("su_request_timeout", "10")));
+                    getString(R.string.request_timeout_summary, prefs.getString(Const.Key.SU_REQUEST_TIMEOUT, "10")));
             multiuserMode.setSummary(getResources()
                     .getStringArray(R.array.multiuser_summary)[mm.multiuserMode]);
             namespaceMode.setSummary(getResources()
@@ -273,8 +285,8 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
         }
 
         @Override
-        public void onTopicPublished(Topic topic) {
-            setLocalePreference((ListPreference) findPreference("locale"));
+        public void onTopicPublished(Topic topic, Object result) {
+            setLocalePreference((ListPreference) findPreference(Const.Key.LOCALE));
         }
 
         @Override

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();
+        }
+    }
 }

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

@@ -11,7 +11,7 @@ import android.widget.TextView;
 
 import com.topjohnwu.magisk.adapters.PolicyAdapter;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.superuser.Policy;
+import com.topjohnwu.magisk.container.Policy;
 
 import java.util.List;
 

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;
         }
 

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

@@ -13,7 +13,7 @@ import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.module.Module;
+import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.utils.Shell;
 
 import java.util.List;
@@ -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();

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

@@ -15,8 +15,8 @@ import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.AlertDialogBuilder;
 import com.topjohnwu.magisk.components.ExpandableView;
 import com.topjohnwu.magisk.components.SnackbarMaker;
+import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.database.SuDatabaseHelper;
-import com.topjohnwu.magisk.superuser.Policy;
 
 import java.util.HashSet;
 import java.util.List;

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

@@ -17,9 +17,9 @@ import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.asyncs.MarkDownWindow;
 import com.topjohnwu.magisk.asyncs.ProcessRepoZip;
 import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.container.Repo;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.module.Repo;
 import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.ArrayList;
@@ -44,6 +44,7 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
         repoDB = db;
         moduleMap = map;
         repoPairs = new ArrayList<>();
+        notifyDBChanged();
     }
 
 

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

@@ -12,8 +12,8 @@ import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.ExpandableView;
+import com.topjohnwu.magisk.container.SuLogEntry;
 import com.topjohnwu.magisk.database.SuDatabaseHelper;
-import com.topjohnwu.magisk.superuser.SuLogEntry;
 
 import java.util.Collections;
 import java.util.HashSet;

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

@@ -0,0 +1,83 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+
+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;
+
+import dalvik.system.DexClassLoader;
+
+public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
+
+    private File dexPath;
+    private DexClassLoader loader;
+
+    public CheckSafetyNet(Activity activity) {
+        super(activity);
+        dexPath = new File(activity.getCacheDir().getParent() + "/snet", "snet.apk");
+    }
+
+    @Override
+    protected void onPreExecute() {
+        MagiskManager mm = MagiskManager.get();
+        if (mm.snet_version != Const.Value.SNET_VER) {
+            Shell.sh("rm -rf " + dexPath.getParent());
+        }
+        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(Const.Url.SNET_URL, null);
+                dexPath.getParentFile().mkdir();
+                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());
+        } catch (Exception e) {
+            return e;
+        }
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(Exception err) {
+        MagiskManager mm = MagiskManager.get();
+        try {
+            if (err != null) throw err;
+            Class<?> helperClazz = loader.loadClass(Const.SNET_PKG + ".SafetyNetHelper");
+            Class<?> callbackClazz = loader.loadClass(Const.SNET_PKG + ".SafetyNetCallback");
+            Object helper = helperClazz.getConstructors()[0].newInstance(
+                    getActivity(), dexPath.getPath(), Proxy.newProxyInstance(
+                            loader, new Class[] { callbackClazz }, (proxy, method, args) -> {
+                                mm.safetyNetDone.publish(false, args[0]);
+                                return null;
+                            }));
+            helperClazz.getMethod("attest").invoke(helper);
+        } catch (Exception e) {
+            e.printStackTrace();
+            mm.safetyNetDone.publish(false, -1);
+        }
+        super.onPostExecute(err);
+    }
+}

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();

app/src/main/java/com/topjohnwu/magisk/asyncs/DownloadBusybox.java

@@ -1,65 +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.io.InputStream;
-
-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);
-            InputStream in = WebService.request(WebService.GET,
-                    Build.SUPPORTED_32_BIT_ABIS[0].contains("x86") ?
-                            BUSYBOX_X86 :
-                            BUSYBOX_ARM,
-                    null
-            );
-            if (in == null) throw new IOException();
-            BufferedInputStream bis = new BufferedInputStream(in);
-            byte[] buffer = new byte[4096];
-            int len;
-            while ((len = bis.read(buffer)) != -1) {
-                out.write(buffer, 0, len);
-            }
-            out.close();
-            bis.close();
-
-        } 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;
-    }
-}

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.utils.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);
     }
 }

app/src/main/java/com/topjohnwu/magisk/asyncs/HideManager.java

@@ -1,73 +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.crypto.JarMap;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.superuser.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> {
 
-    public HideManager(Context context) {
-        super(context);
+    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();
+    }
+
+    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 = ZipUtils.generateUnhide(mm, unhideAPK);
-
-        // Install the application
-        List<String> ret = getShell().su("pm install " + unhideAPK + ">/dev/null && echo true || echo false");
-        unhideAPK.delete();
-        if (!Utils.isValidShellResponse(ret) || !Boolean.parseBoolean(ret.get(0)))
-            return false;
+        File repack = new File(Const.EXTERNAL_PATH, "repack.apk");
+        repack.getParentFile().mkdirs();
+        String pkg = genPackageName("com.", Const.ORIG_PKG_NAME.length());
 
         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) {
+            // 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);
+
+            if (!findAndPatch(xml, Const.ORIG_PKG_NAME, pkg))
+                return false;
+            if (!findAndPatch(xml, Const.ORIG_PKG_NAME + ".provider", pkg + ".provider"))
+                return false;
+
+            // Write in changes
+            apk.getOutputStream(je).write(xml);
+
+            // Sign the APK
+            ZipUtils.signZip(apk, repack, false);
+        } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
 
-        // Hide myself!
-        getShell().su_raw("pm hide " + mm.getPackageName());
+        // Install the application
+
+        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;
+
+        mm.suDB.setStrings(Const.Key.SU_REQUESTER, pkg);
+        Shell.su_raw(String.format(Locale.US, "pm uninstall --user %d %s", mm.userId, 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);
     }

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

@@ -1,15 +1,18 @@
 package com.topjohnwu.magisk.asyncs;
 
 import android.app.Activity;
+import android.content.res.AssetManager;
 import android.net.Uri;
 import android.os.Build;
-import android.os.Environment;
 import android.text.TextUtils;
+import android.view.View;
 
+import com.topjohnwu.crypto.SignBoot;
+import com.topjohnwu.magisk.FlashActivity;
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.AdaptiveList;
+import com.topjohnwu.magisk.container.TarEntry;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.TarEntry;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.ZipUtils;
 
@@ -34,49 +37,42 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
     private static final int DIRECT_MODE = 1;
 
     private Uri mBootImg, mZip;
-    private AdaptiveList<String> mList;
+    private List<String> console, logs;
     private String mBootLocation;
     private boolean mKeepEnc, mKeepVerity;
     private int mode;
 
-    private InstallMagisk(Activity context, AdaptiveList<String> list, Uri zip, boolean enc, boolean verity) {
+    private InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip, boolean enc, boolean verity) {
         super(context);
-        mList = list;
+        this.console = console;
+        this.logs = logs;
         mZip = zip;
         mKeepEnc = enc;
         mKeepVerity = verity;
     }
 
-    public InstallMagisk(Activity context, AdaptiveList<String> list, Uri zip, boolean enc, boolean verity, Uri boot) {
-        this(context, list, zip, enc, verity);
+    public InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip, boolean enc, boolean verity, Uri boot) {
+        this(context, console, logs, zip, enc, verity);
         mBootImg = boot;
         mode = PATCH_MODE;
     }
 
-    public InstallMagisk(Activity context, AdaptiveList<String> list, Uri zip, boolean enc, boolean verity, String boot) {
-        this(context, list, zip, enc, verity);
+    public InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip, boolean enc, boolean verity, String boot) {
+        this(context, console, logs, zip, enc, verity);
         mBootLocation = boot;
         mode = DIRECT_MODE;
     }
 
-    @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 Boolean doInBackground(Void... voids) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return false;
+        MagiskManager mm = MagiskManager.get();
 
-        File install = new File(Utils.getEncContext(mm).getFilesDir().getParent(), "install");
-        getShell().sh_raw("rm -rf " + install);
+        File install = new File(
+                (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ?
+                        mm.createDeviceProtectedStorageContext() :
+                        mm).getFilesDir().getParent()
+                , "install");
+        Shell.sh_raw("rm -rf " + install);
 
         List<String> abis = Arrays.asList(Build.SUPPORTED_ABIS);
         String arch;
@@ -84,11 +80,11 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
         else if (abis.contains("arm64-v8a")) arch = "arm64";
         else if (abis.contains("x86")) arch = "x86";
         else arch = "arm";
-        mList.add("- Device platform: " + arch);
+        console.add("- Device platform: " + arch);
 
         try {
             // Unzip files
-            mList.add("- Extracting files");
+            console.add("- Extracting files");
             try (InputStream in = mm.getContentResolver().openInputStream(mZip)) {
                 if (in == null) throw new FileNotFoundException();
                 BufferedInputStream buf = new BufferedInputStream(in);
@@ -100,18 +96,19 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                 ZipUtils.unzip(buf, install, "chromeos/", false);
                 buf.reset();
                 ZipUtils.unzip(buf, install, "META-INF/com/google/android/update-binary", true);
+                buf.close();
             } catch (FileNotFoundException e) {
-                mList.add("! Invalid Uri");
+                console.add("! Invalid Uri");
                 throw e;
             } catch (Exception e) {
-                mList.add("! Cannot unzip zip");
+                console.add("! Cannot unzip zip");
                 throw e;
             }
 
-            File boot;
+            File boot = new File(install, "boot.img");
             switch (mode) {
                 case PATCH_MODE:
-                    boot = new File(install, "boot.img");
+                    console.add("- Use boot image: " + boot);
                     // Copy boot image to local
                     try (
                         InputStream in = mm.getContentResolver().openInputStream(mBootImg);
@@ -133,89 +130,120 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                             // Direct copy raw image
                             source = new BufferedInputStream(in);
                         }
-                        byte buffer[] = new byte[1024];
-                        int length;
-                        while ((length = source.read(buffer)) > 0)
-                            out.write(buffer, 0, length);
+                        Utils.inToOut(source, out);
                     } catch (FileNotFoundException e) {
-                        mList.add("! Invalid Uri");
+                        console.add("! Invalid Uri");
                         throw e;
                     } catch (IOException e) {
-                        mList.add("! Copy failed");
+                        console.add("! Copy failed");
                         throw e;
                     }
                     break;
                 case DIRECT_MODE:
-                    boot = new File(mBootLocation);
+                    console.add("- Use boot image: " + mBootLocation);
+                    if (boot.createNewFile()) {
+                        Shell.su("cat " + mBootLocation + " > " + boot);
+                    } else {
+                        console.add("! Dump boot image failed");
+                        return false;
+                    }
                     break;
                 default:
                     return false;
             }
 
-            mList.add("- Use boot image: " + boot);
-
-            Shell shell;
-            if (mode == PATCH_MODE && Shell.rootAccess()) {
-                // Force non-root shell
-                shell = Shell.getShell("sh");
-             } else {
-                shell = getShell();
+            boolean isSigned;
+            try (InputStream in = new FileInputStream(boot)) {
+                isSigned = SignBoot.verifySignature(in, null);
+                if (isSigned) {
+                    console.add("- Signed boot image detected");
+                }
+            } catch (Exception e) {
+                console.add("! Unable to check signature");
+                throw e;
             }
 
+            // Force non-root shell
+            Shell shell;
+            if (Shell.rootAccess())
+                shell = new Shell("sh");
+            else
+                shell = Shell.getShell();
+
             // Patch boot image
-            shell.sh(mList,
+            shell.run(console, logs,
                     "cd " + install,
                     "KEEPFORCEENCRYPT=" + mKeepEnc + " KEEPVERITY=" + mKeepVerity + " sh " +
-                            "update-binary indep boot_patch.sh " + boot +
-                            " && echo 'Success!' || echo 'Failed!'"
-            );
+                            "update-binary indep boot_patch.sh " + boot + " || echo 'Failed!'");
 
-            if (!TextUtils.equals(mList.get(mList.size() - 1), "Success!"))
+            if (TextUtils.equals(console.get(console.size() - 1), "Failed!"))
                 return false;
 
-            File patched_boot = new File(install, "new-boot.img");
-            mList.add("");
-            switch (mode) {
-                case PATCH_MODE:
-                    File dest = new File(Environment.getExternalStorageDirectory() + "/MagiskManager/patched_boot" + mm.bootFormat);
-                    dest.getParentFile().mkdirs();
-                    switch (mm.bootFormat) {
-                        case ".img":
-                            getShell().sh_raw("cp -f " + patched_boot + " " + dest);
-                            break;
-                        case ".img.tar":
-                            TarOutputStream tar = new TarOutputStream(new BufferedOutputStream(new FileOutputStream(dest)));
-                            tar.putNextEntry(new TarEntry(patched_boot, "boot.img"));
-                            byte buffer[] = new byte[4096];
-                            BufferedInputStream in = new BufferedInputStream(new FileInputStream(patched_boot));
-                            int len;
-                            while ((len = in.read(buffer)) != -1) {
-                                tar.write(buffer, 0, len);
-                            }
-                            tar.flush();
-                            tar.close();
-                            in.close();
-                            break;
-                    }
-                    mList.add("*********************************");
-                    mList.add(" Patched Boot Image is placed in ");
-                    mList.add(" " + dest + " ");
-                    mList.add("*********************************");
-                    break;
-                case DIRECT_MODE:
-                    // Direct flash boot image
-                    getShell().su(mList, "flash_boot_image " + patched_boot + " " + mBootLocation);
-                    break;
-                default:
-                    return false;
-            }
-
-            // Finals
-            getShell().sh_raw(
-                    "cd " + install,
+            shell.run(null, null,
+                    "mv -f new-boot.img ../",
                     "mv bin/busybox busybox",
                     "rm -rf bin *.img update-binary",
                     "cd /");
+
+            File patched_boot = new File(install.getParent(), "new-boot.img");
+
+            if (isSigned) {
+                console.add("- Signing boot image");
+                File signed = new File(install.getParent(), "signed.img");
+                AssetManager assets = mm.getAssets();
+                try (
+                        InputStream in = new FileInputStream(patched_boot);
+                        OutputStream out = new BufferedOutputStream(new FileOutputStream(signed));
+                        InputStream keyIn = assets.open(Const.PRIVATE_KEY_NAME);
+                        InputStream certIn = assets.open(Const.PUBLIC_KEY_NAME)
+                ) {
+                    SignBoot.doSignature("/boot", in, out, keyIn, certIn);
+                }
+                shell.run_raw(false, false, "mv -f " + signed + " " + patched_boot);
+            }
+
+            switch (mode) {
+                case PATCH_MODE:
+                    File dest = new File(Const.EXTERNAL_PATH, "patched_boot" + mm.bootFormat);
+                    dest.getParentFile().mkdirs();
+                    OutputStream out;
+                    switch (mm.bootFormat) {
+                        case ".img.tar":
+                            out = new TarOutputStream(new BufferedOutputStream(new FileOutputStream(dest)));
+                            ((TarOutputStream) out).putNextEntry(new TarEntry(patched_boot, "boot.img"));
+                            break;
+                        default:
+                        case ".img":
+                            out = new BufferedOutputStream(new FileOutputStream(dest));
+                            break;
+                    }
+                    try (InputStream in = new BufferedInputStream(new FileInputStream(patched_boot))) {
+                        Utils.inToOut(in, out);
+                        out.close();
+                    }
+                    console.add("");
+                    console.add("*********************************");
+                    console.add(" Patched Boot Image is placed in ");
+                    console.add(" " + dest + " ");
+                    console.add("*********************************");
+                    break;
+                case DIRECT_MODE:
+                    // Direct flash boot image and patch dtbo if possible
+                    Shell.getShell().run(console, logs,
+                            "rm -rf /data/magisk/*",
+                            "mkdir -p /data/magisk 2>/dev/null",
+                            "mv -f " + install + "/* /data/magisk",
+                            "rm -rf " + install,
+                            "flash_boot_image " + patched_boot + " " + mBootLocation,
+                            "patch_dtbo_image");
+                    break;
+                default:
+                    return false;
+            }
+
+            patched_boot.delete();
+
+            console.add("- All done!");
         } catch (Exception e) {
             e.printStackTrace();
             return false;
@@ -225,6 +253,11 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
 
     @Override
     protected void onPostExecute(Boolean result) {
-        super.onPostExecute(result);
+        FlashActivity activity = (FlashActivity) getActivity();
+        if (!result) {
+            console.add("! Installation failed");
+            activity.reboot.setVisibility(View.GONE);
+        }
+        activity.buttonPanel.setVisibility(View.VISIBLE);
     }
 }

app/src/main/java/com/topjohnwu/magisk/asyncs/LoadModules.java

@@ -1,45 +1,36 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.content.Context;
-
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.module.BaseModule;
-import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ValueSortedMap;
+import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.container.ValueSortedMap;
+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;
-        Logger.dev("LoadModules: Loading modules");
-
+        MagiskManager mm = MagiskManager.get();
         mm.moduleMap = new ValueSortedMap<>();
 
-        for (String path : Utils.getModList(getShell(), MagiskManager.MAGISK_PATH)) {
-            Logger.dev("LoadModules: Adding modules from " + path);
-            try {
-                Module module = new Module(getShell(), path);
-                mm.moduleMap.put(module.getId(), module);
-            } catch (BaseModule.CacheModException ignored) {}
+        for (String path : getModList()) {
+            Module module = new Module(path);
+            mm.moduleMap.put(module.getId(), module);
         }
 
-        Logger.dev("LoadModules: Data load done");
         return null;
     }
 
     @Override
     protected void onPostExecute(Void v) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return;
-        mm.moduleLoadDone.publish();
+        MagiskManager.get().moduleLoadDone.publish();
         super.onPostExecute(v);
     }
 }

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

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);

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

@@ -5,12 +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.utils.Logger;
+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;
@@ -21,36 +24,60 @@ import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+import java.util.jar.JarOutputStream;
 
-public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
+public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
 
     private ProgressDialog progressDialog;
     private boolean mInstall;
     private String mLink;
     private File mFile;
+    private int progress = 0, total = -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.getParentFile().mkdirs();
+        mFile = new File(Const.EXTERNAL_PATH, filename);
         mInstall = install;
+        mHandler = new Handler();
+    }
+
+    private void removeTopFolder(File input, File output) throws IOException {
+        JarEntry entry;
+        try (
+            JarInputStream in = new JarInputStream(new BufferedInputStream(new FileInputStream(input)));
+            JarOutputStream out = new JarOutputStream(new BufferedOutputStream(new FileOutputStream(output)))
+        ) {
+            String path;
+            while ((entry = in.getNextJarEntry()) != null) {
+                // Remove the top directory from the path
+                path = entry.getName().substring(entry.getName().indexOf("/") + 1);
+                // If it's the top folder, ignore it
+                if (path.isEmpty()) {
+                    continue;
+                }
+                // Don't include placeholder
+                if (path.equals("system/placeholder")) {
+                    continue;
+                }
+                out.putNextEntry(new JarEntry(path));
+                Utils.inToOut(in, out);
+            }
+        }
     }
 
     @Override
     protected void onPreExecute() {
         Activity activity = getActivity();
-        progressDialog = ProgressDialog.show(activity,
-                activity.getString(R.string.zip_download_title),
-                activity.getString(R.string.zip_download_msg));
-    }
-
-    @Override
-    protected void onProgressUpdate(Void... values) {
-        progressDialog.setTitle(R.string.zip_process_title);
-        progressDialog.setMessage(getActivity().getString(R.string.zip_process_msg));
+        mFile.getParentFile().mkdirs();
+        progressDialog = ProgressDialog.show(activity, activity.getString(R.string.zip_download_title), activity.getString(R.string.zip_download_msg, 0));
     }
 
     @Override
@@ -58,40 +85,49 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
         Activity activity = getActivity();
         if (activity == null) return null;
         try {
-
             // Request zip from Internet
-            InputStream in = WebService.request(WebService.GET, mLink, null);
-            if (in == null) return false;
-            in = new BufferedInputStream(in);
+            HttpURLConnection conn;
+            do {
+                conn = WebService.request(mLink, null);
+                if (conn == null) return null;
+                total = conn.getContentLength();
+                if (total < 0)
+                    conn.disconnect();
+                else
+                    break;
+            } while (true);
 
             // 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
-            ZipUtils.removeTopFolder(in, temp1);
-
-            publishProgress();
-
-            // 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();
@@ -99,7 +135,6 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
 
             return true;
         } catch (Exception e) {
-            Logger.error("ProcessRepoZip: Error!");
             e.printStackTrace();
             return false;
         }
@@ -110,24 +145,60 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, 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);
     }
 
     @Override
-    public ParallelTask<Void, Void, Boolean> exec(Void... voids) {
-        Utils.runWithPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE, () -> super.exec(voids));
+    public ParallelTask<Void, Object, Boolean> exec(Void... voids) {
+        Utils.runWithPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                () -> super.exec(voids));
         return this;
     }
+
+    private class ProgressInputStream extends InputStreamWrapper {
+
+        ProgressInputStream(InputStream in) {
+            super(in);
+        }
+
+        private void updateDlProgress(int step) {
+            progress += step;
+            progressDialog.setMessage(getActivity().getString(R.string.zip_download_msg, (int) (100 * (double) progress / total + 0.5)));
+        }
+
+        @Override
+        public synchronized int read() throws IOException {
+            int b = super.read();
+            if (b > 0) {
+                mHandler.post(() -> updateDlProgress(1));
+            }
+            return b;
+        }
+
+        @Override
+        public int read(@NonNull byte[] b) throws IOException {
+            return read(b, 0, b.length);
+        }
+
+        @Override
+        public synchronized int read(@NonNull byte[] b, int off, int len) throws IOException {
+            int read = super.read(b, off, len);
+            if (read > 0) {
+                mHandler.post(() -> updateDlProgress(read));
+            }
+            return read;
+        }
+    }
 }

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);
         }
     }
 }

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

@@ -1,13 +1,13 @@
 package com.topjohnwu.magisk.asyncs;
 
-import android.content.Context;
 import android.content.SharedPreferences;
-import android.text.TextUtils;
+import android.os.AsyncTask;
 
 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.module.BaseModule;
-import com.topjohnwu.magisk.module.Repo;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.WebService;
 
@@ -15,6 +15,7 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.File;
+import java.net.HttpURLConnection;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,40 +27,38 @@ import java.util.Map;
 
 public class UpdateRepos extends ParallelTask<Void, Void, Void> {
 
-    public static final String ETAG_KEY = "ETag";
-
-    private static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&page=%d";
-    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;
 
-    private List<String> etags;
-    private List<String> cached;
+    private List<String> cached, etags, newEtags = new ArrayList<>();
     private RepoDatabaseHelper repoDB;
     private SharedPreferences prefs;
+    private boolean forceUpdate;
 
-    public UpdateRepos(Context context) {
-        super(context);
-        prefs = getMagiskManager().prefs;
-        repoDB = getMagiskManager().repoDB;
-        String prefsPath = context.getApplicationInfo().dataDir + "/shared_prefs";
+    private int tasks = 0;
+
+    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(prefsPath, "RepoMap.xml");
-        if (old.exists() || !prefs.getString("repomap", "empty").equals("empty")) {
+        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();
         }
-        etags = new ArrayList<>(
-                Arrays.asList(prefs.getString(ETAG_KEY, "").split(",")));
+        forceUpdate = force;
     }
 
     private void loadJSON(String jsonString) throws Exception {
         JSONArray jsonArray = new JSONArray(jsonString);
 
+        // Empty page, throw error
+        if (jsonArray.length() == 0) throw new Exception();
+
         for (int i = 0; i < jsonArray.length(); i++) {
             JSONObject jsonobject = jsonArray.getJSONObject(i);
             String id = jsonobject.getString("description");
@@ -67,124 +66,146 @@ public class UpdateRepos extends ParallelTask<Void, Void, Void> {
             String lastUpdate = jsonobject.getString("pushed_at");
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
             Date updatedDate = format.parse(lastUpdate);
-            Repo repo = repoDB.getRepo(id);
-            try {
+            ++tasks;
+            AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+                Repo repo = repoDB.getRepo(id);
                 Boolean updated;
-                if (repo == null) {
-                    Logger.dev("UpdateRepos: Create new repo " + id);
-                    repo = new Repo(name, updatedDate);
-                    updated = true;
-                } else {
-                    // Popout from cached
-                    cached.remove(id);
-                    updated = repo.update(updatedDate);
+                try {
+                    if (repo == null) {
+                        repo = new Repo(name, updatedDate);
+                        updated = true;
+                    } else {
+                        // Popout from cached
+                        cached.remove(id);
+                        if (forceUpdate) {
+                            repo.update();
+                            updated = true;
+                        } else {
+                            updated = repo.update(updatedDate);
+                        }
+                    }
+                    if (updated) {
+                        repoDB.addRepo(repo);
+                        publishProgress();
+                    }
+                    if (!id.equals(repo.getId())) {
+                        Logger.error("Repo [" + name + "] id=[" + repo.getId() + "] has illegal repo id");
+                    }
+                } catch (Repo.IllegalRepoException e) {
+                    Logger.error(e.getMessage());
+                    repoDB.removeRepo(id);
                 }
-                if (updated) {
-                    repoDB.addRepo(repo);
-                }
-            } catch (BaseModule.CacheModException ignored) {}
+                --tasks;
+            });
         }
     }
 
-    private boolean loadPage(int page, String url, int mode) {
-        Logger.dev("UpdateRepos: Loading page: " + (page + 1));
+    private boolean loadPage(int page, int mode) {
         Map<String, String> header = new HashMap<>();
-        if (mode == CHECK_ETAG && page < etags.size() && !TextUtils.isEmpty(etags.get(page))) {
-            Logger.dev("ETAG: " + etags.get(page));
-            header.put(IF_NONE_MATCH, etags.get(page));
-        }
-        if (url == null) {
-            url = String.format(Locale.US, REPO_URL, page + 1);
-        }
-        String jsonString = WebService.getString(url, header);
-        if (TextUtils.isEmpty(jsonString)) {
-            // At least check the pages we know
-            return page + 1 < etags.size() && loadPage(page + 1, null, CHECK_ETAG);
+        String etag = "";
+        if (mode == CHECK_ETAG && page < etags.size()) {
+            etag = etags.get(page);
         }
+        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);
 
-        // The getString succeed, parse the new stuffs
         try {
-            loadJSON(jsonString);
+            if (conn == null) throw new Exception();
+            if (conn.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {
+                newEtags.add(etag);
+                return page + 1 < etags.size() && loadPage(page + 1, CHECK_ETAG);
+            }
+            loadJSON(WebService.getString(conn));
         } catch (Exception e) {
             e.printStackTrace();
-            return false;
+            // Don't continue
+            return true;
         }
 
-        // Update the ETAG
-        String newEtag = header.get(ETAG_KEY);
-        newEtag = newEtag.substring(newEtag.indexOf('\"'), newEtag.lastIndexOf('\"') + 1);
-        Logger.dev("New ETAG: " + newEtag);
-        if (page < etags.size()) {
-            etags.set(page, newEtag);
-        } else {
-            etags.add(newEtag);
-        }
+        // Update ETAG
+        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) {
-            if (mode == CHECK_ETAG || mode == LOAD_NEXT) {
-                // Try to check next page URL
-                url = null;
-                for (String s : links.split(", ")) {
-                    if (s.contains("next")) {
-                        url = s.substring(s.indexOf("<") + 1, s.indexOf(">; "));
-                        break;
-                    }
-                }
-                if (url != null) {
-                    loadPage(page + 1, url, LOAD_NEXT);
-                }
-            }
-
-            if (mode == CHECK_ETAG || mode == LOAD_PREV) {
-                // Try to check prev page URL
-                url = null;
-                for (String s : links.split(", ")) {
-                    if (s.contains("prev")) {
-                        url = s.substring(s.indexOf("<") + 1, s.indexOf(">; "));
-                        break;
-                    }
-                }
-                if (url != null) {
-                    loadPage(page - 1, url, LOAD_PREV);
+            for (String s : links.split(", ")) {
+                if (mode != LOAD_PREV && s.contains("next")) {
+                    // Force load all next pages
+                    loadPage(page + 1, LOAD_NEXT);
+                } else if (mode != LOAD_NEXT && s.contains("prev")) {
+                    // Back propagation
+                    loadPage(page - 1, LOAD_PREV);
                 }
             }
         }
-
         return true;
     }
 
+    private Void waitTasks() {
+        while (tasks > 0) {
+            try {
+                Thread.sleep(5);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected void onProgressUpdate(Void... values) {
+        if (ReposFragment.adapter != null)
+            ReposFragment.adapter.notifyDBChanged();
+    }
+
     @Override
     protected Void doInBackground(Void... voids) {
-        Logger.dev("UpdateRepos: Loading repos");
-
+        etags = new ArrayList<>(Arrays.asList(prefs.getString(Const.Key.ETAG_KEY, "").split(",")));
         cached = repoDB.getRepoIDList();
 
-        if (!loadPage(0, null, CHECK_ETAG)) {
-            Logger.dev("UpdateRepos: No updates, use DB");
-            return null;
+        if (!loadPage(0, CHECK_ETAG)) {
+            // Nothing changed online
+            if (forceUpdate) {
+                for (String id : cached) {
+                    if (id == null) continue;
+                    ++tasks;
+                    AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+                        Repo repo = repoDB.getRepo(id);
+                        try {
+                            repo.update();
+                            repoDB.addRepo(repo);
+                        } catch (Repo.IllegalRepoException e) {
+                            Logger.error(e.getMessage());
+                            repoDB.removeRepo(repo);
+                        }
+                        --tasks;
+                    });
+                }
+            }
+            return waitTasks();
         }
 
+        // Wait till all tasks are done
+        waitTasks();
+
         // The leftover cached means they are removed from online repo
         repoDB.removeRepo(cached);
 
         // Update ETag
         StringBuilder etagBuilder = new StringBuilder();
-        for (int i = 0; i < etags.size(); ++i) {
+        for (int i = 0; i < newEtags.size(); ++i) {
             if (i != 0) etagBuilder.append(",");
-            etagBuilder.append(etags.get(i));
+            etagBuilder.append(newEtags.get(i));
         }
-        prefs.edit().putString(ETAG_KEY, etagBuilder.toString()).apply();
-
-        Logger.dev("UpdateRepos: Done");
+        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);
     }
 }

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);
+    }
+
 }

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);
     }
 }

app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java

@@ -1,17 +1,16 @@
-package com.topjohnwu.magisk.module;
+package com.topjohnwu.magisk.container;
 
 
+import android.content.ContentValues;
 import android.database.Cursor;
 import android.support.annotation.NonNull;
 
-import com.topjohnwu.magisk.utils.Logger;
-
 import java.util.List;
 
 public abstract class BaseModule implements Comparable<BaseModule> {
 
-    private String mId, mName, mVersion, mAuthor, mDescription;
-    private int mVersionCode = 0, templateVersion = 0;
+    private String mId = null, mName, mVersion, mAuthor, mDescription;
+    private int mVersionCode = -1, minMagiskVersion = -1;
 
     protected BaseModule() {}
 
@@ -22,12 +21,24 @@ 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"));
     }
 
-    protected void parseProps(List<String> props) throws CacheModException { parseProps(props.toArray(new String[props.size()])); }
+    public ContentValues getContentValues() {
+        ContentValues values = new ContentValues();
+        values.put("id", mId);
+        values.put("name", mName);
+        values.put("version", mVersion);
+        values.put("versionCode", mVersionCode);
+        values.put("author", mAuthor);
+        values.put("description", mDescription);
+        values.put("minMagisk", minMagiskVersion);
+        return values;
+    }
 
-    protected void parseProps(String[] props) throws CacheModException {
+    protected void parseProps(List<String> props) { parseProps(props.toArray(new String[0])); }
+
+    protected void parseProps(String[] props) throws NumberFormatException {
         for (String line : props) {
             String[] prop = line.split("=", 2);
             if (prop.length != 2)
@@ -48,9 +59,7 @@ public abstract class BaseModule implements Comparable<BaseModule> {
                     mVersion = prop[1];
                     break;
                 case "versionCode":
-                    try {
-                        mVersionCode = Integer.parseInt(prop[1]);
-                    } catch (NumberFormatException ignored) {}
+                    mVersionCode = Integer.parseInt(prop[1]);
                     break;
                 case "author":
                     mAuthor = prop[1];
@@ -58,13 +67,9 @@ public abstract class BaseModule implements Comparable<BaseModule> {
                 case "description":
                     mDescription = prop[1];
                     break;
+                case "minMagisk":
                 case "template":
-                    try {
-                        templateVersion = Integer.parseInt(prop[1]);
-                    } catch (NumberFormatException ignored) {}
-                case "cacheModule":
-                    if (Boolean.parseBoolean(prop[1]))
-                        throw new CacheModException(mId);
+                    minMagiskVersion = Integer.parseInt(prop[1]);
                     break;
                 default:
                     break;
@@ -104,14 +109,8 @@ public abstract class BaseModule implements Comparable<BaseModule> {
         return mVersionCode;
     }
 
-    public int getTemplateVersion() {
-        return templateVersion;
-    }
-
-    public static class CacheModException extends Exception {
-        public CacheModException(String id) {
-            Logger.error("Cache mods are no longer supported! id: " + id);
-        }
+    public int getMinMagiskVersion() {
+        return minMagiskVersion;
     }
 
     @Override

app/src/main/java/com/topjohnwu/magisk/container/CallbackList.java

@@ -0,0 +1,22 @@
+package com.topjohnwu.magisk.container;
+
+import android.os.Handler;
+
+import java.util.ArrayList;
+
+public abstract class CallbackList<E> extends ArrayList<E> {
+
+    private Handler handler;
+
+    protected CallbackList() {
+        handler = new Handler();
+    }
+
+    public abstract void onAddElement(E e);
+
+    public synchronized boolean add(E e) {
+        boolean ret = super.add(e);
+        handler.post(() -> onAddElement(e));
+        return ret;
+    }
+}

app/src/main/java/com/topjohnwu/magisk/container/InputStreamWrapper.java

@@ -0,0 +1,74 @@
+package com.topjohnwu.magisk.container;
+
+import android.support.annotation.NonNull;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class InputStreamWrapper extends InputStream {
+    private InputStream in;
+
+    public InputStreamWrapper(InputStream in) {
+        this.in = in;
+    }
+
+    @Override
+    public int available() throws IOException {
+        return in.available();
+    }
+
+    @Override
+    public void close() throws IOException {
+        in.close();
+    }
+
+    @Override
+    public synchronized void mark(int readlimit) {
+        in.mark(readlimit);
+    }
+
+    @Override
+    public boolean markSupported() {
+        return in.markSupported();
+    }
+
+    @Override
+    public synchronized int read() throws IOException {
+        return in.read();
+    }
+
+    @Override
+    public int read(@NonNull byte[] b) throws IOException {
+        return in.read(b);
+    }
+
+    @Override
+    public synchronized int read(@NonNull byte[] b, int off, int len) throws IOException {
+        return in.read(b, off, len);
+    }
+
+    @Override
+    public synchronized void reset() throws IOException {
+        in.reset();
+    }
+
+    @Override
+    public long skip(long n) throws IOException {
+        return in.skip(n);
+    }
+
+    @Override
+    public int hashCode() {
+        return in.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return in.equals(obj);
+    }
+
+    @Override
+    public String toString() {
+        return in.toString();
+    }
+}

app/src/main/java/com/topjohnwu/magisk/container/Module.java

@@ -0,0 +1,66 @@
+package com.topjohnwu.magisk.container;
+
+import com.topjohnwu.magisk.utils.Utils;
+
+public class Module extends BaseModule {
+
+    private String mRemoveFile, mDisableFile, mUpdateFile;
+    private boolean mEnable, mRemove, mUpdated;
+
+    public Module(String path) {
+
+        try {
+            parseProps(Utils.readFile(path + "/module.prop"));
+        } catch (NumberFormatException ignored) {}
+
+        mRemoveFile = path + "/remove";
+        mDisableFile = path + "/disable";
+        mUpdateFile = path + "/update";
+
+        if (getId() == null) {
+            int sep = path.lastIndexOf('/');
+            setId(path.substring(sep + 1));
+        }
+
+        if (getName() == null) {
+            setName(getId());
+        }
+
+        mEnable = !Utils.itemExist(mDisableFile);
+        mRemove = Utils.itemExist(mRemoveFile);
+        mUpdated = Utils.itemExist(mUpdateFile);
+    }
+
+    public void createDisableFile() {
+        mEnable = false;
+        Utils.createFile(mDisableFile);
+    }
+
+    public void removeDisableFile() {
+        mEnable = true;
+        Utils.removeItem(mDisableFile);
+    }
+
+    public boolean isEnabled() {
+        return mEnable;
+    }
+
+    public void createRemoveFile() {
+        mRemove = true;
+        Utils.createFile(mRemoveFile);
+    }
+
+    public void deleteRemoveFile() {
+        mRemove = false;
+        Utils.removeItem(mRemoveFile);
+    }
+
+    public boolean willBeRemoved() {
+        return mRemove;
+    }
+
+    public boolean isUpdated() {
+        return mUpdated;
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/container/Policy.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.superuser;
+package com.topjohnwu.magisk.container;
 
 import android.content.ContentValues;
 import android.content.pm.ApplicationInfo;
@@ -20,12 +20,11 @@ public class Policy implements Comparable<Policy>{
 
     public Policy(int uid, PackageManager pm) throws PackageManager.NameNotFoundException {
         String[] pkgs = pm.getPackagesForUid(uid);
-        if (pkgs != null && pkgs.length > 0) {
-            this.uid = uid;
-            packageName = pkgs[0];
-            info = pm.getApplicationInfo(packageName, 0);
-            appName = info.loadLabel(pm).toString();
-        } else throw new PackageManager.NameNotFoundException();
+        if (pkgs == null || pkgs.length == 0) throw new PackageManager.NameNotFoundException();
+        this.uid = uid % 100000;
+        packageName = pkgs[0];
+        info = pm.getApplicationInfo(packageName, 0);
+        appName = info.loadLabel(pm).toString();
     }
 
     public Policy(Cursor c, PackageManager pm) throws PackageManager.NameNotFoundException {

app/src/main/java/com/topjohnwu/magisk/container/Repo.java

@@ -0,0 +1,90 @@
+package com.topjohnwu.magisk.container;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.WebService;
+
+import java.util.Date;
+
+public class Repo extends BaseModule {
+
+    private String repoName;
+    private Date mLastUpdate;
+
+    public Repo(String name, Date lastUpdate) throws IllegalRepoException {
+        mLastUpdate = lastUpdate;
+        repoName = name;
+        update();
+    }
+
+    public Repo(Cursor c) {
+        super(c);
+        repoName = c.getString(c.getColumnIndex("repo_name"));
+        mLastUpdate = new Date(c.getLong(c.getColumnIndex("last_update")));
+    }
+
+    public void update() throws IllegalRepoException {
+        String props = WebService.getString(getManifestUrl());
+        String lines[] = props.split("\\n");
+        try {
+            parseProps(lines);
+        } catch (NumberFormatException e) {
+            throw new IllegalRepoException("Repo [" + repoName + "] parse error: " + e.getMessage());
+        }
+
+        if (getId() == null) {
+            throw new IllegalRepoException("Repo [" + repoName + "] does not contain id");
+        }
+        if (getVersionCode() < 0) {
+            throw new IllegalRepoException("Repo [" + repoName + "] does not contain versionCode");
+        }
+        if (getMinMagiskVersion() < Const.Value.MIN_MODULE_VER) {
+            throw new IllegalRepoException("Repo [" + repoName + "] is outdated");
+        }
+    }
+
+    public boolean update(Date lastUpdate) throws IllegalRepoException {
+        if (lastUpdate.after(mLastUpdate)) {
+            mLastUpdate = lastUpdate;
+            update();
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public ContentValues getContentValues() {
+        ContentValues values = super.getContentValues();
+        values.put("repo_name", repoName);
+        values.put("last_update", mLastUpdate.getTime());
+        return values;
+    }
+
+    public String getRepoName() {
+        return repoName;
+    }
+
+    public String getZipUrl() {
+        return String.format(Const.Url.ZIP_URL, repoName);
+    }
+
+    public String getManifestUrl() {
+        return String.format(Const.Url.FILE_URL, repoName, "module.prop");
+    }
+
+    public String getDetailUrl() {
+        return String.format(Const.Url.FILE_URL, repoName, "README.md");
+    }
+
+    public Date getLastUpdate() {
+        return mLastUpdate;
+    }
+
+    public class IllegalRepoException extends Exception {
+        IllegalRepoException(String message) {
+            super(message);
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/container/SuLogEntry.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.superuser;
+package com.topjohnwu.magisk.container;
 
 import android.content.ContentValues;
 import android.database.Cursor;

app/src/main/java/com/topjohnwu/magisk/container/TarEntry.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.utils;
+package com.topjohnwu.magisk.container;
 
 import org.kamranzafar.jtar.TarHeader;
 

app/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.utils;
+package com.topjohnwu.magisk.container;
 
 import android.support.annotation.NonNull;
 

app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java

@@ -6,8 +6,8 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.module.Repo;
-import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.container.Repo;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.LinkedList;
@@ -15,17 +15,20 @@ import java.util.List;
 
 public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VER = 2;
+    private static final int DATABASE_VER = 3;
     private static final String TABLE_NAME = "repos";
-    private static final int MIN_TEMPLATE_VER = 3;
 
     private SQLiteDatabase mDb;
     private MagiskManager mm;
 
     public RepoDatabaseHelper(Context context) {
         super(context, "repo.db", null, DATABASE_VER);
-        mDb = getWritableDatabase();
         mm = Utils.getMagiskManager(context);
+        mDb = getWritableDatabase();
+
+        // Clear bad repos
+        mDb.delete(TABLE_NAME, "minMagisk<?",
+                new String[] { String.valueOf(Const.Value.MIN_MODULE_VER) });
     }
 
     @Override
@@ -35,27 +38,45 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        if (oldVersion == 0) {
-            db.execSQL(
-                    "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
-                    "(id TEXT, name TEXT, version TEXT, versionCode INT, " +
-                    "author TEXT, description TEXT, repo_name TEXT, last_update INT, " +
-                    "PRIMARY KEY(id))");
-            oldVersion++;
-        }
-        if (oldVersion == 1) {
-            db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD template INT");
-            oldVersion++;
+        try {
+            if (oldVersion < 3) {
+                db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+                db.execSQL(
+                        "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
+                                "(id TEXT, name TEXT, version TEXT, versionCode INT, minMagisk INT, " +
+                                "author TEXT, description TEXT, repo_name TEXT, last_update INT, " +
+                                "PRIMARY KEY(id))");
+                mm.prefs.edit().remove(Const.Key.ETAG_KEY).apply();
+                oldVersion = 3;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            // Reset database
+            onDowngrade(db, DATABASE_VER, 0);
         }
     }
 
+    @Override
+    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        onUpgrade(db, 0, DATABASE_VER);
+    }
+
     public void clearRepo() {
         mDb.delete(TABLE_NAME, null, null);
     }
 
+
+    public void removeRepo(String id) {
+        mDb.delete(TABLE_NAME, "id=?", new String[] { id });
+    }
+
+    public void removeRepo(Repo repo) {
+        mDb.delete(TABLE_NAME, "repo_name=?", new String[] { repo.getRepoName() });
+    }
+
     public void removeRepo(List<String> list) {
         for (String id : list) {
-            Logger.dev("Remove from DB: " + id);
+            if (id == null) continue;
             mDb.delete(TABLE_NAME, "id=?", new String[] { id });
         }
     }
@@ -74,7 +95,9 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
     }
 
     public Cursor getRepoCursor() {
-        return mDb.query(TABLE_NAME, null, "template>=? AND template<=?", new String[] { String.valueOf(MIN_TEMPLATE_VER), String.valueOf(mm.magiskVersionCode) }, null, null, "name COLLATE NOCASE");
+        return mDb.query(TABLE_NAME, null, "minMagisk<=?",
+                new String[] { String.valueOf(mm.magiskVersionCode) },
+                null, null, "name COLLATE NOCASE");
     }
 
     public List<String> getRepoIDList() {

app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java

@@ -7,11 +7,15 @@ import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.os.Build;
 import android.text.TextUtils;
+import android.widget.Toast;
 
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.superuser.Policy;
-import com.topjohnwu.magisk.superuser.SuLogEntry;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.container.Policy;
+import com.topjohnwu.magisk.container.SuLogEntry;
+import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 
 import java.io.File;
@@ -23,35 +27,87 @@ import java.util.List;
 
 public class SuDatabaseHelper extends SQLiteOpenHelper {
 
-    public static final String ROOT_ACCESS = "root_access";
-    public static final int ROOT_ACCESS_DISABLED = 0;
-    public static final int ROOT_ACCESS_APPS_ONLY = 1;
-    public static final int ROOT_ACCESS_ADB_ONLY = 2;
-    public static final int ROOT_ACCESS_APPS_AND_ADB = 3;
-
-    public static final String MULTIUSER_MODE = "multiuser_mode";
-    public static final int MULTIUSER_MODE_OWNER_ONLY = 0;
-    public static final int MULTIUSER_MODE_OWNER_MANAGED = 1;
-    public static final int MULTIUSER_MODE_USER = 2;
-
-    public static final String MNT_NS = "mnt_ns";
-    public static final int NAMESPACE_MODE_GLOBAL = 0;
-    public static final int NAMESPACE_MODE_REQUESTER = 1;
-    public static final int NAMESPACE_MODE_ISOLATE = 2;
-
     public static final String DB_NAME = "su.db";
-    private static final int DATABASE_VER = 3;
+
+    private static final int DATABASE_VER = 5;
     private static final String POLICY_TABLE = "policies";
     private static final String LOG_TABLE = "logs";
     private static final String SETTINGS_TABLE = "settings";
+    private static final String STRINGS_TABLE = "strings";
 
-    private MagiskManager mm;
+    private static String GLOBAL_DB;
+
+    private Context mContext;
     private PackageManager pm;
     private SQLiteDatabase mDb;
 
+    private static Context preProcess() {
+        Context context;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            Context ce = MagiskManager.get();
+            context = ce.createDeviceProtectedStorageContext();
+            File oldDB = Utils.getDatabasePath(ce, DB_NAME);
+            if (oldDB.exists()) {
+                // Migrate DB path
+                context.moveDatabaseFrom(ce, DB_NAME);
+            }
+        } else {
+            context = MagiskManager.get();
+        }
+        GLOBAL_DB = context.getFilesDir().getParentFile().getParent() + "/magisk.db";
+        File db = Utils.getDatabasePath(context, DB_NAME);
+        if (!db.exists() && Utils.itemExist(GLOBAL_DB)) {
+            // Migrate global DB to ours
+            db.getParentFile().mkdirs();
+            Shell.su(
+                    "magisk --clone-attr " + context.getFilesDir() + " " + GLOBAL_DB,
+                    "chmod 660 " + GLOBAL_DB,
+                    "ln " + GLOBAL_DB + " " + db
+            );
+        }
+        return context;
+    }
+
+    public static void setupSuDB() {
+        MagiskManager mm = MagiskManager.get();
+        // Check if we need to migrate suDB
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && mm.magiskVersionCode >= 1410 &&
+                Utils.getDatabasePath(mm, SuDatabaseHelper.DB_NAME).exists()) {
+            mm.suDB.close();
+            mm.suDB = new SuDatabaseHelper();
+        }
+
+        File suDbFile = mm.suDB.getDbFile();
+
+        if (!Utils.itemExist(GLOBAL_DB)) {
+            // Hard link our DB globally
+            Shell.su_raw("ln " + suDbFile + " " + GLOBAL_DB);
+        }
+
+        // Check if we are linked globally
+        List<String> ret = Shell.sh("ls -l " + suDbFile);
+        if (Utils.isValidShellResponse(ret)) {
+            try {
+                int links = Integer.parseInt(ret.get(0).trim().split("\\s+")[1]);
+                if (links < 2) {
+                    mm.suDB.close();
+                    suDbFile.delete();
+                    new File(suDbFile + "-journal").delete();
+                    mm.suDB = new SuDatabaseHelper();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public SuDatabaseHelper() {
+        this(preProcess());
+    }
+
     public SuDatabaseHelper(Context context) {
         super(context, DB_NAME, null, DATABASE_VER);
-        mm = Utils.getMagiskManager(context);
+        mContext = context;
         pm = context.getPackageManager();
         mDb = getWritableDatabase();
         cleanup();
@@ -64,37 +120,72 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        if (oldVersion == 0) {
-            createTables(db);
-            oldVersion = 2;
-        }
-        if (oldVersion == 1) {
-            // We're dropping column app_name, rename and re-construct table
-            db.execSQL("ALTER TABLE " + POLICY_TABLE + " RENAME TO " + POLICY_TABLE + "_old");
-
-            // Create the new tables
-            createTables(db);
-
-            // Migrate old data to new tables
-            db.execSQL(
-                    "INSERT INTO " + POLICY_TABLE + " SELECT " +
-                    "uid, package_name, policy, until, logging, notification " +
-                    "FROM " + POLICY_TABLE + "_old");
-            db.execSQL("DROP TABLE " + POLICY_TABLE + "_old");
-
-            File oldDB = mm.getDatabasePath("sulog.db");
-            if (oldDB.exists()) {
-                migrateLegacyLogList(oldDB, db);
-                mm.deleteDatabase("sulog.db");
+        try {
+            if (oldVersion == 0) {
+                createTables(db);
+                oldVersion = 3;
             }
-            ++oldVersion;
-        }
-        if (oldVersion == 2) {
-            db.execSQL("UPDATE " + LOG_TABLE + " SET time=time*1000");
-            ++oldVersion;
+            if (oldVersion == 1) {
+                // We're dropping column app_name, rename and re-construct table
+                db.execSQL("ALTER TABLE " + POLICY_TABLE + " RENAME TO " + POLICY_TABLE + "_old");
+
+                // Create the new tables
+                createTables(db);
+
+                // Migrate old data to new tables
+                db.execSQL(
+                        "INSERT INTO " + POLICY_TABLE + " SELECT " +
+                                "uid, package_name, policy, until, logging, notification " +
+                                "FROM " + POLICY_TABLE + "_old");
+                db.execSQL("DROP TABLE " + POLICY_TABLE + "_old");
+
+                File oldDB = Utils.getDatabasePath(MagiskManager.get(), "sulog.db");
+                if (oldDB.exists()) {
+                    migrateLegacyLogList(oldDB, db);
+                    MagiskManager.get().deleteDatabase("sulog.db");
+                }
+                ++oldVersion;
+            }
+            if (oldVersion == 2) {
+                db.execSQL("UPDATE " + LOG_TABLE + " SET time=time*1000");
+                ++oldVersion;
+            }
+            if (oldVersion == 3) {
+                db.execSQL(
+                        "CREATE TABLE IF NOT EXISTS " + STRINGS_TABLE + " " +
+                                "(key TEXT, value TEXT, PRIMARY KEY(key))");
+                ++oldVersion;
+            }
+            if (oldVersion == 4) {
+                db.execSQL("UPDATE " + POLICY_TABLE + " SET uid=uid%100000");
+                ++oldVersion;
+            }
+
+            if (!Utils.itemExist(GLOBAL_DB)) {
+                // Hard link our DB globally
+                Shell.su_raw("ln " + getDbFile() + " " + GLOBAL_DB);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            onDowngrade(db, DATABASE_VER, 0);
         }
     }
 
+    @Override
+    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        MagiskManager.toast(R.string.su_db_corrupt, Toast.LENGTH_LONG);
+        // Remove everything, we do not support downgrade
+        db.execSQL("DROP TABLE IF EXISTS " + POLICY_TABLE);
+        db.execSQL("DROP TABLE IF EXISTS " + LOG_TABLE);
+        db.execSQL("DROP TABLE IF EXISTS " + SETTINGS_TABLE);
+        db.execSQL("DROP TABLE IF EXISTS " + STRINGS_TABLE);
+        onUpgrade(db, 0, DATABASE_VER);
+    }
+
+    public File getDbFile() {
+        return mContext.getDatabasePath(DB_NAME);
+    }
+
     private void createTables(SQLiteDatabase db) {
         // Policies
         db.execSQL(
@@ -121,7 +212,7 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
                 new String[] { String.valueOf(System.currentTimeMillis() / 1000) });
         // Clear outdated logs
         mDb.delete(LOG_TABLE, "time < ?", new String[] { String.valueOf(
-                System.currentTimeMillis() - mm.suLogTimeout * 86400000) });
+                System.currentTimeMillis() - MagiskManager.get().suLogTimeout * 86400000) });
     }
 
     public void deletePolicy(Policy policy) {
@@ -138,7 +229,7 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
 
     public Policy getPolicy(int uid) {
         Policy policy = null;
-        try (Cursor c = mDb.query(POLICY_TABLE, null, "uid=?", new String[] { String.valueOf(uid) }, null, null, null)) {
+        try (Cursor c = mDb.query(POLICY_TABLE, null, "uid=?", new String[] { String.valueOf(uid % 100000) }, null, null, null)) {
             if (c.moveToNext()) {
                 policy = new Policy(c, pm);
             }
@@ -177,18 +268,6 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
             while (c.moveToNext()) {
                 try {
                     Policy policy = new Policy(c, pm);
-                    // The application changed UID for some reason, check user config
-                    if (policy.info.uid != policy.uid) {
-                        if (mm.suReauth) {
-                            // Reauth required, remove from DB
-                            deletePolicy(policy);
-                            continue;
-                        } else {
-                            // No reauth, update to use the new UID
-                            policy.uid = policy.info.uid;
-                            updatePolicy(policy);
-                        }
-                    }
                     ret.add(policy);
                 } catch (PackageManager.NameNotFoundException e) {
                     // The app no longer exist, remove from DB
@@ -262,4 +341,25 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
         }
         return value;
     }
+
+    public void setStrings(String key, String value) {
+        if (value == null) {
+            mDb.delete(STRINGS_TABLE, "key=?", new String[] { key });
+        } else {
+            ContentValues data = new ContentValues();
+            data.put("key", key);
+            data.put("value", value);
+            mDb.replace(STRINGS_TABLE, null, data);
+        }
+    }
+
+    public String getStrings(String key, String defaultValue) {
+        String value = defaultValue;
+        try (Cursor c = mDb.query(STRINGS_TABLE, null, "key=?",new String[] { key }, null, null, null)) {
+            if (c.moveToNext()) {
+                value = c.getString(c.getColumnIndex("value"));
+            }
+        }
+        return value;
+    }
 }

app/src/main/java/com/topjohnwu/magisk/module/Module.java

@@ -1,68 +0,0 @@
-package com.topjohnwu.magisk.module;
-
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-
-public class Module extends BaseModule {
-
-    private String mRemoveFile, mDisableFile, mUpdateFile;
-    private boolean mEnable, mRemove, mUpdated;
-
-    public Module(Shell shell, String path) throws CacheModException {
-
-        parseProps(Utils.readFile(shell, path + "/module.prop"));
-
-        mRemoveFile = path + "/remove";
-        mDisableFile = path + "/disable";
-        mUpdateFile = path + "/update";
-
-        if (getId() == null) {
-            int sep = path.lastIndexOf('/');
-            setId(path.substring(sep + 1));
-        }
-
-        if (getName() == null) {
-            setName(getId());
-        }
-
-        Logger.dev("Creating Module, id: " + getId());
-
-        mEnable = !Utils.itemExist(shell, mDisableFile);
-        mRemove = Utils.itemExist(shell, mRemoveFile);
-        mUpdated = Utils.itemExist(shell, mUpdateFile);
-    }
-
-    public void createDisableFile(Shell shell) {
-        mEnable = false;
-        Utils.createFile(shell, mDisableFile);
-    }
-
-    public void removeDisableFile(Shell shell) {
-        mEnable = true;
-        Utils.removeItem(shell, mDisableFile);
-    }
-
-    public boolean isEnabled() {
-        return mEnable;
-    }
-
-    public void createRemoveFile(Shell shell) {
-        mRemove = true;
-        Utils.createFile(shell, mRemoveFile);
-    }
-
-    public void deleteRemoveFile(Shell shell) {
-        mRemove = false;
-        Utils.removeItem(shell, mRemoveFile);
-    }
-
-    public boolean willBeRemoved() {
-        return mRemove;
-    }
-
-    public boolean isUpdated() {
-        return mUpdated;
-    }
-
-}

app/src/main/java/com/topjohnwu/magisk/module/Repo.java

@@ -1,76 +0,0 @@
-package com.topjohnwu.magisk.module;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.WebService;
-
-import java.util.Date;
-
-public class Repo extends BaseModule {
-
-    private static final String FILE_URL = "https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s";
-    private static final String ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip";
-
-    private String repoName;
-    private Date mLastUpdate;
-
-    public Repo(String name, Date lastUpdate) throws CacheModException {
-        mLastUpdate = lastUpdate;
-        repoName = name;
-        update();
-    }
-
-    public Repo(Cursor c) {
-        super(c);
-        repoName = c.getString(c.getColumnIndex("repo_name"));
-        mLastUpdate = new Date(c.getLong(c.getColumnIndex("last_update")));
-    }
-
-    public void update() throws CacheModException {
-        String props = WebService.getString(getManifestUrl());
-        String lines[] = props.split("\\n");
-        parseProps(lines);
-        Logger.dev("Repo: Fetching prop: " + getId());
-    }
-
-    public boolean update(Date lastUpdate) throws CacheModException {
-        if (lastUpdate.after(mLastUpdate)) {
-            mLastUpdate = lastUpdate;
-            update();
-            return true;
-        }
-        return false;
-    }
-
-    public ContentValues getContentValues() {
-        ContentValues values = new ContentValues();
-        values.put("id", getId());
-        values.put("name", getName());
-        values.put("version", getVersion());
-        values.put("versionCode", getVersionCode());
-        values.put("author", getAuthor());
-        values.put("description", getDescription());
-        values.put("repo_name", repoName);
-        values.put("last_update", mLastUpdate.getTime());
-        values.put("template", getTemplateVersion());
-        return values;
-    }
-
-    public String getZipUrl() {
-        return String.format(ZIP_URL, repoName);
-    }
-
-    public String getManifestUrl() {
-        return String.format(FILE_URL, repoName, "module.prop");
-    }
-
-    public String getDetailUrl() {
-        return String.format(FILE_URL, repoName, "README.md");
-    }
-
-    public Date getLastUpdate() {
-        return mLastUpdate;
-    }
-}

app/src/main/java/com/topjohnwu/magisk/receivers/BootReceiver.java

@@ -19,10 +19,7 @@ public class BootReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
-            // There is currently no need to start an IntentService onBoot
-            // startIntentService(context);
-        }
+        startIntentService(context);
     }
 
 }

app/src/main/java/com/topjohnwu/magisk/receivers/DownloadReceiver.java

@@ -8,6 +8,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.widget.Toast;
 
+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.Utils;
 
@@ -34,7 +35,7 @@ public abstract class DownloadReceiver extends BroadcastReceiver {
                         onDownloadDone(uri);
                         break;
                     default:
-                        Utils.getMagiskManager(context).toast(R.string.download_file_error, Toast.LENGTH_LONG);
+                        MagiskManager.toast(R.string.download_file_error, Toast.LENGTH_LONG);
                         break;
                 }
                 context.unregisterReceiver(this);

app/src/main/java/com/topjohnwu/magisk/receivers/ManagerUpdate.java

@@ -7,7 +7,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.support.v4.content.FileProvider;
 
-import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Utils;
 
 import java.io.File;
@@ -22,21 +22,22 @@ public class ManagerUpdate extends BroadcastReceiver {
                     public void onDownloadDone(Uri uri) {
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                             Intent install = new Intent(Intent.ACTION_INSTALL_PACKAGE);
-                            install.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                            install.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                            install.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                             Uri content = FileProvider.getUriForFile(context,
-                                    "com.topjohnwu.magisk.provider", new File(uri.getPath()));
+                                    context.getPackageName() + ".provider", new File(uri.getPath()));
                             install.setData(content);
                             context.startActivity(install);
                         } else {
                             Intent install = new Intent(Intent.ACTION_VIEW);
                             install.setDataAndType(uri, "application/vnd.android.package-archive");
-                            install.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            install.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                             context.startActivity(install);
                         }
                     }
                 },
-                intent.getStringExtra(MagiskManager.INTENT_LINK),
+                intent.getStringExtra(Const.Key.INTENT_SET_LINK),
                 Utils.getLegalFilename("MagiskManager-v" +
-                        intent.getStringExtra(MagiskManager.INTENT_VERSION) + ".apk"));
+                        intent.getStringExtra(Const.Key.INTENT_SET_VERSION) + ".apk"));
     }
 }

app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java

@@ -5,35 +5,26 @@ import android.content.Context;
 import android.content.Intent;
 
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.superuser.Policy;
+import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 
 public class PackageReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        MagiskManager magiskManager = Utils.getMagiskManager(context);
+        MagiskManager mm = Utils.getMagiskManager(context);
 
         String pkg = intent.getData().getEncodedSchemeSpecificPart();
-        Policy policy = magiskManager.suDB.getPolicy(pkg);
-        if (policy == null)
-            return;
 
         switch (intent.getAction()) {
             case Intent.ACTION_PACKAGE_REPLACED:
                 // This will only work pre-O
-                if (magiskManager.suReauth) {
-                    magiskManager.suDB.deletePolicy(policy);
-                } else {
-                    int uid = intent.getIntExtra(Intent.EXTRA_UID, -1);
-                    // Update the UID if available
-                    if (uid > 0) {
-                        policy.uid = uid % 100000;
-                    }
-                    magiskManager.suDB.updatePolicy(policy);
+                if (mm.suReauth) {
+                    mm.suDB.deletePolicy(pkg);
                 }
                 break;
             case Intent.ACTION_PACKAGE_FULLY_REMOVED:
-                magiskManager.suDB.deletePolicy(policy);
+                mm.suDB.deletePolicy(pkg);
+                Shell.su_raw("magiskhide --rm " + pkg);
                 break;
         }
     }

app/src/main/java/com/topjohnwu/magisk/receivers/RebootReceiver.java

@@ -0,0 +1,14 @@
+package com.topjohnwu.magisk.receivers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.topjohnwu.magisk.utils.Shell;
+
+public class RebootReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Shell.su_raw("/system/bin/reboot");
+    }
+}

app/src/main/java/com/topjohnwu/magisk/services/OnBootIntentService.java

@@ -3,14 +3,16 @@ package com.topjohnwu.magisk.services;
 import android.app.IntentService;
 import android.content.Intent;
 import android.os.Build;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 
+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Utils;
 
 public class OnBootIntentService extends IntentService {
 
-    private static final int ONBOOT_NOTIFICATION_ID = 3;
-
     public OnBootIntentService() {
         super("OnBootIntentService");
     }
@@ -19,16 +21,28 @@ public class OnBootIntentService extends IntentService {
     public void onCreate() {
         super.onCreate();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+            NotificationCompat.Builder builder =
+                    new NotificationCompat.Builder(this, Const.ID.NOTIFICATION_CHANNEL);
             builder.setSmallIcon(R.drawable.ic_magisk)
                     .setContentTitle("onBoot")
                     .setContentText("Running onBoot operations...");
-            startForeground(ONBOOT_NOTIFICATION_ID, builder.build());
+            startForeground(Const.ID.ONBOOT_NOTIFICATION_ID, builder.build());
         }
     }
 
     @Override
     protected void onHandleIntent(Intent intent) {
-        // Currently nothing to do
+        /* Pixel 2 (XL) devices will need to patch dtbo.img.
+         * However, that is not possible if Magisk is installed by
+         * patching boot image with Magisk Manager and fastboot flash
+         * the boot image, since at that time we do not have root.
+         * Check for dtbo status every boot time, and prompt user
+         * to reboot if dtbo wasn't patched and patched by Magisk Manager.
+         * */
+        MagiskManager mm = Utils.getMagiskManager(this);
+        mm.loadMagiskInfo();
+        if (Shell.rootAccess()) {
+            Utils.patchDTBO();
+        }
     }
 }

app/src/main/java/com/topjohnwu/magisk/services/UpdateCheckService.java

@@ -10,8 +10,8 @@ public class UpdateCheckService extends JobService {
 
     @Override
     public boolean onStartJob(JobParameters params) {
-        Utils.getMagiskManager(this).getMagiskInfo();
-        new CheckUpdates(this, true)
+        Utils.getMagiskManager(this).loadMagiskInfo();
+        new CheckUpdates(true)
                 .setCallBack(() -> jobFinished(params, false)).exec();
         return true;
     }

app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java

@@ -9,33 +9,30 @@ import android.widget.Toast;
 
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.container.Policy;
+import com.topjohnwu.magisk.container.SuLogEntry;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.Date;
 
 public class SuReceiver extends BroadcastReceiver {
 
-    public static final int NO_NOTIFICATION = 0;
-    public static final int TOAST = 1;
-
-    private static final int NOTIFY_NORMAL_LOG = 0;
-    private static final int NOTIFY_USER_TOASTS = 1;
-    private static final int NOTIFY_USER_TO_OWNER = 2;
-
     @Override
     public void onReceive(Context context, Intent intent) {
         int fromUid, toUid, pid, mode;
         String command, action;
         Policy policy;
 
-        MagiskManager magiskManager = (MagiskManager) context.getApplicationContext();
+        MagiskManager mm = Utils.getMagiskManager(context);
 
         if (intent == null) return;
 
         mode = intent.getIntExtra("mode", -1);
         if (mode < 0) return;
 
-        if (mode == NOTIFY_USER_TO_OWNER) {
-            magiskManager.toast(R.string.multiuser_hint_owner_request, Toast.LENGTH_LONG);
+        if (mode == Const.Value.NOTIFY_USER_TO_OWNER) {
+            MagiskManager.toast(R.string.multiuser_hint_owner_request, Toast.LENGTH_LONG);
             return;
         }
 
@@ -46,7 +43,7 @@ public class SuReceiver extends BroadcastReceiver {
         action = intent.getStringExtra("action");
         if (action == null) return;
 
-        policy = magiskManager.suDB.getPolicy(fromUid);
+        policy = mm.suDB.getPolicy(fromUid);
         if (policy == null) {
             try {
                 policy = new Policy(fromUid, context.getPackageManager());
@@ -72,11 +69,11 @@ public class SuReceiver extends BroadcastReceiver {
                 return;
         }
 
-        if (policy.notification && magiskManager.suNotificationType == TOAST) {
-            magiskManager.toast(message, Toast.LENGTH_SHORT);
+        if (policy.notification && mm.suNotificationType == Const.Value.NOTIFICATION_TOAST) {
+            MagiskManager.toast(message, Toast.LENGTH_SHORT);
         }
 
-        if (mode == NOTIFY_NORMAL_LOG && policy.logging) {
+        if (mode == Const.Value.NOTIFY_NORMAL_LOG && policy.logging) {
             toUid = intent.getIntExtra("to.uid", -1);
             if (toUid < 0) return;
             pid = intent.getIntExtra("pid", -1);
@@ -87,7 +84,7 @@ public class SuReceiver extends BroadcastReceiver {
             log.fromPid = pid;
             log.command = command;
             log.date = new Date();
-            magiskManager.suDB.addLog(log);
+            mm.suDB.addLog(log);
         }
     }
 }

app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java

@@ -21,6 +21,8 @@ import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.container.Policy;
+import com.topjohnwu.magisk.utils.Const;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -30,12 +32,6 @@ import butterknife.ButterKnife;
 
 public class SuRequestActivity extends Activity {
 
-    public static final int PROMPT = 0;
-    public static final int AUTO_DENY = 1;
-    public static final int AUTO_ALLOW = 2;
-
-    private static final int[] timeoutList = {0, -1, 10, 20, 30, 60};
-
     @BindView(R.id.su_popup) LinearLayout suPopup;
     @BindView(R.id.timeout) Spinner timeout;
     @BindView(R.id.app_icon) ImageView appIcon;
@@ -47,7 +43,7 @@ public class SuRequestActivity extends Activity {
     private String socketPath;
     private LocalSocket socket;
     private PackageManager pm;
-    private MagiskManager magiskManager;
+    private MagiskManager mm;
 
     private boolean hasTimeout;
     private Policy policy;
@@ -59,7 +55,7 @@ public class SuRequestActivity extends Activity {
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         pm = getPackageManager();
-        magiskManager = getMagiskManager();
+        mm = getMagiskManager();
 
         Intent intent = getIntent();
         socketPath = intent.getStringExtra("socket");
@@ -84,14 +80,14 @@ public class SuRequestActivity extends Activity {
     }
 
     private void showRequest() {
-        switch (magiskManager.suResponseType) {
-            case AUTO_DENY:
+        switch (mm.suResponseType) {
+            case Const.Value.SU_AUTO_DENY:
                 handleAction(Policy.DENY, 0);
                 return;
-            case AUTO_ALLOW:
+            case Const.Value.SU_AUTO_ALLOW:
                 handleAction(Policy.ALLOW, 0);
                 return;
-            case PROMPT:
+            case Const.Value.SU_PROMPT:
             default:
         }
 
@@ -113,7 +109,7 @@ public class SuRequestActivity extends Activity {
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         timeout.setAdapter(adapter);
 
-        timer = new CountDownTimer(magiskManager.suRequestTimeout * 1000, 1000) {
+        timer = new CountDownTimer(mm.suRequestTimeout * 1000, 1000) {
             @Override
             public void onTick(long millisUntilFinished) {
                 deny_btn.setText(getString(R.string.deny_with_str, "(" + millisUntilFinished / 1000 + ")"));
@@ -168,14 +164,14 @@ public class SuRequestActivity extends Activity {
     }
 
     void handleAction(int action) {
-        handleAction(action, timeoutList[timeout.getSelectedItemPosition()]);
+        handleAction(action, Const.Value.timeoutList[timeout.getSelectedItemPosition()]);
     }
 
     void handleAction(int action, int time) {
         policy.policy = action;
         if (time >= 0) {
             policy.until = (time == 0) ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
-            magiskManager.suDB.addPolicy(policy);
+            mm.suDB.addPolicy(policy);
         }
         handleAction();
     }
@@ -215,7 +211,7 @@ public class SuRequestActivity extends Activity {
                 }
 
                 int uid = payload.getAsInteger("uid");
-                policy = magiskManager.suDB.getPolicy(uid);
+                policy = mm.suDB.getPolicy(uid);
                 if (policy == null) {
                     policy = new Policy(uid, pm);
                 }

app/src/main/java/com/topjohnwu/magisk/utils/AdaptiveList.java

@@ -1,36 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-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;
-    }
-}

app/src/main/java/com/topjohnwu/magisk/utils/BootSigner.java

@@ -0,0 +1,56 @@
+package com.topjohnwu.magisk.utils;
+
+import android.support.annotation.Keep;
+
+import com.topjohnwu.crypto.SignBoot;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+public class BootSigner {
+
+    @Keep
+    public static void main(String[] args) throws Exception {
+        if (args.length > 0 && "-verify".equals(args[0])) {
+            String certPath = "";
+            if (args.length >= 3 && "-certificate".equals(args[1])) {
+                /* args[2] is the path to a public key certificate */
+                certPath = args[2];
+            }
+            /* args[1] is the path to a signed boot image */
+            boolean signed = SignBoot.verifySignature(System.in,
+                    certPath.isEmpty() ? null : new FileInputStream(certPath));
+            System.exit(signed ? 0 : 1);
+        } else if (args.length > 0 && "-sign".equals(args[0])) {
+            InputStream keyIn, certIn;
+            if (args.length >= 3) {
+                keyIn = new FileInputStream(args[1]);
+                certIn = new FileInputStream(args[2]);
+            } else {
+                /* Use internal test keys */
+                JarFile apk = new JarFile(System.getProperty("java.class.path"));
+                JarEntry keyEntry = apk.getJarEntry("assets/" + Const.PRIVATE_KEY_NAME);
+                JarEntry sigEntry = apk.getJarEntry("assets/" + Const.PUBLIC_KEY_NAME);
+
+                keyIn = apk.getInputStream(keyEntry);
+                certIn = apk.getInputStream(sigEntry);
+            }
+
+            boolean success = SignBoot.doSignature("/boot", System.in, System.out, keyIn, certIn);
+            System.exit(success ? 0 : 1);
+        } else {
+            System.err.println(
+                    "BootSigner <actions> [args]\n" +
+                    "Input from stdin, outputs to stdout\n" +
+                    "\n" +
+                    "Actions:\n" +
+                    "   -verify [x509.pem]\n" +
+                    "      verify image, cert is optional\n" +
+                    "   -sign [pk8] [x509.pem]\n" +
+                    "      sign image, key and cert are optional\n"
+            );
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/utils/Const.java

@@ -0,0 +1,161 @@
+package com.topjohnwu.magisk.utils;
+
+import android.os.Environment;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+public class Const {
+
+    public static final String DEBUG_TAG = "MagiskManager";
+    public static final String ORIG_PKG_NAME = "com.topjohnwu.magisk";
+    public static final String SNET_PKG = "com.topjohnwu.snet";
+    public static final String MAGISKHIDE_PROP = "persist.magisk.hide";
+
+    // APK content
+    public static final String PUBLIC_KEY_NAME = "public.certificate.x509.pem";
+    public static final String PRIVATE_KEY_NAME = "private.key.pk8";
+    public static final String UNINSTALLER = "magisk_uninstaller.sh";
+    public static final String UTIL_FUNCTIONS= "util_functions.sh";
+    public static final String ANDROID_MANIFEST = "AndroidManifest.xml";
+
+    // Paths
+    public static final String MAGISK_DISABLE_FILE = "/cache/.disable_magisk";
+    public static final String TMP_FOLDER_PATH = "/dev/tmp";
+    public static final String MAGISK_LOG = "/cache/magisk.log";
+    public static final File EXTERNAL_PATH = new File(Environment.getExternalStorageDirectory(), "MagiskManager");
+
+    public static String BUSYBOX_PATH() {
+        if (Utils.itemExist("/sbin/.core/busybox/busybox")) {
+            return "/sbin/.core/busybox";
+        } else {
+            return "/dev/magisk/bin";
+        }
+    }
+
+    public static String MAGISK_PATH() {
+        if (Utils.itemExist("/sbin/.core/img")) {
+            return "/sbin/.core/img";
+        } else if (Utils.itemExist("/dev/magisk/img")) {
+            return "/dev/magisk/img";
+        } else {
+            return "/magisk";
+        }
+    }
+
+    public static String MAGISK_HOST_FILE() {
+        return MAGISK_PATH() + "/.core/hosts";
+    }
+
+    /* A list of apps that should not be shown as hide-able */
+    public static final List<String> SN_BLACKLIST =  Arrays.asList(
+            "android",
+            "com.topjohnwu.magisk",
+            "com.google.android.gms"
+    );
+
+    /* A list of apps that already uses SafetyNet
+     * They DO NOT need to be added to hide list */
+    public static final List<String> SN_DEFAULTLIST =  Arrays.asList(
+            "com.google.android.apps.walletnfcrel",
+            "com.nianticlabs.pokemongo"
+    );
+
+    public static class ID {
+        public static final int UPDATE_SERVICE_ID = 1;
+        public static final int FETCH_ZIP = 2;
+        public static final int SELECT_BOOT = 3;
+
+        // notifications
+        public static final int MAGISK_UPDATE_NOTIFICATION_ID = 4;
+        public static final int APK_UPDATE_NOTIFICATION_ID = 5;
+        public static final int ONBOOT_NOTIFICATION_ID = 6;
+        public static final int DTBO_NOTIFICATION_ID = 7;
+        public static final String NOTIFICATION_CHANNEL = "magisk_notification";
+    }
+
+    public static class Url {
+        public static final String STABLE_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/stable.json";
+        public static final String BETA_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/beta.json";
+        public static final String SNET_URL = "https://github.com/topjohnwu/MagiskManager/raw/c0e60c41f26744a86d90dfbd368a73c847db6b70/snet.apk";
+        public static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&page=%d";
+        public static final String FILE_URL = "https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s";
+        public static final String ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip";
+        public static final String DONATION_URL = "https://www.paypal.me/topjohnwu";
+        public static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382";
+        public static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/MagiskManager";
+    }
+
+
+    public static class Key {
+        // su
+        public static final String ROOT_ACCESS = "root_access";
+        public static final String SU_MULTIUSER_MODE = "multiuser_mode";
+        public static final String SU_MNT_NS = "mnt_ns";
+        public static final String SU_REQUESTER = "requester";
+        public static final String SU_REQUEST_TIMEOUT = "su_request_timeout";
+        public static final String SU_AUTO_RESPONSE = "su_auto_response";
+        public static final String SU_NOTIFICATION = "su_notification";
+        public static final String SU_REAUTH = "su_reauth";
+
+        // intents
+        public static final String OPEN_SECTION = "section";
+        public static final String INTENT_SET_VERSION = "version";
+        public static final String INTENT_SET_LINK = "link";
+        public static final String INTENT_PERM = "perm_dialog";
+        public static final String FLASH_ACTION = "action";
+        public static final String FLASH_SET_BOOT = "boot";
+        public static final String FLASH_SET_ENC = "enc";
+        public static final String FLASH_SET_VERITY = "verity";
+
+
+        // others
+        public static final String UPDATE_NOTIFICATION = "notification";
+        public static final String UPDATE_CHANNEL = "update_channel";
+        public static final String CUSTOM_CHANNEL = "custom_channel";
+        public static final String BOOT_FORMAT = "boot_format";
+        public static final String SNET_VER = "snet_version";
+        public static final String UPDATE_SERVICE_VER = "update_service_version";
+        public static final String MAGISKHIDE = "magiskhide";
+        public static final String HOSTS = "hosts";
+        public static final String DISABLE = "disable";
+        public static final String LOCALE = "locale";
+        public static final String DARK_THEME = "dark_theme";
+        public static final String ETAG_KEY = "ETag";
+        public static final String LINK_KEY = "Link";
+        public static final String IF_NONE_MATCH = "If-None-Match";
+    }
+
+
+    public static class Value {
+        public static final int STABLE_CHANNEL = 0;
+        public static final int BETA_CHANNEL = 1;
+        public static final int CUSTOM_CHANNEL = 2;
+        public static final int ROOT_ACCESS_DISABLED = 0;
+        public static final int ROOT_ACCESS_APPS_ONLY = 1;
+        public static final int ROOT_ACCESS_ADB_ONLY = 2;
+        public static final int ROOT_ACCESS_APPS_AND_ADB = 3;
+        public static final int MULTIUSER_MODE_OWNER_ONLY = 0;
+        public static final int MULTIUSER_MODE_OWNER_MANAGED = 1;
+        public static final int MULTIUSER_MODE_USER = 2;
+        public static final int NAMESPACE_MODE_GLOBAL = 0;
+        public static final int NAMESPACE_MODE_REQUESTER = 1;
+        public static final int NAMESPACE_MODE_ISOLATE = 2;
+        public static final int NO_NOTIFICATION = 0;
+        public static final int NOTIFICATION_TOAST = 1;
+        public static final int NOTIFY_NORMAL_LOG = 0;
+        public static final int NOTIFY_USER_TOASTS = 1;
+        public static final int NOTIFY_USER_TO_OWNER = 2;
+        public static final int SU_PROMPT = 0;
+        public static final int SU_AUTO_DENY = 1;
+        public static final int SU_AUTO_ALLOW = 2;
+        public static final String FLASH_ZIP = "flash";
+        public static final String PATCH_BOOT = "patch";
+        public static final String FLASH_MAGISK = "magisk";
+        public static final int[] timeoutList = {0, -1, 10, 20, 30, 60};
+        public static final int UPDATE_SERVICE_VER = 1;
+        public static final int SNET_VER = 4;
+        public static final int MIN_MODULE_VER = 1400;
+    }
+}

app/src/main/java/com/topjohnwu/magisk/utils/Logger.java

@@ -2,17 +2,14 @@ package com.topjohnwu.magisk.utils;
 
 import android.util.Log;
 
-import com.topjohnwu.magisk.MagiskManager;
-
 import java.util.Locale;
 
 public class Logger {
 
-    public static final String MAIN_TAG = "Magisk";
-    public static final String DEBUG_TAG = "MagiskManager";
+    private static final boolean SHELL_LOGGING = false;
 
     public static void debug(String line) {
-        Log.d(DEBUG_TAG, "DEBUG: " + line);
+        Log.d(Const.DEBUG_TAG, "DEBUG: " + line);
     }
 
     public static void debug(String fmt, Object... args) {
@@ -20,30 +17,20 @@ public class Logger {
     }
 
     public static void error(String line) {
-        Log.e(MAIN_TAG, "MANAGERERROR: " + line);
+        Log.e(Const.DEBUG_TAG, "ERROR: " + line);
     }
 
     public static void error(String fmt, Object... args) {
         error(String.format(Locale.US, fmt, args));
     }
 
-    public static void dev(String line) {
-        if (MagiskManager.devLogging) {
-            Log.d(DEBUG_TAG, line);
+    public static void shell(boolean in, String line) {
+        if (SHELL_LOGGING) {
+            Log.d(Const.DEBUG_TAG, (in ? "SHELLIN : " : "SHELLOUT: ") + line);
         }
     }
 
-    public static void dev(String fmt, Object... args) {
-        dev(String.format(Locale.US, fmt, args));
-    }
-
-    public static void shell(String line) {
-        if (MagiskManager.shellLogging) {
-            Log.d(DEBUG_TAG, "SHELL: " + line);
-        }
-    }
-
-    public static void shell(String fmt, Object... args) {
-        shell(String.format(Locale.US, fmt, args));
+    public static void shell(boolean in, String fmt, Object... args) {
+        shell(in, String.format(Locale.US, fmt, args));
     }
 }

app/src/main/java/com/topjohnwu/magisk/utils/SafetyNetHelper.java

@@ -1,114 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.util.Base64;
-
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.common.api.Status;
-import com.google.android.gms.safetynet.SafetyNet;
-import com.topjohnwu.magisk.R;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.security.SecureRandom;
-
-public abstract class SafetyNetHelper
-        implements GoogleApiClient.OnConnectionFailedListener, GoogleApiClient.ConnectionCallbacks {
-
-    private static boolean isRunning = false;
-
-    private GoogleApiClient mGoogleApiClient;
-    private Result ret;
-    protected FragmentActivity mActivity;
-
-    public SafetyNetHelper(FragmentActivity activity) {
-        ret = new Result();
-        mActivity = activity;
-    }
-
-    // Entry point to start test
-    public void requestTest() {
-        if (isRunning)
-            return;
-        // Connect Google Service
-        mGoogleApiClient = new GoogleApiClient.Builder(mActivity)
-                .enableAutoManage(mActivity, this)
-                .addApi(SafetyNet.API)
-                .addConnectionCallbacks(this)
-                .build();
-        mGoogleApiClient.connect();
-        isRunning = true;
-    }
-
-    @Override
-    public void onConnectionFailed(@NonNull ConnectionResult result) {
-        Logger.dev("SN: Google API fail");
-        ret.errmsg = result.getErrorMessage();
-        handleResults(ret);
-    }
-
-    @Override
-    public void onConnectionSuspended(int i) {
-        Logger.dev("SN: Google API Suspended");
-        switch (i) {
-            case CAUSE_NETWORK_LOST:
-                ret.errmsg = mActivity.getString(R.string.safetyNet_network_loss);
-                break;
-            case CAUSE_SERVICE_DISCONNECTED:
-                ret.errmsg = mActivity.getString(R.string.safetyNet_service_disconnected);
-                break;
-        }
-        handleResults(ret);
-    }
-
-    @Override
-    public void onConnected(@Nullable Bundle bundle) {
-        Logger.dev("SN: Google API Connected");
-        // Create nonce
-        byte[] nonce = new byte[24];
-        new SecureRandom().nextBytes(nonce);
-
-        Logger.dev("SN: Check with nonce: " + Base64.encodeToString(nonce, Base64.DEFAULT));
-
-        // Call SafetyNet
-        SafetyNet.SafetyNetApi.attest(mGoogleApiClient, nonce)
-                .setResultCallback(result -> {
-                    Status status = result.getStatus();
-                    if (status.isSuccess()) {
-                        String json = new String(Base64.decode(result.getJwsResult().split("\\.")[1], Base64.DEFAULT));
-                        Logger.dev("SN: Response: " + json);
-                        try {
-                            JSONObject decoded = new JSONObject(json);
-                            ret.ctsProfile = decoded.getBoolean("ctsProfileMatch");
-                            ret.basicIntegrity = decoded.getBoolean("basicIntegrity");
-                            ret.failed = false;
-                        } catch (JSONException e) {
-                            ret.errmsg = mActivity.getString(R.string.safetyNet_res_invalid);
-                        }
-                    } else {
-                        Logger.dev("SN: No response");
-                        ret.errmsg = mActivity.getString(R.string.safetyNet_no_response);
-                    }
-                    // Disconnect
-                    mGoogleApiClient.stopAutoManage(mActivity);
-                    mGoogleApiClient.disconnect();
-                    isRunning = false;
-                    handleResults(ret);
-                });
-    }
-
-    // Callback function to save the results
-    public abstract void handleResults(Result result);
-
-    public static class Result {
-        public boolean failed = true;
-        public String errmsg;
-        public boolean ctsProfile = false;
-        public boolean basicIntegrity = false;
-    }
-}

app/src/main/java/com/topjohnwu/magisk/utils/Shell.java

@@ -1,16 +1,14 @@
 package com.topjohnwu.magisk.utils;
 
-import android.content.Context;
 import android.text.TextUtils;
 
 import com.topjohnwu.magisk.MagiskManager;
 
 import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -21,192 +19,178 @@ import java.util.List;
 
 public class Shell {
 
-    // -1 = problematic/unknown issue; 0 = not rooted; 1 = properly rooted
-    public static int rootStatus;
+    // -2 = not initialized; -1 = no shell; 0 = non root shell; 1 = root shell
+    public static int status = -2;
 
-    private final Process shellProcess;
-    private final DataOutputStream STDIN;
-    private final DataInputStream STDOUT;
+    private final Process process;
+    private final OutputStream STDIN;
+    private final InputStream STDOUT;
+    private final InputStream STDERR;
 
-    private boolean isValid;
-
-    private void testRootShell(DataOutputStream in, DataInputStream out) throws IOException {
-        in.write(("id\n").getBytes("UTF-8"));
-        in.flush();
-        String s = new BufferedReader(new InputStreamReader(out)).readLine();
+    private static void testRootShell(Shell shell) throws IOException {
+        shell.STDIN.write(("id\n").getBytes("UTF-8"));
+        shell.STDIN.flush();
+        String s = new BufferedReader(new InputStreamReader(shell.STDOUT)).readLine();
         if (TextUtils.isEmpty(s) || !s.contains("uid=0")) {
-            in.close();
-            out.close();
+            shell.STDIN.close();
+            shell.STDIN.close();
             throw new IOException();
         }
     }
 
-    private Shell() {
-        rootStatus = 1;
-        Process process = null;
-        DataOutputStream in = null;
-        DataInputStream out = null;
-
-        try {
-            // Try getting global namespace
-            process = Runtime.getRuntime().exec("su --mount-master");
-            in = new DataOutputStream(process.getOutputStream());
-            out = new DataInputStream(process.getInputStream());
-            testRootShell(in, out);
-        } catch (IOException e) {
-            // Feature not implemented, normal root shell
-            try {
-                process = Runtime.getRuntime().exec("su");
-                in = new DataOutputStream(process.getOutputStream());
-                out = new DataInputStream(process.getInputStream());
-                testRootShell(in, out);
-            } catch (IOException e1) {
-                rootStatus = 0;
-            }
-        }
-
-        if (!rootAccess()) {
-            // Try to gain non-root sh
-            try {
-                process = Runtime.getRuntime().exec("sh");
-                in = new DataOutputStream(process.getOutputStream());
-                out = new DataInputStream(process.getInputStream());
-            } catch (IOException e) {
-                // Nothing works....
-                shellProcess = null;
-                STDIN = null;
-                STDOUT = null;
-                isValid = false;
-                return;
-            }
-        }
-
-        isValid = true;
-        shellProcess = process;
-        STDIN = in;
-        STDOUT = out;
-        sh_raw("umask 022");
-    }
-
-    private Shell(String command) {
-        Process process;
-        DataOutputStream in;
-        DataInputStream out;
-
-        try {
-            process = Runtime.getRuntime().exec(command);
-            in = new DataOutputStream(process.getOutputStream());
-            out = new DataInputStream(process.getInputStream());
-        } catch (IOException e) {
-            // Nothing works....
-            shellProcess = null;
-            STDIN = null;
-            STDOUT = null;
-            isValid = false;
-            return;
-        }
-
-        isValid = true;
-        shellProcess = process;
-        STDIN = in;
-        STDOUT = out;
+    public Shell(String command) throws IOException {
+        process = Runtime.getRuntime().exec(command);
+        STDIN = process.getOutputStream();
+        STDOUT = process.getInputStream();
+        STDERR = process.getErrorStream();
     }
 
     public static Shell getShell() {
-        return new Shell();
-    }
+        MagiskManager mm = MagiskManager.get();
+        boolean needNewShell = mm.shell == null;
 
-    public static Shell getShell(String command) {
-        return new Shell(command);
-    }
-
-    public static Shell getShell(Context context) {
-        MagiskManager magiskManager = Utils.getMagiskManager(context);
-        if (magiskManager.shell == null || !magiskManager.shell.isValid) {
-            // Get new shell if needed
-            magiskManager.shell = getShell();
+        if (!needNewShell) {
+            try {
+                mm.shell.process.exitValue();
+                // The process is dead
+                needNewShell = true;
+            } catch (IllegalThreadStateException ignored) {
+                // This should be the expected result
+            }
         }
-        return magiskManager.shell;
+
+        if (needNewShell) {
+            status = 1;
+            try {
+                mm.shell = new Shell("su --mount-master");
+                testRootShell(mm.shell);
+            } catch (IOException e) {
+                // Mount master not implemented
+                try {
+                    mm.shell = new Shell("su");
+                    testRootShell(mm.shell);
+                } catch (IOException e1) {
+                    // No root exists
+                    status = 0;
+                    try {
+                        mm.shell = new Shell("sh");
+                    } catch (IOException e2) {
+                        status = -1;
+                        return null;
+                    }
+                }
+            }
+            if (rootAccess()) {
+                // Load utility shell scripts
+                try (InputStream in  = mm.getAssets().open(Const.UTIL_FUNCTIONS)) {
+                    mm.shell.loadInputStream(in);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+
+                // Root shell initialization
+                String bbpath = Const.BUSYBOX_PATH();
+                mm.shell.run_raw(false, false,
+                        "export PATH=" + bbpath + ":$PATH",
+                        "mount_partitions",
+                        "find_boot_image",
+                        "migrate_boot_backup");
+            }
+        }
+
+        return mm.shell;
     }
 
     public static boolean rootAccess() {
-        return rootStatus > 0;
+        if (status == -2) getShell();
+        return status > 0;
     }
 
-    public void loadInputStream(InputStream in) {
-        try {
-            int read;
-            byte[] bytes = new byte[4096];
-            while ((read = in.read(bytes)) != -1) {
-                STDIN.write(bytes, 0, read);
+    public void run(Collection<String> output, Collection<String> error, String... commands) {
+        StreamGobbler out, err;
+        synchronized (process) {
+            try {
+                out = new StreamGobbler(STDOUT, output);
+                err = new StreamGobbler(STDERR, error);
+                out.start();
+                err.start();
+                run_raw(output != null, error != null, commands);
+                STDIN.write("echo \'-shell-done-\'\necho \'-shell-done-\' >&2\n".getBytes("UTF-8"));
+                STDIN.flush();
+                try {
+                    out.join();
+                    err.join();
+                } catch (InterruptedException ignored) {}
+            } catch (IOException e) {
+                e.printStackTrace();
+                process.destroy();
             }
-            STDIN.flush();
-        } catch (IOException e) {
-            e.printStackTrace();
         }
     }
 
-    public List<String> sh(String... commands) {
-        List<String> res = new ArrayList<>();
-        if (!isValid) return res;
-        sh(res, commands);
-        return res;
-    }
-
-    public void sh_raw(String... commands) {
-        sh_raw(false, commands);
-    }
-
-    public void sh_raw(boolean stdout, String... commands) {
-        if (!isValid) return;
-        synchronized (shellProcess) {
+    public void run_raw(boolean stdout, boolean stderr, String... commands) {
+        String suffix = "\n";
+        if (!stderr) suffix = " 2>/dev/null" + suffix;
+        if (!stdout) suffix = " >/dev/null" + suffix;
+        synchronized (process) {
             try {
                 for (String command : commands) {
-                    Logger.shell(command);
-                    STDIN.write((command + (stdout ? "\n" : " >/dev/null\n")).getBytes("UTF-8"));
+                    Logger.shell(true, command);
+                    STDIN.write((command + suffix).getBytes("UTF-8"));
                     STDIN.flush();
                 }
             } catch (IOException e) {
                 e.printStackTrace();
-                shellProcess.destroy();
-                isValid = false;
+                process.destroy();
             }
         }
     }
 
-    public void sh(Collection<String> output, String... commands) {
-        if (!isValid) return;
-        try {
-            shellProcess.exitValue();
-            isValid = false;
-            return;  // The process is dead, return
-        } catch (IllegalThreadStateException ignored) {
-            // This should be the expected result
-        }
-        synchronized (shellProcess) {
-            StreamGobbler out = new StreamGobbler(STDOUT, output);
-            out.start();
-            sh_raw(true, commands);
-            sh_raw(true, "echo \'-shell-done-\'");
-            try { out.join(); } catch (InterruptedException ignored) {}
+    public void loadInputStream(InputStream in) {
+        synchronized (process) {
+            try {
+                Utils.inToOut(in, STDIN);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
     }
 
-    public List<String> su(String... commands) {
+    public static List<String> sh(String... commands) {
+        List<String> res = new ArrayList<>();
+        sh(res, commands);
+        return res;
+    }
+
+    public static void sh(Collection<String> output, String... commands) {
+        Shell shell = getShell();
+        if (shell == null)
+            return;
+        shell.run(output, null, commands);
+    }
+
+    public static void sh_raw(String... commands) {
+        Shell shell = getShell();
+        if (shell == null)
+            return;
+        shell.run_raw(false, false, commands);
+    }
+
+    public static List<String> su(String... commands) {
         if (!rootAccess()) return sh();
         return sh(commands);
     }
 
-    public void su_raw(String... commands) {
-        if (!rootAccess()) return;
-        sh_raw(commands);
-    }
-
-    public void su(Collection<String> output, String... commands) {
+    public static void su(Collection<String> output, String... commands) {
         if (!rootAccess()) return;
         sh(output, commands);
     }
 
+    public static void su_raw(String... commands) {
+        if (!rootAccess()) return;
+        sh_raw(commands);
+    }
+
     public static abstract class AbstractList<E> extends java.util.AbstractList<E> {
 
         @Override

app/src/main/java/com/topjohnwu/magisk/utils/ShowUI.java

@@ -0,0 +1,298 @@
+package com.topjohnwu.magisk.utils;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.TaskStackBuilder;
+import android.support.v7.app.AlertDialog;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.FlashActivity;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.SplashActivity;
+import com.topjohnwu.magisk.asyncs.RestoreStockBoot;
+import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.receivers.DownloadReceiver;
+import com.topjohnwu.magisk.receivers.ManagerUpdate;
+import com.topjohnwu.magisk.receivers.RebootReceiver;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ShowUI {
+
+    public static void magiskUpdateNotification() {
+        MagiskManager mm = MagiskManager.get();
+
+        Intent intent = new Intent(mm, SplashActivity.class);
+        intent.putExtra(Const.Key.OPEN_SECTION, "magisk");
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mm);
+        stackBuilder.addParentStack(SplashActivity.class);
+        stackBuilder.addNextIntent(intent);
+        PendingIntent pendingIntent = stackBuilder.getPendingIntent(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL);
+        builder.setSmallIcon(R.drawable.ic_magisk)
+                .setContentTitle(mm.getString(R.string.magisk_update_title))
+                .setContentText(mm.getString(R.string.magisk_update_available, mm.remoteMagiskVersionString))
+                .setVibrate(new long[]{0, 100, 100, 100})
+                .setAutoCancel(true)
+                .setContentIntent(pendingIntent);
+
+        NotificationManager notificationManager =
+                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID, builder.build());
+    }
+
+    public static void managerUpdateNotification() {
+        MagiskManager mm = MagiskManager.get();
+
+        Intent intent = new Intent(mm, ManagerUpdate.class);
+        intent.putExtra(Const.Key.INTENT_SET_LINK, mm.managerLink);
+        intent.putExtra(Const.Key.INTENT_SET_VERSION, mm.remoteManagerVersionString);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(mm,
+                Const.ID.APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL);
+        builder.setSmallIcon(R.drawable.ic_magisk)
+                .setContentTitle(mm.getString(R.string.manager_update_title))
+                .setContentText(mm.getString(R.string.manager_download_install))
+                .setVibrate(new long[]{0, 100, 100, 100})
+                .setAutoCancel(true)
+                .setContentIntent(pendingIntent);
+
+        NotificationManager notificationManager =
+                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(Const.ID.APK_UPDATE_NOTIFICATION_ID, builder.build());
+    }
+
+    public static void dtboPatchedNotification() {
+        MagiskManager mm = MagiskManager.get();
+
+        Intent intent = new Intent(mm, RebootReceiver.class);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(mm,
+                Const.ID.DTBO_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL);
+        builder.setSmallIcon(R.drawable.ic_magisk)
+                .setContentTitle(mm.getString(R.string.dtbo_patched_title))
+                .setContentText(mm.getString(R.string.dtbo_patched_reboot))
+                .setVibrate(new long[]{0, 100, 100, 100})
+                .addAction(R.drawable.ic_refresh, mm.getString(R.string.reboot), pendingIntent);
+
+        NotificationManager notificationManager =
+                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(Const.ID.DTBO_NOTIFICATION_ID, builder.build());
+    }
+
+    public static void magiskInstallDialog(Activity activity, boolean enc, boolean verity) {
+        MagiskManager mm = Utils.getMagiskManager(activity);
+        String filename = Utils.getLegalFilename("Magisk-v" + mm.remoteMagiskVersionString + ".zip");
+        new AlertDialogBuilder(activity)
+            .setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.magisk)))
+            .setMessage(mm.getString(R.string.repo_install_msg, filename))
+            .setCancelable(true)
+            .setPositiveButton(R.string.install, (d, i) -> {
+                List<String> options = new ArrayList<>();
+                options.add(mm.getString(R.string.download_zip_only));
+                options.add(mm.getString(R.string.patch_boot_file));
+                if (Shell.rootAccess()) {
+                    options.add(mm.getString(R.string.direct_install));
+                }
+                List<String> res = Shell.su("echo $SLOT");
+                if (Utils.isValidShellResponse(res)) {
+                    options.add(mm.getString(R.string.install_second_slot));
+                }
+                char[] slot = Utils.isValidShellResponse(res) ? res.get(0).toCharArray() : null;
+                new AlertDialog.Builder(activity)
+                    .setTitle(R.string.select_method)
+                    .setItems(
+                        options.toArray(new String [0]),
+                        (dialog, idx) -> {
+                            String boot;
+                            DownloadReceiver receiver = null;
+                            switch (idx) {
+                                case 1:
+                                    if (mm.remoteMagiskVersionCode < 1400) {
+                                        MagiskManager.toast(R.string.no_boot_file_patch_support, Toast.LENGTH_LONG);
+                                        return;
+                                    }
+                                    MagiskManager.toast(R.string.boot_file_patch_msg, Toast.LENGTH_LONG);
+                                    Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+                                    intent.setType("*/*");
+                                    ((com.topjohnwu.magisk.components.Activity) activity)
+                                        .startActivityForResult(intent, Const.ID.SELECT_BOOT,
+                                        (requestCode, resultCode, data) -> {
+                                            if (requestCode == Const.ID.SELECT_BOOT
+                                                    && resultCode == Activity.RESULT_OK && data != null) {
+                                                Utils.dlAndReceive(
+                                                    activity,
+                                                    new DownloadReceiver() {
+                                                        @Override
+                                                        public void onDownloadDone(Uri uri) {
+                                                            Intent intent = new Intent(mm, FlashActivity.class);
+                                                            intent.setData(uri)
+                                                                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                                                .putExtra(Const.Key.FLASH_SET_BOOT, data.getData())
+                                                                .putExtra(Const.Key.FLASH_SET_ENC, enc)
+                                                                .putExtra(Const.Key.FLASH_SET_VERITY, verity)
+                                                                .putExtra(Const.Key.FLASH_ACTION, Const.Value.PATCH_BOOT);
+                                                            mm.startActivity(intent);
+                                                        }
+                                                    },
+                                                    mm.magiskLink,
+                                                    filename
+                                                );
+                                            }
+                                        });
+                                    return;
+                                case 0:
+                                    receiver = new DownloadReceiver() {
+                                        @Override
+                                        public void onDownloadDone(Uri uri) {
+                                            Utils.showUriSnack(activity, uri);
+                                        }
+                                    };
+                                    break;
+                                case 2:
+                                    boot = mm.bootBlock;
+                                    if (boot == null)
+                                        return;
+                                    receiver = new DownloadReceiver() {
+                                        @Override
+                                        public void onDownloadDone(Uri uri) {
+                                            Intent intent = new Intent(mm, FlashActivity.class);
+                                            intent.setData(uri)
+                                                .putExtra(Const.Key.FLASH_SET_BOOT, boot)
+                                                .putExtra(Const.Key.FLASH_SET_ENC, enc)
+                                                .putExtra(Const.Key.FLASH_SET_VERITY, verity)
+                                                .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_MAGISK);
+                                            activity.startActivity(intent);
+                                        }
+                                    };
+                                    break;
+                                case 3:
+                                    assert (slot != null);
+                                    // Choose the other slot
+                                    if (slot[1] == 'a') slot[1] = 'b';
+                                    else slot[1] = 'a';
+                                    // Then find the boot image again
+                                    List<String> ret = Shell.su(
+                                            "SLOT=" + String.valueOf(slot),
+                                            "find_boot_image",
+                                            "echo \"$BOOTIMAGE\""
+                                    );
+                                    boot = Utils.isValidShellResponse(ret) ? ret.get(ret.size() - 1) : null;
+                                    Shell.su_raw("mount_partitions");
+                                    if (boot == null)
+                                        return;
+                                    receiver = new DownloadReceiver() {
+                                        @Override
+                                        public void onDownloadDone(Uri uri) {
+                                            Intent intent = new Intent(mm, FlashActivity.class);
+                                            intent.setData(uri)
+                                                    .putExtra(Const.Key.FLASH_SET_BOOT, boot)
+                                                    .putExtra(Const.Key.FLASH_SET_ENC, enc)
+                                                    .putExtra(Const.Key.FLASH_SET_VERITY, verity)
+                                                    .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_MAGISK);
+                                            activity.startActivity(intent);
+                                        }
+                                    };
+                                default:
+                            }
+                            Utils.dlAndReceive(
+                                    activity,
+                                    receiver,
+                                    mm.magiskLink,
+                                    filename
+                            );
+                        }
+                    ).show();
+            })
+            .setNeutralButton(R.string.release_notes, (d, i) -> {
+                if (mm.releaseNoteLink != null) {
+                    Intent openLink = new Intent(Intent.ACTION_VIEW, Uri.parse(mm.releaseNoteLink));
+                    openLink.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    mm.startActivity(openLink);
+                }
+            })
+            .setNegativeButton(R.string.no_thanks, null)
+            .show();
+    }
+
+    public static void managerInstallDialog(Activity activity) {
+        MagiskManager mm = Utils.getMagiskManager(activity);
+        new AlertDialogBuilder(activity)
+            .setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.app_name)))
+            .setMessage(mm.getString(R.string.repo_install_msg,
+                    Utils.getLegalFilename("MagiskManager-v" +
+                            mm.remoteManagerVersionString + ".apk")))
+            .setCancelable(true)
+            .setPositiveButton(R.string.install, (d, i) -> {
+                Utils.runWithPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE, () -> {
+                    Intent intent = new Intent(mm, ManagerUpdate.class);
+                    intent.putExtra(Const.Key.INTENT_SET_LINK, mm.managerLink);
+                    intent.putExtra(Const.Key.INTENT_SET_VERSION, mm.remoteManagerVersionString);
+                    mm.sendBroadcast(intent);
+                });
+            })
+            .setNegativeButton(R.string.no_thanks, null)
+            .show();
+    }
+
+    public static void uninstallDialog(Activity activity) {
+        MagiskManager mm = Utils.getMagiskManager(activity);
+        new AlertDialogBuilder(activity)
+            .setTitle(R.string.uninstall_magisk_title)
+            .setMessage(R.string.uninstall_magisk_msg)
+            .setPositiveButton(R.string.complete_uninstall, (d, i) -> {
+                try {
+                    InputStream in = mm.getAssets().open(Const.UNINSTALLER);
+                    File uninstaller = new File(mm.getCacheDir(), Const.UNINSTALLER);
+                    FileOutputStream out = new FileOutputStream(uninstaller);
+                    byte[] bytes = new byte[1024];
+                    int read;
+                    while ((read = in.read(bytes)) != -1) {
+                        out.write(bytes, 0, read);
+                    }
+                    in.close();
+                    out.close();
+                    in = mm.getAssets().open(Const.UTIL_FUNCTIONS);
+                    File utils = new File(mm.getCacheDir(), Const.UTIL_FUNCTIONS);
+                    out = new FileOutputStream(utils);
+                    while ((read = in.read(bytes)) != -1) {
+                        out.write(bytes, 0, read);
+                    }
+                    in.close();
+                    out.close();
+                    Shell.su(
+                            "cat " + uninstaller + " > /cache/" + Const.UNINSTALLER,
+                            "cat " + utils + " > /data/magisk/" + Const.UTIL_FUNCTIONS
+                    );
+                    MagiskManager.toast(R.string.uninstall_toast, Toast.LENGTH_LONG);
+                    Shell.su_raw(
+                            "sleep 5",
+                            "pm uninstall " + mm.getApplicationInfo().packageName
+                    );
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            })
+            .setNeutralButton(R.string.restore_stock_boot, (d, i) -> {
+                new RestoreStockBoot().exec();
+            })
+            .setNegativeButton(R.string.no_thanks, null)
+            .show();
+    }
+}

app/src/main/java/com/topjohnwu/magisk/utils/StreamGobbler.java

@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Collection;
+import java.util.Collections;
 
 /**
  * Modified by topjohnwu, based on Chainfire's libsuperuser
@@ -14,8 +15,8 @@ import java.util.Collection;
 
 public class StreamGobbler extends Thread {
 
-    private BufferedReader reader = null;
-    private Collection<String> writer = null;
+    private BufferedReader reader;
+    private Collection<String> writer;
 
     /**
      * <p>StreamGobbler constructor</p>
@@ -24,17 +25,17 @@ public class StreamGobbler extends Thread {
      * possible to prevent a deadlock from occurring, or Process.waitFor() never
      * returning (as the buffer is full, pausing the native process)</p>
      *
-     * @param inputStream InputStream to read from
-     * @param outputList  {@literal List<String>} to write to, or null
+     * @param in InputStream to read from
+     * @param out  {@literal List<String>} to write to, or null
      */
-    public StreamGobbler(InputStream inputStream, Collection<String> outputList) {
+    public StreamGobbler(InputStream in, Collection<String> out) {
         try {
-            while (inputStream.available() != 0) {
-                inputStream.skip(inputStream.available());
+            while (in.available() != 0) {
+                in.skip(in.available());
             }
         } catch (IOException ignored) {}
-        reader = new BufferedReader(new InputStreamReader(inputStream));
-        writer = outputList;
+        reader = new BufferedReader(new InputStreamReader(in));
+        writer = out == null ? null : Collections.synchronizedCollection(out);
     }
 
     @Override
@@ -45,8 +46,8 @@ public class StreamGobbler extends Thread {
             while ((line = reader.readLine()) != null) {
                 if (TextUtils.equals(line, "-shell-done-"))
                     return;
-                writer.add(line);
-                Logger.shell(line);
+                if (writer != null) writer.add(line);
+                Logger.shell(false, line);
             }
         } catch (IOException e) {
             // reader probably closed, expected exit condition

app/src/main/java/com/topjohnwu/magisk/utils/Topic.java

@@ -31,15 +31,19 @@ public class Topic {
     }
 
     public void publish() {
-        publish(true);
+        publish(true, null);
     }
 
     public void publish(boolean record) {
+        publish(record, null);
+    }
+
+    public void publish(boolean record, Object result) {
         hasPublished = record;
         if (subscribers != null) {
             for (WeakReference<Subscriber> subscriber : subscribers) {
                 if (subscriber.get() != null)
-                    subscriber.get().onTopicPublished(this);
+                    subscriber.get().onTopicPublished(this, result);
             }
         }
     }
@@ -60,9 +64,12 @@ public class Topic {
             }
         }
         default void onTopicPublished() {
-            onTopicPublished(null);
+            onTopicPublished(null, null);
         }
-        void onTopicPublished(Topic topic);
+        default void onTopicPublished(Topic topic) {
+            onTopicPublished(topic, null);
+        }
+        void onTopicPublished(Topic topic, Object result);
         Topic[] getSubscription();
     }
 }

app/src/main/java/com/topjohnwu/magisk/utils/Utils.java

@@ -3,50 +3,35 @@ package com.topjohnwu.magisk.utils;
 import android.Manifest;
 import android.app.Activity;
 import android.app.DownloadManager;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
 import android.provider.OpenableColumns;
 import android.support.annotation.StringRes;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.TaskStackBuilder;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.widget.Toast;
 
-import com.topjohnwu.magisk.FlashActivity;
-import com.topjohnwu.magisk.MagiskFragment;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.SplashActivity;
-import com.topjohnwu.magisk.asyncs.RestoreStockBoot;
-import com.topjohnwu.magisk.asyncs.UpdateRepos;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
 import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.receivers.DownloadReceiver;
-import com.topjohnwu.magisk.receivers.ManagerUpdate;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.SecureRandom;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -55,39 +40,28 @@ import java.util.Locale;
 
 public class Utils {
 
-    public static final int SELECT_BOOT_IMG = 3;
-    public static final String UNINSTALLER = "magisk_uninstaller.sh";
-    public static final String UTIL_FUNCTIONS= "util_functions.sh";
     public static boolean isDownloading = false;
 
-    private static final int MAGISK_UPDATE_NOTIFICATION_ID = 1;
-    private static final int APK_UPDATE_NOTIFICATION_ID = 2;
-
-    public static boolean itemExist(Shell shell, String path) {
+    public static boolean itemExist(String path) {
         String command = "[ -e " + path + " ] && echo true || echo false";
-        List<String> ret = shell.su(command);
+        List<String> ret = Shell.su(command);
         return isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(0));
     }
 
-    public static void createFile(Shell shell, String path) {
+    public static void createFile(String path) {
         String folder = path.substring(0, path.lastIndexOf('/'));
         String command = "mkdir -p " + folder + " 2>/dev/null; touch " + path + " 2>/dev/null;";
-        shell.su_raw(command);
+        Shell.su_raw(command);
     }
 
-    public static void removeItem(Shell shell, String path) {
+    public static void removeItem(String path) {
         String command = "rm -rf " + path + " 2>/dev/null";
-        shell.su_raw(command);
+        Shell.su_raw(command);
     }
 
-    public static List<String> getModList(Shell shell, String path) {
-        String command = "ls -d " + path + "/* | grep -v lost+found";
-        return shell.su(command);
-    }
-
-    public static List<String> readFile(Shell shell, String path) {
+    public static List<String> readFile(String path) {
         String command = "cat " + path + " | sed '$a\\ ' | sed '$d'";
-        return shell.su(command);
+        return Shell.su(command);
     }
 
     public static void dlAndReceive(Context context, DownloadReceiver receiver, String link, String filename) {
@@ -95,7 +69,7 @@ public class Utils {
             return;
 
         runWithPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE, () -> {
-            File file = new File(Environment.getExternalStorageDirectory() + "/MagiskManager/" + filename);
+            File file = new File(Const.EXTERNAL_PATH, filename);
 
             if ((!file.getParentFile().exists() && !file.getParentFile().mkdirs())
                     || (file.exists() && !file.delete())) {
@@ -124,10 +98,6 @@ public class Utils {
                 .replace("#", "").replace("@", "").replace("*", "");
     }
 
-    public static boolean lowercaseContains(CharSequence string, CharSequence nonNullLowercaseSearch) {
-        return !TextUtils.isEmpty(string) && string.toString().toLowerCase().contains(nonNullLowercaseSearch);
-    }
-
     public static boolean isValidShellResponse(List<String> list) {
         if (list != null && list.size() != 0) {
             // Check if all empty
@@ -150,23 +120,6 @@ public class Utils {
         return (MagiskManager) context.getApplicationContext();
     }
 
-    public static void checkSafetyNet(FragmentActivity activity) {
-        new SafetyNetHelper(activity) {
-            @Override
-            public void handleResults(Result result) {
-                getMagiskManager(mActivity).SNCheckResult = result;
-                getMagiskManager(mActivity).safetyNetDone.publish(false);
-            }
-        }.requestTest();
-    }
-
-    public static void clearRepoCache(Context context) {
-        MagiskManager mm = getMagiskManager(context);
-        mm.prefs.edit().remove(UpdateRepos.ETAG_KEY).apply();
-        mm.repoDB.clearRepo();
-        mm.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT);
-    }
-
     public static String getNameFromUri(Context context, Uri uri) {
         String name = null;
         try (Cursor c = context.getContentResolver().query(uri, null, null, null, null)) {
@@ -192,99 +145,43 @@ public class Utils {
                 .setAction(R.string.ok, (v)->{}).show();
     }
 
-    public static boolean checkNetworkStatus(Context context) {
-        ConnectivityManager manager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+    public static boolean checkNetworkStatus() {
+        ConnectivityManager manager = (ConnectivityManager)
+                MagiskManager.get().getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = manager.getActiveNetworkInfo();
         return networkInfo != null && networkInfo.isConnected();
     }
 
-    public static void showMagiskUpdateNotification(MagiskManager mm) {
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, MagiskManager.NOTIFICATION_CHANNEL);
-        builder.setSmallIcon(R.drawable.ic_magisk)
-                .setContentTitle(mm.getString(R.string.magisk_update_title))
-                .setContentText(mm.getString(R.string.magisk_update_available, mm.remoteMagiskVersionString))
-                .setVibrate(new long[]{0, 100, 100, 100})
-                .setAutoCancel(true);
-        Intent intent = new Intent(mm, SplashActivity.class);
-        intent.putExtra(MagiskManager.INTENT_SECTION, "magisk");
-        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mm);
-        stackBuilder.addParentStack(SplashActivity.class);
-        stackBuilder.addNextIntent(intent);
-        PendingIntent pendingIntent = stackBuilder.getPendingIntent(MAGISK_UPDATE_NOTIFICATION_ID,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-        builder.setContentIntent(pendingIntent);
-        NotificationManager notificationManager =
-                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.notify(MAGISK_UPDATE_NOTIFICATION_ID, builder.build());
-    }
-
-    public static void showManagerUpdateNotification(MagiskManager mm) {
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, MagiskManager.NOTIFICATION_CHANNEL);
-        builder.setSmallIcon(R.drawable.ic_magisk)
-                .setContentTitle(mm.getString(R.string.manager_update_title))
-                .setContentText(mm.getString(R.string.manager_download_install))
-                .setVibrate(new long[]{0, 100, 100, 100})
-                .setAutoCancel(true);
-        Intent intent = new Intent(mm, ManagerUpdate.class);
-        intent.putExtra(MagiskManager.INTENT_LINK, mm.managerLink);
-        intent.putExtra(MagiskManager.INTENT_VERSION, mm.remoteManagerVersionString);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(mm,
-                APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-        builder.setContentIntent(pendingIntent);
-        NotificationManager notificationManager =
-                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.notify(APK_UPDATE_NOTIFICATION_ID, builder.build());
-    }
-
-    public static void enableMagiskHide(Shell shell) {
-        shell.su_raw("magiskhide --enable");
-    }
-
-    public static void disableMagiskHide(Shell shell) {
-        shell.su_raw("magiskhide --disable");
-    }
-
-    public static List<String> listMagiskHide(Shell shell) {
-        return shell.su("magiskhide --ls");
-    }
-
-    public static void addMagiskHide(Shell shell, String pkg) {
-        shell.su_raw("magiskhide --add " + pkg);
-    }
-
-    public static void rmMagiskHide(Shell shell, String pkg) {
-        shell.su_raw("magiskhide --rm " + pkg);
-    }
-
-    public static String getLocaleString(Context context, Locale locale, @StringRes int id) {
+    public static String getLocaleString(Locale locale, @StringRes int id) {
+        Context context = MagiskManager.get();
         Configuration config = context.getResources().getConfiguration();
         config.setLocale(locale);
         Context localizedContext = context.createConfigurationContext(config);
         return localizedContext.getString(id);
     }
 
-    public static List<Locale> getAvailableLocale(Context context) {
+    public static List<Locale> getAvailableLocale() {
         List<Locale> locales = new ArrayList<>();
         HashSet<String> set = new HashSet<>();
         Locale locale;
 
-        int compareId = R.string.download_file_error;
+        @StringRes int compareId = R.string.download_file_error;
 
         // Add default locale
         locales.add(Locale.ENGLISH);
-        set.add(getLocaleString(context, Locale.ENGLISH, compareId));
+        set.add(getLocaleString(Locale.ENGLISH, compareId));
 
         // Add some special locales
         locales.add(Locale.TAIWAN);
-        set.add(getLocaleString(context, Locale.TAIWAN, compareId));
+        set.add(getLocaleString(Locale.TAIWAN, compareId));
         locale = new Locale("pt", "BR");
         locales.add(locale);
-        set.add(getLocaleString(context, locale, compareId));
+        set.add(getLocaleString(locale, compareId));
 
         // Other locales
-        for (String s : context.getAssets().getLocales()) {
+        for (String s : MagiskManager.get().getAssets().getLocales()) {
             locale = Locale.forLanguageTag(s);
-            if (set.add(getLocaleString(context, locale, compareId))) {
+            if (set.add(getLocaleString(locale, compareId))) {
                 locales.add(locale);
             }
         }
@@ -294,252 +191,63 @@ public class Utils {
         return locales;
     }
 
-    public static String genPackageName(String prefix, int length) {
-        StringBuilder builder = new StringBuilder(length);
-        builder.append(prefix);
-        length -= prefix.length();
-        SecureRandom random = new SecureRandom();
-        String base = "abcdefghijklmnopqrstuvwxyz";
-        String alpha = base + base.toUpperCase();
-        String full = alpha + "0123456789..........";
-        char next, prev = '\0';
-        for (int i = 0; i < length; ++i) {
-            if (prev == '.' || i == length - 1 || i == 0) {
-                next = alpha.charAt(random.nextInt(alpha.length()));
-            } else {
-                next = full.charAt(random.nextInt(full.length()));
-            }
-            builder.append(next);
-            prev = next;
-        }
-        return builder.toString();
-    }
-
     public static void runWithPermission(Context context, String permission, Runnable callback) {
         if (ContextCompat.checkSelfPermission(context, permission) != PackageManager.PERMISSION_GRANTED) {
             // Passed in context should be an activity if not granted, need to show dialog!
-            if (!(context instanceof com.topjohnwu.magisk.components.Activity))
-                return;
-            com.topjohnwu.magisk.components.Activity activity = (com.topjohnwu.magisk.components.Activity) context;
-            activity.setPermissionGrantCallback(callback);
-            ActivityCompat.requestPermissions(activity, new String[] { permission }, 0);
+            Utils.getMagiskManager(context).setPermissionGrantCallback(callback);
+            if (!(context instanceof com.topjohnwu.magisk.components.Activity)) {
+                // Start activity to show dialog
+                Intent intent = new Intent(context, SplashActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent.putExtra(Const.Key.INTENT_PERM, permission);
+                context.startActivity(intent);
+            } else {
+                ActivityCompat.requestPermissions((Activity) context, new String[] { permission }, 0);
+            }
+
         } else {
             callback.run();
         }
     }
 
-    public static void showMagiskInstallDialog(MagiskFragment fragment, boolean enc, boolean verity) {
-        MagiskManager mm = getMagiskManager(fragment.getActivity());
-        String filename = getLegalFilename("Magisk-v" + mm.remoteMagiskVersionString + ".zip");
-        new AlertDialogBuilder(fragment.getActivity())
-            .setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.magisk)))
-            .setMessage(mm.getString(R.string.repo_install_msg, filename))
-            .setCancelable(true)
-            .setPositiveButton(R.string.install, (d, i) -> {
-                List<String> options = new ArrayList<>();
-                options.add(mm.getString(R.string.download_zip_only));
-                options.add(mm.getString(R.string.patch_boot_file));
-                if (Shell.rootAccess()) {
-                    options.add(mm.getString(R.string.direct_install));
-                }
-                List<String> res = Shell.getShell(mm).su("echo $SLOT");
-                if (isValidShellResponse(res)) {
-                    options.add(mm.getString(R.string.install_second_slot));
-                }
-                char[] slot = isValidShellResponse(res) ? res.get(0).toCharArray() : null;
-                new AlertDialog.Builder(fragment.getActivity())
-                    .setTitle(R.string.select_method)
-                    .setItems(
-                        options.toArray(new String [0]),
-                        (dialog, idx) -> {
-                            String boot;
-                            DownloadReceiver receiver = null;
-                            switch (idx) {
-                                case 1:
-                                    if (mm.remoteMagiskVersionCode < 1400) {
-                                        mm.toast(R.string.no_boot_file_patch_support, Toast.LENGTH_LONG);
-                                        return;
-                                    }
-                                    mm.toast(R.string.boot_file_patch_msg, Toast.LENGTH_LONG);
-                                    Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-                                    intent.setType("*/*");
-                                    fragment.startActivityForResult(intent, SELECT_BOOT_IMG,
-                                        (requestCode, resultCode, data) -> {
-                                            if (requestCode == SELECT_BOOT_IMG
-                                                    && resultCode == Activity.RESULT_OK && data != null) {
-                                                dlAndReceive(
-                                                    fragment.getActivity(),
-                                                    new DownloadReceiver() {
-                                                        @Override
-                                                        public void onDownloadDone(Uri uri) {
-                                                            Intent intent = new Intent(mm, FlashActivity.class);
-                                                            intent.setData(uri)
-                                                                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                                                .putExtra(FlashActivity.SET_BOOT, data.getData())
-                                                                .putExtra(FlashActivity.SET_ENC, enc)
-                                                                .putExtra(FlashActivity.SET_VERITY, verity)
-                                                                .putExtra(FlashActivity.SET_ACTION, FlashActivity.PATCH_BOOT);
-                                                            mm.startActivity(intent);
-                                                        }
-                                                    },
-                                                    mm.magiskLink,
-                                                    filename
-                                                );
-                                            }
-                                        });
-                                    return;
-                                case 0:
-                                    receiver = new DownloadReceiver() {
-                                        @Override
-                                        public void onDownloadDone(Uri uri) {
-                                            showUriSnack(fragment.getActivity(), uri);
-                                        }
-                                    };
-                                    break;
-                                case 2:
-                                    boot = fragment.getSelectedBootImage();
-                                    if (boot == null)
-                                        return;
-                                    receiver = new DownloadReceiver() {
-                                        @Override
-                                        public void onDownloadDone(Uri uri) {
-                                            Intent intent = new Intent(mm, FlashActivity.class);
-                                            intent.setData(uri)
-                                                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                                .putExtra(FlashActivity.SET_BOOT, boot)
-                                                .putExtra(FlashActivity.SET_ENC, enc)
-                                                .putExtra(FlashActivity.SET_VERITY, verity)
-                                                .putExtra(FlashActivity.SET_ACTION, FlashActivity.FLASH_MAGISK);
-                                            mm.startActivity(intent);
-                                        }
-                                    };
-                                    break;
-                                case 3:
-                                    assert (slot != null);
-                                    // Choose the other slot
-                                    if (slot[1] == 'a') slot[1] = 'b';
-                                    else slot[1] = 'a';
-                                    // Then find the boot image again
-                                    List<String> ret = Shell.getShell(mm).su(
-                                            "BOOTIMAGE=",
-                                            "SLOT=" + String.valueOf(slot),
-                                            "find_boot_image",
-                                            "echo \"$BOOTIMAGE\""
-                                    );
-                                    boot = isValidShellResponse(ret) ? ret.get(ret.size() - 1) : null;
-                                    Shell.getShell(mm).su_raw("mount_partitions");
-                                    if (boot == null)
-                                        return;
-                                    receiver = new DownloadReceiver() {
-                                        @Override
-                                        public void onDownloadDone(Uri uri) {
-                                            Intent intent = new Intent(mm, FlashActivity.class);
-                                            intent.setData(uri)
-                                                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                                    .putExtra(FlashActivity.SET_BOOT, boot)
-                                                    .putExtra(FlashActivity.SET_ENC, enc)
-                                                    .putExtra(FlashActivity.SET_VERITY, verity)
-                                                    .putExtra(FlashActivity.SET_ACTION, FlashActivity.FLASH_MAGISK);
-                                            mm.startActivity(intent);
-                                        }
-                                    };
-                                default:
-                            }
-                            Utils.dlAndReceive(
-                                    fragment.getActivity(),
-                                    receiver,
-                                    mm.magiskLink,
-                                    filename
-                            );
-                        }
-                    ).show();
-            })
-            .setNeutralButton(R.string.release_notes, (d, i) -> {
-                if (mm.releaseNoteLink != null) {
-                    Intent openLink = new Intent(Intent.ACTION_VIEW, Uri.parse(mm.releaseNoteLink));
-                    openLink.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    mm.startActivity(openLink);
-                }
-            })
-            .setNegativeButton(R.string.no_thanks, null)
-            .show();
+    public static File getDatabasePath(Context context, String dbName) {
+        return new File(context.getFilesDir().getParent() + "/databases", dbName);
     }
 
-    public static void showManagerInstallDialog(Activity activity) {
-        MagiskManager mm = Utils.getMagiskManager(activity);
-        new AlertDialogBuilder(activity)
-                .setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.app_name)))
-                .setMessage(mm.getString(R.string.repo_install_msg,
-                        Utils.getLegalFilename("MagiskManager-v" +
-                                mm.remoteManagerVersionString + ".apk")))
-                .setCancelable(true)
-                .setPositiveButton(R.string.install, (d, i) -> {
-                    Intent intent = new Intent(mm, ManagerUpdate.class);
-                    intent.putExtra(MagiskManager.INTENT_LINK, mm.managerLink);
-                    intent.putExtra(MagiskManager.INTENT_VERSION, mm.remoteManagerVersionString);
-                    mm.sendBroadcast(intent);
-                })
-                .setNegativeButton(R.string.no_thanks, null)
-                .show();
+    public static AssetManager getAssets(String apk) {
+        try {
+            AssetManager asset = AssetManager.class.newInstance();
+            AssetManager.class.getMethod("addAssetPath", String.class).invoke(asset, apk);
+            return asset;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
     }
 
-    public static void showUninstallDialog(MagiskFragment fragment) {
-        MagiskManager mm = Utils.getMagiskManager(fragment.getActivity());
-        new AlertDialogBuilder(fragment.getActivity())
-            .setTitle(R.string.uninstall_magisk_title)
-            .setMessage(R.string.uninstall_magisk_msg)
-            .setPositiveButton(R.string.complete_uninstall, (d, i) -> {
-                try {
-                    InputStream in = mm.getAssets().open(UNINSTALLER);
-                    File uninstaller = new File(mm.getCacheDir(), UNINSTALLER);
-                    FileOutputStream out = new FileOutputStream(uninstaller);
-                    byte[] bytes = new byte[1024];
-                    int read;
-                    while ((read = in.read(bytes)) != -1) {
-                        out.write(bytes, 0, read);
-                    }
-                    in.close();
-                    out.close();
-                    in = mm.getAssets().open(UTIL_FUNCTIONS);
-                    File utils = new File(mm.getCacheDir(), UTIL_FUNCTIONS);
-                    out = new FileOutputStream(utils);
-                    while ((read = in.read(bytes)) != -1) {
-                        out.write(bytes, 0, read);
-                    }
-                    in.close();
-                    out.close();
-                    Shell.getShell(mm).su(
-                            "cat " + uninstaller + " > /cache/" + UNINSTALLER,
-                            "cat " + utils + " > /data/magisk/" + UTIL_FUNCTIONS
-                    );
-                    mm.toast(R.string.uninstall_toast, Toast.LENGTH_LONG);
-                    Shell.getShell(mm).su_raw(
-                            "sleep 5",
-                            "pm uninstall " + mm.getApplicationInfo().packageName
-                    );
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            })
-            .setNeutralButton(R.string.restore_stock_boot, (d, i) -> {
-                String boot = fragment.getSelectedBootImage();
-                if (boot == null) return;
-                new RestoreStockBoot(mm, boot).exec();
-            })
-            .setNegativeButton(R.string.no_thanks, null)
-            .show();
+    public static int inToOut(InputStream in, OutputStream out) throws IOException {
+        int read, total = 0;
+        byte buffer[] = new byte[4096];
+        while ((read = in.read(buffer)) > 0) {
+            out.write(buffer, 0, read);
+            total += read;
+        }
+        out.flush();
+        return total;
     }
 
-    public static boolean useFDE(Context context) {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-                && context.getSystemService(DevicePolicyManager.class).getStorageEncryptionStatus()
-                == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER;
+    public static void patchDTBO() {
+        if (MagiskManager.get().magiskVersionCode >= 1446) {
+            List<String> ret = Shell.su("patch_dtbo_image && echo true || echo false");
+            if (Utils.isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(ret.size() - 1))) {
+                ShowUI.dtboPatchedNotification();
+            }
+        }
     }
 
-    public static Context getEncContext(Context context) {
-        if (useFDE(context))
-            return context.createDeviceProtectedStorageContext();
-        else
-            return context;
+    public static int dpInPx(int dp) {
+        Context context = MagiskManager.get();
+        float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dp * scale + 0.5);
     }
 }

app/src/main/java/com/topjohnwu/magisk/utils/WebService.java

@@ -2,57 +2,50 @@ package com.topjohnwu.magisk.utils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
 
-import javax.net.ssl.HttpsURLConnection;
-
 public class WebService {
 
-    public final static int GET = 1;
-    public final static int POST = 2;
-
     public static String getString(String url) {
         return getString(url, null);
     }
 
     public static String getString(String url, Map<String, String> header) {
-        InputStream in  = request(GET, url, header);
-        if (in == null) return "";
-        BufferedReader br = new BufferedReader(new InputStreamReader(in));
-        int len;
-        StringBuilder builder = new StringBuilder();
-        char buf[] = new char[4096];
-        try {
-            while ((len = br.read(buf)) != -1) {
-                builder.append(buf, 0, len);
-            }
-            in.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return builder.toString();
+        HttpURLConnection conn = request(url, header);
+        if (conn == null) return "";
+        return getString(conn);
     }
 
-    public static InputStream request(int method, String address, Map<String, String> header) {
-        Logger.dev("WebService: Service call " + address);
+    public static String getString(HttpURLConnection conn) {
+        try {
+            StringBuilder builder = new StringBuilder();
+            if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+                int len;
+                char buf[] = new char[4096];
+                while ((len = br.read(buf)) != -1) {
+                    builder.append(buf, 0, len);
+                }
+            }
+            conn.disconnect();
+            return builder.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    public static HttpURLConnection request(String address, Map<String, String> header) {
         try {
             URL url = new URL(address);
 
             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
             conn.setReadTimeout(15000);
             conn.setConnectTimeout(15000);
-            conn.setDoInput(true);
-
-            if (method == POST) {
-                conn.setRequestMethod("POST");
-            } else if (method == GET) {
-                conn.setRequestMethod("GET");
-            }
 
             if (header != null) {
                 for (Map.Entry<String, String> entry : header.entrySet()) {
@@ -60,20 +53,20 @@ public class WebService {
                 }
             }
 
-            if (conn.getResponseCode() == HttpsURLConnection.HTTP_OK) {
-                if (header != null) {
-                    header.clear();
-                    for (Map.Entry<String, List<String>> entry : conn.getHeaderFields().entrySet()) {
-                        List<String> l = entry.getValue();
-                        header.put(entry.getKey(), l.get(l.size() - 1));
-                    }
+            conn.connect();
+
+            if (header != null) {
+                header.clear();
+                for (Map.Entry<String, List<String>> entry : conn.getHeaderFields().entrySet()) {
+                    List<String> l = entry.getValue();
+                    header.put(entry.getKey(), l.get(l.size() - 1));
                 }
-                return conn.getInputStream();
             }
+
+            return conn;
         } catch (Exception e) {
             e.printStackTrace();
+            return null;
         }
-        return null;
     }
-
 }

app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java

@@ -1,184 +1,27 @@
 package com.topjohnwu.magisk.utils;
 
-import android.content.Context;
-import android.text.TextUtils;
+import android.content.res.AssetManager;
 
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-import org.bouncycastle.cms.CMSTypedData;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.encoders.Base64;
+import com.topjohnwu.crypto.JarMap;
+import com.topjohnwu.crypto.SignAPK;
+import com.topjohnwu.magisk.MagiskManager;
 
 import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.security.DigestOutputStream;
-import java.security.GeneralSecurityException;
-import java.security.KeyFactory;
-import java.security.MessageDigest;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.Security;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
 import java.util.jar.JarInputStream;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.regex.Pattern;
-
-/*
-* Modified from from AOSP(Marshmallow) SignAPK.java
-* */
 
 public class ZipUtils {
-    // File name in assets
-    private static final String PUBLIC_KEY_NAME = "public.certificate.x509.pem";
-    private static final String PRIVATE_KEY_NAME = "private.key.pk8";
-    private static final String UNHIDE_APK = "unhide.apk";
-
-    private static final String CERT_SF_NAME = "META-INF/CERT.SF";
-    private static final String CERT_SIG_NAME = "META-INF/CERT.%s";
-
-    private static final String ANDROID_MANIFEST = "AndroidManifest.xml";
-    private static final byte[] UNHIDE_PKG_NAME = "com.topjohnwu.unhide\0".getBytes();
-
-    private static Provider sBouncyCastleProvider;
-    // bitmasks for which hash algorithms we need the manifest to include.
-    private static final int USE_SHA1 = 1;
-    private static final int USE_SHA256 = 2;
 
     static {
-        sBouncyCastleProvider = new BouncyCastleProvider();
-        Security.insertProviderAt(sBouncyCastleProvider, 1);
         System.loadLibrary("zipadjust");
     }
 
     public native static void zipAdjust(String filenameIn, String filenameOut);
 
-    public static String generateUnhide(Context context, File output) {
-        File temp = new File(context.getCacheDir(), "temp.apk");
-        String pkg = "";
-        try {
-            JarInputStream source = new JarInputStream(context.getAssets().open(UNHIDE_APK));
-            JarOutputStream dest = new JarOutputStream(new FileOutputStream(temp));
-            JarEntry entry;
-            int size;
-            byte buffer[] = new byte[4096];
-            while ((entry = source.getNextJarEntry()) != null) {
-                dest.putNextEntry(new JarEntry(entry.getName()));
-                if (TextUtils.equals(entry.getName(), ANDROID_MANIFEST)) {
-                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                    while((size = source.read(buffer)) != -1) {
-                        baos.write(buffer, 0, size);
-                    }
-                    int offset = -1;
-                    byte xml[] = baos.toByteArray();
-
-                    // 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)
-                        return "";
-
-                    // 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());
-                    dest.write(xml);
-                } else {
-                    while((size = source.read(buffer)) != -1) {
-                        dest.write(buffer, 0, size);
-                    }
-                }
-            }
-            source.close();
-            dest.close();
-            signZip(context, temp, output, false);
-            temp.delete();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return pkg;
-        }
-        return pkg;
-    }
-
-    public static void removeTopFolder(InputStream in, File output) throws IOException {
-        try {
-            JarInputStream source = new JarInputStream(in);
-            JarOutputStream dest = new JarOutputStream(new BufferedOutputStream(new FileOutputStream(output)));
-            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);
-                }
-            }
-            source.close();
-            dest.close();
-            in.close();
-        } catch (IOException e) {
-            Logger.dev("ZipUtils: removeTopFolder IO error!");
-            throw e;
-        }
-    }
-
     public static void unzip(File zip, File folder, String path, boolean junkPath) throws Exception {
         InputStream in = new BufferedInputStream(new FileInputStream(zip));
         unzip(in, folder, path, junkPath);
@@ -186,7 +29,6 @@ public class ZipUtils {
     }
 
     public static void unzip(InputStream zip, File folder, String path, boolean junkPath) throws Exception {
-        byte data[] = new byte[4096];
         try {
             JarInputStream zipfile = new JarInputStream(zip);
             JarEntry entry;
@@ -201,16 +43,11 @@ public class ZipUtils {
                 } else {
                     name = entry.getName();
                 }
-                Logger.dev("ZipUtils: Extracting: " + entry);
                 File dest = new File(folder, name);
                 dest.getParentFile().mkdirs();
-                FileOutputStream out = new FileOutputStream(dest);
-                int count;
-                while ((count = zipfile.read(data)) != -1) {
-                    out.write(data, 0, count);
+                try (FileOutputStream out = new FileOutputStream(dest)) {
+                    Utils.inToOut(zipfile, out);
                 }
-                out.flush();
-                out.close();
             }
         } catch(Exception e) {
             e.printStackTrace();
@@ -218,478 +55,18 @@ public class ZipUtils {
         }
     }
 
-    public static void signZip(Context context, File input, File output, boolean minSign) {
-        int alignment = 4;
-        JarFile inputJar = null;
-        BufferedOutputStream outputFile = null;
-        int hashes = 0;
-        try {
-            X509Certificate publicKey = readPublicKey(context.getAssets().open(PUBLIC_KEY_NAME));
-            hashes |= getDigestAlgorithm(publicKey);
-
-            // Set the ZIP file timestamp to the starting valid time
-            // of the 0th certificate plus one hour (to match what
-            // we've historically done).
-            long timestamp = publicKey.getNotBefore().getTime() + 3600L * 1000;
-            PrivateKey privateKey = readPrivateKey(context.getAssets().open(PRIVATE_KEY_NAME));
-
-            outputFile = new BufferedOutputStream(new FileOutputStream(output));
-            if (minSign) {
-                ZipUtils.signWholeFile(input, publicKey, privateKey, outputFile);
-            } else {
-                inputJar = new JarFile(input, false);  // Don't verify.
-                JarOutputStream outputJar = new JarOutputStream(outputFile);
-                // For signing .apks, use the maximum compression to make
-                // them as small as possible (since they live forever on
-                // the system partition).  For OTA packages, use the
-                // default compression level, which is much much faster
-                // and produces output that is only a tiny bit larger
-                // (~0.1% on full OTA packages I tested).
-                outputJar.setLevel(9);
-                Manifest manifest = addDigestsToManifest(inputJar, hashes);
-                copyFiles(manifest, inputJar, outputJar, timestamp, alignment);
-                signFile(manifest, inputJar, publicKey, privateKey, outputJar);
-                outputJar.close();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (inputJar != null) inputJar.close();
-                if (outputFile != null) outputFile.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
+    public static void signZip(InputStream is, File output, boolean minSign) throws Exception {
+        signZip(new JarMap(is, false), output, minSign);
     }
 
-
-    /**
-     * Return one of USE_SHA1 or USE_SHA256 according to the signature
-     * algorithm specified in the cert.
-     */
-    private static int getDigestAlgorithm(X509Certificate cert) {
-        String sigAlg = cert.getSigAlgName().toUpperCase(Locale.US);
-        if ("SHA1WITHRSA".equals(sigAlg) ||
-                "MD5WITHRSA".equals(sigAlg)) {     // see "HISTORICAL NOTE" above.
-            return USE_SHA1;
-        } else if (sigAlg.startsWith("SHA256WITH")) {
-            return USE_SHA256;
-        } else {
-            throw new IllegalArgumentException("unsupported signature algorithm \"" + sigAlg +
-                    "\" in cert [" + cert.getSubjectDN());
-        }
-    }
-    /** Returns the expected signature algorithm for this key type. */
-    private static String getSignatureAlgorithm(X509Certificate cert) {
-        String sigAlg = cert.getSigAlgName().toUpperCase(Locale.US);
-        String keyType = cert.getPublicKey().getAlgorithm().toUpperCase(Locale.US);
-        if ("RSA".equalsIgnoreCase(keyType)) {
-            if (getDigestAlgorithm(cert) == USE_SHA256) {
-                return "SHA256withRSA";
-            } else {
-                return "SHA1withRSA";
-            }
-        } else if ("EC".equalsIgnoreCase(keyType)) {
-            return "SHA256withECDSA";
-        } else {
-            throw new IllegalArgumentException("unsupported key type: " + keyType);
-        }
-    }
-    // Files matching this pattern are not copied to the output.
-    private static Pattern stripPattern =
-            Pattern.compile("^(META-INF/((.*)[.](SF|RSA|DSA|EC)|com/android/otacert))|(" +
-                    Pattern.quote(JarFile.MANIFEST_NAME) + ")$");
-    private static X509Certificate readPublicKey(InputStream input)
-            throws IOException, GeneralSecurityException {
-        try {
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            return (X509Certificate) cf.generateCertificate(input);
-        } finally {
-            input.close();
-        }
+    public static void signZip(File input, File output, boolean minSign) throws Exception {
+        signZip(new JarMap(input, false), output, minSign);
     }
 
-    /** Read a PKCS#8 format private key. */
-    private static PrivateKey readPrivateKey(InputStream input)
-            throws IOException, GeneralSecurityException {
-        try {
-            byte[] buffer = new byte[4096];
-            int size = input.read(buffer);
-            byte[] bytes = Arrays.copyOf(buffer, size);
-            /* Check to see if this is in an EncryptedPrivateKeyInfo structure. */
-            PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(bytes);
-            /*
-             * Now it's in a PKCS#8 PrivateKeyInfo structure. Read its Algorithm
-             * OID and use that to construct a KeyFactory.
-             */
-            ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(spec.getEncoded()));
-            PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject());
-            String algOid = pki.getPrivateKeyAlgorithm().getAlgorithm().getId();
-            return KeyFactory.getInstance(algOid).generatePrivate(spec);
-        } finally {
-            input.close();
-        }
-    }
-    /**
-     * Add the hash(es) of every file to the manifest, creating it if
-     * necessary.
-     */
-    private static Manifest addDigestsToManifest(JarFile jar, int hashes)
-            throws IOException, GeneralSecurityException {
-        Manifest input = jar.getManifest();
-        Manifest output = new Manifest();
-        Attributes main = output.getMainAttributes();
-        if (input != null) {
-            main.putAll(input.getMainAttributes());
-        } else {
-            main.putValue("Manifest-Version", "1.0");
-            main.putValue("Created-By", "1.0 (Android SignApk)");
-        }
-        MessageDigest md_sha1 = null;
-        MessageDigest md_sha256 = null;
-        if ((hashes & USE_SHA1) != 0) {
-            md_sha1 = MessageDigest.getInstance("SHA1");
-        }
-        if ((hashes & USE_SHA256) != 0) {
-            md_sha256 = MessageDigest.getInstance("SHA256");
-        }
-        byte[] buffer = new byte[4096];
-        int num;
-        // We sort the input entries by name, and add them to the
-        // output manifest in sorted order.  We expect that the output
-        // map will be deterministic.
-        TreeMap<String, JarEntry> byName = new TreeMap<String, JarEntry>();
-        for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements(); ) {
-            JarEntry entry = e.nextElement();
-            byName.put(entry.getName(), entry);
-        }
-        for (JarEntry entry: byName.values()) {
-            String name = entry.getName();
-            if (!entry.isDirectory() &&
-                    (stripPattern == null || !stripPattern.matcher(name).matches())) {
-                InputStream data = jar.getInputStream(entry);
-                while ((num = data.read(buffer)) > 0) {
-                    if (md_sha1 != null) md_sha1.update(buffer, 0, num);
-                    if (md_sha256 != null) md_sha256.update(buffer, 0, num);
-                }
-                Attributes attr = null;
-                if (input != null) attr = input.getAttributes(name);
-                attr = attr != null ? new Attributes(attr) : new Attributes();
-                if (md_sha1 != null) {
-                    attr.putValue("SHA1-Digest",
-                            new String(Base64.encode(md_sha1.digest()), "ASCII"));
-                }
-                if (md_sha256 != null) {
-                    attr.putValue("SHA-256-Digest",
-                            new String(Base64.encode(md_sha256.digest()), "ASCII"));
-                }
-                output.getEntries().put(name, attr);
-            }
-        }
-        return output;
-    }
-
-    /** Write to another stream and track how many bytes have been
-     *  written.
-     */
-    private static class CountOutputStream extends FilterOutputStream {
-        private int mCount;
-        public CountOutputStream(OutputStream out) {
-            super(out);
-            mCount = 0;
-        }
-        @Override
-        public void write(int b) throws IOException {
-            super.write(b);
-            mCount++;
-        }
-        @Override
-        public void write(byte[] b, int off, int len) throws IOException {
-            super.write(b, off, len);
-            mCount += len;
-        }
-        public int size() {
-            return mCount;
-        }
-    }
-    /** Write a .SF file with a digest of the specified manifest. */
-    private static void writeSignatureFile(Manifest manifest, OutputStream out,
-                                           int hash)
-            throws IOException, GeneralSecurityException {
-        Manifest sf = new Manifest();
-        Attributes main = sf.getMainAttributes();
-        main.putValue("Signature-Version", "1.0");
-        main.putValue("Created-By", "1.0 (Android SignApk)");
-        MessageDigest md = MessageDigest.getInstance(
-                hash == USE_SHA256 ? "SHA256" : "SHA1");
-        PrintStream print = new PrintStream(
-                new DigestOutputStream(new ByteArrayOutputStream(), md),
-                true, "UTF-8");
-        // Digest of the entire manifest
-        manifest.write(print);
-        print.flush();
-        main.putValue(hash == USE_SHA256 ? "SHA-256-Digest-Manifest" : "SHA1-Digest-Manifest",
-                new String(Base64.encode(md.digest()), "ASCII"));
-        Map<String, Attributes> entries = manifest.getEntries();
-        for (Map.Entry<String, Attributes> entry : entries.entrySet()) {
-            // Digest of the manifest stanza for this entry.
-            print.print("Name: " + entry.getKey() + "\r\n");
-            for (Map.Entry<Object, Object> att : entry.getValue().entrySet()) {
-                print.print(att.getKey() + ": " + att.getValue() + "\r\n");
-            }
-            print.print("\r\n");
-            print.flush();
-            Attributes sfAttr = new Attributes();
-            sfAttr.putValue(hash == USE_SHA256 ? "SHA-256-Digest" : "SHA1-Digest-Manifest",
-                    new String(Base64.encode(md.digest()), "ASCII"));
-            sf.getEntries().put(entry.getKey(), sfAttr);
-        }
-        CountOutputStream cout = new CountOutputStream(out);
-        sf.write(cout);
-        // A bug in the java.util.jar implementation of Android platforms
-        // up to version 1.6 will cause a spurious IOException to be thrown
-        // if the length of the signature file is a multiple of 1024 bytes.
-        // As a workaround, add an extra CRLF in this case.
-        if ((cout.size() % 1024) == 0) {
-            cout.write('\r');
-            cout.write('\n');
-        }
-    }
-    /** Sign data and write the digital signature to 'out'. */
-    private static void writeSignatureBlock(
-            CMSTypedData data, X509Certificate publicKey, PrivateKey privateKey,
-            OutputStream out)
-            throws IOException,
-            CertificateEncodingException,
-            OperatorCreationException,
-            CMSException {
-        ArrayList<X509Certificate> certList = new ArrayList<>(1);
-        certList.add(publicKey);
-        JcaCertStore certs = new JcaCertStore(certList);
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-        ContentSigner signer = new JcaContentSignerBuilder(getSignatureAlgorithm(publicKey))
-                .setProvider(sBouncyCastleProvider)
-                .build(privateKey);
-        gen.addSignerInfoGenerator(
-                new JcaSignerInfoGeneratorBuilder(
-                        new JcaDigestCalculatorProviderBuilder()
-                                .setProvider(sBouncyCastleProvider)
-                                .build())
-                        .setDirectSignature(true)
-                        .build(signer, publicKey));
-        gen.addCertificates(certs);
-        CMSSignedData sigData = gen.generate(data, false);
-        ASN1InputStream asn1 = new ASN1InputStream(sigData.getEncoded());
-        DEROutputStream dos = new DEROutputStream(out);
-        dos.writeObject(asn1.readObject());
-    }
-    /**
-     * Copy all the files in a manifest from input to output.  We set
-     * the modification times in the output to a fixed time, so as to
-     * reduce variation in the output file and make incremental OTAs
-     * more efficient.
-     */
-    private static void copyFiles(Manifest manifest, JarFile in, JarOutputStream out,
-                                  long timestamp, int alignment) throws IOException {
-        byte[] buffer = new byte[4096];
-        int num;
-        Map<String, Attributes> entries = manifest.getEntries();
-        ArrayList<String> names = new ArrayList<String>(entries.keySet());
-        Collections.sort(names);
-        boolean firstEntry = true;
-        long offset = 0L;
-        // We do the copy in two passes -- first copying all the
-        // entries that are STORED, then copying all the entries that
-        // have any other compression flag (which in practice means
-        // DEFLATED).  This groups all the stored entries together at
-        // the start of the file and makes it easier to do alignment
-        // on them (since only stored entries are aligned).
-        for (String name : names) {
-            JarEntry inEntry = in.getJarEntry(name);
-            JarEntry outEntry = null;
-            if (inEntry.getMethod() != JarEntry.STORED) continue;
-            // Preserve the STORED method of the input entry.
-            outEntry = new JarEntry(inEntry);
-            outEntry.setTime(timestamp);
-            // 'offset' is the offset into the file at which we expect
-            // the file data to begin.  This is the value we need to
-            // make a multiple of 'alignement'.
-            offset += JarFile.LOCHDR + outEntry.getName().length();
-            if (firstEntry) {
-                // The first entry in a jar file has an extra field of
-                // four bytes that you can't get rid of; any extra
-                // data you specify in the JarEntry is appended to
-                // these forced four bytes.  This is JAR_MAGIC in
-                // JarOutputStream; the bytes are 0xfeca0000.
-                offset += 4;
-                firstEntry = false;
-            }
-            if (alignment > 0 && (offset % alignment != 0)) {
-                // Set the "extra data" of the entry to between 1 and
-                // alignment-1 bytes, to make the file data begin at
-                // an aligned offset.
-                int needed = alignment - (int)(offset % alignment);
-                outEntry.setExtra(new byte[needed]);
-                offset += needed;
-            }
-            out.putNextEntry(outEntry);
-            InputStream data = in.getInputStream(inEntry);
-            while ((num = data.read(buffer)) > 0) {
-                out.write(buffer, 0, num);
-                offset += num;
-            }
-            out.flush();
-        }
-        // Copy all the non-STORED entries.  We don't attempt to
-        // maintain the 'offset' variable past this point; we don't do
-        // alignment on these entries.
-        for (String name : names) {
-            JarEntry inEntry = in.getJarEntry(name);
-            JarEntry outEntry = null;
-            if (inEntry.getMethod() == JarEntry.STORED) continue;
-            // Create a new entry so that the compressed len is recomputed.
-            outEntry = new JarEntry(name);
-            outEntry.setTime(timestamp);
-            out.putNextEntry(outEntry);
-            InputStream data = in.getInputStream(inEntry);
-            while ((num = data.read(buffer)) > 0) {
-                out.write(buffer, 0, num);
-            }
-            out.flush();
-        }
-    }
-
-    // This class is to provide a file's content, but trimming out the last two bytes
-    // Used for signWholeFile
-    private static class CMSProcessableFile implements CMSTypedData {
-
-        private File file;
-        private ASN1ObjectIdentifier type;
-        private byte[] buffer;
-        int bufferSize = 0;
-
-        CMSProcessableFile(File file) {
-            this.file = file;
-            type = new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId());
-            buffer = new byte[4096];
-        }
-
-        @Override
-        public ASN1ObjectIdentifier getContentType() {
-            return type;
-        }
-
-        @Override
-        public void write(OutputStream out) throws IOException, CMSException {
-            FileInputStream input = new FileInputStream(file);
-            long len = file.length() - 2;
-            while ((bufferSize = input.read(buffer)) > 0) {
-                if (len <= bufferSize) {
-                    out.write(buffer, 0, (int) len);
-                    break;
-                } else {
-                    out.write(buffer, 0, bufferSize);
-                }
-                len -= bufferSize;
-            }
-        }
-
-        @Override
-        public Object getContent() {
-            return file;
-        }
-
-        byte[] getTail() {
-            return Arrays.copyOfRange(buffer, 0, bufferSize);
-        }
-    }
-
-    private static void signWholeFile(File input, X509Certificate publicKey,
-                                      PrivateKey privateKey, OutputStream outputStream)
-            throws Exception {
-        ByteArrayOutputStream temp = new ByteArrayOutputStream();
-        // put a readable message and a null char at the start of the
-        // archive comment, so that tools that display the comment
-        // (hopefully) show something sensible.
-        // TODO: anything more useful we can put in this message?
-        byte[] message = "signed by SignApk".getBytes("UTF-8");
-        temp.write(message);
-        temp.write(0);
-
-        CMSProcessableFile cmsFile = new CMSProcessableFile(input);
-        writeSignatureBlock(cmsFile, publicKey, privateKey, temp);
-
-        // For a zip with no archive comment, the
-        // end-of-central-directory record will be 22 bytes long, so
-        // we expect to find the EOCD marker 22 bytes from the end.
-        byte[] zipData = cmsFile.getTail();
-        if (zipData[zipData.length-22] != 0x50 ||
-                zipData[zipData.length-21] != 0x4b ||
-                zipData[zipData.length-20] != 0x05 ||
-                zipData[zipData.length-19] != 0x06) {
-            throw new IllegalArgumentException("zip data already has an archive comment");
-        }
-        int total_size = temp.size() + 6;
-        if (total_size > 0xffff) {
-            throw new IllegalArgumentException("signature is too big for ZIP file comment");
-        }
-        // signature starts this many bytes from the end of the file
-        int signature_start = total_size - message.length - 1;
-        temp.write(signature_start & 0xff);
-        temp.write((signature_start >> 8) & 0xff);
-        // Why the 0xff bytes?  In a zip file with no archive comment,
-        // bytes [-6:-2] of the file are the little-endian offset from
-        // the start of the file to the central directory.  So for the
-        // two high bytes to be 0xff 0xff, the archive would have to
-        // be nearly 4GB in size.  So it's unlikely that a real
-        // commentless archive would have 0xffs here, and lets us tell
-        // an old signed archive from a new one.
-        temp.write(0xff);
-        temp.write(0xff);
-        temp.write(total_size & 0xff);
-        temp.write((total_size >> 8) & 0xff);
-        temp.flush();
-        // Signature verification checks that the EOCD header is the
-        // last such sequence in the file (to avoid minzip finding a
-        // fake EOCD appended after the signature in its scan).  The
-        // odds of producing this sequence by chance are very low, but
-        // let's catch it here if it does.
-        byte[] b = temp.toByteArray();
-        for (int i = 0; i < b.length-3; ++i) {
-            if (b[i] == 0x50 && b[i+1] == 0x4b && b[i+2] == 0x05 && b[i+3] == 0x06) {
-                throw new IllegalArgumentException("found spurious EOCD header at " + i);
-            }
-        }
-        cmsFile.write(outputStream);
-        outputStream.write(total_size & 0xff);
-        outputStream.write((total_size >> 8) & 0xff);
-        temp.writeTo(outputStream);
-    }
-    private static void signFile(Manifest manifest, JarFile inputJar,
-                                 X509Certificate publicKey, PrivateKey privateKey,
-                                 JarOutputStream outputJar)
-            throws Exception {
-        // Assume the certificate is valid for at least an hour.
-        long timestamp = publicKey.getNotBefore().getTime() + 3600L * 1000;
-        // MANIFEST.MF
-        JarEntry je = new JarEntry(JarFile.MANIFEST_NAME);
-        je.setTime(timestamp);
-        outputJar.putNextEntry(je);
-        manifest.write(outputJar);
-        je = new JarEntry(CERT_SF_NAME);
-        je.setTime(timestamp);
-        outputJar.putNextEntry(je);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        writeSignatureFile(manifest, baos, getDigestAlgorithm(publicKey));
-        byte[] signedData = baos.toByteArray();
-        outputJar.write(signedData);
-        // CERT.{EC,RSA} / CERT#.{EC,RSA}
-        final String keyType = publicKey.getPublicKey().getAlgorithm();
-        je = new JarEntry(String.format(CERT_SIG_NAME, keyType));
-        je.setTime(timestamp);
-        outputJar.putNextEntry(je);
-        writeSignatureBlock(new CMSProcessableByteArray(signedData),
-                publicKey, privateKey, outputJar);
+    public static void signZip(JarMap input, File output, boolean minSign) throws Exception {
+        AssetManager assets = MagiskManager.get().getAssets();
+        SignAPK.signZip(
+                assets.open(Const.PUBLIC_KEY_NAME), assets.open(Const.PRIVATE_KEY_NAME),
+                input, output, minSign);
     }
 }

app/src/main/res/drawable/ic_arrow.xml

@@ -9,5 +9,5 @@
         android:fillColor="#000000"
         android:pathData="M7.41 7.84L12 12.42l4.59-4.58L18 9.25l-6 6-6-6z" />
     <path
-        android:pathData="M0-.75h24v24H0z" />
+        android:pathData="M0-0.75h24v24H0z" />
 </vector>

app/src/main/res/drawable/ic_delete.xml

@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#000"
+        android:fillColor="?attr/imageColorTint"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,85 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="3842.2534"
+        android:viewportHeight="3842.2534">
+    <group android:translateX="557.1268"
+            android:translateY="557.1268">
+        <path
+            android:pathData="M665,874"
+            android:strokeColor="#626262"
+            android:fillColor="#c3afe5"
+            android:strokeWidth="3"/>
+        <path
+            android:pathData="M1263,1244c-238.9,170.6 -487.1,149.8 -601,-221c-20.2,-65.8 -63.9,478 186,584c74.2,31.5 34.8,-78.8 167,-179c74.5,-56.5 294.6,-217.3 248,-184z"
+            android:fillColor="#fbbcc9"/>
+        <path
+            android:pathData="M1231,1679c-64.6,63.2 -78.9,85.3 -162,158c-119.8,104.9 -241,-42 -223,-12c107.9,179.8 389.1,481.3 376,406c-26,-148.8 -46,-225 -28,-364c12.8,-99.3 58.8,-209.3 37,-188z"
+            android:fillColor="#ffffff"/>
+        <path
+            android:pathData="M1538,1856c18,139 -2,215.2 -28,364c-13.1,75.3 268.1,-226.3 376,-406c18,-30 -103.2,116.9 -223,12c-83.1,-72.7 -97.4,-94.8 -162,-158c-21.8,-21.3 24.2,88.7 37,188z"
+            android:fillColor="#ffffff"/>
+        <path
+            android:pathData="M1322,1731"
+            android:fillColor="#ff6e40"/>
+        <path
+            android:pathData="M1031,1974"
+            android:fillColor="#3747a9"/>
+        <path
+            android:pathData="M1148,1590"
+            android:fillColor="#f9e398"/>
+        <path
+            android:pathData="M1195,1193c-36.8,-163.5 -422.2,-66 -524,-325c-22.7,-57.7 30.6,415.1 319,427c139.7,5.8 212.2,-69.9 205,-102z"
+            android:fillColor="#3747a9"/>
+        <path
+            android:pathData="M1125,798c-5.7,-129.6 -56,-350 -116,-344c-60,6 -211.7,96.5 -184,134c146.9,198.9 237.2,380.7 407,520c22.8,18.7 -101.8,-191.6 -107,-310z"
+            android:fillColor="#ffffff"/>
+        <path
+            android:pathData="M1294,1332l-62,-70"
+            android:fillColor="#e4007e"/>
+        <path
+            android:pathData="M694,1134"
+            android:fillColor="#e4007e"/>
+        <path
+            android:pathData="M959,906c-96.4,-102 -170,-306 -170,-306c0,0 -104.8,125.6 -97,192c10.5,89.2 104.6,173.6 230,208c134.2,36.8 291,121 291,121c-188.9,-119 -149,-104 -254,-215z"
+            android:fillColor="#ff6e40"/>
+        <path
+            android:pathData="M1330,1364c26,10.2 14.6,-538.8 26.6,-685.8c12,-146.9 -77.7,-237.2 -110.6,-264.2c-33,-27 -96.1,-6.4 -172,19c85.9,58.9 129,129 141,225c-18,221.9 101,330 115,706z"
+            android:fillColor="#ffb327"/>
+        <path
+            android:pathData="M1229.3,1429.8c-131.5,37.9 -182.5,220.5 -315.2,243.1c-27.4,4.7 -58.3,12.9 -94.3,11.2c-67.3,-3.2 -152.4,-41.3 -266.1,-202.6c-33.6,-47.7 83.4,307.1 377,311.5c215,3.2 240.1,-210.5 383.4,-217c51.7,-2.3 55,-101 55,-101c0,0 -61.8,-67.6 -139.7,-45.2z"
+            android:fillColor="#303030"/>
+        <path
+            android:pathData="M1507.7,1430.8c131.5,37.9 182.5,220.5 315.2,243.1c27.4,4.7 58.3,12.9 94.3,11.2c67.3,-3.2 152.4,-41.3 266.1,-202.6c33.6,-47.7 -83.4,307.1 -377,311.5c-215,3.2 -240.1,-210.5 -383.4,-217c-51.7,-2.3 -55,-101 -55,-101c0,0 61.8,-67.6 139.7,-45.2z"
+            android:fillColor="#303030"/>
+        <path
+            android:pathData="M761,1626"
+            android:fillColor="#ffb327"/>
+        <path
+            android:pathData="M1721,1428c132.2,100.2 92.8,210.5 167,179c249.9,-106 206.2,-649.8 186,-584c-113.9,370.8 -362.1,391.5 -601,221c-46.7,-33.3 173.5,127.5 248,184z"
+            android:fillColor="#fbbcc9"/>
+        <path
+            android:pathData="M1268.6,1665c0,0 13.5,80.5 -3,258c-20.7,222.5 84.8,576 84.8,576c0,0 143.8,-354.2 118.7,-583c-20.6,-188.1 9.3,-253.8 3,-245c-110.5,152.6 -203.5,-6 -203.5,-6z"
+            android:fillColor="#303030"/>
+        <path
+            android:pathData="M1746,1295c288.4,-11.9 341.7,-484.7 319,-427c-101.8,259 -487.2,161.5 -524,325c-7.2,32.1 65.3,107.8 205,102z"
+            android:fillColor="#3747a9"/>
+        <path
+            android:pathData="M1504,1108c169.8,-139.3 260.1,-321 407,-520c27.7,-37.5 -124,-128 -184,-134c-60,-6 -110.3,214.4 -116,344c-5.2,118.4 -129.8,328.7 -107,310z"
+            android:fillColor="#ffffff"/>
+        <path
+            android:pathData="M1504,1262l-62,70"
+            android:fillColor="#e4007e"/>
+        <path
+            android:pathData="M1523,1121c0,0 156.8,-84.3 291,-121c125.4,-34.3 219.5,-118.8 230,-208c7.8,-66.4 -97,-192 -97,-192c0,0 -73.6,204 -170,306c-105,111 -65.1,96 -254,215z"
+            android:fillColor="#ff6e40"/>
+        <path
+            android:pathData="M1521,658c12,-96 55.1,-166.1 141,-225c-75.9,-25.4 -139,-46 -172,-19c-33,27 -122.6,117.3 -110.6,264.2c12,146.9 0.7,695.9 26.6,685.8c14,-376 133,-484.1 115,-706z"
+            android:fillColor="#ffb327"/>
+        <path
+            android:pathData="M998,2109"
+            android:strokeColor="#626262"
+            android:fillColor="#00000000"
+            android:strokeWidth="3"/>
+    </group>
+</vector>

app/src/main/res/drawable/ic_refresh.xml

@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?attr/imageColorTint"
         android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
 </vector>

app/src/main/res/drawable/ic_save.xml

@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?attr/imageColorTint"
         android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
 </vector>

app/src/main/res/layout/activity_flash.xml

@@ -3,27 +3,34 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
-    android:background="@android:color/black"
+    android:background="@color/flashing_background_color"
     tools:context="com.topjohnwu.magisk.FlashActivity">
 
     <include layout="@layout/toolbar"/>
 
-    <HorizontalScrollView
+    <ScrollView
+        android:id="@+id/scrollView"
         android:layout_weight="1"
         android:layout_width="match_parent"
         android:layout_height="0dp">
 
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/flash_logs"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            app:layoutManager="android.support.v7.widget.LinearLayoutManager">
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        </android.support.v7.widget.RecyclerView>
+            <TextView
+                android:id="@+id/txtLog"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="monospace"
+                android:padding="8dp"
+                android:textColor="@android:color/white"
+                android:textSize="10sp" />
 
-    </HorizontalScrollView>
+        </HorizontalScrollView>
+
+    </ScrollView>
 
     <LinearLayout
         android:id="@+id/button_panel"
@@ -31,7 +38,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:background="@android:color/darker_gray"
+        android:background="@color/button_panel_background_color"
         android:orientation="horizontal"
         android:visibility="gone">
 
@@ -43,6 +50,14 @@
             android:layout_weight="1"
             android:text="@string/close" />
 
+        <Button
+            android:id="@+id/save_logs"
+            style="?android:borderlessButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:text="@string/menuSaveLog" />
+
         <Button
             android:id="@+id/reboot"
             style="?android:borderlessButtonStyle"

app/src/main/res/layout/alert_dialog.xml

@@ -9,26 +9,19 @@
         android:id="@+id/message_panel"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingBottom="12dip"
+        android:paddingEnd="20dip"
+        android:paddingStart="20dip"
+        android:paddingTop="12dip">
 
-        <ScrollView
+        <TextView
+            android:id="@+id/message"
+            style="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:overScrollMode="ifContentScrolls"
-            android:paddingBottom="12dip"
-            android:paddingEnd="20dip"
-            android:paddingStart="20dip"
-            android:paddingTop="12dip">
-
-            <TextView
-                android:id="@+id/message"
-                style="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="5dip" />
-
-        </ScrollView>
+            android:padding="5dip" />
 
     </LinearLayout>
 

app/src/main/res/layout/fragment_magisk.xml

@@ -21,7 +21,6 @@
             android:orientation="vertical">
 
             <android.support.v7.widget.CardView
-                android:id="@+id/magisk_update_card"
                 style="?attr/cardStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -32,65 +31,54 @@
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="@dimen/card_elevation">
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/magisk_update_icon"
-                        android:layout_width="25dp"
-                        android:layout_height="25dp"
-                        android:layout_centerVertical="true"
-                        android:layout_margin="15dp"
-                        android:layout_toStartOf="@+id/magisk_update_status"
-                        android:src="@drawable/ic_refresh"
-                        android:visibility="gone" />
-
-                    <ProgressBar
-                        android:id="@+id/magisk_update_progress"
-                        android:layout_width="25dp"
-                        android:layout_height="25dp"
-                        android:layout_centerVertical="true"
-                        android:layout_margin="15dp"
-                        android:layout_toStartOf="@+id/magisk_update_status" />
-
-                    <TextView
-                        android:id="@+id/magisk_update_status"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:layout_centerVertical="true"
-                        android:gravity="center"
-                        android:minWidth="225dp"
-                        android:padding="6dp"
-                        android:text="@string/checking_for_updates"
-                        android:textStyle="bold" />
-
-                </RelativeLayout>
-
-            </android.support.v7.widget.CardView>
-
-            <android.support.v7.widget.CardView
-                style="?attr/cardStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginEnd="5dp"
-                android:layout_marginStart="5dp"
-                android:layout_marginTop="4dp"
-                app:cardCornerRadius="@dimen/card_corner_radius"
-                app:cardElevation="@dimen/card_elevation" >
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:paddingBottom="7dp"
+                    android:paddingTop="7dp">
+
+                    <RelativeLayout
+                        android:id="@+id/magisk_update"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp">
+
+                        <ImageView
+                            android:id="@+id/magisk_update_icon"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_centerVertical="true"
+                            android:layout_toStartOf="@+id/magisk_update_status"
+                            android:visibility="gone" />
+
+                        <ProgressBar
+                            android:id="@+id/magisk_update_progress"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_centerVertical="true"
+                            android:layout_toStartOf="@+id/magisk_update_status" />
+
+                        <TextView
+                            android:id="@+id/magisk_update_status"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerHorizontal="true"
+                            android:layout_centerVertical="true"
+                            android:gravity="center"
+                            android:minWidth="225dp"
+                            android:padding="6dp"
+                            android:text="@string/checking_for_updates"
+                            android:textStyle="bold" />
+
+                    </RelativeLayout>
 
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_marginBottom="5dp"
-                        android:layout_marginTop="15dp"
+                        android:layout_marginTop="5dp"
                         android:orientation="horizontal">
 
                         <ImageView
@@ -98,8 +86,6 @@
                             android:layout_width="25dp"
                             android:layout_height="25dp"
                             android:layout_centerVertical="true"
-                            android:layout_marginEnd="15dp"
-                            android:layout_marginStart="15dp"
                             android:layout_toStartOf="@+id/magisk_version" />
 
                         <TextView
@@ -116,35 +102,6 @@
 
                     </RelativeLayout>
 
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginBottom="15dp"
-                        android:layout_marginTop="5dp"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:id="@+id/root_status_icon"
-                            android:layout_width="25dp"
-                            android:layout_height="25dp"
-                            android:layout_centerVertical="true"
-                            android:layout_marginEnd="15dp"
-                            android:layout_marginStart="15dp"
-                            android:layout_toStartOf="@+id/root_status" />
-
-                        <TextView
-                            android:id="@+id/root_status"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerHorizontal="true"
-                            android:layout_centerVertical="true"
-                            android:gravity="center"
-                            android:minWidth="225dp"
-                            android:padding="6dp"
-                            android:textStyle="bold" />
-
-                    </RelativeLayout>
-
                 </LinearLayout>
 
             </android.support.v7.widget.CardView>
@@ -178,8 +135,7 @@
                             android:layout_centerVertical="true"
                             android:layout_margin="15dp"
                             android:layout_toStartOf="@+id/safetyNet_status"
-                            android:src="@drawable/ic_refresh"
-                            android:tint="?attr/imageColorTint" />
+                            android:src="@drawable/ic_refresh" />
 
                         <ProgressBar
                             android:id="@+id/safetyNet_check_progress"
@@ -267,61 +223,6 @@
 
             </android.support.v7.widget.CardView>
 
-            <android.support.v7.widget.CardView
-                android:id="@+id/bootimage_card"
-                style="?attr/cardStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginBottom="4dp"
-                android:layout_marginEnd="5dp"
-                android:layout_marginStart="5dp"
-                android:layout_marginTop="4dp"
-                app:cardCornerRadius="@dimen/card_corner_radius"
-                app:cardElevation="@dimen/card_elevation" >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginBottom="15dp"
-                    android:layout_marginTop="15dp"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:paddingBottom="10dp"
-                        android:text="@string/boot_image_title"
-                        android:textStyle="bold" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginEnd="25dp"
-                        android:layout_marginStart="25dp"
-                        android:minHeight="35dp"
-                        android:orientation="horizontal">
-
-                        <Spinner
-                            android:id="@+id/block_spinner"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1" />
-
-                        <Button
-                            android:id="@+id/detect_bootimage"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/detect_button"
-                            android:visibility="gone" />
-                    </LinearLayout>
-
-                </LinearLayout>
-
-            </android.support.v7.widget.CardView>
-
             <android.support.v7.widget.CardView
                 android:id="@+id/install_option_card"
                 style="?attr/cardStyle"
@@ -382,33 +283,36 @@
                 android:layout_marginStart="5dp"
                 android:layout_marginTop="4dp"
                 android:clickable="true"
+                android:focusable="true"
                 android:foreground="?android:attr/selectableItemBackground"
                 android:visibility="gone"
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="@dimen/card_elevation">
 
-                <LinearLayout
+                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginEnd="25dp"
-                    android:layout_marginStart="25dp"
-                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginEnd="40dp"
+                    android:layout_marginStart="40dp"
+                    android:layout_marginTop="10dp"
                     android:orientation="horizontal">
 
                     <ImageView
                         android:id="@+id/imageView"
                         android:layout_width="50dp"
-                        android:layout_height="wrap_content"
+                        android:layout_height="50dp"
+                        android:layout_alignParentStart="true"
+                        android:layout_centerVertical="true"
                         android:layout_marginEnd="5dp"
-                        android:layout_weight="0"
-                        app:srcCompat="@mipmap/ic_launcher" />
+                        app:srcCompat="@mipmap/ic_launcher_round" />
 
                     <TextView
                         android:id="@+id/install_text"
-                        android:layout_width="match_parent"
+                        android:layout_width="180dp"
                         android:layout_height="match_parent"
-                        android:layout_weight="1"
+                        android:layout_centerHorizontal="true"
+                        android:layout_centerVertical="true"
                         android:ems="10"
                         android:fontFamily="sans-serif"
                         android:gravity="center"
@@ -417,15 +321,7 @@
                         android:textSize="20sp"
                         android:textStyle="bold" />
 
-                    <FrameLayout
-                        android:layout_width="50dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginStart="5dp"
-                        android:layout_weight="0">
-
-                    </FrameLayout>
-
-                </LinearLayout>
+                </RelativeLayout>
 
             </android.support.v7.widget.CardView>
 
@@ -442,7 +338,8 @@
                 android:clickable="true"
                 android:foreground="?android:attr/selectableItemBackground"
                 app:cardCornerRadius="@dimen/card_corner_radius"
-                app:cardElevation="@dimen/card_elevation">
+                app:cardElevation="@dimen/card_elevation"
+                android:focusable="true">
 
                 <TextView
                     android:layout_width="match_parent"

app/src/main/res/layout/list_item_app.xml

@@ -56,9 +56,9 @@
                 android:ellipsize="marquee"
                 android:gravity="center_vertical"
                 android:marqueeRepeatLimit="marquee_forever"
-                android:maxLines="1"
                 android:paddingEnd="3dp"
-                android:paddingStart="3dp"/>
+                android:paddingStart="3dp"
+                android:singleLine="true"/>
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/list_item_flashlog.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/textView"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:fontFamily="monospace"
-    android:textColor="@android:color/white"
-    android:textSize="10sp" />

app/src/main/res/menu/drawer.xml

@@ -15,6 +15,10 @@
             android:icon="@drawable/ic_superuser"
             android:title="@string/superuser"
             android:visible="false"/>
+        <item
+            android:id="@+id/magiskhide"
+            android:icon="@drawable/ic_autoroot"
+            android:title="@string/magiskhide" />
 
     </group>
 
@@ -32,32 +36,28 @@
             android:icon="@drawable/ic_cloud_download"
             android:title="@string/downloads"/>
 
-        <item
-            android:id="@+id/magiskhide"
-            android:icon="@drawable/ic_autoroot"
-            android:title="@string/magiskhide"/>
+    </group>
+
+    <group
+        android:checkableBehavior="single"
+        android:id="@+id/third_group">
 
         <item
             android:id="@+id/log"
             android:icon="@drawable/ic_bug_report"
-            android:title="@string/log"/>
-
-    </group>
-
-    <group
-        android:checkableBehavior="none"
-        android:id="@+id/third_group">
-
+            android:title="@string/log" />
         <item
+            android:checkable="false"
             android:id="@+id/settings"
             android:icon="@drawable/ic_settings"
             android:title="@string/settings"/>
 
         <item
+            android:checkable="false"
             android:id="@+id/app_about"
             android:icon="@drawable/ic_info_outline"
             android:title="@string/about"/>
 
     </group>
 
-</menu>
+</menu>

app/src/main/res/menu/menu_log.xml

@@ -5,7 +5,7 @@
     <item
         android:id="@+id/menu_save"
         android:icon="@drawable/ic_save"
-        android:title="@string/menuSaveToSd"
+        android:title="@string/menuSaveLog"
         app:showAsAction="ifRoom"/>
 
     <item

app/src/main/res/menu/menu_magiskhide.xml

@@ -4,6 +4,7 @@
 
     <item
         android:id="@+id/app_search"
+        android:title=""
         app:actionViewClass="android.widget.SearchView"
         app:showAsAction="always"/>
 </menu>

app/src/main/res/menu/menu_repo.xml

@@ -4,6 +4,7 @@
 
     <item
         android:id="@+id/repo_search"
+        android:title=""
         app:actionViewClass="android.widget.SearchView"
         app:showAsAction="always"/>
 </menu>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/values-ar/strings.xml

@@ -14,29 +14,20 @@
 
     <string name="checking_for_updates">البحث عن تحديثات…</string>
     <string name="magisk_update_available">Magisk v%1$s متاح!</string>
-    <string name="cannot_check_updates">لا يمكن التحقق من التحديثات، لا يوجد إنترنت؟</string>
-    <string name="root_error">مروت لكن لا يوجد إذن الروت، غير مسموح به؟</string>
-    <string name="not_rooted">غير مروت</string>
     <string name="safetyNet_check_text">انقر لبدء فحص SafetyNet</string>
     <string name="checking_safetyNet_status">التحقق من حالة SafetyNet…</string>
     <string name="safetyNet_check_success">نجح فحص SafetyNet</string>
-    <string name="safetyNet_no_response">لا يمكن التحقق من SafetyNet، لا يوجد إنترنت؟</string>
     <string name="safetyNet_network_loss">فقدان الاتصال بالشبكة</string>
     <string name="safetyNet_service_disconnected">تم إنهاء الخدمة</string>
     <string name="safetyNet_res_invalid">الاستجابة غير صالحه</string>
 
     <!--Install Fragment-->
-    <string name="auto_detect">(تلقائي) %1$s</string>
-    <string name="cannot_auto_detect">(لا يمكن الكشف التلقائي)</string>
-    <string name="boot_image_title">موقع ملف الإقلاع</string>
-    <string name="detect_button">تحقق</string>
     <string name="advanced_settings_title">إعدادات متقدمة</string>
     <string name="keep_force_encryption">الحفاظ علي قوه التشفير</string>
     <string name="keep_dm_verity">إبقاء dm-verity</string>
     <string name="current_magisk_title">نسخة Magisk المثبته: %1$s</string>
     <string name="install_magisk_title">آخر نسخة Magisk: %1$s</string>
     <string name="uninstall">إلغاء التثبيت</string>
-    <string name="reboot_countdown">إعادة التشغيل في %1$d</string>
     <string name="uninstall_magisk_title">إلغاء تثبيت Magisk</string>
 
     <!--Module Fragment-->
@@ -55,7 +46,6 @@
     <string name="not_installed">غير مثبت</string>
 
     <!--Log Fragment-->
-    <string name="menuSaveToSd">حفظ إلى بطاقة ذاكرة SD</string>
     <string name="menuReload">إعادة تحميل</string>
     <string name="menuClearLog">حذف السجل الآن</string>
     <string name="logs_cleared">تم حذف السجل بنجاح</string>
@@ -84,8 +74,6 @@
     <string name="repo_install_msg">هل تريد تثبيت %1$s ?</string>
     <string name="download">التنزيل</string>
     <string name="download_file_error">خطأ تنزيل الملف</string>
-    <string name="install_error">خطأ في التثبيت!</string>
-    <string name="invalid_zip">الملف المضغوط ليس إضافة Magisk!!</string>
     <string name="reboot">إعادة التشغيل</string>
     <string name="zip_process_msg">معالجة الملف المضغوط …</string>
     <string name="downloading_toast">جاري التنزيل %1$s</string>
@@ -97,7 +85,6 @@
     <string name="process_error">خطأ في العملية</string>
     <string name="internal_storage">يتم تخزين الملف المضغوط في:\n[التخزين الداخلي]%1$s</string>
     <string name="zip_process_title">معالجة</string>
-    <string name="manual_boot_image">يرجى تحديد ملف الإقلاع يدوياً!</string>
 
     <!--Settings Activity -->
     <string name="settings_general_category">عام</string>
@@ -137,12 +124,6 @@
     <string name="user_indepenent_summary">كل مستخدم لديه قواعد روت منفصلة خاصة به</string>
     <string name="multiuser_hint_owner_request">تم إرسال طلب إلى مالك الجهاز. يرجى التبديل إلى المالك ومنح الإذن</string>
 
-    <string name="settings_development_category">تطوير التطبيق</string>
-    <string name="settings_developer_logging_title">تمكين تصحيح السجلات المتقدمة</string>
-    <string name="settings_developer_logging_summary">حدد هذا الخيار لتمكين سجل مطول أكثر.</string>
-    <string name="settings_shell_logging_title">تمكين سجل تصحيح الأوامر الدفعية</string>
-    <string name="settings_shell_logging_summary">حدد هذا الخيار لتمكين سجل جميع الأوامر الدفعية والمخرجات</string>
-
     <!--Superuser-->
     <string name="su_request_title">Superuser طلبات</string>
     <string name="deny_with_str">رفض%1$s</string>

app/src/main/res/values-cs/strings.xml

@@ -14,25 +14,16 @@
 
     <string name="checking_for_updates">Kontrola aktualizací…</string>
     <string name="magisk_update_available">Magisk v%1$s je dostupný!</string>
-    <string name="cannot_check_updates">Nelze zkontrolovat aktualizace. Jste připojeni k Internetu?</string>
-    <string name="root_error">Zařízení s rootem ale chybí root povolení, máte jej zpřístupněno?</string>
-    <string name="not_rooted">Nemáte root</string>
     <string name="safetyNet_check_text">Kliknutím zahájíte SafetyNet kontrolu</string>
     <string name="checking_safetyNet_status">Kontrola stavu SafetyNet…</string>
-    <string name="safetyNet_no_response">Nelze zkontrolovat SafetyNet. Jste připojeni k Internetu?</string>
 
     <!--Install Fragment-->
-    <string name="auto_detect">(Auto) %1$s</string>
-    <string name="cannot_auto_detect">(Nelze zjistit automaticky)</string>
-    <string name="boot_image_title">Umístění Boot Image</string>
-    <string name="detect_button">Zjistit</string>
     <string name="advanced_settings_title">Pokročilá Nastavení</string>
     <string name="keep_force_encryption">Udržet "force encryption"</string>
     <string name="keep_dm_verity">Udržet dm-verity</string>
-    <string name="current_magisk_title">Nainstalovaná verze Magisk: %1$s</string>
-    <string name="install_magisk_title">Poslední verze Magisk: %1$s</string>
+    <string name="current_magisk_title">Nainstalovaná verze: %1$s</string>
+    <string name="install_magisk_title">Poslední verze: %1$s</string>
     <string name="uninstall">Odinstalovat</string>
-    <string name="reboot_countdown">Restart za %1$d</string>
     <string name="uninstall_magisk_title">Odinstalovat Magisk</string>
 
     <!--Module Fragment-->
@@ -51,7 +42,7 @@
     <string name="not_installed">Nenainstalováno</string>
 
     <!--Log Fragment-->
-    <string name="menuSaveToSd">Uložit na SD</string>
+    <string name="menuSaveLog">Uložit log</string>
     <string name="menuReload">Aktualizovat</string>
     <string name="menuClearLog">Smazat Log</string>
     <string name="logs_cleared">Log byl smazán</string>
@@ -80,8 +71,6 @@
     <string name="repo_install_msg">Chcete nainstalovat %1$s ?</string>
     <string name="download">Stáhnout</string>
     <string name="download_file_error">Chyba při Stahování souboru</string>
-    <string name="install_error">Chyba při Instalaci!</string>
-    <string name="invalid_zip">Soubor zip není Magisk Modul!!</string>
     <string name="reboot">Restart</string>
     <string name="zip_process_msg">Zpracování zip souboru …</string>
     <string name="downloading_toast">Stahování %1$s</string>
@@ -93,7 +82,6 @@
     <string name="process_error">Chyba při Zpracování</string>
     <string name="internal_storage">Zip je uchován v:\n[Interním Úložišti]%1$s</string>
     <string name="zip_process_title">Zpracování</string>
-    <string name="manual_boot_image">Ručně vyberte boot image!</string>
 
     <!--Settings Activity -->
     <string name="settings_general_category">Obecné</string>
@@ -122,12 +110,6 @@
     <string name="superuser_notification">Oznámení Superuser</string>
     <string name="request_timeout_summary">%1$s sekund</string>
 
-    <string name="settings_development_category">Vývoj aplikace</string>
-    <string name="settings_developer_logging_title">Povolit pokročilé ladění logování</string>
-    <string name="settings_developer_logging_summary">Zkuste zapnout toto pro rozsáhlejší logování</string>
-    <string name="settings_shell_logging_title">Povolit logování pro příkazy shellu</string>
-    <string name="settings_shell_logging_summary">Logování všech příkazů shellu a jejich výstup</string>
-
     <!--Superuser-->
     <string name="su_request_title">Požadavek Superuser</string>
     <string name="deny_with_str">Zamítnout%1$s</string>

app/src/main/res/values-de/strings.xml

@@ -17,29 +17,20 @@
 
     <string name="checking_for_updates">Suche nach Updates…</string>
     <string name="magisk_update_available">Magisk %1$s ist verfügbar!</string>
-    <string name="cannot_check_updates">Updatesuche fehlgeschlagen.\nIst eine Internetverbindung verfügbar?</string>
-    <string name="root_error">Gerootet, aber keine root-Rechte. Wurde der root-Zugriff verweigert?</string>
-    <string name="not_rooted">Nicht gerootet</string>
     <string name="safetyNet_check_text">SafetyNet-Status abfragen</string>
     <string name="checking_safetyNet_status">Prüfe SafetyNet-Status…</string>
     <string name="safetyNet_check_success">SafetyNet-Test erfolgreich</string>
-    <string name="safetyNet_no_response">SafetyNet-Status konnte nicht geprüft werden. Ist eine Internetverbindung verfügbar?</string>
     <string name="safetyNet_network_loss">Netzwerkverbindung verloren</string>
     <string name="safetyNet_service_disconnected">Der Dienst wurde beendet</string>
     <string name="safetyNet_res_invalid">Die Antwort ist ungültig</string>
 
     <!--Install Fragment-->
-    <string name="auto_detect">%1$s (autom.)</string>
-    <string name="cannot_auto_detect">(Erkennung nicht möglich)</string>
-    <string name="boot_image_title">Boot-Image-Pfad</string>
-    <string name="detect_button">Automatisch</string>
     <string name="advanced_settings_title">Erweiterte Optionen</string>
     <string name="keep_force_encryption">\"force encryption\" beibehalten</string>
     <string name="keep_dm_verity">\"dm-verity\"-Test beibehalten</string>
-    <string name="current_magisk_title">Installierte Magisk-Version: %1$s</string>
-    <string name="install_magisk_title">Neueste Magisk-Version: %1$s</string>
+    <string name="current_magisk_title">Installierte Version: %1$s</string>
+    <string name="install_magisk_title">Neueste Version: %1$s</string>
     <string name="uninstall">Deinstallieren</string>
-    <string name="reboot_countdown">Neustart in %1$d</string>
     <string name="uninstall_magisk_title">Magisk deinstallieren</string>
 
     <!--Module Fragment-->
@@ -58,7 +49,7 @@
     <string name="not_installed">Nicht installiert</string>
 
     <!--Log Fragment-->
-    <string name="menuSaveToSd">Log auf SD-Karte speichern</string>
+    <string name="menuSaveLog">Log auf speichern</string>
     <string name="menuReload">Log erneut laden</string>
     <string name="menuClearLog">Log löschen</string>
     <string name="logs_cleared">Log gelöscht</string>
@@ -87,8 +78,6 @@
     <string name="repo_install_msg">Möchtest du %1$s installieren?</string>
     <string name="download">Herunterladen</string>
     <string name="download_file_error">Fehler beim Herunterladen der Datei</string>
-    <string name="install_error">Fehler bei der Installation!</string>
-    <string name="invalid_zip">Die Zip-Datei ist kein Magisk-Modul!</string>
     <string name="reboot">Neustart</string>
     <string name="downloading_toast">Herunterladen von %1$s</string>
     <string name="magisk_update_title">Neues Magisk-Update verfügbar!</string>
@@ -99,10 +88,9 @@
     <string name="process_error">Prozessfehler</string>
     <string name="internal_storage">Die zip-Datei ist gespeichert unter:\n[Interner Speicher]%1$s</string>
     <string name="zip_download_title">Herunterladen</string>
-    <string name="zip_download_msg">Lade Zip-Datei herunter…</string>
+    <string name="zip_download_msg">Lade Zip-Datei herunter (%1$d%%) …</string>
     <string name="zip_process_title">Verarbeite</string>
     <string name="zip_process_msg">Verarbeite Zip-Datei…</string>
-    <string name="manual_boot_image">Bitte Boot-Image auswählen!</string>
     <string name="manager_update_title">Update für Magisk Manager verfügbar!</string>
     <string name="manager_download_install">Herunterladen und installieren</string>
     <string name="magisk_updates">Magisk Updates</string>
@@ -124,7 +112,6 @@
     <string name="settings_clear_cache_title">Repo-Cache löschen</string>
     <string name="settings_clear_cache_summary">Löscht die zwischengespeicherten Informationen der Online-Repos. Erzwingt eine Aktualisierung</string>
     <string name="settings_hide_manager_title">Magisk Manager verbergen</string>
-    <string name="settings_hide_manager_summary">Magisk Manager temporär verbergen.\nDies installiert eine neue App namens \"Unhide Magisk Manager\"</string>
     <string name="language">Sprache</string>
     <string name="system_default">(Systemstandard)</string>
     <string name="settings_update">Update-Einstellungen</string>
@@ -172,12 +159,6 @@
     <string name="global_summary">Alle root-Sitzungen benutzen den global angelegten Namensraum</string>
     <string name="requester_summary">Root-Sitzungen erben den Namensraum des Abfragenden</string>
     <string name="isolate_summary">Jede root-Sitzung hat ihren isolierten Namensraum</string>
-	
-    <string name="settings_development_category">Entwickler</string>
-    <string name="settings_developer_logging_title">Erweiterte Fehlerprotokolle</string>
-    <string name="settings_developer_logging_summary">Für ausführliches Logging aktivieren</string>
-    <string name="settings_shell_logging_title">Fehlerprotokolle für Shell-Befehle</string>
-    <string name="settings_shell_logging_summary">Logging aller Shell-Befehle sowie deren Ausgabe</string>
 
     <!--Superuser-->
     <string name="su_request_title">Superuser-Anfrage</string>

app/src/main/res/values-el/strings.xml

@@ -1,208 +1,189 @@
-<resources>
-    <!--Welcome Activity-->
-    <string name="modules">Ενότητες</string>
-    <string name="downloads">Λήψεις</string>
-    <string name="superuser">Υπερχρήστης</string>
-    <string name="log">Aρχείο Kαταγραφής</string>
-    <string name="settings">Ρυθμίσεις</string>
-    <string name="install">Εγκατάσταση</string>
-
-    <!--Status Fragment-->
-    <string name="magisk_version_error">Το Magisk δεν είναι εγκατεστημένο</string>
-
-    <string name="checking_for_updates">Έλεγχος για ενημερώσεις…</string>
-    <string name="magisk_update_available">Το Magisk v%1$s είναι διαθέσιμο!</string>
-    <string name="cannot_check_updates">Αδυναμία ελέγχου για ενημερώσεις, δεν έχει internet;</string>
-    <string name="root_error">Υπάρχει root αλλά όχι άδεια για root, δεν επιτρέπεται;</string>
-    <string name="not_rooted">Δεν υπάρχει root</string>
-    <string name="safetyNet_check_text">Πατήστε για έλεγχο του SafetyNet</string>
-    <string name="checking_safetyNet_status">Έλεγχος κατάστασης SafetyNet…</string>
-    <string name="safetyNet_check_success">Ο Έλεγχος του SafetyNet Ήταν Επιτυχής</string>
-    <string name="safetyNet_no_response">Αδυναμία επαλήθευσης SafetyNet, δεν έχει internet;</string>
-    <string name="safetyNet_network_loss">Αδυναμία σύνδεσης στο δίκτυο</string>
-    <string name="safetyNet_service_disconnected">Η υπηρεσία τερματίστηκε</string>
-    <string name="safetyNet_res_invalid">Η απόκριση είναι άκυρη</string>
-
-    <!--Install Fragment-->
-    <string name="auto_detect">(Αυτόματα) %1$s</string>
-    <string name="cannot_auto_detect">(Αδυναμία αυτόματης εύρεσης)</string>
-    <string name="boot_image_title">Τοποθεσία Εικόνας Boot</string>
-    <string name="detect_button">Εύρεση</string>
-    <string name="advanced_settings_title">Προηγμένες ρυθμίσεις</string>
-    <string name="keep_force_encryption">Διατήρηση επιβεβλημένης κρυπτογράφησης</string>
-    <string name="keep_dm_verity">Διατήρηση dm-verity</string>
-    <string name="current_magisk_title">Εγκατεστημένη έκδοση Magisk: %1$s</string>
-    <string name="install_magisk_title">Τελευταία έκδοση Magisk: %1$s</string>
-    <string name="uninstall">Απεγκατάσταση</string>
-    <string name="reboot_countdown">Επανεκκίνηση σε %1$d</string>
-    <string name="uninstall_magisk_title">Απεγκατάσταση Magisk</string>
-    <string name="update">Ενημέρωση %1$s</string>
-
-    <!--Module Fragment-->
-    <string name="no_info_provided">(Δεν δόθηκαν πληροφορίες)</string>
-    <string name="no_modules_found">Δεν βρέθηκαν ενότητες</string>
-    <string name="update_file_created">Η ενότητα θα ενημερωθεί στην επόμενη επανεκκίνηση</string>
-    <string name="remove_file_created">Η ενότητα θα αφαιρεθεί στην επόμενη επανεκκίνηση</string>
-    <string name="remove_file_deleted">Η ενότητα δεν θα αφαιρεθεί στην επόμενη επανεκκίνηση</string>
-    <string name="disable_file_created">Η ενότητα θα απενεργοποιηθεί στην επόμενη επανεκκίνηση</string>
-    <string name="disable_file_removed">Η ενότητα θα ενεργοποιηθεί στην επόμενη επανεκκίνηση</string>
-    <string name="author">Δημιουργήθηκε από τον/την %1$s</string>
-
-    <!--Repo Fragment-->
-    <string name="update_available">Διαθέσιμη Ενημέρωση</string>
-    <string name="installed">Εγκαταστάθηκε</string>
-    <string name="not_installed">Μη εγκατεστημένη</string>
-
-    <!--Log Fragment-->
-    <string name="menuSaveToSd">Αποθήκευση σε SD</string>
-    <string name="menuReload">Επαναφόρτωση</string>
-    <string name="menuClearLog">Εκκαθάριση αρχείου καταγραφής τώρα</string>
-    <string name="logs_cleared">Το αρχείο καταγραφής εκκαθαρίστηκε επιτυχώς</string>
-    <string name="log_is_empty">Το αρχείο καταγραφής είναι κενό</string>
-    <string name="logs_save_failed">Αποτυχία αποθήκευσης αρχείου καταγραφής στην κάρτα SD:</string>
-
-    <!--About Activity-->
-    <string name="about">Περί</string>
-    <string name="app_developers">Κύριοι προγραμματιστές</string>
-    <string name="app_developers_"><![CDATA[Η εφαρμογή δημιουργήθηκε από τον <a href="https://github.com/topjohnwu">topjohnwu</a> σε συνεργασία με <a href="https://github.com/d8ahazard">Digitalhigh</a> και <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
-    <string name="app_changelog">Καταγραφή αλλαγών εφαρμογής</string>
-    <string name="translators">JpegXguy</string>
-    <string name="app_version">Έκδοση εφαρμογής</string>
-    <string name="app_source_code">Πηγαίος κώδικας</string>
-    <string name="donation">Δωρεά</string>
-    <string name="app_translators">Μεταφραστές εφαρμογής</string>
-    <string name="support_thread">Νήμα υποστήριξης</string>
-
-    <!--Toasts, Dialogs-->
-    <string name="permissionNotGranted">Η λειτουργία αυτή δεν θα δουλέψει χωρίς την άδεια εγγραφής στον εξωτερικό χώρο αποθηκεύσης.</string>
-    <string name="no_thanks">Όχι ευχαριστώ</string>
-    <string name="yes">Ναι</string>
-    <string name="ok">OK</string>
-    <string name="close">Κλείσιμο</string>
-    <string name="repo_install_title">Εγκατάσταση %1$s</string>
-    <string name="repo_install_msg">Θέλετε να εγκαταστήσετε το %1$s τώρα;</string>
-    <string name="download">Λήψη</string>
-    <string name="download_file_error">Σφάλμα στη λήψη του αρχείου</string>
-    <string name="install_error">Σφάλμα εγκατάστασης!</string>
-    <string name="invalid_zip">Αυτό το zip δεν είναι Ενότητα Magisk!!</string>
-    <string name="reboot">Επανεκκίνηση</string>
-    <string name="zip_process_msg">Επεξεργασία αρχείου zip …</string>
-    <string name="downloading_toast">Κατέβασμα %1$s</string>
-    <string name="magisk_update_title">Νέα Ενημέρωση Magisk Διαθέσιμη!</string>
-    <string name="settings_reboot_toast">Επανεκκίνηση για εφαρμογή ρυθμίσεων</string>
-    <string name="release_notes">Σημειώσεις έκδοσης</string>
-    <string name="repo_cache_cleared">Η Repo cache καθαρίστηκε</string>
-    <string name="safetyNet_hide_notice">Αυτή η εφαρμογή χρησιμοποιεί SafetyNet\nΉδη διαχειρίζεται από το MagiskHide από προεπιλογή</string>
-    <string name="process_error">Σφάλμα διαδικασίας</string>
-    <string name="internal_storage">Το zip είναι αποθηκευμένο σε:\n[Εσωτερική μνήμη]%1$s</string>
-    <string name="zip_process_title">Επεξεργασία</string>
-    <string name="manual_boot_image">Παρακαλώ επιλέξτε χειροκίνητα μια εικόνα boot!</string>
-    <string name="manager_update_title">Νέα Ενημέρωση Magisk Manager Διαθέσιμη!</string>
-    <string name="manager_download_install">Πιέστε για λήψη και εγκατάσταση</string>
-    <string name="magisk_updates">Ενημερώσεις Magisk</string>
-    <string name="flashing">Γίνεται Flash</string>
-    <string name="hide_manager_toast">Κρύβοντας το Magisk Manager…</string>
-    <string name="hide_manager_fail_toast">Το κρύψιμο Magisk Manager απέτυχε…</string>
-    <string name="download_zip_only">Λήψη Zip Μόνο</string>
-    <string name="patch_boot_file">Εφαρμογή Patch στο Αρχείο Εικόνας Boot</string>
-    <string name="direct_install">Απευθείας Εγκατάσταση (Προτείνεται)</string>
-    <string name="select_method">Επιλογή Μεθόδου</string>
-    
-    <!--Settings Activity -->
-    <string name="settings_general_category">Γενικά</string>
-    <string name="settings_dark_theme_title">Σκούρο θέμα</string>
-    <string name="settings_dark_theme_summary">Ενεργοποίηση σκούρου θέματος</string>
-    <string name="settings_notification_title">Ειδοποίηση Ενημέρωσης</string>
-    <string name="settings_notification_summary">Εμφάνιση ειδοποιήσεων ενημέρωσης όταν είναι διαθέσιμη νέα έκδοση</string>
-    <string name="settings_clear_cache_title">Εκκαθάριση προσωρινής μνήμης αποθετηρίων</string>
-    <string name="settings_clear_cache_summary">Καθαρίζει τις κρυφές πληροφορίες για απευθείας συνδεδεμένα αποθετήρια, αναγκάζει την εφαρμογή να κάνει ανανέωση σε απευθείας σύνδεση</string>
-    <string name="settings_hide_manager_title">Κρύψιμο Magisk Manager</string>
-    <string name="settings_hide_manager_summary">Προσωρινό κρύψιμο του Magisk Manager.\nΑυτό θα εγκαταστήσει μια νέα εφαρμογή με το όνομα \"Unhide Magisk Manager\"</string>
-    <string name="language">Γλώσσα</string>
-    <string name="system_default">(Προεπιλογή Συστήματος)</string>
-    <string name="settings_update">Ρυθμίσεις Ενημερώσεων</string>
-    <string name="settings_update_channel_title">Κανάλι Ενημερώσεων</string>
-    <string name="settings_update_stable">Σταθερή</string>
-    <string name="settings_update_beta">Beta</string>
-    <string name="settings_boot_format_title">Μορφή Τροποποιημένης Εικόνας Boot</string>
-    <string name="settings_boot_format_summary">Επιλέξτε τη μορφή της εξαγόμενης εικόνας boot μετά το patch.\nΕπιλέξτε .img για flash μέσω λειτουργίας fastboot/download· επιλέξτε .img.tar για flash μέσω ODIN.</string>
-
-    <string name="settings_core_only_title">Magisk Λειτουργία Πυρήνα Μόνο</string>
-    <string name="settings_core_only_summary">Ενεργοποίηση μόνο των λειτουργιών πυρήνα, καμία από τις ενότητες δεν θα ενεργοποιηθεί. Τα MagiskSU, MagiskHide, και systemless hosts θα παραμείνουν ενεργά</string>
-    <string name="settings_magiskhide_summary">Κρύβει το Magisk από διάφορες ανιχνεύσεις</string>
-    <string name="settings_hosts_title">Systemless hosts</string>
-    <string name="settings_hosts_summary">Υποστήριξη Systemless hosts για εφαρμογές Adblock</string>
-
-    <string name="settings_su_app_adb">Εφαρμογές και ADB</string>
-    <string name="settings_su_app">Εφαρμογές μόνο</string>
-    <string name="settings_su_adb">ADB μόνο</string>
-    <string name="settings_su_disable">Απενεργοποιημένο</string>
-    <string name="settings_su_request_10">10 δευτερόλεπτα</string>
-    <string name="settings_su_request_20">20 δευτερόλεπτα</string>
-    <string name="settings_su_request_30">30 δευτερόλεπτα</string>
-    <string name="settings_su_request_60">60 δευτερόλεπτα</string>
-    <string name="superuser_access">Πρόσβαση Υπερχρήστη</string>
-    <string name="auto_response">Αυτόματη Απόκριση</string>
-    <string name="request_timeout">Χρονικό όριο Αιτήματος</string>
-    <string name="superuser_notification">Ειδοποίηση Υπερχρήστη</string>
-    <string name="request_timeout_summary">%1$s δευτερόλεπτα</string>
-    <string name="settings_su_reauth_title">Επαναπιστοποίηση μετά από αναβάθμιση</string>
-    <string name="settings_su_reauth_summary">Επαναπιστοποίηση αδειών υπερχρήστη μετά την αναβάθμιση μίας εφαρμογής</string>
-
-    <string name="multiuser_mode">Λειτουργία Πολλών Χρηστών</string>
-    <string name="settings_owner_only">Μόνο Ιδιοκτήτης Συσκευής</string>
-    <string name="settings_owner_manage">Διαχειριζόμενη από τον Ιδιοκτήτη</string>
-    <string name="settings_user_independent">Ανεξάρτητη από τον χρήστη</string>
-    <string name="owner_only_summary">Μόνο ο ιδιοκτήτης έχει πρόσβαση root</string>
-    <string name="owner_manage_summary">Μόνο ο ιδιοκτήτης μπορεί να διαχειριστεί την πρόσβαση root και να δεχτεί προτροπές αίτημάτων</string>
-    <string name="user_indepenent_summary">Κάθε χρήστης έχει τους δικούς του ξεχωριστούς κανόνες root</string>
-    <string name="multiuser_hint_owner_request">Ένα αίτημα έχει σταλεί στον ιδιοκτήτη της συσκευής. Παρακαλώ αλλάξτε σε ιδιοκτήτη και δώστε την άδεια</string>
-
-    <string name="mount_namespace_mode">Λειτουργία προσάρτησης χώρου ονομάτων</string>
-    <string name="settings_ns_global">Καθολικός Χώρος Ονομάτων</string>
-    <string name="settings_ns_requester">Κληρονόμησε Χώρο Ονομάτων</string>
-    <string name="settings_ns_isolate">Απομονωμένος Χώρος Ονομάτων</string>
-    <string name="global_summary">Όλες οι συνεδρίες root χρησιμοποιούν τον καθολικό χώρο oνομάτων προσάρτησης</string>
-    <string name="requester_summary">Οι συνεδρίες root θα κληρονομούν το χώρο ονομάτων του αιτούντα τους</string>
-    <string name="isolate_summary">Κάθε συνεδρία root θα έχει το δικό της απομονωμένο χώρο ονομάτων</string>
-
-    <string name="settings_development_category">Ανάπτυξη Εφαρμογής</string>
-    <string name="settings_developer_logging_title">Ενεργοποίηση προηγμένης καταγραφής ελέγχου σφαλμάτων</string>
-    <string name="settings_developer_logging_summary">Επιλέξτε αυτό για να ενεργοποιήσετε τη verbose καταγραφή</string>
-    <string name="settings_shell_logging_title">Ενεργοποίηση καταγραφής ελέγχου σφαλμάτων εντολών κελύφους</string>
-    <string name="settings_shell_logging_summary">Επιλέξτε αυτό για να ενεργοποιήσετε την καταγραφή όλων των εντολών κελύφους και την έξοδο τους</string>
-
-    <!--Superuser-->
-    <string name="su_request_title">Αίτημα υπερχρήστη</string>
-    <string name="deny_with_str">Άρνηση%1$s</string>
-    <string name="deny">Άρνηση</string>
-    <string name="prompt">Προτροπή</string>
-    <string name="grant">Απόδοχη</string>
-    <string name="su_warning">Δίνει πλήρη πρόσβαση στη συσκευή σας.\nΑρνηθείτε αν δεν είστε σίγουρος/η!</string>
-    <string name="forever">Πάντα</string>
-    <string name="once">Μία φορά</string>
-    <string name="tenmin">10 λεπτά</string>
-    <string name="twentymin">20 λεπτά</string>
-    <string name="thirtymin">30 λεπτά</string>
-    <string name="sixtymin">60 λεπτά</string>
-    <string name="su_allow_toast">Παραχωρήθηκαν δικαιώματα υπερχρήστη στο %1$s</string>
-    <string name="su_deny_toast">Απορρίφθηκαν τα δικαιώματα υπερχρήστη του %1$s</string>
-    <string name="no_apps_found">Δεν βρέθηκαν εφαρμογές</string>
-    <string name="su_snack_grant">Παραχορούνται δικαιώματα υπερχρήστη στο %1$s</string>
-    <string name="su_snack_deny">Δεν παραχορούνται δικαιώματα υπερχρήστη στο %1$s</string>
-    <string name="su_snack_notif_on">Οι ειδοποιήσεις του %1$s είναι ενεργοποιημένες</string>
-    <string name="su_snack_notif_off">Οι ειδοποιήσεις του %1$s είναι απενεργοποιημένες</string>
-    <string name="su_snack_log_on">Η καταγραφή του %1$s είναι ενεργοποιημένη</string>
-    <string name="su_snack_log_off">Η καταγραφή του %1$s είναι απενεργοποιημένη</string>
-    <string name="su_snack_revoke">Τα δικαιώματα του %1$s ανακαλούνται</string>
-    <string name="su_revoke_title">Ανάκληση;</string>
-    <string name="su_revoke_msg">Επιβεβαίωση για ανάκληση δικαιωμάτων %1$s;</string>
-    <string name="toast">Toast</string>
-    <string name="none">Κανένα</string>
-
-    <!--Superuser logs-->
-    <string name="pid">PID:\u0020</string>
-    <string name="target_uid">UID Στόχος:\u0020</string>
-    <string name="command">Εντολή:\u0020</string>
-
-</resources>
+<resources>
+    <!--Welcome Activity-->
+    <string name="modules">Ενότητες</string>
+    <string name="downloads">Λήψεις</string>
+    <string name="superuser">Υπερχρήστης</string>
+    <string name="log">Aρχείο Kαταγραφής</string>
+    <string name="settings">Ρυθμίσεις</string>
+    <string name="install">Εγκατάσταση</string>
+
+    <!--Status Fragment-->
+    <string name="magisk_version_error">Το Magisk δεν είναι εγκατεστημένο</string>
+
+    <string name="checking_for_updates">Έλεγχος για ενημερώσεις…</string>
+    <string name="magisk_update_available">Το Magisk v%1$s είναι διαθέσιμο!</string>
+    <string name="safetyNet_check_text">Πατήστε για έλεγχο του SafetyNet</string>
+    <string name="checking_safetyNet_status">Έλεγχος κατάστασης SafetyNet…</string>
+    <string name="safetyNet_check_success">Ο Έλεγχος του SafetyNet Ήταν Επιτυχής</string>
+    <string name="safetyNet_network_loss">Αδυναμία σύνδεσης στο δίκτυο</string>
+    <string name="safetyNet_service_disconnected">Η υπηρεσία τερματίστηκε</string>
+    <string name="safetyNet_res_invalid">Η απόκριση είναι άκυρη</string>
+
+    <!--Install Fragment-->
+    <string name="advanced_settings_title">Προηγμένες ρυθμίσεις</string>
+    <string name="keep_force_encryption">Διατήρηση επιβεβλημένης κρυπτογράφησης</string>
+    <string name="keep_dm_verity">Διατήρηση dm-verity</string>
+    <string name="current_magisk_title">Εγκατεστημένη έκδοση: %1$s</string>
+    <string name="install_magisk_title">Τελευταία έκδοση: %1$s</string>
+    <string name="uninstall">Απεγκατάσταση</string>
+    <string name="uninstall_magisk_title">Απεγκατάσταση Magisk</string>
+    <string name="update">Ενημέρωση %1$s</string>
+
+    <!--Module Fragment-->
+    <string name="no_info_provided">(Δεν δόθηκαν πληροφορίες)</string>
+    <string name="no_modules_found">Δεν βρέθηκαν ενότητες</string>
+    <string name="update_file_created">Η ενότητα θα ενημερωθεί στην επόμενη επανεκκίνηση</string>
+    <string name="remove_file_created">Η ενότητα θα αφαιρεθεί στην επόμενη επανεκκίνηση</string>
+    <string name="remove_file_deleted">Η ενότητα δεν θα αφαιρεθεί στην επόμενη επανεκκίνηση</string>
+    <string name="disable_file_created">Η ενότητα θα απενεργοποιηθεί στην επόμενη επανεκκίνηση</string>
+    <string name="disable_file_removed">Η ενότητα θα ενεργοποιηθεί στην επόμενη επανεκκίνηση</string>
+    <string name="author">Δημιουργήθηκε από τον/την %1$s</string>
+
+    <!--Repo Fragment-->
+    <string name="update_available">Διαθέσιμη Ενημέρωση</string>
+    <string name="installed">Εγκαταστάθηκε</string>
+    <string name="not_installed">Μη εγκατεστημένη</string>
+
+    <!--Log Fragment-->
+    <string name="menuSaveLog">"Αποθήκευση καταγραφής "</string>
+    <string name="menuReload">Επαναφόρτωση</string>
+    <string name="menuClearLog">Εκκαθάριση αρχείου καταγραφής τώρα</string>
+    <string name="logs_cleared">Το αρχείο καταγραφής εκκαθαρίστηκε επιτυχώς</string>
+    <string name="log_is_empty">Το αρχείο καταγραφής είναι κενό</string>
+    <string name="logs_save_failed">Αποτυχία αποθήκευσης αρχείου καταγραφής στην κάρτα SD:</string>
+
+    <!--About Activity-->
+    <string name="about">Περί</string>
+    <string name="app_developers">Κύριοι προγραμματιστές</string>
+    <string name="app_developers_"><![CDATA[Η εφαρμογή δημιουργήθηκε από τον <a href="https://github.com/topjohnwu">topjohnwu</a> σε συνεργασία με <a href="https://github.com/d8ahazard">Digitalhigh</a> και <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
+    <string name="app_changelog">Καταγραφή αλλαγών εφαρμογής</string>
+    <string name="translators">JpegXguy</string>
+    <string name="app_version">Έκδοση εφαρμογής</string>
+    <string name="app_source_code">Πηγαίος κώδικας</string>
+    <string name="donation">Δωρεά</string>
+    <string name="app_translators">Μεταφραστές εφαρμογής</string>
+    <string name="support_thread">Νήμα υποστήριξης</string>
+
+    <!--Toasts, Dialogs-->
+    <string name="permissionNotGranted">Η λειτουργία αυτή δεν θα δουλέψει χωρίς την άδεια εγγραφής στον εξωτερικό χώρο αποθηκεύσης.</string>
+    <string name="no_thanks">Όχι ευχαριστώ</string>
+    <string name="yes">Ναι</string>
+    <string name="ok">OK</string>
+    <string name="close">Κλείσιμο</string>
+    <string name="repo_install_title">Εγκατάσταση %1$s</string>
+    <string name="repo_install_msg">Θέλετε να εγκαταστήσετε το %1$s τώρα;</string>
+    <string name="download">Λήψη</string>
+    <string name="download_file_error">Σφάλμα στη λήψη του αρχείου</string>
+    <string name="reboot">Επανεκκίνηση</string>
+    <string name="zip_process_msg">Επεξεργασία αρχείου zip …</string>
+    <string name="downloading_toast">Κατέβασμα %1$s</string>
+    <string name="magisk_update_title">Νέα Ενημέρωση Magisk Διαθέσιμη!</string>
+    <string name="settings_reboot_toast">Επανεκκίνηση για εφαρμογή ρυθμίσεων</string>
+    <string name="release_notes">Σημειώσεις έκδοσης</string>
+    <string name="repo_cache_cleared">Η Repo cache καθαρίστηκε</string>
+    <string name="safetyNet_hide_notice">Αυτή η εφαρμογή χρησιμοποιεί SafetyNet\nΉδη διαχειρίζεται από το MagiskHide από προεπιλογή</string>
+    <string name="process_error">Σφάλμα διαδικασίας</string>
+    <string name="internal_storage">Το zip είναι αποθηκευμένο σε:\n[Εσωτερική μνήμη]%1$s</string>
+    <string name="zip_process_title">Επεξεργασία</string>
+    <string name="manager_update_title">Νέα Ενημέρωση Magisk Manager Διαθέσιμη!</string>
+    <string name="manager_download_install">Πιέστε για λήψη και εγκατάσταση</string>
+    <string name="magisk_updates">Ενημερώσεις Magisk</string>
+    <string name="flashing">Γίνεται Flash</string>
+    <string name="hide_manager_toast">Κρύβοντας το Magisk Manager…</string>
+    <string name="hide_manager_fail_toast">Το κρύψιμο Magisk Manager απέτυχε…</string>
+    <string name="download_zip_only">Λήψη Zip Μόνο</string>
+    <string name="patch_boot_file">Εφαρμογή Patch στο Αρχείο Εικόνας Boot</string>
+    <string name="direct_install">Απευθείας Εγκατάσταση (Προτείνεται)</string>
+    <string name="select_method">Επιλογή Μεθόδου</string>
+    
+    <!--Settings Activity -->
+    <string name="settings_general_category">Γενικά</string>
+    <string name="settings_dark_theme_title">Σκούρο θέμα</string>
+    <string name="settings_dark_theme_summary">Ενεργοποίηση σκούρου θέματος</string>
+    <string name="settings_notification_title">Ειδοποίηση Ενημέρωσης</string>
+    <string name="settings_notification_summary">Εμφάνιση ειδοποιήσεων ενημέρωσης όταν είναι διαθέσιμη νέα έκδοση</string>
+    <string name="settings_clear_cache_title">Εκκαθάριση προσωρινής μνήμης αποθετηρίων</string>
+    <string name="settings_clear_cache_summary">Καθαρίζει τις κρυφές πληροφορίες για απευθείας συνδεδεμένα αποθετήρια, αναγκάζει την εφαρμογή να κάνει ανανέωση σε απευθείας σύνδεση</string>
+    <string name="settings_hide_manager_title">Κρύψιμο Magisk Manager</string>
+    <string name="language">Γλώσσα</string>
+    <string name="system_default">(Προεπιλογή Συστήματος)</string>
+    <string name="settings_update">Ρυθμίσεις Ενημερώσεων</string>
+    <string name="settings_update_channel_title">Κανάλι Ενημερώσεων</string>
+    <string name="settings_update_stable">Σταθερή</string>
+    <string name="settings_update_beta">Beta</string>
+    <string name="settings_boot_format_title">Μορφή Τροποποιημένης Εικόνας Boot</string>
+    <string name="settings_boot_format_summary">Επιλέξτε τη μορφή της εξαγόμενης εικόνας boot μετά το patch.\nΕπιλέξτε .img για flash μέσω λειτουργίας fastboot/download· επιλέξτε .img.tar για flash μέσω ODIN.</string>
+
+    <string name="settings_core_only_title">Magisk Λειτουργία Πυρήνα Μόνο</string>
+    <string name="settings_core_only_summary">Ενεργοποίηση μόνο των λειτουργιών πυρήνα, καμία από τις ενότητες δεν θα ενεργοποιηθεί. Τα MagiskSU, MagiskHide, και systemless hosts θα παραμείνουν ενεργά</string>
+    <string name="settings_magiskhide_summary">Κρύβει το Magisk από διάφορες ανιχνεύσεις</string>
+    <string name="settings_hosts_title">Systemless hosts</string>
+    <string name="settings_hosts_summary">Υποστήριξη Systemless hosts για εφαρμογές Adblock</string>
+
+    <string name="settings_su_app_adb">Εφαρμογές και ADB</string>
+    <string name="settings_su_app">Εφαρμογές μόνο</string>
+    <string name="settings_su_adb">ADB μόνο</string>
+    <string name="settings_su_disable">Απενεργοποιημένο</string>
+    <string name="settings_su_request_10">10 δευτερόλεπτα</string>
+    <string name="settings_su_request_20">20 δευτερόλεπτα</string>
+    <string name="settings_su_request_30">30 δευτερόλεπτα</string>
+    <string name="settings_su_request_60">60 δευτερόλεπτα</string>
+    <string name="superuser_access">Πρόσβαση Υπερχρήστη</string>
+    <string name="auto_response">Αυτόματη Απόκριση</string>
+    <string name="request_timeout">Χρονικό όριο Αιτήματος</string>
+    <string name="superuser_notification">Ειδοποίηση Υπερχρήστη</string>
+    <string name="request_timeout_summary">%1$s δευτερόλεπτα</string>
+    <string name="settings_su_reauth_title">Επαναπιστοποίηση μετά από αναβάθμιση</string>
+    <string name="settings_su_reauth_summary">Επαναπιστοποίηση αδειών υπερχρήστη μετά την αναβάθμιση μίας εφαρμογής</string>
+
+    <string name="multiuser_mode">Λειτουργία Πολλών Χρηστών</string>
+    <string name="settings_owner_only">Μόνο Ιδιοκτήτης Συσκευής</string>
+    <string name="settings_owner_manage">Διαχειριζόμενη από τον Ιδιοκτήτη</string>
+    <string name="settings_user_independent">Ανεξάρτητη από τον χρήστη</string>
+    <string name="owner_only_summary">Μόνο ο ιδιοκτήτης έχει πρόσβαση root</string>
+    <string name="owner_manage_summary">Μόνο ο ιδιοκτήτης μπορεί να διαχειριστεί την πρόσβαση root και να δεχτεί προτροπές αίτημάτων</string>
+    <string name="user_indepenent_summary">Κάθε χρήστης έχει τους δικούς του ξεχωριστούς κανόνες root</string>
+    <string name="multiuser_hint_owner_request">Ένα αίτημα έχει σταλεί στον ιδιοκτήτη της συσκευής. Παρακαλώ αλλάξτε σε ιδιοκτήτη και δώστε την άδεια</string>
+
+    <string name="mount_namespace_mode">Λειτουργία προσάρτησης χώρου ονομάτων</string>
+    <string name="settings_ns_global">Καθολικός Χώρος Ονομάτων</string>
+    <string name="settings_ns_requester">Κληρονόμησε Χώρο Ονομάτων</string>
+    <string name="settings_ns_isolate">Απομονωμένος Χώρος Ονομάτων</string>
+    <string name="global_summary">Όλες οι συνεδρίες root χρησιμοποιούν τον καθολικό χώρο oνομάτων προσάρτησης</string>
+    <string name="requester_summary">Οι συνεδρίες root θα κληρονομούν το χώρο ονομάτων του αιτούντα τους</string>
+    <string name="isolate_summary">Κάθε συνεδρία root θα έχει το δικό της απομονωμένο χώρο ονομάτων</string>
+
+    <!--Superuser-->
+    <string name="su_request_title">Αίτημα υπερχρήστη</string>
+    <string name="deny_with_str">Άρνηση%1$s</string>
+    <string name="deny">Άρνηση</string>
+    <string name="prompt">Προτροπή</string>
+    <string name="grant">Απόδοχη</string>
+    <string name="su_warning">Δίνει πλήρη πρόσβαση στη συσκευή σας.\nΑρνηθείτε αν δεν είστε σίγουρος/η!</string>
+    <string name="forever">Πάντα</string>
+    <string name="once">Μία φορά</string>
+    <string name="tenmin">10 λεπτά</string>
+    <string name="twentymin">20 λεπτά</string>
+    <string name="thirtymin">30 λεπτά</string>
+    <string name="sixtymin">60 λεπτά</string>
+    <string name="su_allow_toast">Παραχωρήθηκαν δικαιώματα υπερχρήστη στο %1$s</string>
+    <string name="su_deny_toast">Απορρίφθηκαν τα δικαιώματα υπερχρήστη του %1$s</string>
+    <string name="no_apps_found">Δεν βρέθηκαν εφαρμογές</string>
+    <string name="su_snack_grant">Παραχορούνται δικαιώματα υπερχρήστη στο %1$s</string>
+    <string name="su_snack_deny">Δεν παραχορούνται δικαιώματα υπερχρήστη στο %1$s</string>
+    <string name="su_snack_notif_on">Οι ειδοποιήσεις του %1$s είναι ενεργοποιημένες</string>
+    <string name="su_snack_notif_off">Οι ειδοποιήσεις του %1$s είναι απενεργοποιημένες</string>
+    <string name="su_snack_log_on">Η καταγραφή του %1$s είναι ενεργοποιημένη</string>
+    <string name="su_snack_log_off">Η καταγραφή του %1$s είναι απενεργοποιημένη</string>
+    <string name="su_snack_revoke">Τα δικαιώματα του %1$s ανακαλούνται</string>
+    <string name="su_revoke_title">Ανάκληση;</string>
+    <string name="su_revoke_msg">Επιβεβαίωση για ανάκληση δικαιωμάτων %1$s;</string>
+    <string name="toast">Toast</string>
+    <string name="none">Κανένα</string>
+
+    <!--Superuser logs-->
+    <string name="pid">PID:\u0020</string>
+    <string name="target_uid">UID Στόχος:\u0020</string>
+    <string name="command">Εντολή:\u0020</string>
+
+</resources>