update Ukrainian language

Added latest strings 
- setup_title
- setup_msg
- restore_img_title
- restore_img_msg

.gitignore

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

README.md

@@ -1,7 +1,7 @@
 # Magisk Manager
-This is one of the submodules used in Magisk. The project is licensed under GPL v3 (or newer).
+This repo is no longer an independent component. It is a submodule of the [Magisk Project](https://github.com/topjohnwu/Magisk).
-More info are written in the [Magisk Main Repo](https://github.com/topjohnwu/Magisk)
 
-## Building Notes
+# Translations
-You need to install CMake and NDK to build the zipadjust library.
+The default (English) string resources are scattered in these files: `src/full/res/values/strings.xml`, `src/main/res/values/strings.xml`, `src/stub/res/values/strings.xml`.  
-There are several files required to let Magisk Manager work properly, and they can be copied by using the build script in the [Magisk Main Repo](https://github.com/topjohnwu/Magisk). These files are: `magisk_uninstaller.sh`, `util_functions.sh`, `public.certificate.x509.pem`, and `private.key.pk8` under the `app/src/main/assets` folder.
+Place the translated XMLs in the corresponding folder to the locale.  
+Translations are highly appreciated via pull requests here on Github.

app/.gitignore

@@ -1 +0,0 @@
-/build

app/build.gradle

@@ -1,68 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
-
-    defaultConfig {
-        applicationId "com.topjohnwu.magisk"
-        minSdkVersion 21
-        targetSdkVersion 26
-        versionCode 54
-        versionName "5.3.0"
-        ndk {
-            moduleName 'zipadjust'
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-        }
-        javaCompileOptions {
-            annotationProcessorOptions {
-                argument('butterknife.debuggable', 'false')
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    dexOptions {
-        preDexLibraries true
-        javaMaxHeapSize "2g"
-    }
-    externalNativeBuild {
-        cmake {
-            path 'src/main/jni/CMakeLists.txt'
-        }
-    }
-    lintOptions {
-        disable 'MissingTranslation'
-    }
-}
-repositories {
-    jcenter()
-    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.0.2'
-    implementation 'com.android.support:cardview-v7:26.0.2'
-    implementation 'com.android.support:design:26.0.2'
-    implementation 'com.android.support:support-v4:26.0.2'
-    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 '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/src/main/java/com/topjohnwu/magisk/AboutActivity.java

@@ -1,133 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
-import android.text.Html;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.view.View;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.components.AboutCardRow;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-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;
-    @BindView(R.id.app_developers) AboutCardRow appDevelopers;
-    @BindView(R.id.app_translators) AboutCardRow appTranslators;
-    @BindView(R.id.app_source_code) AboutCardRow appSourceCode;
-    @BindView(R.id.support_thread) AboutCardRow supportThread;
-    @BindView(R.id.donation) AboutCardRow donation;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getMagiskManager().isDarkTheme) {
-            setTheme(R.style.AppTheme_Transparent_Dark);
-        }
-        setContentView(R.layout.activity_about);
-        ButterKnife.bind(this);
-
-        setSupportActionBar(toolbar);
-        toolbar.setNavigationOnClickListener(view -> finish());
-
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setTitle(R.string.about);
-            ab.setDisplayHomeAsUpEnabled(true);
-        }
-
-        appVersionInfo.setSummary(BuildConfig.VERSION_NAME);
-
-        String changes = null;
-        try (InputStream is = getAssets().open("changelog.html")) {
-            int size = is.available();
-
-            byte[] buffer = new byte[size];
-            is.read(buffer);
-
-            changes = new String(buffer);
-        } catch (IOException ignored) {
-        }
-
-        appChangelog.removeSummary();
-        if (changes == null) {
-            appChangelog.setVisibility(View.GONE);
-        } else {
-            Spanned result;
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-                result = Html.fromHtml(changes, Html.TO_HTML_PARAGRAPH_LINES_CONSECUTIVE);
-            } else {
-                result = Html.fromHtml(changes);
-            }
-            appChangelog.setOnClickListener(v -> {
-                AlertDialog d = new AlertDialogBuilder(this)
-                        .setTitle(R.string.app_changelog)
-                        .setMessage(result)
-                        .setPositiveButton(android.R.string.ok, null)
-                        .show();
-
-                //noinspection ConstantConditions
-                ((TextView) d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
-            });
-        }
-
-        appDevelopers.removeSummary();
-        appDevelopers.setOnClickListener(view -> {
-            Spanned result;
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-                result = Html.fromHtml(getString(R.string.app_developers_), Html.TO_HTML_PARAGRAPH_LINES_CONSECUTIVE);
-            } else {
-                result = Html.fromHtml(getString(R.string.app_developers_));
-            }
-            AlertDialog d = new AlertDialogBuilder(this)
-                    .setTitle(R.string.app_developers)
-                    .setMessage(result)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .create();
-
-            d.show();
-            //noinspection ConstantConditions
-            ((TextView) d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
-        });
-
-        String translators = getString(R.string.translators);
-        if (TextUtils.isEmpty(translators)) {
-            appTranslators.setVisibility(View.GONE);
-        } else {
-            appTranslators.setSummary(translators);
-        }
-
-        appSourceCode.removeSummary();
-        appSourceCode.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(SOURCE_CODE_URL))));
-
-        supportThread.removeSummary();
-        supportThread.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(XDA_THREAD))));
-
-        donation.removeSummary();
-        donation.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(DONATION_URL))));
-
-        setFloating();
-    }
-
-}

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

@@ -1,151 +0,0 @@
-package com.topjohnwu.magisk;
-
-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.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-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.utils.Shell;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-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;
-
-    @OnClick(R.id.no_thanks)
-    public void dismiss() {
-        finish();
-    }
-
-    @OnClick(R.id.reboot)
-    public void reboot() {
-        getShell().su_raw("reboot");
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        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();
-        if (!Shell.rootAccess())
-            reboot.setVisibility(View.GONE);
-
-        flashLogs.setAdapter(new FlashLogAdapter(rootShellOutput));
-
-        // 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);
-
-        switch (getIntent().getStringExtra(SET_ACTION)) {
-            case FLASH_ZIP:
-                new FlashZip(this, uri, rootShellOutput)
-                        .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
-                        .exec();
-                break;
-            case PATCH_BOOT:
-                new InstallMagisk(this, rootShellOutput, uri, keepEnc, keepVerity, (Uri) intent.getParcelableExtra(SET_BOOT))
-                        .setCallBack(() -> buttonPanel.setVisibility(View.VISIBLE))
-                        .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;
-        }
-    }
-
-    @Override
-    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/MagiskLogFragment.java

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

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

@@ -1,309 +0,0 @@
-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.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.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.Shell;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.io.File;
-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 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;
-
-    // Topics
-    public final Topic magiskHideDone = new Topic();
-    public final Topic reloadActivity = new Topic();
-    public final Topic moduleLoadDone = new Topic();
-    public final Topic repoLoadDone = new Topic();
-    public final Topic updateCheckDone = new Topic();
-    public final Topic safetyNetDone = new Topic();
-    public final Topic localeDone = new Topic();
-
-    // Info
-    public String magiskVersionString;
-    public int magiskVersionCode = -1;
-    public String remoteMagiskVersionString;
-    public int remoteMagiskVersionCode = -1;
-    public String magiskLink;
-    public String releaseNoteLink;
-    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;
-
-    // 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;
-
-    public boolean magiskHide;
-    public boolean isDarkTheme;
-    public boolean updateNotification;
-    public boolean suReauth;
-    public int suRequestTimeout;
-    public int suLogTimeout = 14;
-    public int suAccessState;
-    public int multiuserMode;
-    public int suResponseType;
-    public int suNotificationType;
-    public int suNamespaceMode;
-    public String localeConfig;
-    public int updateChannel;
-    public String bootFormat;
-
-    // Global resources
-    public SharedPreferences prefs;
-    public SuDatabaseHelper suDB;
-    public RepoDatabaseHelper repoDB;
-    public Shell shell;
-
-    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();
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        new File(getApplicationInfo().dataDir).mkdirs();  /* Create the app data directory */
-        prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        suDB = new SuDatabaseHelper(this);
-        repoDB = new RepoDatabaseHelper(this);
-        defaultLocale = Locale.getDefault();
-        setLocale();
-        loadConfig();
-    }
-
-    public void setLocale() {
-        localeConfig = prefs.getString("locale", "");
-        if (localeConfig.isEmpty()) {
-            locale = defaultLocale;
-        } else {
-            locale = Locale.forLanguageTag(localeConfig);
-        }
-        Resources res = getBaseContext().getResources();
-        Configuration config = new Configuration(res.getConfiguration());
-        config.setLocale(locale);
-        res.updateConfiguration(config, res.getDisplayMetrics());
-    }
-
-    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;
-        }
-
-        // 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);
-
-        updateNotification = prefs.getBoolean("notification", true);
-        updateChannel = Utils.getPrefsInt(prefs, "update_channel", CheckUpdates.STABLE_CHANNEL);
-        bootFormat = prefs.getString("boot_format", ".img");
-    }
-
-    public void toast(String msg, int duration) {
-        mHandler.post(() -> Toast.makeText(this, msg, duration).show());
-    }
-
-    public void toast(int resId, int duration) {
-        mHandler.post(() -> Toast.makeText(this, resId, duration).show());
-    }
-
-    public void startup() {
-        if (started)
-            return;
-        started = true;
-
-        boolean hasNetwork = Utils.checkNetworkStatus(this);
-
-        getMagiskInfo();
-        new LoadLocale(this).exec();
-
-        // Force synchronous, make sure we have busybox to use
-        if (hasNetwork && Shell.rootAccess()
-                && !Utils.itemExist(shell, BUSYBOXPATH + "/busybox")) {
-            try {
-                new DownloadBusybox(this).exec().get();
-            } catch (InterruptedException | ExecutionException e) {
-                e.printStackTrace();
-            }
-        }
-        shell.su_raw("export PATH=" + BUSYBOXPATH + ":$PATH");
-
-        updateBlockInfo();
-
-        // Write back default values
-        prefs.edit()
-                .putBoolean("dark_theme", isDarkTheme)
-                .putBoolean("magiskhide", magiskHide)
-                .putBoolean("notification", updateNotification)
-                .putBoolean("hosts", new File("/magisk/.core/hosts").exists())
-                .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);
-            ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).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() {
-        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");
-        if (!Utils.isValidShellResponse(ret)) {
-            ret = shell.sh("getprop magisk.version");
-            if (Utils.isValidShellResponse(ret)) {
-                try {
-                    magiskVersionString = ret.get(0);
-                    magiskVersionCode = (int) Double.parseDouble(ret.get(0)) * 10;
-                } catch (NumberFormatException ignored) {}
-            }
-        } else {
-            magiskVersionString = ret.get(0).split(":")[0];
-            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;
-        }
-        ret = shell.sh("getprop " + MAGISKHIDE_PROP);
-        try {
-            magiskHide = !Utils.isValidShellResponse(ret) || Integer.parseInt(ret.get(0)) != 0;
-        } catch (NumberFormatException e) {
-            magiskHide = true;
-        }
-    }
-
-    private void updateBlockInfo() {
-        List<String> res = shell.su(
-                "for BLOCK in boot_a kern-a android_boot kernel boot lnx; do",
-                "  BOOTIMAGE=`find /dev/block -iname $BLOCK | head -n 1` 2>/dev/null",
-                "  [ ! -z $BOOTIMAGE ] && break",
-                "done",
-                "[ ! -z \"$BOOTIMAGE\" -a -L \"$BOOTIMAGE\" ] && BOOTIMAGE=`readlink $BOOTIMAGE`",
-                "echo \"$BOOTIMAGE\""
-        );
-        if (Utils.isValidShellResponse(res)) {
-            bootBlock = res.get(0);
-        } else {
-            blockList = shell.su("find /dev/block -type b | grep -vE 'dm-0|ram|loop'");
-        }
-    }
-
-}

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

@@ -1,286 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.Manifest;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-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.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.utils.Shell;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.util.Locale;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class SettingsActivity extends Activity implements Topic.Subscriber {
-
-    @BindView(R.id.toolbar) Toolbar toolbar;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getMagiskManager().isDarkTheme) {
-            setTheme(R.style.AppTheme_Transparent_Dark);
-        }
-
-        setContentView(R.layout.activity_settings);
-        ButterKnife.bind(this);
-
-        setSupportActionBar(toolbar);
-
-        toolbar.setNavigationOnClickListener(view -> finish());
-
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setTitle(R.string.settings);
-            ab.setDisplayHomeAsUpEnabled(true);
-        }
-
-        setFloating();
-
-        if (savedInstanceState == null) {
-            getFragmentManager().beginTransaction().add(R.id.container, new SettingsFragment()).commit();
-        }
-
-    }
-
-    @Override
-    public void onTopicPublished(Topic topic) {
-        recreate();
-    }
-
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { getMagiskManager().reloadActivity };
-    }
-
-    public static class SettingsFragment extends PreferenceFragment
-            implements SharedPreferences.OnSharedPreferenceChangeListener,
-            Topic.Subscriber {
-
-        private SharedPreferences prefs;
-        private PreferenceScreen prefScreen;
-
-        private ListPreference updateChannel, suAccess, autoRes, suNotification,
-                requestTimeout, multiuserMode, namespaceMode;
-        private MagiskManager mm;
-        private PreferenceCategory generalCatagory;
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.app_settings);
-            prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
-            prefScreen = getPreferenceScreen();
-            mm = Utils.getMagiskManager(getActivity());
-
-            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");
-
-            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);
-            }
-
-            // Remove re-authentication option on Android O, it will not work
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                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 (!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);
-                }
-            }
-        }
-
-        private void setLocalePreference(ListPreference lp) {
-            boolean isNew = lp == null;
-            if (isNew) {
-                lp = new ListPreference(getActivity());
-            }
-            CharSequence[] entries = new CharSequence[mm.locales.size() + 1];
-            CharSequence[] entryValues = new CharSequence[mm.locales.size() + 1];
-            entries[0] = getString(R.string.system_default);
-            entryValues[0] = "";
-            int i = 1;
-            for (Locale locale : mm.locales) {
-                entries[i] = locale.getDisplayName(locale);
-                entryValues[i++] = locale.toLanguageTag();
-            }
-            lp.setEntries(entries);
-            lp.setEntryValues(entryValues);
-            lp.setTitle(R.string.language);
-            lp.setKey("locale");
-            lp.setSummary(MagiskManager.locale.getDisplayName(MagiskManager.locale));
-            if (isNew) {
-                generalCatagory.addPreference(lp);
-            }
-        }
-
-        @Override
-        public void onResume() {
-            super.onResume();
-            prefs.registerOnSharedPreferenceChangeListener(this);
-            subscribeTopics();
-        }
-
-        @Override
-        public void onPause() {
-            prefs.unregisterOnSharedPreferenceChangeListener(this);
-            unsubscribeTopics();
-            super.onPause();
-        }
-
-        @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);
-                    if (mm.isDarkTheme != enabled) {
-                        mm.reloadActivity.publish(false);
-                    }
-                    break;
-                case "disable":
-                    enabled = prefs.getBoolean("disable", false);
-                    if (enabled) {
-                        Utils.createFile(getShell(), MagiskManager.MAGISK_DISABLE_FILE);
-                    } else {
-                        Utils.removeItem(getShell(), MagiskManager.MAGISK_DISABLE_FILE);
-                    }
-                    Toast.makeText(getActivity(), R.string.settings_reboot_toast, Toast.LENGTH_LONG).show();
-                    break;
-                case "magiskhide":
-                    enabled = prefs.getBoolean("magiskhide", false);
-                    if (enabled) {
-                        Utils.enableMagiskHide(getShell());
-                    } else {
-                        Utils.disableMagiskHide(getShell());
-                    }
-                    break;
-                case "hosts":
-                    enabled = prefs.getBoolean("hosts", false);
-                    if (enabled) {
-                        getShell().su_raw(
-                                "cp -af /system/etc/hosts /magisk/.core/hosts",
-                                "mount -o bind /magisk/.core/hosts /system/etc/hosts");
-                    } else {
-                        getShell().su_raw(
-                                "umount -l /system/etc/hosts",
-                                "rm -f /magisk/.core/hosts");
-                    }
-                    break;
-                case "su_access":
-                    mm.suDB.setSettings(SuDatabaseHelper.ROOT_ACCESS, Utils.getPrefsInt(prefs, "su_access"));
-                    break;
-                case "multiuser_mode":
-                    mm.suDB.setSettings(SuDatabaseHelper.MULTIUSER_MODE, Utils.getPrefsInt(prefs, "multiuser_mode"));
-                    break;
-                case "mnt_ns":
-                    mm.suDB.setSettings(SuDatabaseHelper.MNT_NS, Utils.getPrefsInt(prefs, "mnt_ns"));
-                    break;
-                case "locale":
-                    mm.setLocale();
-                    mm.reloadActivity.publish(false);
-                    break;
-                case "update_channel":
-                    mm.updateChannel = Utils.getPrefsInt(prefs, "update_channel");
-                    new CheckUpdates(mm, true).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]);
-            suAccess.setSummary(getResources()
-                    .getStringArray(R.array.su_access)[mm.suAccessState]);
-            autoRes.setSummary(getResources()
-                    .getStringArray(R.array.auto_response)[mm.suResponseType]);
-            suNotification.setSummary(getResources()
-                    .getStringArray(R.array.su_notification)[mm.suNotificationType]);
-            requestTimeout.setSummary(
-                    getString(R.string.request_timeout_summary, prefs.getString("su_request_timeout", "10")));
-            multiuserMode.setSummary(getResources()
-                    .getStringArray(R.array.multiuser_summary)[mm.multiuserMode]);
-            namespaceMode.setSummary(getResources()
-                    .getStringArray(R.array.namespace_summary)[mm.suNamespaceMode]);
-        }
-
-        @Override
-        public void onTopicPublished(Topic topic) {
-            setLocalePreference((ListPreference) findPreference("locale"));
-        }
-
-        @Override
-        public Topic[] getSubscription() {
-            return new Topic[] { mm.localeDone };
-        }
-    }
-
-}

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

@@ -1,24 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.topjohnwu.magisk.components.Activity;
-
-public class SplashActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        getMagiskManager().startup();
-
-        Intent intent = new Intent(this, MainActivity.class);
-        String section = getIntent().getStringExtra(MagiskManager.INTENT_SECTION);
-        if (section != null) {
-            intent.putExtra(MagiskManager.INTENT_SECTION, section);
-        }
-        startActivity(intent);
-        finish();
-    }
-}

app/src/main/java/com/topjohnwu/magisk/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_raw(
-                    "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

@@ -1,121 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.net.Uri;
-import android.text.TextUtils;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.AdaptiveList;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ZipUtils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-
-public class FlashZip extends ParallelTask<Void, Void, Integer> {
-
-    private Uri mUri;
-    private File mCachedFile, mScriptFile, mCheckFile;
-
-    private String mFilename;
-    private AdaptiveList<String> mList;
-
-    public FlashZip(Activity context, Uri uri, AdaptiveList<String> list) {
-        super(context);
-        mUri = uri;
-        mList = list;
-
-        mCachedFile = new File(context.getCacheDir(), "install.zip");
-        mScriptFile = new File(context.getCacheDir(), "/META-INF/com/google/android/update-binary");
-        mCheckFile = new File(mScriptFile.getParent(), "updater-script");
-
-        // Try to get the filename ourselves
-        mFilename = Utils.getNameFromUri(context, mUri);
-    }
-
-    private boolean unzipAndCheck() throws Exception {
-        ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android", false);
-        List<String> ret = Utils.readFile(getShell(), mCheckFile.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;
-        try {
-            mList.add("- Copying zip to temp directory");
-
-            mCachedFile.delete();
-            try (
-                InputStream in = mm.getContentResolver().openInputStream(mUri);
-                OutputStream out = new FileOutputStream(mCachedFile)
-            ) {
-                if (in == null) throw new FileNotFoundException();
-                byte buffer[] = new byte[1024];
-                int length;
-                while ((length = in.read(buffer)) > 0)
-                    out.write(buffer, 0, length);
-            } catch (FileNotFoundException e) {
-                mList.add("! Invalid Uri");
-                throw e;
-            } catch (IOException e) {
-                mList.add("! Cannot copy to cache");
-                throw e;
-            }
-            if (!unzipAndCheck()) return 0;
-            mList.add("- Installing " + mFilename);
-            getShell().su(mList,
-                    "BOOTMODE=true sh " + mScriptFile + " dummy 1 " + mCachedFile +
-                            " && echo 'Success!' || echo 'Failed!'"
-            );
-            if (TextUtils.equals(mList.get(mList.size() - 1), "Success!"))
-                return 1;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        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(
-                "rm -rf " + mCachedFile.getParent(),
-                "rm -rf " + MagiskManager.TMP_FOLDER_PATH
-        );
-        switch (result) {
-            case -1:
-                mList.add(mm.getString(R.string.install_error));
-                Utils.showUriSnack(getActivity(), mUri);
-                break;
-            case 0:
-                mList.add(mm.getString(R.string.invalid_zip));
-                break;
-            case 1:
-                // Success
-                new LoadModules(mm).exec();
-                break;
-        }
-        super.onPostExecute(result);
-    }
-}

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

@@ -1,74 +0,0 @@
-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.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.superuser.Policy;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ZipUtils;
-
-import java.io.File;
-import java.util.List;
-
-public class HideManager extends ParallelTask<Void, Void, Boolean> {
-
-    public HideManager(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected void onPreExecute() {
-        getMagiskManager().toast(R.string.hide_manager_toast, Toast.LENGTH_SHORT);
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... voids) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null)
-            return false;
-
-        // 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;
-
-        try {
-            // Allow the application to gain root by default
-            PackageManager pm = mm.getPackageManager();
-            int uid = pm.getApplicationInfo(pkg, 0).uid;
-            Policy policy = new Policy(uid, pm);
-            policy.policy = Policy.ALLOW;
-            policy.notification = false;
-            policy.logging = false;
-            mm.suDB.addPolicy(policy);
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-            return false;
-        }
-
-        // Hide myself!
-        getShell().su_raw("pm hide " + mm.getPackageName());
-        return true;
-    }
-
-    @Override
-    protected void onPostExecute(Boolean b) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null)
-            return;
-        if (!b) {
-            mm.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
-        }
-        super.onPostExecute(b);
-    }
-}

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

@@ -1,231 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.text.TextUtils;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.AdaptiveList;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.TarEntry;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ZipUtils;
-
-import org.kamranzafar.jtar.TarInputStream;
-import org.kamranzafar.jtar.TarOutputStream;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.List;
-
-public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
-
-    private static final int PATCH_MODE = 0;
-    private static final int DIRECT_MODE = 1;
-
-    private Uri mBootImg, mZip;
-    private AdaptiveList<String> mList;
-    private String mBootLocation;
-    private boolean mKeepEnc, mKeepVerity;
-    private int mode;
-
-    private InstallMagisk(Activity context, AdaptiveList<String> list, Uri zip, boolean enc, boolean verity) {
-        super(context);
-        mList = list;
-        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);
-        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);
-        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;
-
-        File install = new File(mm.getApplicationInfo().dataDir, "install");
-        getShell().sh_raw("rm -rf " + install);
-
-        List<String> abis = Arrays.asList(Build.SUPPORTED_ABIS);
-        String arch;
-        if (abis.contains("x86_64")) arch = "x64";
-        else if (abis.contains("arm64-v8a")) arch = "arm64";
-        else if (abis.contains("x86")) arch = "x86";
-        else arch = "arm";
-        mList.add("- Device platform: " + arch);
-
-        try {
-            // Unzip files
-            mList.add("- Extracting files");
-            try (InputStream in = mm.getContentResolver().openInputStream(mZip)) {
-                if (in == null) throw new FileNotFoundException();
-                BufferedInputStream buf = new BufferedInputStream(in);
-                buf.mark(Integer.MAX_VALUE);
-                ZipUtils.unzip(buf, install, arch + "/", true);
-                buf.reset();
-                ZipUtils.unzip(buf, install, "common/", true);
-                buf.reset();
-                ZipUtils.unzip(buf, install, "chromeos/", false);
-                buf.reset();
-                ZipUtils.unzip(buf, install, "META-INF/com/google/android/update-binary", true);
-            } catch (FileNotFoundException e) {
-                mList.add("! Invalid Uri");
-                throw e;
-            } catch (Exception e) {
-                mList.add("! Cannot unzip zip");
-                throw e;
-            }
-
-            File boot;
-            switch (mode) {
-                case PATCH_MODE:
-                    boot = new File(install, "boot.img");
-                    // Copy boot image to local
-                    try (
-                            InputStream in = mm.getContentResolver().openInputStream(mBootImg);
-                            OutputStream out = new FileOutputStream(boot)
-                    ) {
-                        InputStream source;
-                        if (in == null) throw new FileNotFoundException();
-
-                        if (Utils.getNameFromUri(mm, mBootImg).endsWith(".tar")) {
-                            // Extract boot.img from tar
-                            TarInputStream tar = new TarInputStream(new BufferedInputStream(in));
-                            org.kamranzafar.jtar.TarEntry entry;
-                            while ((entry = tar.getNextEntry()) != null) {
-                                if (entry.getName().equals("boot.img"))
-                                    break;
-                            }
-                            source = tar;
-                        } else {
-                            // Direct copy raw image
-                            source = in;
-                        }
-                        byte buffer[] = new byte[1024];
-                        int length;
-                        while ((length = source.read(buffer)) > 0)
-                            out.write(buffer, 0, length);
-                    } catch (FileNotFoundException e) {
-                        mList.add("! Invalid Uri");
-                        throw e;
-                    } catch (IOException e) {
-                        mList.add("! Copy failed");
-                        throw e;
-                    }
-                    break;
-                case DIRECT_MODE:
-                    boot = new File(mBootLocation);
-                    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();
-            }
-
-            // Patch boot image
-            shell.sh(mList,
-                    "cd " + install,
-                    "KEEPFORCEENCRYPT=" + mKeepEnc + " KEEPVERITY=" + mKeepVerity + " sh " +
-                            "update-binary indep boot_patch.sh " + boot +
-                            " && echo 'Success!' || echo 'Failed!'"
-            );
-
-            if (!TextUtils.equals(mList.get(mList.size() - 1), "Success!"))
-                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_raw("cat " + patched_boot + " /dev/zero | dd of=" + mBootLocation + " bs=4096");
-                    mList.add("Flashing patched boot to " + mBootLocation);
-                    break;
-                default:
-                    return false;
-            }
-
-            // Finals
-            getShell().sh_raw(
-                    "cd " + install,
-                    "mv bin/busybox busybox",
-                    "rm -rf bin *.img update-binary",
-                    "cd /");
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        super.onPostExecute(result);
-    }
-}

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

