Bump version

Translation update or translation improvement :D

.gitignore

@@ -5,7 +5,8 @@
 /build
 app/release
 *.hprof
-app/.externalNativeBuild/
-*.sh
+.externalNativeBuild/
+src/main/assets
 public.certificate.x509.pem
 private.key.pk8
+*.apk

README.md

@@ -1,7 +1,2 @@
 # Magisk Manager
-This is one of the submodules used in Magisk. The project is licensed under GPL v3 (or newer).
-More info are written in the [Magisk Main Repo](https://github.com/topjohnwu/Magisk)
-
-## Building Notes
-You need to install CMake and NDK to build the zipadjust library.
-There are several files required to let Magisk Manager work properly, and they can be copied by using the build script in the [Magisk Main Repo](https://github.com/topjohnwu/Magisk). These files are: `magisk_uninstaller.sh`, `util_functions.sh`, `public.certificate.x509.pem`, and `private.key.pk8` under the `app/src/main/assets` folder.
+This repo is no longer an independent component. It is a submodule of the [Magisk Project](https://github.com/topjohnwu/Magisk).

app/.gitignore

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

app/build.gradle

@@ -1,66 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
-
-    defaultConfig {
-        applicationId "com.topjohnwu.magisk"
-        minSdkVersion 21
-        targetSdkVersion 26
-        versionCode 52
-        versionName "5.2.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 'com.android.support:recyclerview-v7:26.0.0'
-    implementation 'com.android.support:cardview-v7:26.0.0'
-    implementation 'com.android.support:design:26.0.0'
-    implementation 'com.android.support:support-v4:26.0.0'
-    implementation 'com.jakewharton:butterknife:8.8.1'
-    implementation 'com.atlassian.commonmark:commonmark:0.9.0'
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.57'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.57'
-    implementation 'com.google.android.gms:play-services-safetynet:9.0.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
-}

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

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

@@ -1,61 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.job.JobInfo;
-import android.app.job.JobScheduler;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.TextUtils;
-
-import com.topjohnwu.magisk.asyncs.LoadModules;
-import com.topjohnwu.magisk.asyncs.UpdateRepos;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.services.UpdateCheckService;
-import com.topjohnwu.magisk.utils.Utils;
-
-public class SplashActivity extends Activity{
-
-    private static final int UPDATE_SERVICE_ID = 1;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-        MagiskManager magiskManager = getApplicationContext();
-
-        // Init the info and configs and root sh
-        magiskManager.init();
-
-        // Get possible additional info from intent
-        magiskManager.remoteMagiskVersionString = getIntent().getStringExtra(MagiskManager.INTENT_VERSION);
-        magiskManager.magiskLink = getIntent().getStringExtra(MagiskManager.INTENT_LINK);
-
-        LoadModules loadModuleTask = new LoadModules(this);
-
-        if (Utils.checkNetworkStatus(this)) {
-            // Initialize the update check service, notify every 8 hours
-            if (!TextUtils.equals("install", getIntent().getStringExtra(MagiskManager.INTENT_SECTION))) {
-                ComponentName service = new ComponentName(this, UpdateCheckService.class);
-                JobInfo jobInfo = new JobInfo.Builder(UPDATE_SERVICE_ID, service)
-                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-                        .setPersisted(true)
-                        .setPeriodic(8 * 60 * 60 * 1000)
-                        .build();
-                ((JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE)).schedule(jobInfo);
-            }
-            loadModuleTask.setCallBack(() -> new UpdateRepos(getApplication()).exec());
-        }
-
-        loadModuleTask.exec();
-
-        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/CheckUpdates.java

@@ -1,62 +0,0 @@
-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.WebService;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class CheckUpdates extends ParallelTask<Void, Void, Void> {
-
-    private static final String UPDATE_JSON = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/magisk_update.json";
-
-    private boolean showNotification = false;
-
-    public CheckUpdates(Context context) {
-        super(context);
-    }
-
-    public CheckUpdates(Context context, boolean b) {
-        super(context);
-        showNotification = b;
-    }
-
-    @Override
-    protected Void doInBackground(Void... voids) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return null;
-        String jsonStr = WebService.getString(UPDATE_JSON);
-        try {
-            JSONObject json = new JSONObject(jsonStr);
-            JSONObject magisk = json.getJSONObject("magisk");
-            magiskManager.remoteMagiskVersionString = magisk.getString("version");
-            magiskManager.remoteMagiskVersionCode = magisk.getInt("versionCode");
-            magiskManager.magiskLink = magisk.getString("link");
-            magiskManager.releaseNoteLink = magisk.getString("note");
-            JSONObject manager = json.getJSONObject("app");
-            magiskManager.remoteManagerVersionString = manager.getString("version");
-            magiskManager.remoteManagerVersionCode = manager.getInt("versionCode");
-            magiskManager.managerLink = manager.getString("link");
-        } catch (JSONException ignored) {}
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void v) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return;
-        if (showNotification && magiskManager.updateNotification) {
-            if (BuildConfig.VERSION_CODE < magiskManager.remoteManagerVersionCode) {
-                Utils.showManagerUpdate(magiskManager);
-            } else if (magiskManager.magiskVersionCode < magiskManager.remoteMagiskVersionCode) {
-                Utils.showMagiskUpdate(magiskManager);
-            }
-        }
-        magiskManager.updateCheckDone.publish();
-        super.onPostExecute(v);
-    }
-}

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

@@ -1,71 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.content.Context;
-import android.os.Build;
-
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.WebService;
-
-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.1/busybox-arm";
-    private static final String BUSYBOX_X86 = "https://github.com/topjohnwu/ndk-busybox/releases/download/1.27.1/busybox-x86";
-    private static final String BUSYBOXPATH = "/dev/magisk/bin";
-
-    private File busybox;
-
-    public DownloadBusybox(Context context) {
-        super(context);
-        busybox = new File(context.getCacheDir(), "busybox");
-    }
-
-    @Override
-    protected void onPreExecute() {
-        getShell().su_raw("export PATH=" + BUSYBOXPATH + ":$PATH");
-    }
-
-    @Override
-    protected Void doInBackground(Void... voids) {
-        Context context = getMagiskManager();
-        if (!Utils.itemExist(getShell(), BUSYBOXPATH + "/busybox")) {
-            if (!busybox.exists() && Utils.checkNetworkStatus(context)) {
-                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();
-                    byte[] buffer = new byte[4096];
-                    int read;
-                    while ((read = in.read(buffer)) != -1) {
-                        out.write(buffer, 0, read);
-                    }
-                    out.close();
-                    in.close();
-
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (busybox.exists()) {
-                getShell().su_raw(
-                        "rm -rf " + BUSYBOXPATH,
-                        "mkdir -p " + BUSYBOXPATH,
-                        "cp " + busybox + " " + BUSYBOXPATH,
-                        "chmod -R 755 " + BUSYBOXPATH,
-                        BUSYBOXPATH + "/busybox --install -s " + BUSYBOXPATH
-                );
-            }
-        }
-        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, String, 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");
-        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(String... values) {
-        mList.updateView();
-    }
-
-    @Override
-    protected Integer doInBackground(Void... voids) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return -1;
-        try {
-            mList.add(magiskManager.getString(R.string.copying_msg));
-
-            mCachedFile.delete();
-            try (
-                InputStream in = magiskManager.getContentResolver().openInputStream(mUri);
-                OutputStream outputStream = new FileOutputStream(mCachedFile)
-            ) {
-                if (in == null) throw new FileNotFoundException();
-                byte buffer[] = new byte[1024];
-                int length;
-                while ((length = in.read(buffer)) > 0)
-                    outputStream.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(magiskManager.getString(R.string.zip_install_progress_msg, 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 magiskManager = getMagiskManager();
-        if (magiskManager == null) return;
-        getShell().su_raw(
-                "rm -rf " + mCachedFile.getParent(),
-                "rm -rf " + MagiskManager.TMP_FOLDER_PATH
-        );
-        switch (result) {
-            case -1:
-                mList.add(magiskManager.getString(R.string.install_error));
-                Utils.showUriSnack(getActivity(), mUri);
-                break;
-            case 0:
-                mList.add(magiskManager.getString(R.string.invalid_zip));
-                break;
-            case 1:
-                // Success
-                new LoadModules(magiskManager).exec();
-                break;
-        }
-        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 magiskManager = getMagiskManager();
-        if (magiskManager == null) return null;
-        Logger.dev("LoadModules: Loading modules");
-
-        magiskManager.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);
-                magiskManager.moduleMap.put(module.getId(), module);
-            } catch (BaseModule.CacheModException ignored) {}
-        }
-
-        Logger.dev("LoadModules: Data load done");
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void v) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return;
-        magiskManager.moduleLoadDone.publish();
-        super.onPostExecute(v);
-    }
-}

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

@@ -1,50 +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 renderer.render(doc);
-    }
-
-    @Override
-    protected void onPostExecute(String html) {
-        AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
-        alert.setTitle(mTitle);
-
-        WebView wv = new WebView(getActivity());
-
-        html = String.format(
-                "<link rel='stylesheet' type='text/css' href='file:///android_asset/%s.css'/> %s",
-                getMagiskManager().isDarkTheme ? "dark" : "light", html);
-
-        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,105 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.net.Uri;
-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.ZipUtils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.OutputStream;
-
-public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
-
-    private Uri mUri;
-    private ProgressDialog progressDialog;
-    private boolean mInstall;
-
-    public ProcessRepoZip(Activity context, Uri uri, boolean install) {
-        super(context);
-        mUri = uri;
-        mInstall = install;
-    }
-
-    @Override
-    protected void onPreExecute() {
-        Activity activity = getActivity();
-        if (activity == null) return;
-        progressDialog = ProgressDialog.show(activity,
-                activity.getString(R.string.zip_process_title),
-                activity.getString(R.string.zip_process_msg));
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... params) {
-        Activity activity = getActivity();
-        if (activity == null) return null;
-        try {
-
-            // Create temp file
-            File temp1 = new File(activity.getCacheDir(), "1.zip");
-            File temp2 = new File(activity.getCacheDir(), "2.zip");
-            activity.getCacheDir().mkdirs();
-            temp1.createNewFile();
-            temp2.createNewFile();
-
-            // First remove top folder in Github source zip, Uri -> temp1
-            ZipUtils.removeTopFolder(activity.getContentResolver().openInputStream(mUri), temp1);
-
-            // 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 back to the downloaded zip, temp2 -> Uri
-            try (OutputStream out = activity.getContentResolver().openOutputStream(mUri);
-                 FileInputStream in = new FileInputStream(temp2)
-            ) {
-                byte[] buffer = new byte[4096];
-                int length;
-                if (out == null) throw new FileNotFoundException();
-                while ((length = in.read(buffer)) > 0)
-                    out.write(buffer, 0, length);
-            }
-
-            // Delete the temp file
-            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();
-        if (result) {
-            if (Shell.rootAccess() && mInstall) {
-                activity.startActivity(new Intent(activity, FlashActivity.class).setData(mUri));
-            } else {
-                Utils.showUriSnack(activity, mUri);
-            }
-        } else {
-            Utils.getMagiskManager(activity).toast(R.string.process_error, Toast.LENGTH_LONG);
-        }
-    }
-}

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

@@ -1,192 +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) {
-        MagiskManager magiskManager = getMagiskManager();
-        if (magiskManager == null) return null;
-        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 magiskManager = getMagiskManager();
-        if (magiskManager == null) return;
-        magiskManager.repoLoadDone.publish();
-        super.onPostExecute(v);
-    }
-}

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

@@ -1,57 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.content.res.Configuration;
-import android.os.Bundle;
-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.Topic;
-
-public class Activity extends AppCompatActivity {
-
-    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 MagiskManager getApplicationContext() {
-        return (MagiskManager) super.getApplicationContext();
-    }
-
-    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/components/ExpandableViewHolder.java

@@ -1,77 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.animation.ValueAnimator;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-
-public abstract class ExpandableViewHolder extends RecyclerView.ViewHolder {
-
-    protected ViewGroup expandLayout;
-    private ValueAnimator expandAnimator, collapseAnimator;
-    private static int expandHeight = 0;
-
-    public boolean mExpanded = false;
-
-    public ExpandableViewHolder(View itemView) {
-        super(itemView);
-        setExpandLayout(itemView);
-        expandLayout.getViewTreeObserver().addOnPreDrawListener(
-                new ViewTreeObserver.OnPreDrawListener() {
-
-                    @Override
-                    public boolean onPreDraw() {
-                        if (expandHeight == 0) {
-                            final int widthSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
-                            final int heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
-                            expandLayout.measure(widthSpec, heightSpec);
-                            expandHeight = expandLayout.getMeasuredHeight();
-                        }
-
-                        expandLayout.getViewTreeObserver().removeOnPreDrawListener(this);
-                        expandLayout.setVisibility(View.GONE);
-                        expandAnimator = slideAnimator(0, expandHeight);
-                        collapseAnimator = slideAnimator(expandHeight, 0);
-                        return true;
-                    }
-
-                });
-    }
-
-    public void setExpanded(boolean expanded) {
-        mExpanded = expanded;
-        ViewGroup.LayoutParams layoutParams = expandLayout.getLayoutParams();
-        layoutParams.height = expanded ? expandHeight : 0;
-        expandLayout.setLayoutParams(layoutParams);
-        expandLayout.setVisibility(expanded ? View.VISIBLE : View.GONE);
-    }
-
-    public void expand() {
-        if (mExpanded) return;
-        expandLayout.setVisibility(View.VISIBLE);
-        expandAnimator.start();
-        mExpanded = true;
-    }
-
-    public void collapse() {
-        if (!mExpanded) return;
-        collapseAnimator.start();
-        mExpanded = false;
-    }
-
-    public abstract void setExpandLayout(View itemView);
-
-    private ValueAnimator slideAnimator(int start, int end) {
-
-        ValueAnimator animator = ValueAnimator.ofInt(start, end);
-
-        animator.addUpdateListener(valueAnimator -> {
-            int value = (Integer) valueAnimator.getAnimatedValue();
-            ViewGroup.LayoutParams layoutParams = expandLayout.getLayoutParams();
-            layoutParams.height = value;
-            expandLayout.setLayoutParams(layoutParams);
-        });
-        return animator;
-    }
-}

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

@@ -1,85 +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.module.Repo;
-import com.topjohnwu.magisk.utils.Logger;
-
-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;
-
-    public RepoDatabaseHelper(Context context) {
-        super(context, "repo.db", null, DATABASE_VER);
-        mDb = getWritableDatabase();
-    }
-
-    @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>=?", new String[] { String.valueOf(MIN_TEMPLATE_VER) }, 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,252 +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 String MULTIUSER_MODE = "multiuser_mode";
-    public static final String MNT_NS = "mnt_ns";
-
-    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/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/ByteArrayInOutStream.java

@@ -1,18 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-public class ByteArrayInOutStream extends ByteArrayOutputStream {
-    public ByteArrayInputStream getInputStream() {
-        ByteArrayInputStream in = new ByteArrayInputStream(buf, 0, count);
-        count = 0;
-        buf = new byte[32];
-        return in;
-    }
-
-    public void setBuffer(byte[] buffer) {
-        buf = buffer;
-        count = buffer.length;
-    }
-}

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,183 +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");
-    }
-
-    public static Shell getShell() {
-        return new Shell();
-    }
-
-    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;
-        }
-    }
-}