@@ -1,45 +0,0 @@
-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;
-
-public class LoadModules extends ParallelTask<Void, Void, Void> {
-
-    public LoadModules(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected Void doInBackground(Void... voids) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return null;
-        Logger.dev("LoadModules: Loading modules");
-
-        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) {}
-        }
-
-        Logger.dev("LoadModules: Data load done");
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void v) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return;
-        mm.moduleLoadDone.publish();
-        super.onPostExecute(v);
-    }
-}

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

@@ -1,47 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.support.v7.app.AlertDialog;
-import android.webkit.WebView;
-
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.WebService;
-
-import org.commonmark.node.Node;
-import org.commonmark.parser.Parser;
-import org.commonmark.renderer.html.HtmlRenderer;
-
-public class MarkDownWindow extends ParallelTask<Void, Void, String> {
-
-    private String mTitle, mUrl;
-
-    public MarkDownWindow(Activity context, String title, String url) {
-        super(context);
-        mTitle = title;
-        mUrl = url;
-    }
-
-    @Override
-    protected String doInBackground(Void... voids) {
-        String md = WebService.getString(mUrl);
-        Parser parser = Parser.builder().build();
-        HtmlRenderer renderer = HtmlRenderer.builder().build();
-        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));
-    }
-
-    @Override
-    protected void onPostExecute(String html) {
-        AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
-        alert.setTitle(mTitle);
-
-        WebView wv = new WebView(getActivity());
-        wv.loadDataWithBaseURL("fake://", html, "text/html", "UTF-8", null);
-
-        alert.setView(wv);
-        alert.setNegativeButton(R.string.close, (dialog, id) -> dialog.dismiss());
-        alert.show();
-    }
-}

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

@@ -1,131 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.Manifest;
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Environment;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.FlashActivity;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.WebService;
-import com.topjohnwu.magisk.utils.ZipUtils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
-
-    private ProgressDialog progressDialog;
-    private boolean mInstall;
-    private String mLink, mFile;
-
-    public ProcessRepoZip(Activity context, String link, String filename, boolean install) {
-        super(context);
-        mLink = link;
-        mFile = Environment.getExternalStorageDirectory() + "/MagiskManager/" + filename;
-        mInstall = install;
-    }
-
-    @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));
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... params) {
-        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);
-
-            // 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))
-            ) {
-                byte[] buffer = new byte[4096];
-                int length;
-                while ((length = source.read(buffer)) > 0)
-                    out.write(buffer, 0, length);
-            }
-
-            // Delete temp files
-            temp1.delete();
-            temp2.delete();
-
-            return true;
-        } catch (Exception e) {
-            Logger.error("ProcessRepoZip: Error!");
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        Activity activity = getActivity();
-        if (activity == null) return;
-        progressDialog.dismiss();
-        Uri uri = Uri.fromFile(new File(mFile));
-        if (result) {
-            if (Shell.rootAccess() && mInstall) {
-                Intent intent = new Intent(getActivity(), FlashActivity.class);
-                intent.setData(uri).putExtra(FlashActivity.SET_ACTION, FlashActivity.FLASH_ZIP);
-                activity.startActivity(intent);
-            } else {
-                Utils.showUriSnack(activity, uri);
-            }
-        } else {
-            Utils.getMagiskManager(activity).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));
-        return this;
-    }
-}

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

@@ -1,40 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.content.Context;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.R;
-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("gzip -d < " + stock_boot + " | cat - /dev/zero | dd of=" + mBoot + " bs=4096");
-        return true;
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        if (result) {
-            getMagiskManager().toast(R.string.restore_done, Toast.LENGTH_SHORT);
-        } else {
-            getMagiskManager().toast(R.string.restore_fail, Toast.LENGTH_LONG);
-        }
-    }
-}

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

@@ -1,190 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.text.TextUtils;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.module.BaseModule;
-import com.topjohnwu.magisk.module.Repo;
-import com.topjohnwu.magisk.utils.Logger;
-import com.topjohnwu.magisk.utils.WebService;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-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 RepoDatabaseHelper repoDB;
-    private SharedPreferences prefs;
-
-    public UpdateRepos(Context context) {
-        super(context);
-        prefs = getMagiskManager().prefs;
-        repoDB = getMagiskManager().repoDB;
-        String prefsPath = context.getApplicationInfo().dataDir + "/shared_prefs";
-        // Legacy data cleanup
-        File old = new File(prefsPath, "RepoMap.xml");
-        if (old.exists() || !prefs.getString("repomap", "empty").equals("empty")) {
-            old.delete();
-            prefs.edit().remove("version").remove("repomap").remove(ETAG_KEY).apply();
-            repoDB.clearRepo();
-        }
-        etags = new ArrayList<>(
-                Arrays.asList(prefs.getString(ETAG_KEY, "").split(",")));
-    }
-
-    private void loadJSON(String jsonString) throws Exception {
-        JSONArray jsonArray = new JSONArray(jsonString);
-
-        for (int i = 0; i < jsonArray.length(); i++) {
-            JSONObject jsonobject = jsonArray.getJSONObject(i);
-            String id = jsonobject.getString("description");
-            String name = jsonobject.getString("name");
-            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 {
-                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);
-                }
-                if (updated) {
-                    repoDB.addRepo(repo);
-                }
-            } catch (BaseModule.CacheModException ignored) {}
-        }
-    }
-
-    private boolean loadPage(int page, String url, int mode) {
-        Logger.dev("UpdateRepos: Loading page: " + (page + 1));
-        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);
-        }
-
-        // The getString succeed, parse the new stuffs
-        try {
-            loadJSON(jsonString);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-
-        // 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);
-        }
-
-        String links = header.get(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);
-                }
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    protected Void doInBackground(Void... voids) {
-        Logger.dev("UpdateRepos: Loading repos");
-
-        cached = repoDB.getRepoIDList();
-
-        if (!loadPage(0, null, CHECK_ETAG)) {
-            Logger.dev("UpdateRepos: No updates, use DB");
-            return null;
-        }
-
-        // 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) {
-            if (i != 0) etagBuilder.append(",");
-            etagBuilder.append(etags.get(i));
-        }
-        prefs.edit().putString(ETAG_KEY, etagBuilder.toString()).apply();
-
-        Logger.dev("UpdateRepos: Done");
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void v) {
-        MagiskManager mm = getMagiskManager();
-        if (mm == null) return;
-        mm.repoLoadDone.publish();
-        super.onPostExecute(v);
-    }
-}

app/src/main/java/com/topjohnwu/magisk/components/Activity.java

@@ -1,79 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-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;
-
-public class Activity extends AppCompatActivity {
-
-    private Runnable permissionGrantCallback;
-
-    public Activity() {
-        super();
-        Configuration configuration = new Configuration();
-        configuration.setLocale(MagiskManager.locale);
-        applyOverrideConfiguration(configuration);
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (this instanceof Topic.Subscriber) {
-            ((Topic.Subscriber) this).subscribeTopics();
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (this instanceof Topic.Subscriber) {
-            ((Topic.Subscriber) this).unsubscribeTopics();
-        }
-        super.onDestroy();
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            if (permissionGrantCallback != null) {
-                permissionGrantCallback.run();
-            }
-        }
-        permissionGrantCallback = null;
-    }
-
-    public void setPermissionGrantCallback(Runnable callback) {
-        permissionGrantCallback = callback;
-    }
-
-    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) {
-            WindowManager.LayoutParams params = getWindow().getAttributes();
-            params.height = getResources().getDimensionPixelSize(R.dimen.floating_height);
-            params.width = getResources().getDimensionPixelSize(R.dimen.floating_width);
-            params.alpha = 1.0f;
-            params.dimAmount = 0.6f;
-            params.flags |= 2;
-            getWindow().setAttributes(params);
-            setFinishOnTouchOutside(true);
-        }
-    }
-
-}

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

@@ -1,89 +0,0 @@
-package com.topjohnwu.magisk.database;
-
-import android.content.Context;
-import android.database.Cursor;
-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.utils.Utils;
-
-import java.util.LinkedList;
-import java.util.List;
-
-public class RepoDatabaseHelper extends SQLiteOpenHelper {
-
-    private static final int DATABASE_VER = 2;
-    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);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        onUpgrade(db, 0, DATABASE_VER);
-    }
-
-    @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++;
-        }
-    }
-
-    public void clearRepo() {
-        mDb.delete(TABLE_NAME, null, null);
-    }
-
-    public void removeRepo(List<String> list) {
-        for (String id : list) {
-            Logger.dev("Remove from DB: " + id);
-            mDb.delete(TABLE_NAME, "id=?", new String[] { id });
-        }
-    }
-
-    public void addRepo(Repo repo) {
-        mDb.replace(TABLE_NAME, null, repo.getContentValues());
-    }
-
-    public Repo getRepo(String id) {
-        try (Cursor c = mDb.query(TABLE_NAME, null, "id=?", new String[] { id }, null, null, null)) {
-            if (c.moveToNext()) {
-                return new Repo(c);
-            }
-        }
-        return null;
-    }
-
-    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");
-    }
-
-    public List<String> getRepoIDList() {
-        LinkedList<String> ret = new LinkedList<>();
-        try (Cursor c = mDb.query(TABLE_NAME, null, null, null, null, null, null)) {
-            while (c.moveToNext()) {
-                ret.add(c.getString(c.getColumnIndex("id")));
-            }
-        }
-        return ret;
-    }
-}

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

@@ -1,264 +0,0 @@
-package com.topjohnwu.magisk.database;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.text.TextUtils;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.superuser.Policy;
-import com.topjohnwu.magisk.superuser.SuLogEntry;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.io.File;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-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;
-
-    private static final int DATABASE_VER = 3;
-    private static final String POLICY_TABLE = "policies";
-    private static final String LOG_TABLE = "logs";
-    private static final String SETTINGS_TABLE = "settings";
-
-    private MagiskManager magiskManager;
-    private PackageManager pm;
-    private SQLiteDatabase mDb;
-
-    public SuDatabaseHelper(Context context) {
-        super(context, "su.db", null, DATABASE_VER);
-        magiskManager = Utils.getMagiskManager(context);
-        pm = context.getPackageManager();
-        mDb = getWritableDatabase();
-        cleanup();
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        onUpgrade(db, 0, DATABASE_VER);
-    }
-
-    @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 = magiskManager.getDatabasePath("sulog.db");
-            if (oldDB.exists()) {
-                migrateLegacyLogList(oldDB, db);
-                magiskManager.deleteDatabase("sulog.db");
-            }
-            ++oldVersion;
-        }
-        if (oldVersion == 2) {
-            db.execSQL("UPDATE " + LOG_TABLE + " SET time=time*1000");
-            ++oldVersion;
-        }
-    }
-
-    private void createTables(SQLiteDatabase db) {
-        // Policies
-        db.execSQL(
-                "CREATE TABLE IF NOT EXISTS " + POLICY_TABLE + " " +
-                "(uid INT, package_name TEXT, policy INT, " +
-                "until INT, logging INT, notification INT, " +
-                "PRIMARY KEY(uid))");
-
-        // Logs
-        db.execSQL(
-                "CREATE TABLE IF NOT EXISTS " + LOG_TABLE + " " +
-                "(from_uid INT, package_name TEXT, app_name TEXT, from_pid INT, " +
-                "to_uid INT, action INT, time INT, command TEXT)");
-
-        // Settings
-        db.execSQL(
-                "CREATE TABLE IF NOT EXISTS " + SETTINGS_TABLE + " " +
-                "(key TEXT, value INT, PRIMARY KEY(key))");
-    }
-
-    private void cleanup() {
-        // Clear outdated policies
-        mDb.delete(POLICY_TABLE, "until > 0 AND until < ?",
-                new String[] { String.valueOf(System.currentTimeMillis() / 1000) });
-        // Clear outdated logs
-        mDb.delete(LOG_TABLE, "time < ?", new String[] { String.valueOf(
-                System.currentTimeMillis() - magiskManager.suLogTimeout * 86400000) });
-    }
-
-    public void deletePolicy(Policy policy) {
-        deletePolicy(policy.packageName);
-    }
-
-    public void deletePolicy(String pkg) {
-        mDb.delete(POLICY_TABLE, "package_name=?", new String[] { pkg });
-    }
-
-    public void deletePolicy(int uid) {
-        mDb.delete(POLICY_TABLE, "uid=?", new String[]{String.valueOf(uid)});
-    }
-
-    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)) {
-            if (c.moveToNext()) {
-                policy = new Policy(c, pm);
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            deletePolicy(uid);
-            return null;
-        }
-        return policy;
-    }
-
-    public Policy getPolicy(String pkg) {
-        Policy policy = null;
-        try (Cursor c = mDb.query(POLICY_TABLE, null, "package_name=?", new String[] { pkg }, null, null, null)) {
-            if (c.moveToNext()) {
-                policy = new Policy(c, pm);
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            deletePolicy(pkg);
-            return null;
-        }
-        return policy;
-    }
-
-    public void addPolicy(Policy policy) {
-        mDb.replace(POLICY_TABLE, null, policy.getContentValues());
-    }
-
-    public void updatePolicy(Policy policy) {
-        mDb.update(POLICY_TABLE, policy.getContentValues(), "package_name=?",
-                new String[] { policy.packageName });
-    }
-
-    public List<Policy> getPolicyList(PackageManager pm) {
-        try (Cursor c = mDb.query(POLICY_TABLE, null, null, null, null, null, null)) {
-            List<Policy> ret = new ArrayList<>(c.getCount());
-            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 (magiskManager.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
-                    deletePolicy(c.getInt(c.getColumnIndex("uid")));
-                }
-            }
-            Collections.sort(ret);
-            return ret;
-        }
-    }
-
-    public List<List<Integer>> getLogStructure() {
-        try (Cursor c = mDb.query(LOG_TABLE, new String[] { "time" }, null, null, null, null, "time DESC")) {
-            List<List<Integer>> ret = new ArrayList<>();
-            List<Integer> list = null;
-            String dateString = null, newString;
-            while (c.moveToNext()) {
-                Date date = new Date(c.getLong(c.getColumnIndex("time")));
-                newString = DateFormat.getDateInstance(DateFormat.MEDIUM, MagiskManager.locale).format(date);
-                if (!TextUtils.equals(dateString, newString)) {
-                    dateString = newString;
-                    list = new ArrayList<>();
-                    ret.add(list);
-                }
-                list.add(c.getPosition());
-            }
-            return ret;
-        }
-    }
-
-    public Cursor getLogCursor() {
-        return getLogCursor(mDb);
-    }
-
-    public Cursor getLogCursor(SQLiteDatabase db) {
-        return db.query(LOG_TABLE, null, null, null, null, null, "time DESC");
-    }
-
-    private void migrateLegacyLogList(File oldDB, SQLiteDatabase newDB) {
-        try (SQLiteDatabase oldDb = SQLiteDatabase.openDatabase(oldDB.getPath(), null, SQLiteDatabase.OPEN_READWRITE);
-             Cursor c = getLogCursor(oldDb)) {
-            while (c.moveToNext()) {
-                ContentValues values = new ContentValues();
-                DatabaseUtils.cursorRowToContentValues(c, values);
-                newDB.insert(LOG_TABLE, null, values);
-            }
-        }
-    }
-
-    public void addLog(SuLogEntry log) {
-        mDb.insert(LOG_TABLE, null, log.getContentValues());
-    }
-
-    public void clearLogs() {
-        mDb.delete(LOG_TABLE, null, null);
-    }
-
-    public void setSettings(String key, int value) {
-        ContentValues data = new ContentValues();
-        data.put("key", key);
-        data.put("value", value);
-        mDb.replace(SETTINGS_TABLE, null, data);
-    }
-
-    public int getSettings(String key, int defaultValue) {
-        int value = defaultValue;
-        try (Cursor c = mDb.query(SETTINGS_TABLE, null, "key=?",new String[] { key }, null, null, null)) {
-            if (c.moveToNext()) {
-                value = c.getInt(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/ManagerUpdate.java

@@ -1,42 +0,0 @@
-package com.topjohnwu.magisk.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.support.v4.content.FileProvider;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.io.File;
-
-public class ManagerUpdate extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Utils.dlAndReceive(
-                context,
-                new DownloadReceiver() {
-                    @Override
-                    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);
-                            Uri content = FileProvider.getUriForFile(context,
-                                    "com.topjohnwu.magisk.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);
-                            context.startActivity(install);
-                        }
-                    }
-                },
-                intent.getStringExtra(MagiskManager.INTENT_LINK),
-                Utils.getLegalFilename("MagiskManager-v" +
-                        intent.getStringExtra(MagiskManager.INTENT_VERSION) + ".apk"));
-    }
-}

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

@@ -1,40 +0,0 @@
-package com.topjohnwu.magisk.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.superuser.Policy;
-import com.topjohnwu.magisk.utils.Utils;
-
-public class PackageReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        MagiskManager magiskManager = 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);
-                }
-                break;
-            case Intent.ACTION_PACKAGE_FULLY_REMOVED:
-                magiskManager.suDB.deletePolicy(policy);
-                break;
-        }
-    }
-}

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

@@ -1,34 +0,0 @@
-package com.topjohnwu.magisk.services;
-
-import android.app.IntentService;
-import android.content.Intent;
-import android.os.Build;
-import android.support.v7.app.NotificationCompat;
-
-import com.topjohnwu.magisk.R;
-
-public class OnBootIntentService extends IntentService {
-
-    private static final int ONBOOT_NOTIFICATION_ID = 3;
-
-    public OnBootIntentService() {
-        super("OnBootIntentService");
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
-            builder.setSmallIcon(R.drawable.ic_magisk)
-                    .setContentTitle("onBoot")
-                    .setContentText("Running onBoot operations...");
-            startForeground(ONBOOT_NOTIFICATION_ID, builder.build());
-        }
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        // Currently nothing to do
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.topjohnwu.magisk.superuser;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.topjohnwu.magisk.components.Activity;
-
-public class RequestActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = getIntent();
-        if (intent == null) {
-            finish();
-            return;
-        }
-
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setClass(this, SuRequestActivity.class);
-        startActivity(intent);
-        finish();
-    }
-}

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/Logger.java

@@ -1,49 +0,0 @@
-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";
-
-    public static void debug(String line) {
-        Log.d(DEBUG_TAG, "DEBUG: " + line);
-    }
-
-    public static void debug(String fmt, Object... args) {
-        debug(String.format(Locale.US, fmt, args));
-    }
-
-    public static void error(String line) {
-        Log.e(MAIN_TAG, "MANAGERERROR: " + 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 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));
-    }
-}

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,211 +0,0 @@
-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.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Modified by topjohnwu, based on Chainfire's libsuperuser
- */
-
-public class Shell {
-
-    // -1 = problematic/unknown issue; 0 = not rooted; 1 = properly rooted
-    public static int rootStatus;
-
-    private final Process shellProcess;
-    private final DataOutputStream STDIN;
-    private final DataInputStream STDOUT;
-
-    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();
-        if (TextUtils.isEmpty(s) || !s.contains("uid=0")) {
-            in.close();
-            out.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 static Shell getShell() {
-        return new Shell();
-    }
-
-    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();
-        }
-        return magiskManager.shell;
-    }
-
-    public static boolean rootAccess() {
-        return rootStatus > 0;
-    }
-
-    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) {
-            try {
-                for (String command : commands) {
-                    Logger.shell(command);
-                    STDIN.write((command + (stdout ? "\n" : " >/dev/null\n")).getBytes("UTF-8"));
-                    STDIN.flush();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                shellProcess.destroy();
-                isValid = false;
-            }
-        }
-    }
-
-    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 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) {
-        if (!rootAccess()) return;
-        sh(output, commands);
-    }
-
-    public static abstract class AbstractList<E> extends java.util.AbstractList<E> {
-
-        @Override
-        public abstract boolean add(E e);
-
-        @Override
-        public E get(int i) {
-            return null;
-        }
-
-        @Override
-        public int size() {
-            return 0;
-        }
-    }
-}

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

@@ -1,62 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.text.TextUtils;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Collection;
-
-/**
- * Modified by topjohnwu, based on Chainfire's libsuperuser
- */
-
-public class StreamGobbler extends Thread {
-
-    private BufferedReader reader = null;
-    private Collection<String> writer = null;
-
-    /**
-     * <p>StreamGobbler constructor</p>
-     *
-     * <p>We use this class because sh STDOUT and STDERR should be read as quickly as
-     * 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
-     */
-    public StreamGobbler(InputStream inputStream, Collection<String> outputList) {
-        try {
-            while (inputStream.available() != 0) {
-                inputStream.skip(inputStream.available());
-            }
-        } catch (IOException ignored) {}
-        reader = new BufferedReader(new InputStreamReader(inputStream));
-        writer = outputList;
-    }
-
-    @Override
-    public void run() {
-        // keep reading the InputStream until it ends (or an error occurs)
-        try {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                if (TextUtils.equals(line, "-shell-done-"))
-                    return;
-                writer.add(line);
-                Logger.shell(line);
-            }
-        } catch (IOException e) {
-            // reader probably closed, expected exit condition
-        }
-
-        // make sure our stream is closed and resources will be freed
-        try {
-            reader.close();
-        } catch (IOException e) {
-            // read already closed
-        }
-    }
-}

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

@@ -1,68 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import java.lang.ref.WeakReference;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-public class Topic {
-
-    public boolean hasPublished = false;
-    private List<WeakReference<Subscriber>> subscribers;
-
-    public void subscribe(Subscriber sub) {
-        if (subscribers == null) {
-            subscribers = new LinkedList<>();
-        }
-        subscribers.add(new WeakReference<>(sub));
-    }
-
-    public void unsubscribe() {
-        subscribers = null;
-    }
-
-    public void unsubscribe(Subscriber sub) {
-        for (Iterator<WeakReference<Subscriber>> i = subscribers.iterator(); i.hasNext();) {
-            WeakReference<Subscriber> subscriber = i.next();
-            if (subscriber.get() == null || subscriber.get() == sub) {
-                i.remove();
-            }
-        }
-    }
-
-    public void publish() {
-        publish(true);
-    }
-
-    public void publish(boolean record) {
-        hasPublished = record;
-        if (subscribers != null) {
-            for (WeakReference<Subscriber> subscriber : subscribers) {
-                if (subscriber.get() != null)
-                    subscriber.get().onTopicPublished(this);
-            }
-        }
-    }
-
-
-    public interface Subscriber {
-        default void subscribeTopics() {
-            for (Topic topic : getSubscription()) {
-                if (topic.hasPublished) {
-                    onTopicPublished(topic);
-                }
-                topic.subscribe(this);
-            }
-        }
-        default void unsubscribeTopics() {
-            for (Topic event : getSubscription()) {
-                event.unsubscribe(this);
-            }
-        }
-        default void onTopicPublished() {
-            onTopicPublished(null);
-        }
-        void onTopicPublished(Topic topic);
-        Topic[] getSubscription();
-    }
-}

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

@@ -1,507 +0,0 @@
-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.ProgressDialog;
-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.Configuration;
-import android.database.Cursor;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.os.CountDownTimer;
-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.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-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) {
-        String command = "[ -e " + path + " ] && echo true || echo false";
-        List<String> ret = shell.su(command);
-        return isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(0));
-    }
-
-    public static void createFile(Shell shell, 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);
-    }
-
-    public static void removeItem(Shell shell, String path) {
-        String command = "rm -rf " + path + " 2>/dev/null";
-        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) {
-        String command = "cat " + path + " | sed '$a\\ ' | sed '$d'";
-        return shell.su(command);
-    }
-
-    public static void dlAndReceive(Context context, DownloadReceiver receiver, String link, String filename) {
-        if (isDownloading)
-            return;
-
-        runWithPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE, () -> {
-            File file = new File(Environment.getExternalStorageDirectory() + "/MagiskManager/" + filename);
-
-            if ((!file.getParentFile().exists() && !file.getParentFile().mkdirs())
-                    || (file.exists() && !file.delete())) {
-                Toast.makeText(context, R.string.permissionNotGranted, Toast.LENGTH_LONG).show();
-                return;
-            }
-
-            Toast.makeText(context, context.getString(R.string.downloading_toast, filename), Toast.LENGTH_LONG).show();
-            isDownloading = true;
-
-            DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-
-            if (link != null) {
-                DownloadManager.Request request = new DownloadManager.Request(Uri.parse(link));
-                request.setDestinationUri(Uri.fromFile(file));
-                receiver.setDownloadID(downloadManager.enqueue(request));
-            }
-            receiver.setFilename(filename);
-            context.getApplicationContext().registerReceiver(receiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
-        });
-    }
-
-    public static String getLegalFilename(CharSequence filename) {
-        return filename.toString().replace(" ", "_").replace("'", "").replace("\"", "")
-                .replace("$", "").replace("`", "").replace("(", "").replace(")", "")
-                .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
-            for (String res : list) {
-                if (!TextUtils.isEmpty(res)) return true;
-            }
-        }
-        return false;
-    }
-
-    public static int getPrefsInt(SharedPreferences prefs, String key, int def) {
-        return Integer.parseInt(prefs.getString(key, String.valueOf(def)));
-    }
-
-    public static int getPrefsInt(SharedPreferences prefs, String key) {
-        return getPrefsInt(prefs, key, 0);
-    }
-
-    public static MagiskManager getMagiskManager(Context context) {
-        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)) {
-            if (c != null) {
-                int nameIndex = c.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-                if (nameIndex != -1) {
-                    c.moveToFirst();
-                    name = c.getString(nameIndex);
-                }
-            }
-        }
-        if (name == null) {
-            int idx = uri.getPath().lastIndexOf('/');
-            name = uri.getPath().substring(idx + 1);
-        }
-        return name;
-    }
-
-    public static void showUriSnack(Activity activity, Uri uri) {
-        SnackbarMaker.make(activity, activity.getString(R.string.internal_storage,
-                "/MagiskManager/" + Utils.getNameFromUri(activity, uri)),
-                Snackbar.LENGTH_LONG)
-                .setAction(R.string.ok, (v)->{}).show();
-    }
-
-    public static boolean checkNetworkStatus(Context context) {
-        ConnectivityManager manager = (ConnectivityManager) context.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) {
-        Configuration config = context.getResources().getConfiguration();
-        config.setLocale(locale);
-        Context localizedContext = context.createConfigurationContext(config);
-        return localizedContext.getString(id);
-    }
-
-    public static List<Locale> getAvailableLocale(Context context) {
-        List<Locale> locales = new ArrayList<>();
-        HashSet<String> set = new HashSet<>();
-        Locale locale;
-
-        int compareId = R.string.download_file_error;
-
-        // Add default locale
-        locales.add(Locale.ENGLISH);
-        set.add(getLocaleString(context, Locale.ENGLISH, compareId));
-
-        // Add some special locales
-        locales.add(Locale.TAIWAN);
-        set.add(getLocaleString(context, Locale.TAIWAN, compareId));
-        locale = new Locale("pt", "BR");
-        locales.add(locale);
-        set.add(getLocaleString(context, locale, compareId));
-
-        // Other locales
-        for (String s : context.getAssets().getLocales()) {
-            locale = Locale.forLanguageTag(s);
-            if (set.add(getLocaleString(context, locale, compareId))) {
-                locales.add(locale);
-            }
-        }
-
-        Collections.sort(locales, (l1, l2) -> l1.getDisplayName(l1).compareTo(l2.getDisplayName(l2)));
-
-        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);
-        } 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));
-                    }
-                    new AlertDialog.Builder(fragment.getActivity())
-                        .setTitle(R.string.select_method)
-                        .setItems(
-                            options.toArray(new String [0]),
-                            (dialog, idx) -> {
-                                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:
-                                        final String 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;
-                                }
-                                Utils.dlAndReceive(
-                                        mm,
-                                        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 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 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();
-                        ProgressDialog progress = new ProgressDialog(fragment.getActivity());
-                        progress.setTitle(R.string.reboot);
-                        progress.show();
-                        new CountDownTimer(5000, 1000) {
-                            @Override
-                            public void onTick(long millisUntilFinished) {
-                                progress.setMessage(mm.getString(R.string.reboot_countdown,
-                                        millisUntilFinished / 1000));
-                            }
-
-                            @Override
-                            public void onFinish() {
-                                progress.setMessage(mm.getString(R.string.reboot_countdown, 0));
-                                Shell.getShell(mm).su_raw(
-                                        "mv -f " + uninstaller + " /cache/" + UNINSTALLER,
-                                        "mv -f " + utils + " /data/magisk/" + UTIL_FUNCTIONS,
-                                        "reboot"
-                                );
-                            }
-                        }.start();
-                    } 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();
-    }
-}

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

@@ -1,79 +0,0 @@
-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();
-    }
-
-    public static InputStream request(int method, String address, Map<String, String> header) {
-        Logger.dev("WebService: Service call " + address);
-        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()) {
-                    conn.setRequestProperty(entry.getKey(), entry.getValue());
-                }
-            }
-
-            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));
-                    }
-                }
-                return conn.getInputStream();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-}

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

@@ -1,695 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.content.Context;
-import android.text.TextUtils;
-
-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 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);
-        in.close();
-    }
-
-    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;
-            while ((entry = zipfile.getNextJarEntry()) != null) {
-                if (!entry.getName().startsWith(path) || entry.isDirectory()){
-                    // Ignore directories, only create files
-                    continue;
-                }
-                String name;
-                if (junkPath) {
-                    name = entry.getName().substring(entry.getName().lastIndexOf('/') + 1);
-                } 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);
-                }
-                out.flush();
-                out.close();
-            }
-        } catch(Exception e) {
-            e.printStackTrace();
-            throw e;
-        }
-    }
-
-    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();
-            }
-        }
-    }
-
-
-    /**
-     * 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();
-        }
-    }
-
-    /** 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);
-    }
-}

app/src/main/jni/CMakeLists.txt

@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.6)
-add_library(zipadjust SHARED
-                jni_glue.c
-                zipadjust.c)
-find_library(libz z)
-find_library(liblog log)
-target_link_libraries(zipadjust ${libz} ${liblog})

app/src/main/jni/jni_glue.c

@@ -1,19 +0,0 @@
-//
-// Java entry point
-//
-
-#include <jni.h>
-#include "zipadjust.h"
-
-JNIEXPORT void JNICALL
-Java_com_topjohnwu_magisk_utils_ZipUtils_zipAdjust(JNIEnv *env, jclass type, jstring filenameIn_,
-                                                    jstring filenameOut_) {
-    const char *filenameIn = (*env)->GetStringUTFChars(env, filenameIn_, 0);
-    const char *filenameOut = (*env)->GetStringUTFChars(env, filenameOut_, 0);
-
-    // TODO
-    zipadjust(filenameIn, filenameOut, 0);
-
-    (*env)->ReleaseStringUTFChars(env, filenameIn_, filenameIn);
-    (*env)->ReleaseStringUTFChars(env, filenameOut_, filenameOut);
-}

app/src/main/jni/zipadjust.c

@@ -1,297 +0,0 @@
-#include <stdlib.h>
-#include <fcntl.h>
-#include <string.h>
-#include <zlib.h>
-#include <unistd.h>
-#include "zipadjust.h"
-
-#ifndef O_BINARY
-#define O_BINARY  0
-#define O_TEXT    0
-#endif
-
-#pragma pack(1)
-struct local_header_struct {
-    uint32_t signature;
-    uint16_t extract_version;
-    uint16_t flags;
-    uint16_t compression_method;
-    uint16_t last_modified_time;
-    uint16_t last_modified_date;
-    uint32_t crc32;
-    uint32_t size_compressed;
-    uint32_t size_uncompressed;
-    uint16_t length_filename;
-    uint16_t length_extra;
-    // filename
-    // extra
-};
-typedef struct local_header_struct local_header_t;
-
-#pragma pack(1)
-struct data_descriptor_struct {
-    uint32_t signature;
-    uint32_t crc32;
-    uint32_t size_compressed;
-    uint32_t size_uncompressed;
-};
-typedef struct data_descriptor_struct data_descriptor_t;
-
-#pragma pack(1)
-struct central_header_struct {
-    uint32_t signature;
-    uint16_t version_made;
-    uint16_t version_needed;
-    uint16_t flags;
-    uint16_t compression_method;
-    uint16_t last_modified_time;
-    uint16_t last_modified_date;
-    uint32_t crc32;
-    uint32_t size_compressed;
-    uint32_t size_uncompressed;
-    uint16_t length_filename;
-    uint16_t length_extra;
-    uint16_t length_comment;
-    uint16_t disk_start;
-    uint16_t attr_internal;
-    uint32_t attr_external;
-    uint32_t offset;
-    // filename
-    // extra
-    // comment
-};
-typedef struct central_header_struct central_header_t;
-
-#pragma pack(1)
-struct central_footer_struct {
-    uint32_t signature;
-    uint16_t disk_number;
-    uint16_t disk_number_central_directory;
-    uint16_t central_directory_entries_this_disk;
-    uint16_t central_directory_entries_total;
-    uint32_t central_directory_size;
-    uint32_t central_directory_offset;
-    uint16_t length_comment;
-    // comment
-};
-typedef struct central_footer_struct central_footer_t;
-
-#define MAGIC_LOCAL_HEADER 0x04034b50
-#define MAGIC_DATA_DESCRIPTOR 0x08074b50
-#define MAGIC_CENTRAL_HEADER 0x02014b50
-#define MAGIC_CENTRAL_FOOTER 0x06054b50
-
-static int xerror(char* message) {
-    LOGE("%s\n", message);
-    return 0;
-}
-
-static int xseekread(int fd, off_t offset, void* buf, size_t bytes) {
-    if (lseek(fd, offset, SEEK_SET) == (off_t)-1) return xerror("Seek failed");
-    if (read(fd, buf, bytes) != bytes) return xerror("Read failed");
-    return 1;
-}
-
-static int xseekwrite(int fd, off_t offset, void* buf, size_t bytes) {
-    if (lseek(fd, offset, SEEK_SET) == (off_t)-1) return xerror("Seek failed");
-    if (write(fd, buf, bytes) != bytes) return xerror("Write failed");
-    return 1;
-}
-
-static int xfilecopy(int fdIn, int fdOut, off_t offsetIn, off_t offsetOut, size_t bytes) {
-    if ((offsetIn != (off_t)-1) && (lseek(fdIn, offsetIn, SEEK_SET) == (off_t)-1)) return xerror("Seek failed");
-    if ((offsetOut != (off_t)-1) && (lseek(fdOut, offsetOut, SEEK_SET) == (off_t)-1)) return xerror("Seek failed");
-
-    int CHUNK = 256 * 1024;
-    void* buf = malloc(CHUNK);
-    if (buf == NULL) return xerror("malloc failed");
-    size_t left = bytes;
-    while (left > 0) {
-        size_t wanted = (left < CHUNK) ? left : CHUNK;
-        size_t r = read(fdIn, buf, wanted);
-        if (r <= 0) return xerror("Read failed");
-        if (write(fdOut, buf, r) != r) return xerror("Write failed");
-        left -= r;
-    }
-    free(buf);
-
-    return 1;
-}
-
-static int xdecompress(int fdIn, int fdOut, off_t offsetIn, off_t offsetOut, size_t bytes) {
-    if ((offsetIn != (off_t)-1) && (lseek(fdIn, offsetIn, SEEK_SET) == (off_t)-1)) return xerror("Seek failed");
-    if ((offsetOut != (off_t)-1) && (lseek(fdOut, offsetOut, SEEK_SET) == (off_t)-1)) return xerror("Seek failed");
-
-    int CHUNK = 256 * 1024;
-
-    int ret;
-    unsigned have;
-    z_stream strm;
-    unsigned char in[CHUNK];
-    unsigned char out[CHUNK];
-
-    strm.zalloc = Z_NULL;
-    strm.zfree = Z_NULL;
-    strm.opaque = Z_NULL;
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit2(&strm, -15);
-    if (ret != Z_OK) return xerror("ret != Z_OK");
-
-    do {
-        strm.avail_in = read(fdIn, in, CHUNK);
-        if (strm.avail_in == 0) break;
-        strm.next_in = in;
-
-        do {
-            strm.avail_out = CHUNK;
-            strm.next_out = out;
-
-            ret = inflate(&strm, Z_NO_FLUSH);
-            if (ret == Z_STREAM_ERROR) return xerror("Stream error");
-            switch (ret) {
-                case Z_NEED_DICT:
-                    ret = Z_DATA_ERROR;
-                case Z_DATA_ERROR:
-                case Z_MEM_ERROR:
-                    (void)inflateEnd(&strm);
-                    return xerror("DICT/DATA/MEM error");
-            }
-
-            have = CHUNK - strm.avail_out;
-            if (write(fdOut, out, have) != have) {
-                (void)inflateEnd(&strm);
-                return xerror("Write failed");
-            }
-        } while (strm.avail_out == 0);
-    } while (ret != Z_STREAM_END);
-    (void)inflateEnd(&strm);
-
-    return ret == Z_STREAM_END ? 1 : 0;
-}
-
-int zipadjust(const char* filenameIn, const char* filenameOut, int decompress) {
-    int ok = 0;
-
-    int fin = open(filenameIn, O_RDONLY | O_BINARY);
-    if (fin > 0) {
-        unsigned int size = lseek(fin, 0, SEEK_END);
-        lseek(fin, 0, SEEK_SET);
-        LOGD("%d bytes\n", size);
-
-        char filename[1024];
-
-        central_footer_t central_footer;
-        uint32_t central_directory_in_position = 0;
-        uint32_t central_directory_in_size = 0;
-        uint32_t central_directory_out_size = 0;
-
-        int i;
-        for (i = size - 4; i >= 0; i--) {
-            uint32_t magic = 0;
-            if (!xseekread(fin, i, &magic, sizeof(uint32_t))) return 0;
-            if (magic == MAGIC_CENTRAL_FOOTER) {
-                LOGD("central footer @ %08X\n", i);
-                if (!xseekread(fin, i, &central_footer, sizeof(central_footer_t))) return 0;
-
-                central_header_t central_header;
-                if (!xseekread(fin, central_footer.central_directory_offset, &central_header, sizeof(central_header_t))) return 0;
-                if ( central_header.signature == MAGIC_CENTRAL_HEADER ) {
-                    central_directory_in_position = central_footer.central_directory_offset;
-                    central_directory_in_size = size - central_footer.central_directory_offset;
-                    LOGD("central header @ %08X (%d)\n", central_footer.central_directory_offset, central_footer.central_directory_size);
-                    break;
-                }
-            }
-        }
-
-        if (central_directory_in_position == 0) return 0;
-
-        unsigned char* central_directory_in = (unsigned char*)malloc(central_directory_in_size);
-        unsigned char* central_directory_out = (unsigned char*)malloc(central_directory_in_size);
-        if (!xseekread(fin, central_directory_in_position, central_directory_in, central_directory_in_size)) return 0;
-        memset(central_directory_out, 0, central_directory_in_size);
-
-        unlink(filenameOut);
-        int fout = open(filenameOut, O_CREAT | O_WRONLY | O_BINARY, 0644);
-        if (fout > 0) {
-
-            uintptr_t central_directory_in_index = 0;
-            uintptr_t central_directory_out_index = 0;
-
-            central_header_t* central_header = NULL;
-
-            uint32_t out_index = 0;
-
-            while (1) {
-                central_header = (central_header_t*)&central_directory_in[central_directory_in_index];
-                if (central_header->signature != MAGIC_CENTRAL_HEADER) break;
-
-                filename[central_header->length_filename] = (char)0;
-                memcpy(filename, &central_directory_in[central_directory_in_index + sizeof(central_header_t)], central_header->length_filename);
-                LOGD("%s (%d --> %d) [%08X] (%d)\n", filename, central_header->size_uncompressed, central_header->size_compressed, central_header->crc32, central_header->length_extra + central_header->length_comment);
-
-                local_header_t local_header;
-                if (!xseekread(fin, central_header->offset, &local_header, sizeof(local_header_t))) return 0;
-
-                // save and update to next index before we clobber the data
-                uint16_t compression_method_old = central_header->compression_method;
-                uint32_t size_compressed_old = central_header->size_compressed;
-                uint32_t offset_old = central_header->offset;
-                uint32_t length_extra_old = central_header->length_extra;
-                central_directory_in_index += sizeof(central_header_t) + central_header->length_filename + central_header->length_extra + central_header->length_comment;
-
-                // copying, rewriting, and correcting local and central headers so all the information matches, and no data descriptors are necessary
-                central_header->offset = out_index;
-                central_header->flags = central_header->flags & !8;
-                if (decompress && (compression_method_old == 8)) {
-                    central_header->compression_method = 0;
-                    central_header->size_compressed = central_header->size_uncompressed;
-                }
-                central_header->length_extra = 0;
-                central_header->length_comment = 0;
-                local_header.compression_method = central_header->compression_method;
-                local_header.flags = central_header->flags;
-                local_header.crc32 = central_header->crc32;
-                local_header.size_uncompressed = central_header->size_uncompressed;
-                local_header.size_compressed = central_header->size_compressed;
-                local_header.length_extra = 0;
-
-                if (!xseekwrite(fout, out_index, &local_header, sizeof(local_header_t))) return 0;
-                out_index += sizeof(local_header_t);
-                if (!xseekwrite(fout, out_index, &filename[0], central_header->length_filename)) return 0;
-                out_index += central_header->length_filename;
-
-                if (decompress && (compression_method_old == 8)) {
-                    if (!xdecompress(fin, fout, offset_old + sizeof(local_header_t) + central_header->length_filename + length_extra_old, out_index, size_compressed_old)) return 0;
-                } else {
-                    if (!xfilecopy(fin, fout, offset_old + sizeof(local_header_t) + central_header->length_filename + length_extra_old, out_index, size_compressed_old)) return 0;
-                }
-                out_index += local_header.size_compressed;
-
-                memcpy(&central_directory_out[central_directory_out_index], central_header, sizeof(central_header_t) + central_header->length_filename);
-                central_directory_out_index += sizeof(central_header_t) + central_header->length_filename;
-            }
-
-            central_directory_out_size = central_directory_out_index;
-            central_footer.central_directory_size = central_directory_out_size;
-            central_footer.central_directory_offset = out_index;
-            central_footer.length_comment = 0;
-            if (!xseekwrite(fout, out_index, central_directory_out, central_directory_out_size)) return 0;
-            out_index += central_directory_out_size;
-            if (!xseekwrite(fout, out_index, &central_footer, sizeof(central_footer_t))) return 0;
-
-            LOGD("central header @ %08X (%d)\n", central_footer.central_directory_offset, central_footer.central_directory_size);
-            LOGD("central footer @ %08X\n", out_index);
-
-            close(fout);
-            ok = 1;
-        }
-
-        free(central_directory_in);
-        free(central_directory_out);
-        close(fin);
-    }
-
-    return ok;
-}

app/src/main/jni/zipadjust.h

@@ -1,13 +0,0 @@
-#ifndef MAGISKMANAGER_ZIPADJUST_H_H
-#define MAGISKMANAGER_ZIPADJUST_H_H
-
-#include <android/log.h>
-
-int zipadjust(const char* filenameIn, const char* filenameOut, int decompress);
-
-#define  LOG_TAG    "zipadjust"
-
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
-#define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
-
-#endif //MAGISKMANAGER_ZIPADJUST_H_H

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

@@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="400.0"
-    android:viewportWidth="400.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1.00" android:fillColor="#000000" android:pathData="M200.6,24.2C231.8,24.2 263,33 289.6,49.5C304.7,58.8 318.2,70.7 329.8,84.1C351.5,109.6 365.2,141.7 368.8,175C373.6,217.4 361.5,261.5 335.5,295.5C334.2,297.1 332.8,298.7 331.9,300.7C341.7,310.1 351,320 360.9,329.3C322.7,339.3 284.5,349.6 246.3,359.9C256.4,323.5 266,287 275.7,250.5C262.4,250.5 249.1,250.5 235.8,250.5C228.5,269.8 221.2,289.1 214.1,308.4C205.9,308.6 197.8,308.5 189.6,308.5C188.4,306.7 187.1,304.9 185.9,303C192.4,285.5 199.1,268 205.6,250.5C189.5,250.6 173.4,250.3 157.4,250.6C150.4,270 142.9,289.2 135.8,308.5C129.8,308.5 123.9,308.4 117.9,308.6C130.4,317.8 144,325.6 158.9,330.3C171.9,334.6 185.6,336.6 199.4,336.7C199.4,349.4 199.3,362.1 199.4,374.8C165.8,374.9 132.2,364.5 104.4,345.6C91.7,337 80.3,326.5 70.2,314.9C48.5,289.4 34.8,257.3 31.2,224C26.3,180.4 39.2,134.9 66.8,100.7C67.2,99.9 67.7,99.2 68.1,98.4C58.3,88.9 49,79 39.1,69.7C77.3,59.7 115.6,49.4 153.7,39.1C143.6,75.7 133.8,112.5 124.1,149.3C137.9,149.3 151.7,149.2 165.5,149.3C172.9,130 180.2,110.6 187.3,91.2C195.5,90.8 203.7,91 211.8,91C213,92.8 214.3,94.6 215.5,96.3C209.1,114 202.3,131.6 195.8,149.2C211.8,149.3 227.8,149.2 243.9,149.3C251.2,129.9 258.3,110.3 265.8,90.9C271.5,90.8 277.3,91.6 282.9,90.4C280.2,89.5 278.1,87.7 275.9,86.1C254,70.7 227.4,62.2 200.6,62.3C200.6,49.6 200.7,36.9 200.6,24.2M292.5,100C286.4,116.4 280.2,132.8 274,149.3C280.9,149.2 287.8,149.3 294.7,149.2C296,150.8 297.3,152.4 298.6,153.9C297.1,162.1 295.7,170.3 294.3,178.5C283.9,178.5 273.4,178.5 262.9,178.5C257.5,192.7 252.1,206.9 246.9,221.2C258.7,221.3 270.5,221.1 282.3,221.3C283.5,222.9 284.8,224.4 286.1,225.9C284.9,233.7 283.4,241.4 282.1,249.1C281.6,251 283.6,252.1 284.6,253.3C291.5,259.8 297.7,266.9 304.8,273.1C312.9,262.1 319.6,250.1 324.2,237.3C334.3,208.7 334.2,176.7 323.7,148.3C317,130.1 306.4,113.4 292.5,100M95.2,125.9C86.2,138 79,151.4 74.5,165.8C65.3,194.4 66.4,226.3 77.6,254.2C84.6,271.5 95.1,287.4 108.7,300.1C114.9,283.6 121.3,267.1 127.2,250.5C121.5,250.5 115.8,250.5 110,250.5C108.6,250.4 106.7,251 105.8,249.5C104.5,247.9 102.3,246.3 102.9,244.1C104.2,236.5 105.5,228.9 106.8,221.2C117.4,221.2 128.1,221.4 138.7,221.1C143.9,206.9 149.3,192.7 154.6,178.5C142.9,178.4 131.1,178.6 119.3,178.4C117.6,177.3 116.4,175.3 115,173.8C116.3,165.8 117.9,157.9 119,150C118.3,148.2 116.6,147.1 115.3,145.7C108.6,139.2 102.3,132.1 95.2,125.9M168.8,221.2C184.8,221.2 200.8,221.3 216.8,221.2C222.2,207 227.5,192.8 232.8,178.5C216.8,178.5 200.7,178.5 184.6,178.5C179.4,192.8 174,207 168.8,221.2Z"/>
-</vector>

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

@@ -1,27 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="2230.0"
-    android:viewportWidth="2230.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M416,565"/>
-    <path android:fillColor="#FF000000" android:pathData="M1014,935c-238.9,170.6 -487.1,149.8 -601,-221 -20.2,-65.8 -63.9,478 186,584 74.2,31.5 34.8,-78.8 167,-179C840.5,1062.5 1060.7,901.7 1014,935Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M982,1370c-64.6,63.2 -78.9,85.3 -162,158 -119.8,104.9 -241,-42 -223,-12 107.9,179.8 389.1,481.3 376,406 -26,-148.8 -46,-225 -28,-364C957.8,1458.7 1003.8,1348.7 982,1370Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M1252,1359c64.6,63.2 78.9,85.3 162,158 119.8,104.9 241,-42 223,-12 -107.9,179.8 -389.1,481.3 -376,406 26,-148.8 46,-225 28,-364C1276.2,1447.7 1230.2,1337.7 1252,1359Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M1073,1422"/>
-    <path android:fillColor="#FF000000" android:pathData="M782,1665"/>
-    <path android:fillColor="#FF000000" android:pathData="M899,1281"/>
-    <path android:fillColor="#FF000000" android:pathData="M946,884c-36.8,-163.5 -422.2,-66 -524,-325 -22.7,-57.7 30.6,415.1 319,427C880.7,991.8 953.2,916.1 946,884Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M983,799C813.2,659.7 722.9,478 576,279c-27.7,-37.5 124,-128 184,-134S870.3,359.4 876,489C881.2,607.4 1005.8,817.7 983,799Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M983,953l62,70"/>
-    <path android:fillColor="#FF000000" android:pathData="M445,825"/>
-    <path android:fillColor="#FF000000" android:pathData="M964,812S807.2,727.8 673,691C547.6,656.6 453.5,572.2 443,483c-7.8,-66.4 97,-192 97,-192s73.5,204 170,306C815,708 775.1,693 964,812Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M1081,1055c26,10.2 14.6,-538.8 26.6,-685.8S1030,132 997,105s-96.1,-6.4 -172,19c85.9,58.9 129,129 141,225C948,570.9 1067,679 1081,1055Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M980.3,1120.8c-131.5,37.9 -182.5,220.5 -315.2,243.1 -27.4,4.7 -58.3,12.9 -94.3,11.2 -67.3,-3.2 -152.4,-41.3 -266.1,-202.6 -33.6,-47.7 83.4,307.1 377,311.5 215,3.2 240.1,-210.5 383.4,-217 51.7,-2.3 55,-101 55,-101S1058.2,1098.4 980.3,1120.8Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M1258.7,1121.8c131.5,37.9 182.5,220.5 315.2,243.1 27.4,4.7 58.3,12.9 94.3,11.2 67.3,-3.2 152.4,-41.3 266.1,-202.6 33.6,-47.7 -83.4,307.1 -377,311.5 -215,3.2 -240.1,-210.5 -383.4,-217 -51.7,-2.3 -55,-101 -55,-101S1180.8,1099.4 1258.7,1121.8Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M512,1317"/>
-    <path android:fillColor="#FF000000" android:pathData="M1224,935c238.9,170.6 487.1,149.8 601,-221 20.2,-65.8 63.9,478 -186,584 -74.2,31.5 -34.8,-78.8 -167,-179C1397.5,1062.5 1177.3,901.7 1224,935Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M1223.1,1362c6.4,-8.8 -23.6,56.9 -3,245 25.1,228.8 -118.7,583 -118.7,583s-105.4,-353.5 -84.8,-576c16.5,-177.5 3,-258 3,-258S1112.6,1514.7 1223.1,1362Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M1292,884c36.8,-163.5 422.2,-66 524,-325 22.7,-57.7 -30.6,415.1 -319,427C1357.3,991.8 1284.8,916.1 1292,884Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M1255,799c169.8,-139.3 260.1,-321 407,-520 27.7,-37.5 -124,-128 -184,-134s-110.3,214.4 -116,344C1356.8,607.4 1232.2,817.7 1255,799Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M1255,953l-62,70"/>
-    <path android:fillColor="#FF000000" android:pathData="M1274,812s156.8,-84.3 291,-121c125.4,-34.4 219.5,-118.8 230,-208 7.8,-66.4 -97,-192 -97,-192s-73.6,204 -170,306C1423,708 1462.9,693 1274,812Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M1157,1055c-26,10.2 -14.6,-538.8 -26.6,-685.8S1208,132 1241,105s96.1,-6.4 172,19c-85.9,58.9 -129,129 -141,225C1290,570.9 1171,679 1157,1055Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M749,1800"/>
-</vector>

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

@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M5.41,21L6.12,17H2.12L2.47,15H6.47L7.53,9H3.53L3.88,7H7.88L8.59,3H10.59L9.88,7H15.88L16.59,3H18.59L17.88,7H21.88L21.53,9H17.53L16.47,15H20.47L20.12,17H16.12L15.41,21H13.41L14.12,17H8.12L7.41,21H5.41M9.53,9L8.47,15H14.47L15.53,9H9.53Z" />
-</vector>

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="?android:windowBackground"
-              android:orientation="vertical">
-
-    <include layout="@layout/toolbar"/>
-
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-</LinearLayout>

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

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<android.support.v7.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:layout_marginBottom="@dimen/card_vertical_margin"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
-    android:layout_marginTop="@dimen/card_vertical_margin"
-    style="?attr/cardStyle"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    card_view:cardCornerRadius="@dimen/card_corner_radius"
-    card_view:cardElevation="@dimen/card_elevation">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        android:layout_gravity="center_vertical"
-        android:padding="@dimen/card_layout_padding">
-
-        <ImageView
-            android:id="@+id/app_icon"
-            android:layout_width="@dimen/card_appicon_size"
-            android:layout_height="@dimen/card_appicon_size"
-            android:layout_centerVertical="true"
-            android:scaleType="centerCrop"/>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_alignBottom="@+id/app_icon"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:paddingEnd="@dimen/card_appicon_size"
-            android:paddingStart="65dp"
-            android:weightSum="1">
-
-
-            <TextView
-                android:id="@+id/app_name"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:maxLines="1"
-                android:paddingEnd="3dp"
-                android:paddingStart="3dp"
-                android:textStyle="bold"/>
-
-            <TextView
-                android:id="@+id/app_package"
-                android:layout_width="fill_parent"
-                android:layout_height="25dp"
-                android:ellipsize="marquee"
-                android:gravity="center_vertical"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:maxLines="1"
-                android:paddingEnd="3dp"
-                android:paddingStart="3dp"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true">
-
-            <CheckBox
-                android:id="@+id/checkbox"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:focusable="false"
-                android:gravity="center"
-                android:src="@drawable/ic_menu_overflow_material"
-                android:checked="false" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-
-</android.support.v7.widget.CardView>
-
-

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/values-fr/strings.xml

@@ -1,200 +0,0 @@
-<resources>
-    <!--Universal-->
-    <!--Welcome Activity-->
-    <string name="modules">Modules</string>
-    <string name="downloads">Téléchargements</string>
-    <string name="superuser">Superuser</string>
-    <string name="log">Journal</string>
-    <string name="settings">Paramètres</string>
-    <string name="install">Installer</string>
-    <!--Status Fragment-->
-    <string name="magisk_version_error">Magisk non installé</string>
-    <string name="checking_for_updates">Vérification de mises à jour…</string>
-    <string name="magisk_update_available">Magisk v%1$s disponible !</string>
-    <string name="cannot_check_updates">Impossible de vérifier les mises à jour, pas d\'Internet ?</string>
-    <string name="root_error">Rooté mais aucune permission root, non autorisée ?</string>
-    <string name="not_rooted">Non rooté</string>
-    <string name="safetyNet_check_text">Appuyer pour lancer le contrôle SafetyNet</string>
-    <string name="checking_safetyNet_status">Vérification de l\'état de SafetyNet…</string>
-    <string name="safetyNet_no_response">Impossible de contrôler SafetyNet, pas d\'Internet?</string>
-	<string name="safetyNet_check_success">Contrôle SafetyNet passé avec succès</string>
-	<string name="safetyNet_network_loss">Connexion réseau indisponible unavailable</string>
-	<string name="safetyNet_service_disconnected">Le service a été tué</string>
-	<string name="safetyNet_res_invalid">La réponse est invalide</string>
-    <!--Install Fragment-->
-    <string name="auto_detect">(Auto) %1$s</string>
-    <string name="cannot_auto_detect">(Auto détection impossible)</string>
-    <string name="boot_image_title">Emplacement de l\'Image Boot</string>
-    <string name="detect_button">Détection</string>
-    <string name="advanced_settings_title">Paramètres avancés</string>
-    <string name="keep_force_encryption">Garder le chiffrement forcé</string>
-    <string name="keep_dm_verity">Garder dm-verity</string>
-    <string name="current_magisk_title">Version Magisk Installée : %1$s</string>
-    <string name="install_magisk_title">Dernière Version Magisk : %1$s</string>
-    <string name="uninstall">Désinstaller</string>
-    <string name="reboot_countdown">Redémarrage dans %1$d</string>
-    <string name="uninstall_magisk_title">Désinstaller Magisk</string>
-	<string name="uninstall_magisk_msg">Tous les modules seront désactivés/effacés. Le root sera enlevé et vos données seront potentiellement chiffrées si ce n'est actuellement pas le cas</string>
-	<string name="update">Mise à jour %1$s</string>
-    <!--Module Fragment-->
-    <string name="no_info_provided">(Aucune information transmise)</string>
-    <string name="no_modules_found">Aucun module trouvé</string>
-    <string name="update_file_created">Le module va être mis à jour au prochain redémarrage</string>
-    <string name="remove_file_created">Le module va être supprimé au prochain redémarrage</string>
-    <string name="remove_file_deleted">Le module ne va pas être supprimé au prochain redémarrage</string>
-    <string name="disable_file_created">Le module va être désactivé au prochain redémarrage</string>
-    <string name="disable_file_removed">Le module va être activé au prochain redémarrage</string>
-    <string name="author">Créé par %1$s</string>
-    <!--Repo Fragment-->
-    <string name="update_available">Mise à jour disponible</string>
-    <string name="installed">Installé</string>
-    <string name="not_installed">Non installé</string>
-    <!--Log Fragment-->
-    <string name="menuSaveToSd">Enregistrer sur SD</string>
-    <string name="menuReload">Actualiser</string>
-    <string name="menuClearLog">Effacer le journal maintenant</string>
-    <string name="logs_cleared">Journal effacé avec succès</string>
-    <string name="log_is_empty">Journal vide</string>
-    <string name="logs_save_failed">Impossible d\'écrire le journal sur la SD card:</string>
-    <!--About Activity-->
-    <string name="about">À propos</string>
-    <string name="app_developers">Principaux développeurs</string>
-    <string name="app_developers_"><![CDATA[Appli créée par <a href="https://github.com/topjohnwu">topjohnwu</a> en collaboration avec <a href="https://github.com/d8ahazard">Digitalhigh</a> et <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
-    <string name="app_changelog">Modifications de l\'application</string>
-    <string name="translators" />
-    <string name="app_version">Version de l\'application</string>
-    <string name="app_source_code">Code source</string>
-    <string name="donation">Dons</string>
-    <string name="app_translators">Traducteurs de l\'application</string>
-    <string name="support_thread">Sujet pour support</string>
-    <!--Toasts, Dialogs-->
-    <string name="permissionNotGranted">Cette fonctionnalité ne marchera pas sans la permission d\'écriture sur le stockage externe.</string>
-    <string name="no_thanks">Non merci</string>
-    <string name="yes">Oui</string>
-    <string name="ok">OK</string>
-    <string name="close">Fermer</string>
-    <string name="repo_install_title">Installer %1$s</string>
-    <string name="repo_install_msg">Voulez-vous installer %1$s ?</string>
-    <string name="download">Télécharger</string>
-    <string name="download_file_error">Erreur de téléchargement du fichier</string>
-    <string name="install_error">Échec de l\'installation !</string>
-    <string name="invalid_zip">Ce zip n\'est pas un Module Magisk !!</string>
-    <string name="reboot">Redémarrer</string>
-    <string name="zip_process_msg">Exécution du fichier zip…</string>
-    <string name="downloading_toast">Téléchargement %1$s</string>
-    <string name="magisk_update_title">Nouvelle mise à jour de Magisk disponible !</string>
-    <string name="settings_reboot_toast">Redémarrer pour appliquer les changements</string>
-    <string name="release_notes">Notes de version</string>
-    <string name="repo_cache_cleared">Cache du dépôt effacé</string>
-    <string name="safetyNet_hide_notice">Cette application utilise SafetyNet\nDéjà pris en charge par MagiskHide par défaut</string>
-    <string name="process_error">Erreur d\'exécution</string>
-    <string name="internal_storage">Le zip est stocké dans :\n[Internal Storage]%1$s</string>
-    <string name="zip_process_title">Exécution</string>
-    <string name="manual_boot_image">Veuillez sélectionner l\'image boot manuellement !</string>
-	<string name="zip_download_title">Téléchargement</string>
-	<string name="zip_download_msg">Téléchargement du fichier zip...</string>
-	<string name="manager_update_title">Nouvelle mise à jour Magisk Manager disponible !</string>
-	<string name="manager_download_install">Appuyez pour télécharger et installer</string>
-	<string name="magisk_updates">Mises à jour Magisk</string>
-	<string name="flashing">Flash en-cours</string>
-	<string name="hide_manager_toast">Masquage de Magisk Manager…</string>
-	<string name="hide_manager_fail_toast">Échec du masquage de Magisk Manager...</string>
-	<string name="download_zip_only">Télécharger uniquement le zip</string>
-	<string name="patch_boot_file">Patcher le fichier image Boot</string>
-	<string name="direct_install">Installation directe (recommandée)</string>
-	<string name="select_method">Choisir une méthode</string>
-	<string name="no_boot_file_patch_support">La version cible de Magisk ne supporte pas la modification du fichier image Boot</string>
-	<string name="complete_uninstall">Désinstaller complètement</string>
-	<string name="restore_stock_boot">Restaurer le Boot stock</string>
-	<string name="restore_done">Restauration effectuée !</string>
-	<string name="restore_fail">Pas de sauvegarde stock disponible !</string>
-    <!--Settings Activity -->
-    <string name="settings_general_category">Général</string>
-    <string name="settings_dark_theme_title">Thème sombre</string>
-    <string name="settings_dark_theme_summary">Activer le thème sombre</string>
-    <string name="settings_notification_title">Notification de mise à jour</string>
-    <string name="settings_notification_summary">Afficher des notifications de mises à jour quand une nouvelle version est disponible</string>
-    <string name="settings_clear_cache_title">Effacer le cache du dépôt</string>
-    <string name="settings_clear_cache_summary">Effacer les informations en cache des dépôts en ligne, pour forcer une actualisation de l\'application</string>
-    <string name="settings_core_only_title">Mode Magisk Core uniquement</string>
-    <string name="settings_core_only_summary">Activer uniquement les fonctionnalités de base, tous les modules ne seront pas chargés. MagiskSU, MagiskHide et les hosts systemless restent activés</string>
-    <string name="settings_magiskhide_summary">Masquer Magisk de diverses détections</string>
-    <string name="settings_hosts_title">Hosts systemless</string>
-    <string name="settings_hosts_summary">Support hosts systemless pour les applications type Adblock</string>
-    <string name="settings_su_app_adb">Applications et ADB</string>
-    <string name="settings_su_app">Applications uniquement</string>
-    <string name="settings_su_adb">ADB uniquement</string>
-    <string name="settings_su_disable">Désactivé</string>
-    <string name="settings_su_request_10">10 secondes</string>
-    <string name="settings_su_request_20">20 secondes</string>
-    <string name="settings_su_request_30">30 secondes</string>
-    <string name="settings_su_request_60">60 secondes</string>
-    <string name="superuser_access">Accès Superuser</string>
-    <string name="auto_response">Réponse automatique</string>
-    <string name="request_timeout">Délai de requête</string>
-    <string name="superuser_notification">Notification Superuser</string>
-    <string name="request_timeout_summary">%1$s secondes</string>
-    <string name="settings_development_category">Dévellopement de l\'application</string>
-    <string name="settings_developer_logging_title">Activer le journal de débogage avancé</string>
-    <string name="settings_developer_logging_summary">Cocher ceci pour activer la journalisation "verbose" (tout)</string>
-    <string name="settings_shell_logging_title">Activer la journalisation de débogage de commande shell</string>
-    <string name="settings_shell_logging_summary">Cocher ceci pour activer la journalisation de toutes les commandes shell et leurs données de sortie</string>
-	<string name="settings_hide_manager_title">Masquer Magisk Manager</string>
-	<string name="settings_hide_manager_summary">Masquer temporellement Magisk Manager.\nCeci installera une nouvelle appli appelée \"Démasquer Magisk Manager\"</string>
-	<string name="language">Langue</string>
-	<string name="system_default">(Selon système)</string>
-	<string name="settings_update">Paramètres de mises à jour</string>
-	<string name="settings_update_channel_title">Canal de mise à jour</string>
-	<string name="settings_update_stable">Stable</string>
-	<string name="settings_update_beta">Beta</string>
-	<string name="settings_boot_format_title">Format de sortie du boot patché</string>
-	<string name="settings_boot_format_summary">Sélectionner le format de \'image boot patchée finale.\nChoisir .img pour flasher via fastboot/mode download ; chosiir .img.tar pour flasher via ODIN.</string>
-	<string name="settings_su_reauth_title">Ré-authentifier après mise à jour</string>
-	<string name="settings_su_reauth_summary">Ré-authentifier les permissions superuser après les mises à jour d\'une application</string>
-	<string name="multiuser_mode">Mode multi-utilisateurs</string>
-	<string name="settings_owner_only">Appareil du propriétaire uniquement</string>
-	<string name="settings_owner_manage">Appareil du propriétaire géré</string>
-	<string name="settings_user_independent">Utilisateur indépendant</string>
-	<string name="owner_only_summary">Seul le propriétaire a l\'accès root</string>
-	<string name="owner_manage_summary">Seul le propriétaire peut gérer les accès root et recevoir des demandes de permissions</string>
-	<string name="user_indepenent_summary">Chaque utilisateur dispose de ses propres règles root</string>
-	<string name="multiuser_hint_owner_request">Une requête a été envoyée au propriétaire de l\'appareil. Veuillez basculer sur le profil du propriétaire et accorder la permission</string>
-	<string name="mount_namespace_mode">Monter le mode espace de noms</string>
-	<string name="settings_ns_global">Espace de noms global</string>
-	<string name="settings_ns_requester">Hériter de l\'espace de noms</string>
-	<string name="settings_ns_isolate">Espace de noms isolé</string>
-	<string name="global_summary">Toutes les sessions root utilisent l\'espace de noms global monté</string>
-	<string name="requester_summary">Les sessions root hériteront des espaces de noms du demandeur</string>
-	<string name="isolate_summary">Chaque session root aura son propre espace de noms isolé</string>
-    <!--Superuser-->
-    <string name="su_request_title">Requête Superuser</string>
-    <string name="deny_with_str">Refuser%1$s</string>
-    <string name="deny">Refuser</string>
-    <string name="prompt">Demander</string>
-    <string name="grant">Accepter</string>
-    <string name="su_warning">Accepter un accès complet à votre appareil.\nRefuser si vous n\'êtes pas sûr!</string>
-    <string name="forever">Toujours</string>
-    <string name="once">Une fois</string>
-    <string name="tenmin">10 min</string>
-    <string name="twentymin">20 min</string>
-    <string name="thirtymin">30 min</string>
-    <string name="sixtymin">60 min</string>
-    <string name="su_allow_toast">%1$s a obtenu les droits Superuser</string>
-    <string name="su_deny_toast">%1$s n\'a pas obtenu les droits Superuser</string>
-    <string name="no_apps_found">Aucun application trouvée</string>
-    <string name="su_snack_grant">Les droits Superuser de %1$s sont accordés</string>
-    <string name="su_snack_deny">Les droits Superuser de %1$s sont refusés</string>
-    <string name="su_snack_notif_on">Les notifications pour %1$s sont activées</string>
-    <string name="su_snack_notif_off">Les notifications pour %1$s sont désactivées</string>
-    <string name="su_snack_log_on">La journalisation pour %1$s est activée</string>
-    <string name="su_snack_log_off">La journalisation pour %1$s est désactivée</string>
-    <string name="su_snack_revoke">Les droits de %1$s sont annulés</string>
-    <string name="su_revoke_title">Annuler ?</string>
-    <string name="su_revoke_msg">Vous confirmez l\'annulation des droits pour %1$s ?</string>
-    <string name="toast">Toast</string>
-    <string name="none">Aucun</string>
-    <!--Superuser logs-->
-    <string name="pid">PID :\u0020</string>
-    <string name="target_uid">Cible UID:\u0020</string>
-    <string name="command">Commande :\u0020</string>
-</resources>

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

@@ -1,186 +0,0 @@
-<resources>
-    <!--Universal-->
-
-    <!--Welcome Activity-->
-    <string name="modules">Moduli</string>
-    <string name="downloads">Download</string>
-    <string name="superuser">Superuser</string>
-    <string name="log">Registro eventi</string>
-    <string name="settings">Impostazioni</string>
-    <string name="install">Installa</string>
-
-    <!--Status Fragment-->
-    <string name="magisk_version_error">Magisk non installato</string>
-
-    <string name="checking_for_updates">Controllo aggiornamenti…</string>
-    <string name="magisk_update_available">È disponibile Magisk v%1$s!</string>
-    <string name="cannot_check_updates">Impossibile controllare aggiornamenti</string>
-    <string name="root_error">Rootato ma senza permessi. Non sei autorizzato?</string>
-    <string name="not_rooted">Non rootato</string>
-    <string name="safetyNet_check_text">Tocca per avviare controllo SafetyNet</string>
-    <string name="checking_safetyNet_status">Controllo stato SafetyNet</string>
-    <string name="safetyNet_check_success">Controllo SafetyNet OK</string>
-    <string name="safetyNet_no_response">Impossibile controllare SafetyNet. Nessuna connessione internet?</string>
-    <string name="safetyNet_network_loss">persa conenssioen di rete</string>
-    <string name="safetyNet_service_disconnected">Ils ervizio è stato terminato</string>
-    <string name="safetyNet_res_invalid">La risposta non è valida</string>
-
-    <!--Install Fragment-->
-    <string name="auto_detect">%1$s (auto)</string>
-    <string name="cannot_auto_detect">(impossibile rilevare automaticamente)</string>
-    <string name="boot_image_title">Percorso immagine boot</string>
-    <string name="detect_button">Rileva</string>
-    <string name="advanced_settings_title">Impostazioni avanzate</string>
-    <string name="keep_force_encryption">Mantieni crittografia forzata</string>
-    <string name="keep_dm_verity">Mantieni dm-verity</string>
-    <string name="current_magisk_title">Versione Magisk installata: %1$s</string>
-    <string name="install_magisk_title">Versione Magisk aggiornata: %1$s</string>
-    <string name="uninstall">Disinstalla</string>
-    <string name="reboot_countdown">Riavvio tra %1$d</string>
-    <string name="uninstall_magisk_title">Disinstalla Magisk</string>
-    <string name="update">Aggiorna %1$s</string>
-
-    <!--Module Fragment-->
-    <string name="no_info_provided">(nessuna informazione)</string>
-    <string name="no_modules_found">Nessun modulo trovato</string>
-    <string name="update_file_created">Il modulo sarà aggiornato al prossimo riavvio</string>
-    <string name="remove_file_created">Il modulo sarà rimosso al prossimo riavvio</string>
-    <string name="remove_file_deleted">Il modulo non sarà rimosso al prossimo riavvio</string>
-    <string name="disable_file_created">Il modulo sarà disattivato al prossimo riavvio</string>
-    <string name="disable_file_removed">Il modulo sarà abilitato al prossimo riavvio</string>
-    <string name="author">Creato da: %1$s</string>
-
-    <!--Repo Fragment-->
-    <string name="update_available">Aggiornamento disponibile</string>
-    <string name="installed">Installato</string>
-    <string name="not_installed">Non installato</string>
-
-    <!--Log Fragment-->
-    <string name="menuSaveToSd">Salva nella SD</string>
-    <string name="menuReload">Ricarica</string>
-    <string name="menuClearLog">Azzera registro eventi</string>
-    <string name="logs_cleared">Registro eventi creato correttamente</string>
-    <string name="log_is_empty">Il registro eventi è vuoto</string>
-    <string name="logs_save_failed">Impossibile scrivere registro eventi nella SD</string>
-
-    <!--About Activity-->
-    <string name="about">Informazioni</string>
-    <string name="app_developers">Sviluppatori</string>
-    <string name="app_developers_"><![CDATA[App creata da <a href="https://github.com/topjohnwu">topjohnwu</a> in collaborazione con <a href="https://github.com/d8ahazard">Digitalhigh</a> e <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
-    <string name="app_changelog">Novità</string>
-    <string name="translators">Fabb2303 - bovirus</string>
-    <string name="app_version">Versione app</string>
-    <string name="app_source_code">Codice sorgente</string>
-    <string name="donation">Dona</string>
-    <string name="app_translators">Traduttori app</string>
-    <string name="support_thread">Supporto app</string>
-
-    <!--Toasts, Dialogs-->
-    <string name="permissionNotGranted">Questa funzione non sarà operativa senza il permesso di scrittura nella memoria di archiviazione esterna</string>
-    <string name="no_thanks">No grazie</string>
-    <string name="yes">Sì</string>
-    <string name="ok">OK</string>
-    <string name="close">Chiudi</string>
-    <string name="repo_install_title">Installazione %1$s</string>
-    <string name="repo_install_msg">Vuoi installare %1$s ?</string>
-    <string name="download">Download</string>
-    <string name="download_file_error">Errore nel download del file</string>
-    <string name="install_error">Errore di installazione!</string>
-    <string name="invalid_zip">Lo ZIP non è un modulo Magisk!!</string>
-    <string name="reboot">Riavvia</string>
-    <string name="zip_process_msg">Elaborazione file ZIP…</string>
-    <string name="downloading_toast">Download di %1$s</string>
-    <string name="magisk_update_title">Disponibile nuovo aggiornamento Magisk!</string>
-    <string name="settings_reboot_toast">Riavvia per applicare</string>
-    <string name="release_notes">Note di rilascio</string>
-    <string name="repo_cache_cleared">Cache reposititory azzerata</string>
-    <string name="safetyNet_hide_notice">Quest\'app usa SafetyNet\ned è già gestita da MagiskHide</string>
-    <string name="process_error">Errore di elaborazione</string>
-    <string name="internal_storage">Lo ZIP si trova in:\n[memoria interna]%1$s</string>
-    <string name="zip_process_title">Elaborazione</string>
-    <string name="manual_boot_image">Seleziona manualmente l\'immagine di boot!</string>
-    <string name="manager_update_title">Nuovo aggiornamento di Magisk Manager disponibile!</string>
-    <string name="manager_download_install">Premere per scaricare e installare</string>
-    <string name="magisk_updates">Aggiornamenti Magisk</string>
-    <string name="flashing">Flashando</string>
-
-    <!--Settings Activity -->
-    <string name="settings_general_category">Generale</string>
-    <string name="settings_dark_theme_title">Tema scuro</string>
-    <string name="settings_dark_theme_summary">Abilita tema scuro</string>
-    <string name="settings_notification_title">Notifica aggiornamenti</string>
-    <string name="settings_notification_summary">Visualizza notifica quando sono diponibili aggiornamenti</string>
-    <string name="settings_clear_cache_title">Azzera cache repository</string>
-    <string name="settings_clear_cache_summary">Azzera le informazioni nella cache per i repository online, e forza l\'aggiornamento online dell\'app</string>
-
-    <string name="settings_core_only_title">Solo modo core Magisk</string>
-    <string name="settings_core_only_summary">Abilita solo le funzioni principali. Non tutti i moduli verranno caricati. MagiskSU, MagiskHide, e host systemless rimarranno abilitati</string>
-    <string name="settings_magiskhide_summary">Nasconde Magisk da numerose rilevazioni</string>
-    <string name="settings_hosts_title">Host systemless</string>
-    <string name="settings_hosts_summary">Supporto host systemless per app blocco pubblicità</string>
-
-    <string name="settings_su_app_adb">App e ADB</string>
-    <string name="settings_su_app">Solo app</string>
-    <string name="settings_su_adb">Solo ADB</string>
-    <string name="settings_su_disable">Disabilitato</string>
-    <string name="settings_su_request_10">10 secondi</string>
-    <string name="settings_su_request_20">20 secondi</string>
-    <string name="settings_su_request_30">30 secondi</string>
-    <string name="settings_su_request_60">60 secondi</string>
-    <string name="superuser_access">Accesso Superuser</string>
-    <string name="auto_response">Risposta automatica</string>
-    <string name="request_timeout">Timeout richiesta</string>
-    <string name="superuser_notification">Notifica Superuser</string>
-    <string name="request_timeout_summary">%1$s secondi</string>
-    <string name="settings_su_reauth_title">Ri-autentifica dopo aggiornamento</string>
-    <string name="settings_su_reauth_summary">Ri-autentifica permessi superuser dopo aggiornamento applicazione</string>
-
-    <string name="multiuser_mode">Modo multiutente</string>
-    <string name="settings_owner_only">Solo proprietario dispositivo</string>
-    <string name="settings_owner_manage">gestito da propietario utente</string>
-    <string name="settings_user_independent">Utente indipendente</string>
-    <string name="owner_only_summary">Solo proprietario che ha accesso root</string>
-    <string name="owner_manage_summary">Solo il propietario può gestire accesso root e ricevere richieste</string>
-    <string name="user_indepenent_summary">Ogni utente ha le sue regole di root separate</string>
-    <string name="multiuser_hint_owner_request">Una richiestà è stata inviata al propietario dipositivo. Accedi come propietario dispositivo e concedi i permessi.</string>
-
-    <string name="settings_development_category">Sviluppo app</string>
-    <string name="settings_developer_logging_title">Abilita registro eventi avanzato debug</string>
-    <string name="settings_developer_logging_summary">Spunta questo per abilitare il registro eventi dettagliato</string>
-    <string name="settings_shell_logging_title">Abilita registro eventi debug comandi shell</string>
-    <string name="settings_shell_logging_summary">Spunta questo per abilitare il registro eventi dettagliato dei comandi shell e dei relativi risultati</string>
-
-    <!--Superuser-->
-    <string name="su_request_title">Richiesta Superuser</string>
-    <string name="deny_with_str">Nega %1$s</string>
-    <string name="deny">Nega</string>
-    <string name="prompt">Richiedi</string>
-    <string name="grant">Concedi</string>
-    <string name="su_warning">Concede il pieno accesso al dispositivo.\nNega se non sei sicuro</string>
-    <string name="forever">Sempre</string>
-    <string name="once">Una volta</string>
-    <string name="tenmin">10 minuti</string>
-    <string name="twentymin">20 minuti</string>
-    <string name="thirtymin">30 minuti</string>
-    <string name="sixtymin">60 minuti</string>
-    <string name="su_allow_toast">%1$s HA ottenuto i permessi Superuser</string>
-    <string name="su_deny_toast">%1$s NON ha ottenuto i permessi Superuser</string>
-    <string name="no_apps_found">Nessuna app trovata</string>
-    <string name="su_snack_grant"> %1$s HA ottenuto i permessi Superuser</string>
-    <string name="su_snack_deny"> %1$s NON ha ottenuto i permessi Superuser</string>
-    <string name="su_snack_notif_on">Notifiche per %1$s abilitate</string>
-    <string name="su_snack_notif_off">Notifiche per %1$s disabilitate</string>
-    <string name="su_snack_log_on">Registro eventi abilitato per %1$s</string>
-    <string name="su_snack_log_off">Registro eventi NON abilitato per %1$s</string>
-    <string name="su_snack_revoke">I diritti di %1$s sono stati revocati</string>
-    <string name="su_revoke_title">Revocare?</string>
-    <string name="su_revoke_msg">Confermi la revoca dei diritti di %1$s?</string>
-    <string name="toast">Toast</string>
-    <string name="none">Nessuno</string>
-
-    <!--Superuser logs-->
-    <string name="pid">PID:\u0020</string>
-    <string name="target_uid">UID destinazione:\u0020</string>
-    <string name="command">Comando:\u0020</string>
-
-</resources>

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

@@ -1,166 +0,0 @@
-<resources>
-    <!--Universal-->
-
-    <!--Welcome Activity-->
-    <string name="modules">モジュール</string>
-    <string name="downloads">ダウンロード</string>
-    <string name="superuser">スーパーユーザー</string>
-    <string name="log">ログ</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">更新を確認できませんでした。インターネットに接続されていますか？</string>
-    <string name="root_error">Root化はされていますが権限がありません。拒否していませんか？</string>
-    <string name="not_rooted">Root化されていません</string>
-    <string name="safetyNet_check_text">タップしてSafetyNetチェックを開始</string>
-    <string name="checking_safetyNet_status">SafetyNet Statusをチェック中…</string>
-    <string name="safetyNet_no_response">SafetyNetをチェックできませんでした。インターネットに接続されていますか？</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>
-
-    <!--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">神楽坂桜（Sakura_Sa233#Twitter）/ hota (@lindwurm)</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">リポジトリキャッシュを消去しました</string>
-    <string name="safetyNet_hide_notice">このアプリはSafetyNetを使用しています。\n既定ではMagiskHideで既に処理されています</string>
-    <string name="process_error">プロセスエラー</string>
-    <string name="internal_storage">zipは:\n[Internal Storage]%1$sに保存されます</string>
-    <string name="zip_process_title">処理</string>
-    <string name="manual_boot_image">ブートイメージを手動で選択してください！</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_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">AdblockのためのSystemless hostsサポート</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_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">スーパーユーザーリクエスト</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">トースト通知</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>

app/src/main/res/values-pt-rBR/strings.xml

@@ -1,196 +0,0 @@
-<resources>
-	
-	
-	
-	
-    <!--Welcome Activity-->
-
-    <string name="modules">Módulos</string>
-    <string name="downloads">Baixar</string>
-	<string name="superuser">Superusuário</string>
-    <string name="log">Registro</string>
-    <string name="settings">Configurações</string>
-    <string name="install">Instalar</string>
-
-    <!--Status Fragment-->
-    <string name="magisk_version_error">Magisk não instalado</string>
-
-	<string name="checking_for_updates">Checando por atualizações…</string>
-    <string name="magisk_update_available">Magisk v%1$s disponível!</string>
-    <string name="cannot_check_updates">Não é possível verificar se há atualizações</string>
-    <string name="root_error">Rooteado mas sem permissão de root, o acesso foi permitido?</string>
-    <string name="not_rooted">Sem root</string>
-    <string name="safetyNet_check_text">Pressione para checar o SafetyNet</string>
-    <string name="checking_safetyNet_status">Verificando status do SafetyNet…</string>
-	<string name="safetyNet_check_success">SafetyNet verificado</string>
-    <string name="safetyNet_no_response">Não é possível verificar o SafetyNet, sem Internet?</string>
-    <string name="safetyNet_network_loss">Conexão com a rede perdida</string>
-    <string name="safetyNet_service_disconnected">O serviço foi morto</string>
-    <string name="safetyNet_res_invalid">A resposta é inválida</string>
-
-    <!--Install Fragment-->
-	<string name="auto_detect">(Auto) %1$s</string>
-	<string name="cannot_auto_detect">(Não foi auto detectado)</string>
-    <string name="boot_image_title">Local da Boot Image</string>
-    <string name="detect_button">Detectar</string>
-    <string name="advanced_settings_title">Configurações avançadas</string>
-    <string name="keep_force_encryption">Keep force encryption</string>
-    <string name="keep_dm_verity">Keep dm-verity</string>
-    <string name="current_magisk_title">Versão instalada do Magisk: %1$s</string>
-    <string name="install_magisk_title">Última versão do Magisk: %1$s</string>
-	<string name="uninstall">Desinstalar</string>
-    <string name="reboot_countdown">Reiniciando em %1$d</string>
-    <string name="uninstall_magisk_title">Desinstalar Magisk</string>
-
-    <!--Module Fragment-->
-    <string name="no_info_provided">(Nenhuma informação fornecida)</string>
-    <string name="no_modules_found">Nenhum módulo encontrado</string>
-    <string name="update_file_created">Módulo será atualizado na próxima reinicialização</string>
-    <string name="remove_file_created">Módulo será removido na próxima reinicialização</string>
-    <string name="remove_file_deleted">Módulo não será removido na próxima reinicialização</string>
-    <string name="disable_file_created">Módulo será desativado na próxima reinicialização</string>
-    <string name="disable_file_removed">Módulo será ativado na próxima reinicialização</string>
-    <string name="author">Criado por %1$s</string>
-
-    <!--Repo Fragment-->
-    <string name="update_available">Atualização disponível</string>
-    <string name="installed">Instalado</string>
-    <string name="not_installed">Não Instalado</string>
-
-    <!--Log Fragment-->
-    <string name="menuSaveToSd">Salvar no SD</string>
-    <string name="menuReload">Recarregar</string>
-    <string name="menuClearLog">Limpar registro agora</string>
-    <string name="logs_cleared">Registro limpado com sucesso</string>
-    <string name="log_is_empty">Registro está vazio</string>
-    <string name="logs_save_failed">Não foi possível gravar o registro para o cartão SD:</string>
-
-    <!--About Activity-->
-    <string name="about">Sobre</string>
-    <string name="app_developers">Principais desenvolvedores</string>
-    <string name="app_developers_"><![CDATA[App criado por <a href="https://github.com/topjohnwu">topjohnwu</a> em colaboração com <a href="https://github.com/d8ahazard">Digitalhigh</a> e <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
-    <string name="app_changelog">Registro de Mudanças do App</string>
-    <string name="translators">Killer7Mod</string>
-    <string name="app_version">Versão do App</string>
-    <string name="app_source_code">Código fonte</string>
-    <string name="donation">Doação</string>
-    <string name="app_translators">Tradutores do App</string>
-    <string name="support_thread">Suporte</string>
-
-    <!--Toasts, Dialogs-->
-    <string name="permissionNotGranted">Este recurso não funcionará sem permissão de escrita do armazenamento externo.</string>
-    <string name="no_thanks">Não, Obrigado</string>
-	<string name="yes">Sim</string>
-	<string name="ok">OK</string>
-    <string name="close">Fechar</string>
-    <string name="repo_install_title">Instalar %1$s</string>
-    <string name="repo_install_msg">Você deseja instalar%1$s ?</string>
-    <string name="download">Baixar</string>
-    <string name="download_file_error">Erro ao baixar o arquivo</string>
-    <string name="install_error">Erro na instalação!</string>
-    <string name="invalid_zip">O zip não é um Módulo Magisk!!</string>
-    <string name="reboot">Reiniciar</string>
-    <string name="zip_process_msg">Processando arquivo zip …</string>
-    <string name="downloading_toast">Baixando %1$s</string>
-    <string name="magisk_update_title">Nova atualização do Magisk disponível!</string>
-    <string name="settings_reboot_toast">Reinicie para aplicar configurações</string>
-    <string name="release_notes">Notas da atualização</string>
-	<string name="repo_cache_cleared">Cache do Repo. limpado</string>
-    <string name="safetyNet_hide_notice">Este aplicativo usa SafetyNet\nJá manipulado pelo MagiskHide por padrão</string>
-    <string name="process_error">Erro no processo</string>
-    <string name="internal_storage">O zip foi salvo em:\n[Armazenamento interno]%1$s</string>
-    <string name="zip_process_title">Processando</string>
-    <string name="manual_boot_image">Por Favor, selecione manualmente a Boot Image</string>
-	<string name="manager_update_title">Nova atualização do Magisk Manager disponível!</string>
-    <string name="manager_download_install">Pressione para baixar e instalar</string>
-    <string name="magisk_updates">Atualizações do Magisk</string>
-	
-    <!--Settings Fragment -->
-    <string name="settings_general_category">Geral</string>
-    <string name="settings_dark_theme_title">Tema escuro</string>
-    <string name="settings_dark_theme_summary">Ativa o tema escuro</string>
-	<string name="settings_notification_title">Notificação de Atualização</string>
-    <string name="settings_notification_summary">Mostrar notificações de atualização quando a nova versão estiver disponível</string>
-    <string name="settings_clear_cache_title">Limpar Repo Cache</string>
-    <string name="settings_clear_cache_summary">Limpe as informações armazenadas em cache para repos. online, forçando o aplicativo a atualizar online</string>
-
-	<string name="settings_core_only_title">Magisk modo somente Core</string>
-    <string name="settings_core_only_summary">Ativar somente recursos principais, todos os módulos não serão carregados. MagiskSU, MagiskHide, e systemless hosts ainda estará ativado</string>
-    <string name="settings_magiskhide_summary">Ocultar Magisk de várias detecções</string>
-    <string name="settings_hosts_title">Ativar systemless hosts</string>
-    <string name="settings_hosts_summary">Suporte do systemless para Adblock apps</string>
-
-	<string name="settings_su_app_adb">Aplicativos e ADB</string>
-    <string name="settings_su_app">Somente Aplicativos</string>
-    <string name="settings_su_adb">Somente ADB</string>
-    <string name="settings_su_disable">Desativado</string>
-    <string name="settings_su_request_10">10 segundos</string>
-    <string name="settings_su_request_20">20 segundos</string>
-    <string name="settings_su_request_30">30 segundos</string>
-    <string name="settings_su_request_60">60 segundos</string>
-    <string name="superuser_access">Acesso de superusuário</string>
-    <string name="auto_response">Resposta Automática</string>
-    <string name="request_timeout">Tempo limite de solicitação</string>
-    <string name="superuser_notification">Notificação do superusuário</string>
-    <string name="request_timeout_summary">%1$s segundos</string>
-	<string name="settings_su_reauth_title">Re-autenticar após a atualização</string>
-    <string name="settings_su_reauth_summary">Re-autenticar permissões de superusuário após as atualizações de um aplicativo</string>
-	
-	<string name="multiuser_mode">Modo Multiusuário</string>
-    <string name="settings_owner_only">Apenas Proprietário do Dispositivo</string>
-    <string name="settings_owner_manage">Proprietário do dispositivo gerenciado</string>
-    <string name="settings_user_independent">Usuário Independente</string>
-    <string name="owner_only_summary">Somente o proprietário possui acesso de root</string>
-    <string name="owner_manage_summary">Somente o proprietário pode gerenciar o acesso root e receber paineis de solicitações</string>
-    <string name="user_indepenent_summary">Cada usuário tem suas próprias regras raiz separadas</string>
-    <string name="multiuser_hint_owner_request">Um pedido foi enviado ao proprietário do dispositivo. Mude para o proprietário e conceda a permissão</string>
-
-    <string name="mount_namespace_mode">Modo namespace de montagem</string>
-    <string name="settings_ns_global">Global namespace</string>
-    <string name="settings_ns_requester">Herdar namespace</string>
-    <string name="settings_ns_isolate">Isolar namespace</string>
-    <string name="global_summary">Todas as sessões raiz usam o namespace de montagem global</string>
-    <string name="requester_summary">As sessões de raiz herdarão o namespace do seu solicitante</string>
-    <string name="isolate_summary">Cada sessão raiz terá seu próprio namespace isolado</string>
-	
-    <string name="settings_development_category">Desenvolvimento</string>
-    <string name="settings_developer_logging_title">Ativar registro mais detalhado</string>
-    <string name="settings_developer_logging_summary">Marque essa opção para habilitar um registro mais detalhado</string>
-    <string name="settings_shell_logging_title">Ativar registro da shell de comando</string>
-    <string name="settings_shell_logging_summary">Marque esta opção para habilitar o registro de todos os comandos shell e de saída</string>
-
-	<!--Superuser-->
-	<string name="su_request_title">Solicitação de superusuário</string>
-    <string name="deny_with_str">Negar%1$s</string>
-    <string name="deny">Negar</string>
-    <string name="prompt">Perguntar</string>
-    <string name="grant">Permitir</string>
-    <string name="su_warning">Concede acesso total ao seu dispositivo.\nNegue se você não tiver certeza!</string>
-    <string name="forever">Sempre</string>
-    <string name="once">Uma vez</string>
-    <string name="tenmin">10 minutos</string>
-    <string name="twentymin">20 minutos</string>
-    <string name="thirtymin">30 minutos</string>
-    <string name="sixtymin">60 minutos</string>
-    <string name="su_allow_toast">%1$s foi permitido o acesso de superusuário</string>
-    <string name="su_deny_toast">%1$s foi negado o acesso de superusuário</string>
-    <string name="no_apps_found">Não foram encontrados apps</string>
-    <string name="su_snack_grant">Acesso de superusuário do %1$s está permitido</string>
-    <string name="su_snack_deny">Acesso de superusuário do %1$s está negado</string>
-    <string name="su_snack_notif_on">Notificações do %1$s está ativado</string>
-    <string name="su_snack_notif_off">Notificações do %1$s está desativado</string>
-    <string name="su_snack_log_on">Registro do %1$s está ativado</string>
-    <string name="su_snack_log_off">Registro do %1$s está desativado</string>
-    <string name="su_snack_revoke">%1$s Direitos foi revogados</string>
-    <string name="su_revoke_title">Revogar?</string>
-    <string name="su_revoke_msg">Revogar os diretos do %1$s, Confirmar?</string>
-    <string name="toast">Notificação(Toast)</string>
-    <string name="none">Nenhum</string>
-
-    <!--Superuser logs-->
-    <string name="pid">PID:\u0020</string>
-    <string name="target_uid">Alvo UID:\u0020</string>
-    <string name="command">Comando:\u0020</string>
-
-
-</resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -1,198 +0,0 @@
-<resources>
-<!--Universal-->
-
-<!--Welcome Activity-->
-    <string name="modules">Módulos</string>
-<string name="downloads">Transferir</string>
-<string name="superuser">Super-Utilizador</string>
-<string name="log">Registo</string>
-<string name="settings">Definições</string>
-    <string name="install">Instalar</string>
-
-<!--Status Fragment-->
-    <string name="magisk_version_error">Magisk não instalado</string>
-
-<string name="checking_for_updates">A procurar por atualizações…</string>
-<string name="magisk_update_available">Magisk v%1$s disponível!</string>
-<string name="cannot_check_updates">Não foi possível verificar atualizações, sem internet?</string>
-    <string name="root_error">Com root mas sem permissão de root, o acesso foi permitido?</string>
-<string name="not_rooted">Sem root</string>
-    <string name="safetyNet_check_text">Pressione para verificar SafetyNet</string>
-<string name="checking_safetyNet_status">A verificar o estado do SafetyNet…</string>
-<string name="safetyNet_check_success">SafetyNet verificado com sucesso</string>
-    <string name="safetyNet_no_response">Não é possível verificar o SafetyNet, sem Internet?</string>
-    <string name="safetyNet_network_loss">Perda de ligação</string>
-<string name="safetyNet_service_disconnected">Serviço foi interrompido</string>
-<string name="safetyNet_res_invalid">A resposta é inválida</string>
-
-    <!--Install Fragment-->
-<string name="auto_detect">(Auto) %1$s</string>
-<string name="cannot_auto_detect">(Não foi auto detetado)</string>
-<string name="boot_image_title">Local da Imagem de Arranque</string>
-<string name="detect_button">Detectar</string>
-<string name="advanced_settings_title">Definições avançadas</string>
-<string name="keep_force_encryption">Manter encriptação forçada</string>
-<string name="keep_dm_verity">Manter dm-verity</string>
-<string name="current_magisk_title">Versão instalada do Magisk: %1$s</string>
-<string name="install_magisk_title">Última versão do Magisk: %1$s</string>
-<string name="uninstall">Desinstalar</string>
-<string name="reboot_countdown">A reiniciar em %1$d</string>
-<string name="uninstall_magisk_title">Desinstalar Magisk</string>
-    <string name="update">Atualizar %1$s</string>
-
-<!--Module Fragment-->
-<string name="no_info_provided">(Nenhuma informação fornecida)</string>
-<string name="no_modules_found">Nenhum módulo encontrado</string>
-<string name="update_file_created">Módulo será atualizado depois de reiniciar</string>
-<string name="remove_file_created">Módulo será removido depois de reiniciar</string>
-<string name="remove_file_deleted">Módulo não será removido ao reiniciar</string>
-<string name="disable_file_created">Módulo será desativado depois de reiniciar</string>
-<string name="disable_file_removed">Módulo será ativado depois de reiniciar</string>
-<string name="author">Criado por %1$s</string>
-
-    <!--Repo Fragment-->
-<string name="update_available">Atualização disponível</string>
-<string name="installed">Instalado</string>
-<string name="not_installed">Não Instalado</string>
-
-<!--Log Fragment-->
-<string name="menuSaveToSd">Gravar no SD</string>
-<string name="menuReload">Recarregar</string>
-<string name="menuClearLog">Limpar registo agora</string>
-<string name="logs_cleared">Registo limpo com sucesso</string>
-<string name="log_is_empty">Registo está vazio</string>
-<string name="logs_save_failed">Não foi possível gravar o registo para o cartão SD:</string>
-
-<!--About Activity-->
-<string name="about">Sobre</string>
-<string name="app_developers">Principais programadores</string>
-<string name="app_developers_"><![CDATA[App criado por <a href="https://github.com/topjohnwu">topjohnwu</a> em colaboração com <a href="https://github.com/d8ahazard">Digitalhigh</a> e <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
-<string name="app_changelog">Lista de alterações da aplicação</string>
-<string name="app_version">Versão do aplicação</string>
-<string name="app_source_code">Código fonte</string>
-<string name="donation">Doar</string>
-<string name="app_translators">Tradutores da Aplicação</string>
-<string name="support_thread">Suporte</string>
-
-<!--Toasts, Dialogs-->
-<string name="permissionNotGranted">Esta funcionalidade não funcionará sem permissão de escrita do armazenamento externo.</string>
-<string name="no_thanks">Não, Obrigado</string>
-<string name="yes">Sim</string>
-<string name="ok">OK</string>
-<string name="close">Fechar</string>
-<string name="repo_install_title">Instalar %1$s</string>
-<string name="repo_install_msg">Deseja instalar%1$s agora?</string>
-    <string name="download">Transferir</string>
-    <string name="download_file_error">Erro ao transferir ficheiro</string>
-<string name="install_error">Erro na instalação!</string>
-<string name="invalid_zip">Este zip não é um Módulo Magisk!!</string>
-    <string name="reboot">Reiniciar</string>
-    <string name="zip_process_msg">A processar ficheiro zip …</string>
-    <string name="downloading_toast">A transferir %1$s</string>
-<string name="magisk_update_title">Nova atualização do Magisk disponível!</string>
-<string name="settings_reboot_toast">Reinicie para aplicar definições</string>
-<string name="release_notes">Notas da atualização</string>
-<string name="repo_cache_cleared">Cache do repositório apagado</string>
-<string name="safetyNet_hide_notice">Esta aplicação usa SafetyNet
-\nJá manipulado pelo MagiskHide por padrão</string>
-    <string name="process_error">Erro no processo</string>
-<string name="internal_storage">O zip foi guardado em:
-\n[Armazenamento interno]%1$s</string>
-<string name="zip_process_title">A processar</string>
-<string name="manual_boot_image">Por Favor, selecione manualmente a imagem de Arranque</string>
-<string name="manager_update_title">Nova atualização do Magisk Manager disponível!</string>
-<string name="manager_download_install">Pressione para transferir e instalar</string>
-<string name="magisk_updates">Atualizações do Magisk</string>
-<string name="flashing">A instalar</string>
-
-<!--Settings Activity -->
-<string name="settings_general_category">Geral</string>
-<string name="settings_dark_theme_title">Tema escuro</string>
-<string name="settings_dark_theme_summary">Ativa o tema escuro</string>
-<string name="settings_notification_title">Notificação de Atualização</string>
-<string name="settings_notification_summary">Mostrar notificações de atualização quando a nova versão estiver disponível</string>
-<string name="settings_clear_cache_title">Apagar Cache de Repositório</string>
-<string name="settings_clear_cache_summary">Apaga a informação cache de repositórios online. online, forçando a aplicação a atualizar online</string>
-<string name="language">Língua</string>
-<string name="system_default">(Padrão do Sistema)</string>
-
-<string name="settings_core_only_title">Magisk somente em Modo Core</string>
-<string name="settings_core_only_summary">Ativar somente funcionalidades principais, todos os módulos não serão carregados. MagiskSU, MagiskHide, e systemless hosts ainda estará ativado</string>
-<string name="settings_magiskhide_summary">Oculta Magisk de várias deteções</string>
-    <string name="settings_hosts_title">Ativar systemless hosts</string>
-<string name="settings_hosts_summary">Suporte de systemless para aplicações Adblock</string>
-
-<string name="settings_su_app_adb">Aplicações e ADB</string>
-<string name="settings_su_app">Somente Aplicações</string>
-<string name="settings_su_adb">Somente ADB</string>
-<string name="settings_su_disable">Desativado</string>
-<string name="settings_su_request_10">10 segundos</string>
-<string name="settings_su_request_20">20 segundos</string>
-<string name="settings_su_request_30">30 segundos</string>
-<string name="settings_su_request_60">60 segundos</string>
-<string name="superuser_access">Acesso de Super-Utilizador</string>
-<string name="auto_response">Resposta Automática</string>
-<string name="request_timeout">Tempo limite de solicitação</string>
-<string name="superuser_notification">Notificação de Super-Utilizador</string>
-<string name="request_timeout_summary">%1$s segundos</string>
-<string name="settings_su_reauth_title">Autenticar novamente após atualizar</string>
-<string name="settings_su_reauth_summary">Autenticar novamente permissões de Super-Utilizador após atualizar aplicações</string>
-
-<string name="multiuser_mode">Modo Multi-Utilizador</string>
-<string name="settings_owner_only">Apenas Proprietário de Dispositivo</string>
-<string name="settings_owner_manage">Gerido Proprietário do Dispositivo</string>
-<string name="settings_user_independent">Independente de Utilizadores</string>
-<string name="owner_only_summary">Apenas o proprietário tem acesso a root</string>
-<string name="owner_manage_summary">Apenas o proprietário pode gerir acesso root e receber pedidos</string>
-<string name="user_indepenent_summary">Cada utilizador tem suas próprias regras de root separadas</string>
-<string name="multiuser_hint_owner_request">Um pedido foi enviado ao proprietário do dispositivo. Mude para o proprietário e conceda a permissão</string>
-
-<string name="mount_namespace_mode">Cada sessão root terá sua própria identificação isolada</string>
-<string name="settings_ns_global">Identificação Global</string>
-<string name="settings_ns_requester">Herdar Identificação</string>
-<string name="settings_ns_isolate">Identificação Isolada</string>
-<string name="global_summary">Todas as sessões root usam a identificação de montagem global</string>
-<string name="requester_summary">As sessões de root herdarão a identificação do seu solicitante</string>
-<string name="isolate_summary">Cada sessão root terá sua própria identificação isolada</string>
-
-<string name="settings_development_category">Desenvolvimento</string>
-<string name="settings_developer_logging_title">Ativar registo mais detalhado</string>
-<string name="settings_developer_logging_summary">Marque essa opção para permitir um registo mais detalhado</string>
-<string name="settings_shell_logging_title">Ativar registo da linha de comandos</string>
-<string name="settings_shell_logging_summary">Marque esta opção para permitir o registo de todos os comandos</string>
-
-<!--Superuser-->
-<string name="su_request_title">Pedido de Super-Utilizador</string>
-<string name="deny_with_str">Negar%1$s</string>
-<string name="deny">Negar</string>
-<string name="prompt">Perguntar</string>
-<string name="grant">Permitir</string>
-<string name="su_warning">Concede acesso total ao seu dispositivo.
-\nNegue se não tiver certeza!</string>
-<string name="forever">Sempre</string>
-<string name="once">Uma vez</string>
-<string name="tenmin">10 minutos</string>
-<string name="twentymin">20 minutos</string>
-<string name="thirtymin">30 minutos</string>
-<string name="sixtymin">60 minutos</string>
-<string name="su_allow_toast">%1$s foi permitido o acesso de Super-Utilizador</string>
-<string name="su_deny_toast">%1$s foi negado o acesso de Super-Utilizador</string>
-<string name="no_apps_found">Não foram encontrados aplicações</string>
-<string name="su_snack_grant">Acesso de Super-Utilizador a %1$s foi permitido</string>
-<string name="su_snack_deny">Acesso de Super-Utilizador a %1$s foi negado</string>
-<string name="su_snack_notif_on">Notificações de %1$s está ativado</string>
-<string name="su_snack_notif_off">Notificações da %1$s está desativado</string>
-<string name="su_snack_log_on">Registo de %1$s está ativado</string>
-<string name="su_snack_log_off">Registo de %1$s está desativado</string>
-<string name="su_snack_revoke">%1$s direitos foram revogados</string>
-<string name="su_revoke_title">Revogar?</string>
-<string name="su_revoke_msg">Revogar os diretos do %1$s, Confirmar?</string>
-<string name="toast">Notificação(pop-up)</string>
-<string name="none">Nenhum</string>
-
-<!--Superuser logs-->
-<string name="pid">PID:\u0020</string>
-<string name="target_uid">Alvo UID:\u0020</string>
-<string name="command">Comando:\u0020</string>
-
-</resources>

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

@@ -1,204 +0,0 @@
-<resources>
-    <!--Universal-->
-
-    <!--Welcome Activity-->
-    <string name="modules">Модули</string>
-    <string name="downloads">Загрузки</string>
-    <string name="superuser">Суперпользователь</string>
-    <string name="log">История</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">Невозможно проверить наличие обновлений</string>
-    <string name="root_error">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</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">Сохранить на карту памяти</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">Не удалось записать файл истории на карту памяти:</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" />
-    <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">В архив отсутствует модуль Magisk!</string>
-    <string name="reboot">Перезагрузка</string>
-    <string name="zip_process_msg">Обработка архива …</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">Кеш репозитория очищен</string>
-    <string name="safetyNet_hide_notice">Данное приложение использует SafetyNet.\nУже обработано MagiskHide по умолчанию</string>
-    <string name="process_error">Ошибка обработки</string>
-    <string name="internal_storage">Архив расположен:\n[Внутреннее Хранилище]%1$s</string>
-    <string name="zip_process_title">Обработка</string>
-    <string name="manual_boot_image">Пожалуйста, выберите вручную boot-образ!</string>
-    <string name="manager_update_title">Доступно новое обновление менеджера Magisk!</string>
-    <string name="manager_download_install">Нажмите, чтобы скачать и установить</string>
-    <string name="hide_manager_toast">Скрытие Менеджера Magisk…</string>
-    <string name="hide_manager_fail_toast">Скрытие Менеджера Magisk неудачно…</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</string>
-    <string name="settings_hide_manager_summary">Временно скрывает Менеджер Magisk.\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-образа.\n.img - для прошивки с помощью fastboot либо режима download\n.img.tar - для прошивки с помощью ODIN</string>
-
-    <string name="settings_core_only_title">Режим Magisk Core</string>
-    <string name="settings_core_only_summary">Включить возможности только уровня Core, все модули не будут загружены. MagiskSU, MagiskHide и внесистемные хосты останутся включенными</string>
-    <string name="settings_magiskhide_summary">Скрыть Magisk от различных проверок</string>
-    <string name="settings_hosts_title">Внесистемные хосты</string>
-    <string name="settings_hosts_summary">Поддержка внесистемных хостов для приложений блокировки рекламы</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">Все сеансы Суперпользователя используют глобальное пространство имён</string>
-    <string name="requester_summary">Сессии Суперпользователя наследуют пространство имен запрашивающего</string>
-    <string name="isolate_summary">Каждая сессия Суперпользователя будет иметь собственное изолированное пространство имен</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">Запрос прав Суперпользователя</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">Всплывающее уведомление</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>

build.gradle

@@ -1,26 +1,65 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply plugin: 'com.android.application'
 
-buildscript {
+android {
-    repositories {
+    compileSdkVersion rootProject.ext.compileSdkVersion
-        jcenter()
+    buildToolsVersion rootProject.ext.buildToolsVersion
-        mavenCentral()
+
-        maven { url "https://maven.google.com" }
+    defaultConfig {
+        applicationId "com.topjohnwu.magisk"
+        minSdkVersion 21
+        targetSdkVersion rootProject.ext.compileSdkVersion
+        javaCompileOptions {
+            annotationProcessorOptions {
+                argument('butterknife.debuggable', 'false')
+            }
+        }
     }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta4'
 
-        // NOTE: Do not place your application dependencies here; they belong
+    buildTypes {
-        // in the individual module build.gradle files
+        release {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    flavorDimensions "mode"
+
+    productFlavors {
+        full {
+            versionCode 127
+            versionName "5.8.1"
+        }
+        stub {
+            versionCode 1
+            versionName "stub"
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    dexOptions {
+        preDexLibraries true
+        javaMaxHeapSize "2g"
+    }
+    lintOptions {
+        disable 'MissingTranslation'
     }
 }
 
-allprojects {
+dependencies {
-    repositories {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
-        jcenter()
+    fullImplementation project(':utils')
-        maven { url "https://jitpack.io" }
+    implementation "com.android.support:support-core-utils:${rootProject.ext.supportLibVersion}"
-    }
+    fullImplementation "com.android.support:preference-v7:${rootProject.ext.supportLibVersion}"
-}
+    fullImplementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
-
+    fullImplementation "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
-task clean(type: Delete) {
+    fullImplementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
-    delete rootProject.buildDir
+    fullImplementation 'com.github.topjohnwu:libsu:1.3.0'
+    fullImplementation 'com.atlassian.commonmark:commonmark:0.11.0'
+    fullImplementation 'org.kamranzafar:jtar:2.3'
+    fullImplementation 'com.jakewharton:butterknife:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 }

gradle.properties

@@ -1,22 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2560m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-org.gradle.parallel=true
-
-# When set to true the Gradle daemon is used to run the build. For local developer builds this is our favorite property.
-# The developer environment is optimized for speed and feedback so we nearly always run Gradle jobs with the daemon.
-org.gradle.daemon=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Sat Sep 02 18:20:31 CST 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

proguard-rules.pro

@@ -16,10 +16,14 @@
 #   public *;
 #}
 
+# Keep all names, we are open source anyway :)
+-keepnames class ** { *; }
+
 # BouncyCastle
--keep class org.bouncycastle.** { *; }
+-keep class org.bouncycastle.jcajce.provider.asymmetric.rsa.**SHA1** { *; }
+-keep class org.bouncycastle.jcajce.provider.asymmetric.RSA** { *; }
+-keep class org.bouncycastle.jcajce.provider.digest.SHA1** { *; }
 -dontwarn javax.naming.**
 
--dontwarn android.content.**
+# Gson
--dontwarn android.animation.**
+-keepattributes Signature
-

resource/.gitignore

@@ -1 +0,0 @@
-/build

resource/build.gradle

@@ -1,23 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
-
-    }
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt')
-        }
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-}

resource/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="com.topjohnwu.resource" />

settings.gradle

@@ -1 +0,0 @@
-include ':app', ':unhide', ':resource'

src/full/AndroidManifest.xml

@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
     <application
         android:name=".MagiskManager"
-        android:allowBackup="true"
+        android:theme="@style/AppTheme">
-        android:icon="@mipmap/ic_launcher"
+
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize"
@@ -29,32 +21,28 @@
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name=".AboutActivity"
-            android:theme="@style/AppTheme.Transparent" />
+            android:theme="@style/AppTheme.StatusBar" />
         <activity
             android:name=".SettingsActivity"
-            android:theme="@style/AppTheme.Transparent" />
+            android:theme="@style/AppTheme.StatusBar" />
         <activity
             android:name=".FlashActivity"
-            android:screenOrientation="nosensor"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/AppTheme.Transparent" />
+            android:screenOrientation="nosensor"
-
+            android:theme="@style/AppTheme.StatusBar" />
+        <activity
+            android:name=".NoUIActivity"
+            android:theme="@style/AppTheme.Translucent" />
         <activity
             android:name=".superuser.RequestActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
             android:taskAffinity="internal.superuser"
-            android:theme="@android:style/Theme.NoDisplay" />
-        <activity
-            android:name=".superuser.SuRequestActivity"
-            android:excludeFromRecents="true"
-            android:taskAffinity="internal.superuser"
             android:theme="@style/SuRequest" />
 
         <receiver android:name=".superuser.SuReceiver" />
@@ -67,11 +55,16 @@
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
                 <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
-
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
         <receiver android:name=".receivers.ManagerUpdate" />
+        <receiver android:name=".receivers.RebootReceiver" />
+        <receiver android:name=".receivers.ShortcutReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.LOCALE_CHANGED" />
+            </intent-filter>
+        </receiver>
 
         <service android:name=".services.OnBootIntentService" />
         <service
@@ -79,19 +72,10 @@
             android:exported="true"
             android:permission="android.permission.BIND_JOB_SERVICE" />
 
-        <provider
+        <!-- Hardcode GMS version -->
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.topjohnwu.magisk.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
-
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
+            android:value="7095000" />
 
     </application>
 

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

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

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

@@ -0,0 +1,155 @@
+package com.topjohnwu.magisk;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.asyncs.FlashZip;
+import com.topjohnwu.magisk.asyncs.InstallMagisk;
+import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.superuser.CallbackList;
+import com.topjohnwu.superuser.Shell;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Locale;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class FlashActivity extends Activity {
+
+    @BindView(R.id.toolbar) Toolbar toolbar;
+    @BindView(R.id.txtLog) TextView flashLogs;
+    @BindView(R.id.button_panel) public LinearLayout buttonPanel;
+    @BindView(R.id.reboot) public Button reboot;
+    @BindView(R.id.scrollView) ScrollView sv;
+
+    private List<String> logs;
+
+    @OnClick(R.id.no_thanks)
+    void dismiss() {
+        finish();
+    }
+
+    @OnClick(R.id.reboot)
+    void reboot() {
+        Shell.Async.su("/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
+    public int getDarkTheme() {
+        return R.style.AppTheme_StatusBar_Dark;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_flash);
+        ButterKnife.bind(this);
+        setSupportActionBar(toolbar);
+        ActionBar ab = getSupportActionBar();
+        if (ab != null) {
+            ab.setTitle(R.string.flashing);
+        }
+        setFloating();
+        setFinishOnTouchOutside(false);
+        if (!Shell.rootAccess())
+            reboot.setVisibility(View.GONE);
+
+        logs = new ArrayList<>();
+        CallbackList<String> console = new CallbackList<String>(new ArrayList<>()) {
+            @Override
+            public void onAddElement(String s) {
+                logs.add(s);
+                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();
+
+        switch (intent.getStringExtra(Const.Key.FLASH_ACTION)) {
+            case Const.Value.FLASH_ZIP:
+                new FlashZip(this, uri, console, logs).exec();
+                break;
+            case Const.Value.UNINSTALL:
+                new UninstallMagisk(this, uri, console, logs).exec();
+                break;
+            case Const.Value.FLASH_MAGISK:
+                new InstallMagisk(this, console, logs, uri, InstallMagisk.DIRECT_MODE).exec();
+                break;
+            case Const.Value.FLASH_SECOND_SLOT:
+                new InstallMagisk(this, console, logs, uri, InstallMagisk.SECOND_SLOT_MODE).exec();
+                break;
+            case Const.Value.PATCH_BOOT:
+                new InstallMagisk(this, console, logs, uri,
+                        intent.getParcelableExtra(Const.Key.FLASH_SET_BOOT)).exec();
+                break;
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        // Prevent user accidentally press back button
+    }
+
+    private static class UninstallMagisk extends FlashZip {
+
+        private UninstallMagisk(Activity context, Uri uri, List<String> console, List<String> logs) {
+            super(context, uri, console, logs);
+        }
+
+        @Override
+        protected void onPostExecute(Integer result) {
+            if (result == 1) {
+                new Handler().postDelayed(() ->
+                        RootUtils.uninstallPkg(getActivity().getPackageName()), 3000);
+            } else {
+                super.onPostExecute(result);
+            }
+        }
+    }
+}

src/full/java/com/topjohnwu/magisk/LogFragment.java

@@ -10,6 +10,7 @@ import android.view.ViewGroup;
 
 import com.topjohnwu.magisk.adapters.TabFragmentAdapter;
 import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.utils.Const;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -33,13 +34,12 @@ public class LogFragment extends Fragment {
 
         TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());
 
-        if (getApplication().isSuClient) {
+        if (!(Const.USER_ID > 0 && getApplication().multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
             adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
-            tab.setupWithViewPager(viewPager);
-            tab.setVisibility(View.VISIBLE);
         }
-
         adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
+        tab.setupWithViewPager(viewPager);
+        tab.setVisibility(View.VISIBLE);
 
         viewPager.setAdapter(adapter);
 

src/full/java/com/topjohnwu/magisk/MagiskFragment.java

@@ -4,31 +4,32 @@ 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.text.TextUtils;
 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.Const;
-import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.ISafetyNetHelper;
+import com.topjohnwu.magisk.utils.ShowUI;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
-
+import com.topjohnwu.superuser.Shell;
-import java.util.ArrayList;
+import com.topjohnwu.superuser.ShellUtils;
-import java.util.List;
 
 import butterknife.BindColor;
 import butterknife.BindView;
@@ -47,15 +48,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 +65,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 +80,33 @@ public class MagiskFragment extends Fragment
 
     @OnClick(R.id.safetyNet_title)
     void safetyNet() {
-        safetyNetProgress.setVisibility(View.VISIBLE);
+        Runnable task = () -> {
-        safetyNetRefreshIcon.setVisibility(View.GONE);
+            safetyNetProgress.setVisibility(View.VISIBLE);
-        safetyNetStatusText.setText(R.string.checking_safetyNet_status);
+            safetyNetRefreshIcon.setVisibility(View.GONE);
-        Utils.checkSafetyNet(getActivity());
+            safetyNetStatusText.setText(R.string.checking_safetyNet_status);
-        collapse();
+            new CheckSafetyNet(getActivity()).exec();
+            collapse();
+        };
+        if (!TextUtils.equals(mm.getPackageName(), Const.ORIG_PKG_NAME)) {
+            new AlertDialogBuilder(getActivity())
+                    .setTitle(R.string.cannot_check_sn_title)
+                    .setMessage(R.string.cannot_check_sn_notice)
+                    .setCancelable(true)
+                    .setPositiveButton(R.string.ok, null)
+                    .show();
+        } else if (!CheckSafetyNet.dexPath.exists()) {
+            // 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 +115,17 @@ 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
@@ -124,6 +140,11 @@ public class MagiskFragment extends Fragment
         expandableContainer.expandLayout = expandLayout;
         setupExpandable();
 
+        keepVerityChkbox.setChecked(mm.keepVerity);
+        keepVerityChkbox.setOnCheckedChangeListener((view, checked) -> mm.keepVerity = checked);
+        keepEncChkbox.setChecked(mm.keepEnc);
+        keepEncChkbox.setOnCheckedChangeListener((view, checked) -> mm.keepEnc = checked);
+
         mSwipeRefreshLayout.setOnRefreshListener(this);
         updateUI();
 
@@ -132,7 +153,7 @@ public class MagiskFragment extends Fragment
 
     @Override
     public void onRefresh() {
-        mm.getMagiskInfo();
+        mm.loadMagiskInfo();
         updateUI();
 
         magiskUpdateText.setText(R.string.checking_for_updates);
@@ -141,8 +162,8 @@ public class MagiskFragment extends Fragment
 
         safetyNetStatusText.setText(R.string.safetyNet_check_text);
 
-        mm.safetyNetDone.hasPublished = false;
+        mm.safetyNetDone.reset();
-        mm.updateCheckDone.hasPublished = false;
+        mm.updateCheckDone.reset();
         mm.remoteMagiskVersionString = null;
         mm.remoteMagiskVersionCode = -1;
         collapse();
@@ -150,8 +171,8 @@ public class MagiskFragment extends Fragment
         shownDialog = false;
 
         // Trigger state check
-        if (Utils.checkNetworkStatus(mm)) {
+        if (Utils.checkNetworkStatus()) {
-            new CheckUpdates(getActivity()).exec();
+            new CheckUpdates().exec();
         } else {
             mSwipeRefreshLayout.setRefreshing(false);
         }
@@ -162,7 +183,7 @@ public class MagiskFragment extends Fragment
         if (topic == mm.updateCheckDone) {
             updateCheckUI();
         } else if (topic == mm.safetyNetDone) {
-            updateSafetyNetUI();
+            updateSafetyNetUI((int) topic.getResults()[0]);
         }
     }
 
@@ -182,35 +203,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;
+        boolean isUpToDate = mm.magiskVersionCode > Const.MAGISK_VER.UNIFIED;
 
-        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,42 +229,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));
-            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() {
@@ -272,25 +237,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) {
-        installButton.setVisibility(View.VISIBLE);
+                installText.setText(getString(R.string.update, getString(R.string.app_name)));
-        if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
+            } else if (mm.magiskVersionCode > 0 && mm.remoteMagiskVersionCode > mm.magiskVersionCode) {
-            installText.setText(getString(R.string.update, getString(R.string.app_name)));
+                installText.setText(getString(R.string.update, getString(R.string.magisk)));
-        } else if (mm.magiskVersionCode > 0 && mm.remoteMagiskVersionCode > mm.magiskVersionCode) {
+            } else {
-            installText.setText(getString(R.string.update, getString(R.string.magisk)));
+                installText.setText(R.string.install);
-        } else {
+            }
-            installText.setText(R.string.install);
-        }
-
-        if (!shownDialog && (mm.remoteMagiskVersionCode > mm.magiskVersionCode
-                || mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE)) {
-                install();
         }
 
         magiskUpdateIcon.setImageResource(image);
@@ -299,39 +259,54 @@ public class MagiskFragment extends Fragment
 
         magiskUpdateProgress.setVisibility(View.GONE);
         mSwipeRefreshLayout.setRefreshing(false);
+
+        if (!shownDialog) {
+            if (mm.remoteMagiskVersionCode > mm.magiskVersionCode
+                    || mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
+                install();
+            } else if (mm.remoteMagiskVersionCode >= Const.MAGISK_VER.FIX_ENV &&
+                    !ShellUtils.fastCmdResult("env_check")) {
+                ShowUI.envFixDialog(getActivity());
+            }
+        }
     }
 
-    private void updateSafetyNetUI() {
+    private void updateSafetyNetUI(int response) {
-        int image, color;
         safetyNetProgress.setVisibility(View.GONE);
         safetyNetRefreshIcon.setVisibility(View.VISIBLE);
-        if (mm.SNCheckResult.failed) {
+        if ((response & 0x0F) == 0) {
-            safetyNetStatusText.setText(mm.SNCheckResult.errmsg);
-            collapse();
-        } else {
             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) {
+            boolean b;
-                color = colorOK;
+            b = (response & ISafetyNetHelper.CTS_PASS) != 0;
-                image = R.drawable.ic_check_circle;
+            ctsStatusText.setText("ctsProfile: " + b);
-            } else {
+            ctsStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
-                color = colorBad;
+            ctsStatusIcon.setColorFilter(b ? colorOK : colorBad);
-                image = R.drawable.ic_cancel;
+
-            }
+            b = (response & ISafetyNetHelper.BASIC_PASS) != 0;
-            basicStatusText.setText("basicIntegrity: " + mm.SNCheckResult.basicIntegrity);
+            basicStatusText.setText("basicIntegrity: " + b);
-            basicStatusIcon.setImageResource(image);
+            basicStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
-            basicStatusIcon.setColorFilter(color);
+            basicStatusIcon.setColorFilter(b ? colorOK : colorBad);
+
             expand();
+        } else {
+            @StringRes int resid;
+            switch (response) {
+                case ISafetyNetHelper.CAUSE_SERVICE_DISCONNECTED:
+                    resid = R.string.safetyNet_network_loss;
+                    break;
+                case ISafetyNetHelper.CAUSE_NETWORK_LOST:
+                    resid = R.string.safetyNet_service_disconnected;
+                    break;
+                case ISafetyNetHelper.RESPONSE_ERR:
+                    resid = R.string.safetyNet_res_invalid;
+                    break;
+                case ISafetyNetHelper.CONNECTION_FAIL:
+                default:
+                    resid = R.string.safetyNet_api_error;
+                    break;
+            }
+            safetyNetStatusText.setText(resid);
         }
     }
 }

src/full/java/com/topjohnwu/magisk/MagiskHideFragment.java

@@ -28,7 +28,6 @@ public class MagiskHideFragment extends Fragment implements Topic.Subscriber {
     private ApplicationAdapter appAdapter;
 
     private SearchView.OnQueryTextListener searchListener;
-    private String lastFilter;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -41,25 +40,22 @@ public class MagiskHideFragment extends Fragment implements Topic.Subscriber {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_magisk_hide, container, false);
         unbinder = ButterKnife.bind(this, view);
-        lastFilter = "";
 
         mSwipeRefreshLayout.setRefreshing(true);
         mSwipeRefreshLayout.setOnRefreshListener(() -> appAdapter.refresh());
 
-        appAdapter = new ApplicationAdapter(getActivity());
+        appAdapter = new ApplicationAdapter();
         recyclerView.setAdapter(appAdapter);
 
         searchListener = new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
-                lastFilter = query;
                 appAdapter.filter(query);
                 return false;
             }
 
             @Override
             public boolean onQueryTextChange(String newText) {
-                lastFilter = newText;
                 appAdapter.filter(newText);
                 return false;
             }
@@ -86,7 +82,7 @@ public class MagiskHideFragment extends Fragment implements Topic.Subscriber {
     @Override
     public void onTopicPublished(Topic topic) {
         mSwipeRefreshLayout.setRefreshing(false);
-        appAdapter.filter(lastFilter);
+        appAdapter.filter(null);
     }
 
     @Override

src/full/java/com/topjohnwu/magisk/MagiskLogFragment.java

@@ -0,0 +1,145 @@
+package com.topjohnwu.magisk;
+
+import android.Manifest;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ProgressBar;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.components.SnackbarMaker;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+public class MagiskLogFragment extends Fragment {
+
+    private Unbinder unbinder;
+
+    @BindView(R.id.txtLog) TextView txtLog;
+    @BindView(R.id.svLog) ScrollView svLog;
+    @BindView(R.id.hsvLog) HorizontalScrollView hsvLog;
+    @BindView(R.id.progressBar) ProgressBar progressBar;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_magisk_log, container, false);
+        unbinder = ButterKnife.bind(this, view);
+        setHasOptionsMenu(true);
+        txtLog.setTextIsSelectable(true);
+        return view;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        getActivity().setTitle(R.string.log);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        readLogs();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_log, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_refresh:
+                readLogs();
+                return true;
+            case R.id.menu_save:
+                runWithPermission(new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, this::saveLogs);
+                return true;
+            case R.id.menu_clear:
+                clearLogs();
+                return true;
+            default:
+                return true;
+        }
+    }
+
+    public void readLogs() {
+        Shell.Async.su(new Shell.Async.Callback() {
+            @Override
+            public void onTaskResult(@Nullable List<String> out, @Nullable List<String> err) {
+                progressBar.setVisibility(View.GONE);
+                if (ShellUtils.isValidOutput(out)) {
+                    txtLog.setText(TextUtils.join("\n", out));
+                } else {
+                    txtLog.setText(R.string.log_is_empty);
+                }
+                svLog.postDelayed(() -> svLog.fullScroll(ScrollView.FOCUS_DOWN), 100);
+                hsvLog.postDelayed(() -> hsvLog.fullScroll(ScrollView.FOCUS_LEFT), 100);
+            }
+
+            @Override
+            public void onTaskError(@NonNull Throwable throwable) {
+                txtLog.setText(R.string.log_is_empty);
+            }
+        }, "cat " + Const.MAGISK_LOG + " | tail -n 5000");
+    }
+
+    public void saveLogs() {
+        Calendar now = Calendar.getInstance();
+        String filename = Utils.fmt("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));
+
+        File targetFile = new File(Const.EXTERNAL_PATH + "/logs", filename);
+        targetFile.getParentFile().mkdirs();
+        try {
+            targetFile.createNewFile();
+        } catch (IOException e) {
+            return;
+        }
+        Shell.Async.su(new Shell.Async.Callback() {
+            @Override
+            public void onTaskResult(@Nullable List<String> out, @Nullable List<String> err) {
+                SnackbarMaker.make(txtLog, targetFile.getPath(), Snackbar.LENGTH_SHORT).show();
+            }
+
+            @Override
+            public void onTaskError(@NonNull Throwable throwable) {}
+        }, "cat " + Const.MAGISK_LOG + " > " + targetFile);
+    }
+
+    public void clearLogs() {
+        Shell.Async.su("echo -n > " + Const.MAGISK_LOG);
+        SnackbarMaker.make(txtLog, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
+    }
+}

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

@@ -0,0 +1,292 @@
+package com.topjohnwu.magisk;
+
+import android.app.job.JobInfo;
+import android.app.job.JobScheduler;
+import android.content.ComponentName;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.util.Xml;
+
+import com.topjohnwu.magisk.components.Application;
+import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
+import com.topjohnwu.magisk.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.services.UpdateCheckService;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.magisk.utils.ShellInitializer;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileInputStream;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+public class MagiskManager extends Application implements Shell.Container {
+
+    // Topics
+    public final Topic magiskHideDone = new Topic();
+    public final Topic reloadActivity = new Topic();
+    public final Topic moduleLoadDone = new Topic();
+    public final Topic repoLoadDone = new Topic();
+    public final Topic updateCheckDone = new Topic();
+    public final Topic safetyNetDone = new Topic();
+    public final Topic localeDone = new Topic();
+
+    // Info
+    public boolean hasInit = false;
+    public String magiskVersionString;
+    public int magiskVersionCode = -1;
+    public String remoteMagiskVersionString;
+    public int remoteMagiskVersionCode = -1;
+    public String remoteManagerVersionString;
+    public int remoteManagerVersionCode = -1;
+
+    public String magiskLink;
+    public String magiskNoteLink;
+    public String managerLink;
+    public String managerNoteLink;
+    public String uninstallerLink;
+
+    public boolean keepVerity = false;
+    public boolean keepEnc = false;
+
+    // Data
+    public Map<String, Module> moduleMap;
+    public List<Locale> locales;
+
+    public boolean magiskHide;
+    public boolean isDarkTheme;
+    public int suRequestTimeout;
+    public int suLogTimeout = 14;
+    public int suAccessState;
+    public int multiuserMode;
+    public int suResponseType;
+    public int suNotificationType;
+    public int suNamespaceMode;
+    public String localeConfig;
+    public int updateChannel;
+    public String bootFormat;
+    public int repoOrder;
+
+    // Global resources
+    public SharedPreferences prefs;
+    public MagiskDatabaseHelper mDB;
+    public RepoDatabaseHelper repoDB;
+
+    private volatile Shell mShell;
+
+    public MagiskManager() {
+        weakSelf = new WeakReference<>(this);
+        Shell.setContainer(this);
+    }
+
+    @Nullable
+    @Override
+    public Shell getShell() {
+        return mShell;
+    }
+
+    @Override
+    public void setShell(@Nullable Shell shell) {
+        mShell = shell;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        Shell.setFlags(Shell.FLAG_MOUNT_MASTER);
+        Shell.verboseLogging(BuildConfig.DEBUG);
+        Shell.setInitializer(ShellInitializer.class);
+
+        prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        mDB = MagiskDatabaseHelper.getInstance(this);
+
+        String pkg = mDB.getStrings(Const.Key.SU_MANAGER, null);
+        if (pkg != null && getPackageName().equals(Const.ORIG_PKG_NAME)) {
+            mDB.setStrings(Const.Key.SU_MANAGER, null);
+            RootUtils.uninstallPkg(pkg);
+        }
+        if (TextUtils.equals(pkg, getPackageName())) {
+            try {
+                // We are the manager, remove com.topjohnwu.magisk as it could be malware
+                getPackageManager().getApplicationInfo(Const.ORIG_PKG_NAME, 0);
+                RootUtils.uninstallPkg(Const.ORIG_PKG_NAME);
+            } catch (PackageManager.NameNotFoundException ignored) {}
+        }
+
+        setLocale();
+        loadConfig();
+    }
+
+    public static MagiskManager get() {
+        return (MagiskManager) weakSelf.get();
+    }
+
+    public void setLocale() {
+        localeConfig = prefs.getString(Const.Key.LOCALE, "");
+        if (localeConfig.isEmpty()) {
+            locale = defaultLocale;
+        } else {
+            locale = Locale.forLanguageTag(localeConfig);
+        }
+        Resources res = getBaseContext().getResources();
+        Configuration config = new Configuration(res.getConfiguration());
+        config.setLocale(locale);
+        res.updateConfiguration(config, res.getDisplayMetrics());
+    }
+
+    public void loadConfig() {
+        // su
+        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);
+        suAccessState = mDB.getSettings(Const.Key.ROOT_ACCESS, Const.Value.ROOT_ACCESS_APPS_AND_ADB);
+        multiuserMode = mDB.getSettings(Const.Key.SU_MULTIUSER_MODE, Const.Value.MULTIUSER_MODE_OWNER_ONLY);
+        suNamespaceMode = mDB.getSettings(Const.Key.SU_MNT_NS, Const.Value.NAMESPACE_MODE_REQUESTER);
+
+        // config
+        isDarkTheme = prefs.getBoolean(Const.Key.DARK_THEME, false);
+        updateChannel = Utils.getPrefsInt(prefs, Const.Key.UPDATE_CHANNEL, Const.Value.STABLE_CHANNEL);
+        bootFormat = prefs.getString(Const.Key.BOOT_FORMAT, ".img");
+        repoOrder = prefs.getInt(Const.Key.REPO_ORDER, Const.Value.ORDER_NAME);
+    }
+
+    public void writeConfig() {
+        prefs.edit()
+                .putBoolean(Const.Key.DARK_THEME, isDarkTheme)
+                .putBoolean(Const.Key.MAGISKHIDE, magiskHide)
+                .putBoolean(Const.Key.HOSTS, Const.MAGISK_HOST_FILE.exists())
+                .putBoolean(Const.Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
+                .putString(Const.Key.SU_REQUEST_TIMEOUT, String.valueOf(suRequestTimeout))
+                .putString(Const.Key.SU_AUTO_RESPONSE, String.valueOf(suResponseType))
+                .putString(Const.Key.SU_NOTIFICATION, String.valueOf(suNotificationType))
+                .putString(Const.Key.ROOT_ACCESS, String.valueOf(suAccessState))
+                .putString(Const.Key.SU_MULTIUSER_MODE, String.valueOf(multiuserMode))
+                .putString(Const.Key.SU_MNT_NS, String.valueOf(suNamespaceMode))
+                .putString(Const.Key.UPDATE_CHANNEL, String.valueOf(updateChannel))
+                .putString(Const.Key.LOCALE, localeConfig)
+                .putString(Const.Key.BOOT_FORMAT, bootFormat)
+                .putInt(Const.Key.UPDATE_SERVICE_VER, Const.UPDATE_SERVICE_VER)
+                .putInt(Const.Key.REPO_ORDER, repoOrder)
+                .apply();
+    }
+
+    public void loadMagiskInfo() {
+        try {
+            magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":")[0];
+            magiskVersionCode = Integer.parseInt(ShellUtils.fastCmd("magisk -V"));
+            String s = ShellUtils.fastCmd((magiskVersionCode >= Const.MAGISK_VER.RESETPROP_PERSIST ?
+                    "resetprop -p " : "getprop ") + Const.MAGISKHIDE_PROP);
+            magiskHide = s == null || Integer.parseInt(s) != 0;
+        } catch (Exception ignored) {}
+    }
+
+    public void getDefaultInstallFlags() {
+        keepVerity = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPVERITY"));
+        keepEnc = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPFORCEENCRYPT"));
+    }
+
+    public void setupUpdateCheck() {
+        JobScheduler scheduler = (JobScheduler) getSystemService(JOB_SCHEDULER_SERVICE);
+
+        if (prefs.getBoolean(Const.Key.CHECK_UPDATES, true)) {
+            if (scheduler.getAllPendingJobs().isEmpty() ||
+                    Const.UPDATE_SERVICE_VER > prefs.getInt(Const.Key.UPDATE_SERVICE_VER, -1)) {
+                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();
+                scheduler.schedule(info);
+            }
+        } else {
+            scheduler.cancel(Const.UPDATE_SERVICE_VER);
+        }
+    }
+
+    public void dumpPrefs() {
+        // Flush prefs to disk
+        prefs.edit().commit();
+        File xml = new File(getFilesDir().getParent() + "/shared_prefs",
+                getPackageName() + "_preferences.xml");
+        Shell.Sync.su(Utils.fmt("for usr in /data/user/*; do cat %s > ${usr}/%s; done", xml, Const.MANAGER_CONFIGS));
+    }
+
+    public void loadPrefs() {
+        SuFile config = new SuFile(Utils.fmt("/data/user/%d/%s", Const.USER_ID, Const.MANAGER_CONFIGS));
+        if (config.exists()) {
+            SharedPreferences.Editor editor = prefs.edit();
+            try {
+                SuFileInputStream is = new SuFileInputStream(config);
+                XmlPullParser parser = Xml.newPullParser();
+                parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
+                parser.setInput(is, "UTF-8");
+                parser.nextTag();
+                parser.require(XmlPullParser.START_TAG, null, "map");
+                while (parser.next() != XmlPullParser.END_TAG) {
+                    if (parser.getEventType() != XmlPullParser.START_TAG)
+                        continue;
+                    String key = parser.getAttributeValue(null, "name");
+                    String value = parser.getAttributeValue(null, "value");
+                    switch (parser.getName()) {
+                        case "string":
+                            parser.require(XmlPullParser.START_TAG, null, "string");
+                            editor.putString(key, parser.nextText());
+                            parser.require(XmlPullParser.END_TAG, null, "string");
+                            break;
+                        case "boolean":
+                            parser.require(XmlPullParser.START_TAG, null, "boolean");
+                            editor.putBoolean(key, Boolean.parseBoolean(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "boolean");
+                            break;
+                        case "int":
+                            parser.require(XmlPullParser.START_TAG, null, "int");
+                            editor.putInt(key, Integer.parseInt(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "int");
+                            break;
+                        case "long":
+                            parser.require(XmlPullParser.START_TAG, null, "long");
+                            editor.putLong(key, Long.parseLong(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "long");
+                            break;
+                        case "float":
+                            parser.require(XmlPullParser.START_TAG, null, "int");
+                            editor.putFloat(key, Float.parseFloat(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "int");
+                            break;
+                        default:
+                            parser.next();
+                    }
+                }
+            } catch (IOException | XmlPullParserException e) {
+                e.printStackTrace();
+            }
+            editor.remove(Const.Key.ETAG_KEY);
+            editor.apply();
+            loadConfig();
+            config.delete();
+        }
+    }
+}

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

@@ -1,11 +1,11 @@
 package com.topjohnwu.magisk;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 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,9 +16,10 @@ import android.view.MenuItem;
 import android.view.View;
 
 import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -27,8 +28,8 @@ public class MainActivity extends Activity
         implements NavigationView.OnNavigationItemSelectedListener, Topic.Subscriber {
 
     private final Handler mDrawerHandler = new Handler();
-    private SharedPreferences prefs;
     private int mDrawerItem;
+    private boolean fromShortcut = true;
 
     @BindView(R.id.toolbar) Toolbar toolbar;
     @BindView(R.id.drawer_layout) DrawerLayout drawer;
@@ -36,15 +37,31 @@ public class MainActivity extends Activity
 
     private float toolbarElevation;
 
+    @Override
+    public int getDarkTheme() {
+        return R.style.AppTheme_Dark;
+    }
+
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
-        getMagiskManager().startup();
 
-        prefs = getMagiskManager().prefs;
+        MagiskManager mm = getMagiskManager();
 
-        if (getMagiskManager().isDarkTheme) {
+        if (!mm.hasInit) {
-            setTheme(R.style.AppTheme_Dark);
+            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);
+        }
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         ButterKnife.bind(this);
@@ -70,10 +87,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
@@ -86,7 +102,7 @@ public class MainActivity extends Activity
     public void onBackPressed() {
         if (drawer.isDrawerOpen(navigationView)) {
             drawer.closeDrawer(navigationView);
-        } else if (mDrawerItem != R.id.magisk) {
+        } else if (mDrawerItem != R.id.magisk && !fromShortcut) {
             navigate(R.id.magisk);
         } else {
             finish();
@@ -112,26 +128,24 @@ 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
+                Shell.rootAccess() && mm.magiskVersionCode >= Const.MAGISK_VER.UNIFIED
-                        && prefs.getBoolean("magiskhide", false));
+                        && mm.prefs.getBoolean(Const.Key.MAGISKHIDE, false));
-        menu.findItem(R.id.modules).setVisible(
+        menu.findItem(R.id.modules).setVisible(!mm.prefs.getBoolean(Const.Key.COREONLY, false) &&
-                Shell.rootAccess() && getMagiskManager().magiskVersionCode >= 0);
+                Shell.rootAccess() && mm.magiskVersionCode >= 0);
-        menu.findItem(R.id.downloads).setVisible(Utils.checkNetworkStatus(this) &&
+        menu.findItem(R.id.downloads).setVisible(!mm.prefs.getBoolean(Const.Key.COREONLY, false)
-                Shell.rootAccess() && getMagiskManager().magiskVersionCode >= 0);
+                && Utils.checkNetworkStatus() && Shell.rootAccess() && mm.magiskVersionCode >= 0);
         menu.findItem(R.id.log).setVisible(Shell.rootAccess());
-        menu.findItem(R.id.superuser).setVisible(
+        menu.findItem(R.id.superuser).setVisible(Shell.rootAccess() &&
-                Shell.rootAccess() && getMagiskManager().isSuClient);
+                !(Const.USER_ID > 0 && mm.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED));
     }
 
     public void navigate(String item) {
         int itemId = R.id.magisk;
         if (item != null) {
             switch (item) {
-                case "magisk":
-                    itemId = R.id.magisk;
-                    break;
                 case "superuser":
                     itemId = R.id.superuser;
                     break;
@@ -164,22 +178,23 @@ public class MainActivity extends Activity
         navigationView.setCheckedItem(itemId);
         switch (itemId) {
             case R.id.magisk:
-                displayFragment(new MagiskFragment(), "magisk", true);
+                fromShortcut = false;
+                displayFragment(new MagiskFragment(), true);
                 break;
             case R.id.superuser:
-                displayFragment(new SuperuserFragment(), "superuser", true);
+                displayFragment(new SuperuserFragment(), true);
                 break;
             case R.id.modules:
-                displayFragment(new ModulesFragment(), "modules", true);
+                displayFragment(new ModulesFragment(), true);
                 break;
             case R.id.downloads:
-                displayFragment(new ReposFragment(), "downloads", true);
+                displayFragment(new ReposFragment(), true);
                 break;
             case R.id.magiskhide:
-                displayFragment(new MagiskHideFragment(), "magiskhide", true);
+                displayFragment(new MagiskHideFragment(), true);
                 break;
             case R.id.log:
-                displayFragment(new LogFragment(), "log", false);
+                displayFragment(new LogFragment(), false);
                 break;
             case R.id.settings:
                 startActivity(new Intent(this, SettingsActivity.class));
@@ -192,12 +207,13 @@ public class MainActivity extends Activity
         }
     }
 
-    private void displayFragment(@NonNull Fragment navFragment, String tag, boolean setElevation) {
+    private void displayFragment(@NonNull Fragment navFragment, boolean setElevation) {
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         supportInvalidateOptionsMenu();
-        transaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out);
+        getSupportFragmentManager()
-        transaction.replace(R.id.content_frame, navFragment, tag).commitNow();
+                .beginTransaction()
-        if (setElevation) toolbar.setElevation(toolbarElevation);
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
-        else toolbar.setElevation(0);
+                .replace(R.id.content_frame, navFragment)
+                .commitNow();
+        toolbar.setElevation(setElevation ? toolbarElevation : 0);
     }
 }

src/full/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;
@@ -7,6 +8,9 @@ import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -14,9 +18,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.container.Module;
-import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.superuser.Shell;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,17 +33,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);
+        runWithPermission(new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, () -> {
-        intent.setType("application/zip");
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        startActivityForResult(intent, FETCH_ZIP_CODE);
+            intent.setType("application/zip");
+            startActivityForResult(intent, Const.ID.FETCH_ZIP);
+        });
     }
 
     private List<Module> listModules = new ArrayList<>();
@@ -48,10 +53,11 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_modules, container, false);
         unbinder = ButterKnife.bind(this, view);
+        setHasOptionsMenu(true);
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
             recyclerView.setVisibility(View.GONE);
-            new LoadModules(getActivity()).exec();
+            new LoadModules().exec();
         });
 
         recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@@ -73,7 +79,6 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
 
     @Override
     public void onTopicPublished(Topic topic) {
-        Logger.dev("ModulesFragment: UI refresh triggered");
         updateUI();
     }
 
@@ -84,10 +89,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);
         }
     }
@@ -98,6 +103,31 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
         unbinder.unbind();
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_reboot, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.reboot:
+                Shell.Async.su("/system/bin/reboot");
+                return true;
+            case R.id.reboot_recovery:
+                Shell.Async.su("/system/bin/reboot recovery");
+                return true;
+            case R.id.reboot_bootloader:
+                Shell.Async.su("/system/bin/reboot bootloader");
+                return true;
+            case R.id.reboot_download:
+                Shell.Async.su("/system/bin/reboot download");
+                return true;
+            default:
+                return false;
+        }
+    }
+
     private void updateUI() {
         listModules.clear();
         listModules.addAll(getApplication().moduleMap.values());

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

@@ -0,0 +1,26 @@
+package com.topjohnwu.magisk;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+
+import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.utils.Const;
+
+public class NoUIActivity extends Activity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        String[] perms = getIntent().getStringArrayExtra(Const.Key.INTENT_PERM);
+        if (perms != null) {
+            ActivityCompat.requestPermissions(this, perms, 0);
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        finish();
+    }
+}

src/full/java/com/topjohnwu/magisk/ReposFragment.java

@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk;
 
+import android.app.AlertDialog;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -7,6 +8,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.SearchView;
@@ -15,7 +17,7 @@ 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.Const;
 import com.topjohnwu.magisk.utils.Topic;
 
 import butterknife.BindView;
@@ -25,11 +27,12 @@ import butterknife.Unbinder;
 public class ReposFragment extends Fragment implements Topic.Subscriber {
 
     private Unbinder unbinder;
+    private MagiskManager mm;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
     @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) {
@@ -42,15 +45,14 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_repos, container, false);
         unbinder = ButterKnife.bind(this, view);
+        mm = getApplication();
 
-        adapter = new ReposAdapter(getApplication().repoDB, getApplication().moduleMap);
+        mSwipeRefreshLayout.setRefreshing(mm.repoLoadDone.isPending());
-        recyclerView.setAdapter(adapter);
-
-        mSwipeRefreshLayout.setRefreshing(true);
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
-            recyclerView.setVisibility(View.GONE);
+            recyclerView.setVisibility(View.VISIBLE);
-            new UpdateRepos(getActivity()).exec();
+            emptyRv.setVisibility(View.GONE);
+            new UpdateRepos(true).exec();
         });
 
         getActivity().setTitle(R.string.downloads);
@@ -58,18 +60,29 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
         return view;
     }
 
+    @Override
+    public void onResume() {
+        adapter = new ReposAdapter(mm.repoDB, mm.moduleMap);
+        recyclerView.setAdapter(adapter);
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        adapter = null;
+    }
+
     @Override
     public void onTopicPublished(Topic topic) {
-        Logger.dev("ReposFragment: UI refresh triggered");
         mSwipeRefreshLayout.setRefreshing(false);
-        adapter.notifyDBChanged();
         recyclerView.setVisibility(adapter.getItemCount() == 0 ? View.GONE : View.VISIBLE);
         emptyRv.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
     }
 
     @Override
     public Topic[] getSubscription() {
-        return new Topic[] { getApplication().repoLoadDone };
+        return new Topic[] { mm.repoLoadDone };
     }
 
     @Override
@@ -90,6 +103,21 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
         });
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.repo_sort) {
+            new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.sorting_order)
+                .setSingleChoiceItems(R.array.sorting_orders, mm.repoOrder, (d, which) -> {
+                    mm.repoOrder = which;
+                    mm.prefs.edit().putInt(Const.Key.REPO_ORDER, mm.repoOrder).apply();
+                    adapter.notifyDBChanged();
+                    d.dismiss();
+                }).show();
+        }
+        return true;
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();

src/full/java/com/topjohnwu/magisk/SettingsActivity.java

@@ -0,0 +1,321 @@
+package com.topjohnwu.magisk;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceFragmentCompat;
+import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+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.receivers.DownloadReceiver;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+
+import java.io.IOException;
+import java.util.Locale;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class SettingsActivity extends Activity implements Topic.Subscriber {
+
+    @BindView(R.id.toolbar) Toolbar toolbar;
+
+    @Override
+    public int getDarkTheme() {
+        return R.style.AppTheme_StatusBar_Dark;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+        ButterKnife.bind(this);
+
+        setSupportActionBar(toolbar);
+
+        toolbar.setNavigationOnClickListener(view -> finish());
+
+        ActionBar ab = getSupportActionBar();
+        if (ab != null) {
+            ab.setTitle(R.string.settings);
+            ab.setDisplayHomeAsUpEnabled(true);
+        }
+
+        setFloating();
+
+        if (savedInstanceState == null) {
+            getSupportFragmentManager().beginTransaction().add(R.id.container, new SettingsFragment()).commit();
+        }
+
+    }
+
+    @Override
+    public void onTopicPublished(Topic topic) {
+        recreate();
+    }
+
+    @Override
+    public Topic[] getSubscription() {
+        return new Topic[] { getMagiskManager().reloadActivity };
+    }
+
+    public static class SettingsFragment extends PreferenceFragmentCompat
+            implements SharedPreferences.OnSharedPreferenceChangeListener, Topic.Subscriber {
+
+        private SharedPreferences prefs;
+        private PreferenceScreen prefScreen;
+
+        private ListPreference updateChannel, suAccess, autoRes, suNotification,
+                requestTimeout, multiuserMode, namespaceMode;
+        private MagiskManager mm;
+        private PreferenceCategory generalCatagory;
+
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+            setPreferencesFromResource(R.xml.app_settings, rootKey);
+            mm = Utils.getMagiskManager(getActivity());
+            prefs = mm.prefs;
+            prefScreen = getPreferenceScreen();
+
+            generalCatagory = (PreferenceCategory) findPreference("general");
+            PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
+            PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
+            Preference hideManager = findPreference("hide");
+            Preference restoreManager = findPreference("restore");
+            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);
+            SwitchPreference fingerprint = (SwitchPreference) findPreference(Const.Key.SU_FINGERPRINT);
+
+            updateChannel.setOnPreferenceChangeListener((pref, o) -> {
+                mm.updateChannel = Integer.parseInt((String) o);
+                if (mm.updateChannel == Const.Value.CUSTOM_CHANNEL) {
+                    View v = LayoutInflater.from(getActivity()).inflate(R.layout.custom_channel_dialog, null);
+                    EditText url = v.findViewById(R.id.custom_url);
+                    url.setText(mm.prefs.getString(Const.Key.CUSTOM_CHANNEL, ""));
+                    new AlertDialog.Builder(getActivity())
+                            .setTitle(R.string.settings_update_custom)
+                            .setView(v)
+                            .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 secondary user
+            if (Const.USER_ID > 0) {
+                suCategory.removePreference(multiuserMode);
+            }
+
+            // Disable re-authentication option on Android O, it will not work
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                reauth.setEnabled(false);
+                reauth.setSummary(R.string.android_o_not_support);
+            }
+
+            // Disable fingerprint option if not possible
+            if (!FingerprintHelper.canUseFingerprint()) {
+                fingerprint.setEnabled(false);
+                fingerprint.setSummary(R.string.disable_fingerprint);
+            }
+
+            if (mm.magiskVersionCode >= Const.MAGISK_VER.MANAGER_HIDE) {
+                if (mm.getPackageName().equals(Const.ORIG_PKG_NAME)) {
+                    hideManager.setOnPreferenceClickListener((pref) -> {
+                        new HideManager(getActivity()).exec();
+                        return true;
+                    });
+                    generalCatagory.removePreference(restoreManager);
+                } else {
+                    if (Utils.checkNetworkStatus()) {
+                        restoreManager.setOnPreferenceClickListener((pref) -> {
+                            Utils.dlAndReceive(
+                                getActivity(), new DownloadReceiver() {
+                                    @Override
+                                    public void onDownloadDone(Context context, Uri uri) {
+                                        mm.dumpPrefs();
+                                        if (ShellUtils.fastCmdResult("pm install " + uri.getPath()))
+                                            RootUtils.uninstallPkg(context.getPackageName());
+                                    }
+                                },
+                                mm.managerLink,
+                                Utils.fmt("MagiskManager-v%s.apk", mm.remoteManagerVersionString)
+                            );
+                            return true;
+                        });
+                    } else {
+                        generalCatagory.removePreference(restoreManager);
+                    }
+                    generalCatagory.removePreference(hideManager);
+                }
+            } else {
+                generalCatagory.removePreference(restoreManager);
+                generalCatagory.removePreference(hideManager);
+            }
+
+            if (!Shell.rootAccess() || (Const.USER_ID > 0 &&
+                    mm.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
+                prefScreen.removePreference(suCategory);
+            }
+
+            if (!Shell.rootAccess()) {
+                prefScreen.removePreference(magiskCategory);
+                generalCatagory.removePreference(hideManager);
+            } else if (mm.magiskVersionCode < Const.MAGISK_VER.UNIFIED) {
+                prefScreen.removePreference(magiskCategory);
+            }
+        }
+
+        private void setLocalePreference(ListPreference lp) {
+            CharSequence[] entries = new CharSequence[mm.locales.size() + 1];
+            CharSequence[] entryValues = new CharSequence[mm.locales.size() + 1];
+            entries[0] = Utils.getLocaleString(MagiskManager.defaultLocale, R.string.system_default);
+            entryValues[0] = "";
+            int i = 1;
+            for (Locale locale : mm.locales) {
+                entries[i] = locale.getDisplayName(locale);
+                entryValues[i++] = locale.toLanguageTag();
+            }
+            lp.setEntries(entries);
+            lp.setEntryValues(entryValues);
+            lp.setSummary(MagiskManager.locale.getDisplayName(MagiskManager.locale));
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+            prefs.registerOnSharedPreferenceChangeListener(this);
+            subscribeTopics();
+            return super.onCreateView(inflater, container, savedInstanceState);
+        }
+
+        @Override
+        public void onDestroyView() {
+            prefs.unregisterOnSharedPreferenceChangeListener(this);
+            unsubscribeTopics();
+            super.onDestroyView();
+        }
+
+        @Override
+        public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
+
+            switch (key) {
+                case Const.Key.DARK_THEME:
+                    mm.isDarkTheme = prefs.getBoolean(key, false);
+                    mm.reloadActivity.publish(false);
+                    return;
+                case Const.Key.COREONLY:
+                    if (prefs.getBoolean(key, false)) {
+                        try {
+                            Const.MAGISK_DISABLE_FILE.createNewFile();
+                        } catch (IOException ignored) {}
+                    } else {
+                        Const.MAGISK_DISABLE_FILE.delete();
+                    }
+                    Toast.makeText(getActivity(), R.string.settings_reboot_toast, Toast.LENGTH_LONG).show();
+                    break;
+                case Const.Key.MAGISKHIDE:
+                    if (prefs.getBoolean(key, false)) {
+                        Shell.Async.su("magiskhide --enable");
+                    } else {
+                        Shell.Async.su("magiskhide --disable");
+                    }
+                    break;
+                case Const.Key.HOSTS:
+                    if (prefs.getBoolean(key, false)) {
+                        Shell.Async.su(
+                                "cp -af /system/etc/hosts " + Const.MAGISK_HOST_FILE,
+                                "mount -o bind " + Const.MAGISK_HOST_FILE + " /system/etc/hosts");
+                    } else {
+                        Shell.Async.su(
+                                "umount -l /system/etc/hosts",
+                                "rm -f " + Const.MAGISK_HOST_FILE);
+                    }
+                    break;
+                case Const.Key.ROOT_ACCESS:
+                case Const.Key.SU_MULTIUSER_MODE:
+                case Const.Key.SU_MNT_NS:
+                    mm.mDB.setSettings(key, Utils.getPrefsInt(prefs, key));
+                    break;
+                case Const.Key.LOCALE:
+                    mm.setLocale();
+                    mm.reloadActivity.publish(false);
+                    break;
+                case Const.Key.UPDATE_CHANNEL:
+                    new CheckUpdates().exec();
+                    break;
+                case Const.Key.CHECK_UPDATES:
+                    mm.setupUpdateCheck();
+                    break;
+            }
+            mm.loadConfig();
+            setSummary();
+        }
+
+        private void setSummary() {
+            updateChannel.setSummary(getResources()
+                    .getStringArray(R.array.update_channel)[mm.updateChannel]);
+            suAccess.setSummary(getResources()
+                    .getStringArray(R.array.su_access)[mm.suAccessState]);
+            autoRes.setSummary(getResources()
+                    .getStringArray(R.array.auto_response)[mm.suResponseType]);
+            suNotification.setSummary(getResources()
+                    .getStringArray(R.array.su_notification)[mm.suNotificationType]);
+            requestTimeout.setSummary(
+                    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()
+                    .getStringArray(R.array.namespace_summary)[mm.suNamespaceMode]);
+        }
+
+        @Override
+        public void onTopicPublished(Topic topic) {
+            setLocalePreference((ListPreference) findPreference(Const.Key.LOCALE));
+        }
+
+        @Override
+        public Topic[] getSubscription() {
+            return new Topic[] { mm.localeDone };
+        }
+    }
+
+}

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

@@ -0,0 +1,88 @@
+package com.topjohnwu.magisk;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+
+import com.topjohnwu.magisk.asyncs.CheckUpdates;
+import com.topjohnwu.magisk.asyncs.LoadModules;
+import com.topjohnwu.magisk.asyncs.ParallelTask;
+import com.topjohnwu.magisk.asyncs.UpdateRepos;
+import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.receivers.ShortcutReceiver;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+
+public class SplashActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        RootUtils.init();
+        MagiskManager mm = getMagiskManager();
+
+        mm.repoDB = new RepoDatabaseHelper(this);
+        mm.loadMagiskInfo();
+        mm.getDefaultInstallFlags();
+        mm.loadPrefs();
+
+        // 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);
+        }
+
+        // Setup shortcuts
+        sendBroadcast(new Intent(this, ShortcutReceiver.class));
+
+        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) {
+            // Update check service
+            mm.setupUpdateCheck();
+            // Fire asynctasks
+            loadModuleTask.exec();
+        }
+
+        // Write back default values
+        mm.writeConfig();
+
+        mm.hasInit = true;
+
+        Intent intent = new Intent(this, MainActivity.class);
+        intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION));
+        intent.putExtra(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();
+        }
+    }
+}

src/full/java/com/topjohnwu/magisk/SuLogFragment.java

@@ -46,7 +46,7 @@ public class SuLogFragment extends Fragment {
         View v = inflater.inflate(R.layout.fragment_su_log, container, false);
         unbinder = ButterKnife.bind(this, v);
         mm = getApplication();
-        adapter = new SuLogAdapter(mm.suDB);
+        adapter = new SuLogAdapter(mm.mDB);
         recyclerView.setAdapter(adapter);
 
         updateList();
@@ -73,7 +73,7 @@ public class SuLogFragment extends Fragment {
                 updateList();
                 return true;
             case R.id.menu_clear:
-                mm.suDB.clearLogs();
+                mm.mDB.clearLogs();
                 updateList();
                 return true;
             default:

src/full/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;
 
@@ -34,13 +34,13 @@ public class SuperuserFragment extends Fragment {
         PackageManager pm = getActivity().getPackageManager();
         MagiskManager mm = getApplication();
 
-        List<Policy> policyList = mm.suDB.getPolicyList(pm);
+        List<Policy> policyList = mm.mDB.getPolicyList(pm);
 
         if (policyList.size() == 0) {
             emptyRv.setVisibility(View.VISIBLE);
             recyclerView.setVisibility(View.GONE);
         } else {
-            recyclerView.setAdapter(new PolicyAdapter(policyList, mm.suDB, pm));
+            recyclerView.setAdapter(new PolicyAdapter(policyList, mm.mDB, pm));
             emptyRv.setVisibility(View.GONE);
             recyclerView.setVisibility(View.VISIBLE);
         }

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

@@ -1,10 +1,9 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.support.design.widget.Snackbar;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,15 +12,13 @@ import android.widget.Filter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.topjohnwu.magisk.MagiskManager;
 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.superuser.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,31 +28,16 @@ import butterknife.ButterKnife;
 
 public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.ViewHolder> {
 
-    public static final List<String> BLACKLIST =  Arrays.asList(
+    private List<ApplicationInfo> fullList, showList;
-            "android",
+    private List<String> hideList;
-            "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) {
+    public ApplicationAdapter() {
-        mOriginalList = mList = Collections.emptyList();
+        fullList = showList = Collections.emptyList();
-        mHideList = Collections.emptyList();
+        hideList = Collections.emptyList();
         filter = new ApplicationFilter();
-        pm = context.getPackageManager();
+        pm = MagiskManager.get().getPackageManager();
-        magiskHideDone = Utils.getMagiskManager(context).magiskHideDone;
-        shell = Shell.getShell(context);
         new LoadApps().exec();
     }
 
@@ -67,41 +49,28 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
 
     @Override
     public void onBindViewHolder(final ViewHolder holder, int position) {
-        ApplicationInfo info = mList.get(position);
+        ApplicationInfo info = showList.get(position);
 
         holder.appIcon.setImageDrawable(info.loadIcon(pm));
         holder.appName.setText(info.loadLabel(pm));
         holder.appPackage.setText(info.packageName);
 
-        // Remove all listeners
-        holder.itemView.setOnClickListener(null);
         holder.checkBox.setOnCheckedChangeListener(null);
-
+        holder.checkBox.setChecked(hideList.contains(info.packageName));
-        if (SNLIST.contains(info.packageName)) {
+        holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
-            holder.checkBox.setChecked(true);
+            if (isChecked) {
-            holder.checkBox.setEnabled(false);
+                Shell.Async.su("magiskhide --add " + info.packageName);
-            holder.itemView.setOnClickListener(v ->
+                hideList.add(info.packageName);
-                SnackbarMaker.make(holder.itemView,
+            } else {
-                        R.string.safetyNet_hide_notice, Snackbar.LENGTH_LONG).show()
+                Shell.Async.su("magiskhide --rm " + info.packageName);
-            );
+                hideList.remove(info.packageName);
-        } else {
+            }
-            holder.checkBox.setEnabled(true);
+        });
-            holder.checkBox.setChecked(mHideList.contains(info.packageName));
-            holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
-                if (isChecked) {
-                    Utils.addMagiskHide(shell, info.packageName);
-                    mHideList.add(info.packageName);
-                } else {
-                    Utils.rmMagiskHide(shell, info.packageName);
-                    mHideList.remove(info.packageName);
-                }
-            });
-        }
     }
 
     @Override
     public int getItemCount() {
-        return mList.size();
+        return showList.size();
     }
 
     public void filter(String constraint) {
@@ -116,7 +85,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
 
         @BindView(R.id.app_icon) ImageView appIcon;
         @BindView(R.id.app_name) TextView appName;
-        @BindView(R.id.app_package) TextView appPackage;
+        @BindView(R.id.package_name) TextView appPackage;
         @BindView(R.id.checkbox) CheckBox checkBox;
 
         ViewHolder(View itemView) {
@@ -127,17 +96,21 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
 
     private class ApplicationFilter extends Filter {
 
+        private boolean lowercaseContains(String s, CharSequence filter) {
+            return !TextUtils.isEmpty(s) && s.toLowerCase().contains(filter);
+        }
+
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
             if (constraint == null || constraint.length() == 0) {
-                mList = mOriginalList;
+                showList = fullList;
             } else {
-                mList = new ArrayList<>();
+                showList = new ArrayList<>();
                 String filter = constraint.toString().toLowerCase();
-                for (ApplicationInfo info : mOriginalList) {
+                for (ApplicationInfo info : fullList) {
-                    if (Utils.lowercaseContains(info.loadLabel(pm), filter)
+                    if (lowercaseContains(info.loadLabel(pm).toString(), filter)
-                            || Utils.lowercaseContains(info.packageName, filter)) {
+                            || lowercaseContains(info.packageName, filter)) {
-                        mList.add(info);
+                        showList.add(info);
                     }
                 }
             }
@@ -154,22 +127,32 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
 
         @Override
         protected Void doInBackground(Void... voids) {
-            mOriginalList = pm.getInstalledApplications(0);
+            fullList = pm.getInstalledApplications(0);
-            for (Iterator<ApplicationInfo> i = mOriginalList.iterator(); i.hasNext(); ) {
+            hideList = Shell.Sync.su("magiskhide --ls");
+            for (Iterator<ApplicationInfo> i = fullList.iterator(); i.hasNext(); ) {
                 ApplicationInfo info = i.next();
-                if (ApplicationAdapter.BLACKLIST.contains(info.packageName) || !info.enabled) {
+                if (Const.HIDE_BLACKLIST.contains(info.packageName) || !info.enabled) {
                     i.remove();
                 }
             }
-            Collections.sort(mOriginalList, (a, b) -> a.loadLabel(pm).toString().toLowerCase()
+            Collections.sort(fullList, (a, b) -> {
-                    .compareTo(b.loadLabel(pm).toString().toLowerCase()));
+                boolean ah = hideList.contains(a.packageName);
-            mHideList = Utils.listMagiskHide(shell);
+                boolean bh = hideList.contains(b.packageName);
+                if (ah == bh) {
+                    return a.loadLabel(pm).toString().toLowerCase().compareTo(
+                            b.loadLabel(pm).toString().toLowerCase());
+                } else if (ah) {
+                    return -1;
+                } else {
+                    return 1;
+                }
+            });
             return null;
         }
 
         @Override
         protected void onPostExecute(Void v) {
-            magiskHideDone.publish(false);
+            MagiskManager.get().magiskHideDone.publish(false);
         }
     }
 }

src/full/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java

@@ -13,8 +13,8 @@ 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 com.topjohnwu.superuser.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();

src/full/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.database.SuDatabaseHelper;
+import com.topjohnwu.magisk.container.Policy;
-import com.topjohnwu.magisk.superuser.Policy;
+import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
 
 import java.util.HashSet;
 import java.util.List;
@@ -28,11 +28,11 @@ import butterknife.ButterKnife;
 public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder> {
 
     private List<Policy> policyList;
-    private SuDatabaseHelper dbHelper;
+    private MagiskDatabaseHelper dbHelper;
     private PackageManager pm;
     private Set<Policy> expandList = new HashSet<>();
 
-    public PolicyAdapter(List<Policy> list, SuDatabaseHelper db, PackageManager pm) {
+    public PolicyAdapter(List<Policy> list, MagiskDatabaseHelper db, PackageManager pm) {
         policyList = list;
         dbHelper = db;
         this.pm = pm;

src/full/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();
     }
 
 
@@ -94,6 +95,7 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
         String author = repo.getAuthor();
         holder.author.setText(TextUtils.isEmpty(author) ? null : context.getString(R.string.author, author));
         holder.description.setText(repo.getDescription());
+        holder.updateTime.setText(context.getString(R.string.updated_on, repo.getLastUpdateString()));
 
         holder.infoLayout.setOnClickListener(v ->
                 new MarkDownWindow((Activity) context, null, repo.getDetailUrl()).exec());
@@ -179,6 +181,7 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
         @BindView(R.id.author) TextView author;
         @BindView(R.id.info_layout) LinearLayout infoLayout;
         @BindView(R.id.download) ImageView downloadImage;
+        @BindView(R.id.update_time) TextView updateTime;
 
         RepoHolder(View itemView) {
             super(itemView);

src/full/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.database.SuDatabaseHelper;
+import com.topjohnwu.magisk.container.SuLogEntry;
-import com.topjohnwu.magisk.superuser.SuLogEntry;
+import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -27,10 +27,10 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
 
     private List<List<Integer>> logEntryList;
     private Set<Integer> itemExpanded, sectionExpanded;
-    private SuDatabaseHelper suDB;
+    private MagiskDatabaseHelper suDB;
     private Cursor suLogCursor = null;
 
-    public SuLogAdapter(SuDatabaseHelper db) {
+    public SuLogAdapter(MagiskDatabaseHelper db) {
         suDB = db;
         logEntryList = Collections.emptyList();
         sectionExpanded = new HashSet<>();

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

@@ -0,0 +1,84 @@
+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.ISafetyNetHelper;
+import com.topjohnwu.magisk.utils.WebService;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+
+import dalvik.system.DexClassLoader;
+
+public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
+
+    public static final File dexPath =
+            new File(MagiskManager.get().getFilesDir().getParent() + "/snet", "snet.apk");
+    private ISafetyNetHelper helper;
+
+    public CheckSafetyNet(Activity activity) {
+        super(activity);
+    }
+
+    private void dlSnet() throws Exception {
+        Shell.Sync.sh("rm -rf " + dexPath.getParent());
+        dexPath.getParentFile().mkdir();
+        HttpURLConnection conn = WebService.request(Const.Url.SNET_URL, null);
+        try (
+                OutputStream out = new BufferedOutputStream(new FileOutputStream(dexPath));
+                InputStream in = new BufferedInputStream(conn.getInputStream())) {
+            ShellUtils.pump(in, out);
+        } finally {
+            conn.disconnect();
+        }
+    }
+
+    private void dyload() throws Exception {
+        DexClassLoader loader = new DexClassLoader(dexPath.getPath(), dexPath.getParent(),
+                null, ISafetyNetHelper.class.getClassLoader());
+        Class<?> clazz = loader.loadClass("com.topjohnwu.snet.SafetyNetHelper");
+        helper = (ISafetyNetHelper) clazz.getConstructors()[0]
+                .newInstance(getActivity(), (ISafetyNetHelper.Callback)
+                        code -> MagiskManager.get().safetyNetDone.publish(false, code));
+        if (helper.getVersion() != Const.SNET_VER) {
+            throw new Exception();
+        }
+    }
+
+    @Override
+    protected Exception doInBackground(Void... voids) {
+        try {
+            try {
+                dyload();
+            } catch (Exception e) {
+                // If dynamic load failed, try re-downloading and reload
+                dlSnet();
+                dyload();
+            }
+        } catch (Exception e) {
+            return e;
+        }
+
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(Exception e) {
+        if (e == null) {
+            helper.attest();
+        } else {
+            e.printStackTrace();
+            MagiskManager.get().safetyNetDone.publish(false, -1);
+        }
+        super.onPostExecute(e);
+    }
+}

src/full/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;
+    private boolean showNotification;
-    public static final int BETA_CHANNEL = 1;
 
-    private static final String STABLE_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/stable.json";
+    public CheckUpdates() {
-    private static final String BETA_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/beta.json";
+        this(false);
-
-    private boolean showNotification = false;
-
-    public CheckUpdates(Context context) {
-        super(context);
     }
 
-    public CheckUpdates(Context context, boolean b) {
+    public CheckUpdates(boolean b) {
-        super(context);
         showNotification = b;
     }
 
     @Override
     protected Void doInBackground(Void... voids) {
-        MagiskManager mm = getMagiskManager();
+        MagiskManager mm = MagiskManager.get();
-        if (mm == null) return null;
+        String jsonStr = "";
-        String jsonStr;
         switch (mm.updateChannel) {
-            case STABLE_CHANNEL:
+            case Const.Value.STABLE_CHANNEL:
-                jsonStr = WebService.getString(STABLE_URL);
+                jsonStr = WebService.getString(Const.Url.STABLE_URL);
                 break;
-            case BETA_CHANNEL:
+            case Const.Value.BETA_CHANNEL:
-                jsonStr = WebService.getString(BETA_URL);
+                jsonStr = WebService.getString(Const.Url.BETA_URL);
+                break;
+            case Const.Value.CUSTOM_CHANNEL:
+                jsonStr = WebService.getString(mm.prefs.getString(Const.Key.CUSTOM_CHANNEL, ""));
                 break;
-            default:
-                jsonStr = null;
         }
         try {
             JSONObject json = new JSONObject(jsonStr);
@@ -50,24 +42,26 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
             mm.remoteMagiskVersionString = magisk.getString("version");
             mm.remoteMagiskVersionCode = magisk.getInt("versionCode");
             mm.magiskLink = magisk.getString("link");
-            mm.releaseNoteLink = magisk.getString("note");
+            mm.magiskNoteLink = magisk.getString("note");
             JSONObject manager = json.getJSONObject("app");
             mm.remoteManagerVersionString = manager.getString("version");
             mm.remoteManagerVersionCode = manager.getInt("versionCode");
             mm.managerLink = manager.getString("link");
+            mm.managerNoteLink = manager.getString("note");
+            JSONObject uninstaller = json.getJSONObject("uninstaller");
+            mm.uninstallerLink = uninstaller.getString("link");
         } catch (JSONException ignored) {}
         return null;
     }
 
     @Override
     protected void onPostExecute(Void v) {
-        MagiskManager mm = getMagiskManager();
+        MagiskManager mm = MagiskManager.get();
-        if (mm == null) return;
+        if (showNotification) {
-        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();

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

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

src/full/java/com/topjohnwu/magisk/asyncs/HideManager.java

@@ -0,0 +1,95 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.PatchAPK;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileOutputStream;
+
+import java.io.FileNotFoundException;
+import java.security.SecureRandom;
+
+public class HideManager extends ParallelTask<Void, Void, Boolean> {
+
+    private ProgressDialog dialog;
+
+    public HideManager(Activity activity) {
+        super(activity);
+    }
+
+    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();
+    }
+
+    @Override
+    protected void onPreExecute() {
+        dialog = ProgressDialog.show(getActivity(),
+                getActivity().getString(R.string.hide_manager_toast),
+                getActivity().getString(R.string.hide_manager_toast2));
+    }
+
+    @Override
+    protected Boolean doInBackground(Void... voids) {
+        MagiskManager mm = MagiskManager.get();
+
+        // Generate a new app with random package name
+        SuFile repack = new SuFile("/data/local/tmp/repack.apk");
+        String pkg = genPackageName("com.", Const.ORIG_PKG_NAME.length());
+
+        try {
+            if (!PatchAPK.patchPackageID(
+                    mm.getPackageCodePath(),
+                    new SuFileOutputStream(repack),
+                    Const.ORIG_PKG_NAME, pkg))
+                return false;
+        } catch (FileNotFoundException e) {
+            return false;
+        }
+
+        // Install the application
+        if (!ShellUtils.fastCmdResult(Shell.getShell(), "pm install " + repack))
+            return false;
+
+        repack.delete();
+
+        mm.mDB.setStrings(Const.Key.SU_MANAGER, pkg);
+        mm.dumpPrefs();
+        RootUtils.uninstallPkg(Const.ORIG_PKG_NAME);
+
+        return true;
+    }
+
+    @Override
+    protected void onPostExecute(Boolean b) {
+        dialog.dismiss();
+        if (!b) {
+            MagiskManager.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
+        }
+        super.onPostExecute(b);
+    }
+}

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

@@ -0,0 +1,327 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.net.Uri;
+import android.os.Build;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.FlashActivity;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.container.TarEntry;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.ZipUtils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFileInputStream;
+import com.topjohnwu.utils.SignBoot;
+
+import org.kamranzafar.jtar.TarInputStream;
+import org.kamranzafar.jtar.TarOutputStream;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.AbstractList;
+import java.util.Arrays;
+import java.util.List;
+
+public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
+
+    private static final int PATCH_MODE = 0;
+    public static final int DIRECT_MODE = 1;
+    private static final int FIX_ENV_MODE = 2;
+    public static final int SECOND_SLOT_MODE = 3;
+
+    private Uri bootUri, mZip;
+    private List<String> console, logs;
+    private String mBoot;
+    private int mode;
+    private File installDir;
+    private ProgressDialog dialog;
+    private MagiskManager mm;
+
+    public InstallMagisk(Activity context, Uri zip) {
+        super(context);
+        mZip = zip;
+        mm = MagiskManager.get();
+        mode = FIX_ENV_MODE;
+    }
+
+    public InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip, int mode) {
+        this(context, zip);
+        this.console = console;
+        this.logs = logs;
+        this.mode = mode;
+    }
+
+    public InstallMagisk(FlashActivity context, List<String> console, List<String> logs, Uri zip, Uri boot) {
+        this(context, console, logs, zip, PATCH_MODE);
+        bootUri = boot;
+    }
+
+    @Override
+    protected void onPreExecute() {
+        if (mode == FIX_ENV_MODE) {
+            Activity a = getActivity();
+            dialog = ProgressDialog.show(a, a.getString(R.string.setup_title), a.getString(R.string.setup_msg));
+            console = new NOPList<>();
+        }
+    }
+
+    private void extractFiles(String arch) throws IOException {
+        console.add("- Extracting files");
+        try (InputStream in = mm.getContentResolver().openInputStream(mZip)) {
+            if (in == null) throw new FileNotFoundException();
+            BufferedInputStream buf = new BufferedInputStream(in);
+            buf.mark(Integer.MAX_VALUE);
+            ZipUtils.unzip(buf, installDir, arch + "/", true);
+            buf.reset();
+            ZipUtils.unzip(buf, installDir, "common/", true);
+            buf.reset();
+            ZipUtils.unzip(buf, installDir, "chromeos/", false);
+            buf.reset();
+            ZipUtils.unzip(buf, installDir, "META-INF/com/google/android/update-binary", true);
+            buf.close();
+        } catch (FileNotFoundException e) {
+            console.add("! Invalid Uri");
+            throw e;
+        } catch (IOException e) {
+            console.add("! Cannot unzip zip");
+            throw e;
+        }
+        Shell.Sync.sh(Utils.fmt("chmod -R 755 %s/*; %s/magiskinit -x magisk %s/magisk",
+                installDir, installDir, installDir));
+    }
+
+    private boolean dumpBoot() {
+        console.add("- Copying image locally");
+        // Copy boot image to local
+        try (InputStream in = mm.getContentResolver().openInputStream(bootUri);
+             OutputStream out = new FileOutputStream(mBoot)
+        ) {
+            if (in == null)
+                throw new FileNotFoundException();
+
+            InputStream src;
+            if (Utils.getNameFromUri(mm, bootUri).endsWith(".tar")) {
+                // Extract boot.img from tar
+                TarInputStream tar = new TarInputStream(new BufferedInputStream(in));
+                org.kamranzafar.jtar.TarEntry entry;
+                while ((entry = tar.getNextEntry()) != null) {
+                    if (entry.getName().equals("boot.img"))
+                        break;
+                }
+                src = tar;
+            } else {
+                // Direct copy raw image
+                src = new BufferedInputStream(in);
+            }
+            ShellUtils.pump(src, out);
+        } catch (FileNotFoundException e) {
+            console.add("! Invalid Uri");
+            return false;
+        } catch (IOException e) {
+            console.add("! Copy failed");
+            return false;
+        }
+        return true;
+    }
+
+    private File patchBoot() throws IOException {
+        boolean isSigned;
+        try (InputStream in = new SuFileInputStream(mBoot)) {
+            isSigned = SignBoot.verifySignature(in, null);
+            if (isSigned) {
+                console.add("- Boot image is signed with AVB 1.0");
+            }
+        } catch (IOException e) {
+            console.add("! Unable to check signature");
+            throw e;
+        }
+
+        // Patch boot image
+        Shell.Sync.sh(console, logs,
+                "cd " + installDir,
+                Utils.fmt("KEEPFORCEENCRYPT=%b KEEPVERITY=%b sh update-binary indep " +
+                                "boot_patch.sh %s || echo 'Failed!'",
+                        mm.keepEnc, mm.keepVerity, mBoot));
+
+        if (TextUtils.equals(console.get(console.size() - 1), "Failed!"))
+            return null;
+
+        Shell.Sync.sh("mv bin/busybox busybox",
+                "rm -rf magisk.apk bin boot.img update-binary",
+                "cd /");
+
+        File patched = new File(installDir, "new-boot.img");
+        if (isSigned) {
+            console.add("- Signing boot image with test keys");
+            File signed = new File(installDir, "signed.img");
+            try (InputStream in = new SuFileInputStream(patched);
+                 OutputStream out = new BufferedOutputStream(new FileOutputStream(signed))
+            ) {
+                SignBoot.doSignature("/boot", in, out, null, null);
+            }
+            Shell.Sync.su("mv -f " + signed + " " + patched);
+        }
+        return patched;
+    }
+
+    private void outputBoot(File patched) throws IOException {
+        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.img"));
+                        break;
+                    default:
+                    case ".img":
+                        out = new BufferedOutputStream(new FileOutputStream(dest));
+                        break;
+                }
+                try (InputStream in = new SuFileInputStream(patched)) {
+                    ShellUtils.pump(in, out);
+                    out.close();
+                }
+                Shell.Sync.su("rm -f " + patched);
+                console.add("");
+                console.add("****************************");
+                console.add(" Patched image is placed in ");
+                console.add(" " + dest + " ");
+                console.add("****************************");
+                break;
+            case SECOND_SLOT_MODE:
+            case DIRECT_MODE:
+                Shell.Sync.sh(console, logs,
+                        Utils.fmt("direct_install %s %s %s", patched, mBoot, installDir));
+                if (!mm.keepVerity)
+                    Shell.Sync.sh(console, logs, "find_dtbo_image", "patch_dtbo_image");
+                break;
+        }
+    }
+
+    @Override
+    protected Boolean doInBackground(Void... voids) {
+        if (mode == FIX_ENV_MODE) {
+            installDir = new File("/data/adb/magisk");
+            Shell.Sync.sh("rm -rf /data/adb/magisk/*");
+        } else {
+            installDir = new File(
+                    (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ?
+                            mm.createDeviceProtectedStorageContext() : mm)
+                            .getFilesDir().getParent()
+                    , "install");
+            Shell.Sync.sh("rm -rf " + installDir);
+            installDir.mkdirs();
+        }
+
+        switch (mode) {
+            case PATCH_MODE:
+                mBoot = new File(installDir, "boot.img").getAbsolutePath();
+                if (!dumpBoot())
+                    return false;
+                break;
+            case DIRECT_MODE:
+                console.add("- Detecting target image");
+                mBoot = ShellUtils.fastCmd("find_boot_image", "echo \"$BOOTIMAGE\"");
+                break;
+            case SECOND_SLOT_MODE:
+                console.add("- Detecting target image");
+                char slot[] = ShellUtils.fastCmd("echo $SLOT").toCharArray();
+                if (slot[1] == 'a') slot[1] = 'b';
+                else slot[1] = 'a';
+                mBoot = ShellUtils.fastCmd("SLOT=" + String.valueOf(slot),
+                        "find_boot_image", "echo \"$BOOTIMAGE\"");
+                Shell.Async.su("mount_partitions");
+                break;
+            case FIX_ENV_MODE:
+                mBoot = "";
+                break;
+        }
+        if (mBoot == null) {
+            console.add("! Unable to detect target image");
+            return false;
+        }
+
+        console.add("- Target image: " + mBoot);
+
+        List<String> abis = Arrays.asList(Build.SUPPORTED_ABIS);
+        String arch;
+
+        if (mm.remoteMagiskVersionCode >= Const.MAGISK_VER.SEPOL_REFACTOR) {
+            // 32-bit only
+            if (abis.contains("x86")) arch = "x86";
+            else arch = "arm";
+        } else {
+            if (abis.contains("x86_64")) arch = "x64";
+            else if (abis.contains("arm64-v8a")) arch = "arm64";
+            else if (abis.contains("x86")) arch = "x86";
+            else arch = "arm";
+        }
+
+        console.add("- Device platform: " + Build.SUPPORTED_ABIS[0]);
+
+        try {
+            extractFiles(arch);
+            if (mode == FIX_ENV_MODE) {
+                Shell.Sync.sh("fix_env");
+            } else {
+                File patched = patchBoot();
+                if (patched == null)
+                    return false;
+                outputBoot(patched);
+                console.add("- All done!");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    protected void onPostExecute(Boolean result) {
+        if (mode == FIX_ENV_MODE) {
+            dialog.dismiss();
+            MagiskManager.toast(result ? R.string.setup_done : R.string.setup_fail, Toast.LENGTH_LONG);
+        } else {
+            // Running in FlashActivity
+            FlashActivity activity = (FlashActivity) getActivity();
+            if (!result) {
+                Shell.Async.sh("rm -rf " + installDir);
+                console.add("! Installation failed");
+                activity.reboot.setVisibility(View.GONE);
+            }
+            activity.buttonPanel.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private static class NOPList<E> extends AbstractList<E> {
+        @Override
+        public E get(int index) {
+            return null;
+        }
+
+        @Override
+        public int size() {
+            return 0;
+        }
+
+        @Override
+        public void add(int index, E element) {}
+    }
+}

src/full/java/com/topjohnwu/magisk/asyncs/LoadModules.java

@@ -0,0 +1,36 @@
+package com.topjohnwu.magisk.asyncs;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.container.ValueSortedMap;
+import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.superuser.Shell;
+
+import java.util.List;
+
+public class LoadModules extends ParallelTask<Void, Void, Void> {
+
+    private List<String> getModList() {
+        String command = "ls -d " + Const.MAGISK_PATH + "/* | grep -v lost+found";
+        return Shell.Sync.su(command);
+    }
+
+    @Override
+    protected Void doInBackground(Void... voids) {
+        MagiskManager mm = MagiskManager.get();
+        mm.moduleMap = new ValueSortedMap<>();
+
+        for (String path : getModList()) {
+            Module module = new Module(path);
+            mm.moduleMap.put(module.getId(), module);
+        }
+
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(Void v) {
+        MagiskManager.get().moduleLoadDone.publish();
+        super.onPostExecute(v);
+    }
+}