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/
-*.sh
+.externalNativeBuild/
+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).
-More info are written in the [Magisk Main Repo](https://github.com/topjohnwu/Magisk)
+This repo is no longer an independent component. It is a submodule of the [Magisk Project](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.
+# Translations
+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`.  
+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,66 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.1"
-
-    defaultConfig {
-        applicationId "com.topjohnwu.magisk"
-        minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 64
-        versionName "5.4.3"
-        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()
-    google()
-    maven { url "https://jitpack.io" }
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation project(':crypto')
-    implementation 'com.android.support:recyclerview-v7:27.0.1'
-    implementation 'com.android.support:cardview-v7:27.0.1'
-    implementation 'com.android.support:design:27.0.1'
-    implementation 'com.android.support:support-v4:27.0.1'
-    implementation 'com.jakewharton:butterknife:8.8.1'
-    implementation 'com.atlassian.commonmark:commonmark:0.10.0'
-    implementation 'org.kamranzafar:jtar:2.3'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
-}

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

@@ -1,131 +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 com.topjohnwu.magisk.utils.Const;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Locale;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class AboutActivity extends Activity {
-
-    @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(String.format(Locale.US, "%s (%d)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
-
-        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(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();
-    }
-
-}

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

@@ -1,227 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.Manifest;
-import android.os.Bundle;
-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.Const;
-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 java.util.Locale;
-
-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);
-
-        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());
-        }
-
-        @Override
-        protected Object doInBackground(Object... params) {
-            mode = (int) params[0];
-            switch (mode) {
-                case 0:
-                    StringBuildingList logList = new StringBuildingList();
-                    Shell.su(logList, "cat " + Const.MAGISK_LOG + " | tail -n 1000");
-                    return logList.getCharSequence();
-
-                case 1:
-                    Shell.su_raw("echo -n > " + Const.MAGISK_LOG);
-                    SnackbarMaker.make(txtLog, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
-                    return "";
-
-                case 2:
-                    Calendar now = Calendar.getInstance();
-                    String filename = String.format(Locale.US,
-                            "magisk_log_%04d%02d%02d_%02d:%02d:%02d.log",
-                            now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
-                            now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
-                            now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
-
-                    targetFile = new File(Const.EXTERNAL_PATH + "/logs", filename);
-
-                    if ((!targetFile.getParentFile().exists() && !targetFile.getParentFile().mkdirs())
-                            || (targetFile.exists() && !targetFile.delete())) {
-                        return false;
-                    }
-
-                    try (FileWriter out = new FileWriter(targetFile)) {
-                        FileWritingList fileWritingList = new FileWritingList(out);
-                        Shell.su(fileWritingList, "cat " + Const.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:
-                    CharSequence llog = (CharSequence) o;
-                    progressBar.setVisibility(View.GONE);
-                    if (TextUtils.isEmpty(llog))
-                        txtLog.setText(R.string.log_is_empty);
-                    else
-                        txtLog.setText(llog);
-                    svLog.postDelayed(() -> svLog.fullScroll(ScrollView.FOCUS_DOWN), 100);
-                    hsvLog.postDelayed(() -> hsvLog.fullScroll(ScrollView.FOCUS_LEFT), 100);
-                    break;
-                case 2:
-                    boolean bool = (boolean) o;
-                    if (bool) {
-                        MagiskManager.toast(targetFile.getPath(), Toast.LENGTH_LONG);
-                    } else {
-                        MagiskManager.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;
-        }
-
-        public CharSequence getCharSequence() {
-            return builder;
-        }
-    }
-
-    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,200 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.Application;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.database.SuDatabaseHelper;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.lang.ref.WeakReference;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-public class MagiskManager extends Application {
-
-    // Global weak reference to self
-    private static WeakReference<MagiskManager> weakSelf;
-
-    // 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 int userId;
-    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 String bootBlock = null;
-    public int snet_version;
-    public int updateServiceVersion;
-
-    // Data
-    public Map<String, Module> moduleMap;
-    public List<Locale> locales;
-
-    // Configurations
-    public static Locale locale;
-    public static Locale defaultLocale;
-
-    public boolean magiskHide;
-    public boolean isDarkTheme;
-    public boolean updateNotification;
-    public boolean suReauth;
-    public boolean coreOnly;
-    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 String customChannelUrl;
-
-    // Global resources
-    public SharedPreferences prefs;
-    public SuDatabaseHelper suDB;
-    public RepoDatabaseHelper repoDB;
-    public Shell shell;
-    public Runnable permissionGrantCallback = null;
-
-    private static Handler mHandler = new Handler();
-
-    public MagiskManager() {
-        weakSelf = new WeakReference<>(this);
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        userId = getApplicationInfo().uid / 100000;
-
-        if (Utils.getDatabasePath(this, SuDatabaseHelper.DB_NAME).exists()) {
-            // Don't migrate yet, wait and check Magisk version
-            suDB = new SuDatabaseHelper(this);
-        } else {
-            suDB = new SuDatabaseHelper();
-        }
-
-        // If detect original package, self destruct!
-        if (!getPackageName().equals(Const.ORIG_PKG_NAME)) {
-            try {
-                getPackageManager().getApplicationInfo(Const.ORIG_PKG_NAME, 0);
-                Shell.su(String.format(Locale.US, "pm uninstall --user %d %s", userId, getPackageName()));
-                return;
-            } catch (PackageManager.NameNotFoundException ignored) { /* Expected*/ }
-        }
-
-        repoDB = new RepoDatabaseHelper(this);
-        defaultLocale = Locale.getDefault();
-        setLocale();
-        loadConfig();
-    }
-
-    public static MagiskManager get() {
-        return 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() {
-        isDarkTheme = prefs.getBoolean(Const.Key.DARK_THEME, false);
-
-        // 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);
-        suReauth = prefs.getBoolean(Const.Key.SU_REAUTH, false);
-        suAccessState = suDB.getSettings(Const.Key.ROOT_ACCESS, Const.Value.ROOT_ACCESS_APPS_AND_ADB);
-        multiuserMode = suDB.getSettings(Const.Key.SU_MULTIUSER_MODE, Const.Value.MULTIUSER_MODE_OWNER_ONLY);
-        suNamespaceMode = suDB.getSettings(Const.Key.SU_MNT_NS, Const.Value.NAMESPACE_MODE_REQUESTER);
-
-        coreOnly = prefs.getBoolean(Const.Key.DISABLE, false);
-        updateNotification = prefs.getBoolean(Const.Key.UPDATE_NOTIFICATION, true);
-        updateChannel = Utils.getPrefsInt(prefs, Const.Key.UPDATE_CHANNEL, Const.Value.STABLE_CHANNEL);
-        bootFormat = prefs.getString(Const.Key.BOOT_FORMAT, ".img");
-        snet_version = prefs.getInt(Const.Key.SNET_VER, -1);
-        updateServiceVersion = prefs.getInt(Const.Key.UPDATE_SERVICE_VER, -1);
-        customChannelUrl = prefs.getString(Const.Key.CUSTOM_CHANNEL, "");
-    }
-
-    public static void toast(String msg, int duration) {
-        mHandler.post(() -> Toast.makeText(weakSelf.get(), msg, duration).show());
-    }
-
-    public static void toast(int resId, int duration) {
-        mHandler.post(() -> Toast.makeText(weakSelf.get(), resId, duration).show());
-    }
-
-    public void loadMagiskInfo() {
-        List<String> ret;
-        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) {}
-        }
-        if (magiskVersionCode > 1435) {
-            ret = Shell.su("resetprop -p " + Const.MAGISKHIDE_PROP);
-        } else {
-            ret = Shell.sh("getprop " + Const.MAGISKHIDE_PROP);
-        }
-        try {
-            magiskHide = !Utils.isValidShellResponse(ret) || Integer.parseInt(ret.get(0)) != 0;
-        } catch (NumberFormatException e) {
-            magiskHide = true;
-        }
-    }
-
-    public void setPermissionGrantCallback(Runnable callback) {
-        permissionGrantCallback = callback;
-    }
-}

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

@@ -1,134 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.job.JobInfo;
-import android.app.job.JobScheduler;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-
-import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.asyncs.LoadModules;
-import com.topjohnwu.magisk.asyncs.ParallelTask;
-import com.topjohnwu.magisk.asyncs.UpdateRepos;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.database.SuDatabaseHelper;
-import com.topjohnwu.magisk.services.UpdateCheckService;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.util.List;
-
-public class SplashActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        MagiskManager mm = getMagiskManager();
-
-        // Dynamic detect all locales
-        new LoadLocale().exec();
-
-        // Create notification channel on Android O
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel(Const.ID.NOTIFICATION_CHANNEL,
-                    getString(R.string.magisk_updates), NotificationManager.IMPORTANCE_DEFAULT);
-            getSystemService(NotificationManager.class).createNotificationChannel(channel);
-        }
-
-        mm.loadMagiskInfo();
-        LoadModules loadModuleTask = new LoadModules();
-
-        if (Utils.checkNetworkStatus()) {
-
-            // Fire update check
-            new CheckUpdates().exec();
-
-            // Add repo update check
-            loadModuleTask.setCallBack(() -> new UpdateRepos(false).exec());
-        }
-
-        // Magisk working as expected
-        if (Shell.rootAccess() && mm.magiskVersionCode > 0) {
-
-            List<String> ret = Shell.su("echo \"$BOOTIMAGE\"");
-            if (Utils.isValidShellResponse(ret)) {
-                mm.bootBlock = ret.get(0);
-            }
-
-            // Setup suDB
-            SuDatabaseHelper.setupSuDB();
-
-            // Check alternative Magisk Manager
-            String pkg;
-            if (getPackageName().equals(Const.ORIG_PKG_NAME) &&
-                    (pkg = mm.suDB.getStrings(Const.Key.SU_REQUESTER, null)) != null) {
-                Shell.su_raw("pm uninstall " + pkg);
-                mm.suDB.setStrings(Const.Key.SU_REQUESTER, null);
-            }
-
-            // Add update checking service
-            if (Const.Value.UPDATE_SERVICE_VER > mm.updateServiceVersion) {
-                ComponentName service = new ComponentName(this, UpdateCheckService.class);
-                JobInfo info = new JobInfo.Builder(Const.ID.UPDATE_SERVICE_ID, service)
-                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-                        .setPersisted(true)
-                        .setPeriodic(8 * 60 * 60 * 1000)
-                        .build();
-                ((JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE)).schedule(info);
-                mm.updateServiceVersion = Const.Value.UPDATE_SERVICE_VER;
-            }
-
-            // Fire asynctasks
-            loadModuleTask.exec();
-
-            // Check dtbo status
-            Utils.patchDTBO();
-        }
-
-        // Write back default values
-        mm.prefs.edit()
-                .putBoolean(Const.Key.DARK_THEME, mm.isDarkTheme)
-                .putBoolean(Const.Key.MAGISKHIDE, mm.magiskHide)
-                .putBoolean(Const.Key.UPDATE_NOTIFICATION, mm.updateNotification)
-                .putBoolean(Const.Key.HOSTS, Utils.itemExist(Const.MAGISK_HOST_FILE()))
-                .putBoolean(Const.Key.DISABLE, Utils.itemExist(Const.MAGISK_DISABLE_FILE))
-                .putBoolean(Const.Key.SU_REAUTH, mm.suReauth)
-                .putString(Const.Key.SU_REQUEST_TIMEOUT, String.valueOf(mm.suRequestTimeout))
-                .putString(Const.Key.SU_AUTO_RESPONSE, String.valueOf(mm.suResponseType))
-                .putString(Const.Key.SU_NOTIFICATION, String.valueOf(mm.suNotificationType))
-                .putString(Const.Key.ROOT_ACCESS, String.valueOf(mm.suAccessState))
-                .putString(Const.Key.SU_MULTIUSER_MODE, String.valueOf(mm.multiuserMode))
-                .putString(Const.Key.SU_MNT_NS, String.valueOf(mm.suNamespaceMode))
-                .putString(Const.Key.UPDATE_CHANNEL, String.valueOf(mm.updateChannel))
-                .putString(Const.Key.LOCALE, mm.localeConfig)
-                .putString(Const.Key.BOOT_FORMAT, mm.bootFormat)
-                .putInt(Const.Key.UPDATE_SERVICE_VER, mm.updateServiceVersion)
-                .apply();
-
-        mm.hasInit = true;
-
-        Intent intent = new Intent(this, MainActivity.class);
-        intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION));
-        intent.putExtra(Const.Key.INTENT_PERM, getIntent().getStringExtra(Const.Key.INTENT_PERM));
-        startActivity(intent);
-        finish();
-    }
-
-    static class LoadLocale extends ParallelTask<Void, Void, Void> {
-        @Override
-        protected Void doInBackground(Void... voids) {
-            MagiskManager.get().locales = Utils.getAvailableLocale();
-            return null;
-        }
-        @Override
-        protected void onPostExecute(Void aVoid) {
-            MagiskManager.get().localeDone.publish();
-        }
-    }
-}

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

@@ -1,83 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.WebService;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Proxy;
-import java.net.HttpURLConnection;
-
-import dalvik.system.DexClassLoader;
-
-public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
-
-    private File dexPath;
-    private DexClassLoader loader;
-
-    public CheckSafetyNet(Activity activity) {
-        super(activity);
-        dexPath = new File(activity.getCacheDir().getParent() + "/snet", "snet.apk");
-    }
-
-    @Override
-    protected void onPreExecute() {
-        MagiskManager mm = MagiskManager.get();
-        if (mm.snet_version != Const.Value.SNET_VER) {
-            Shell.sh("rm -rf " + dexPath.getParent());
-        }
-        mm.snet_version = Const.Value.SNET_VER;
-        mm.prefs.edit().putInt(Const.Key.SNET_VER, Const.Value.SNET_VER).apply();
-    }
-
-    @Override
-    protected Exception doInBackground(Void... voids) {
-        try {
-            if (!dexPath.exists()) {
-                HttpURLConnection conn = WebService.request(Const.Url.SNET_URL, null);
-                dexPath.getParentFile().mkdir();
-                try (
-                        OutputStream out = new BufferedOutputStream(new FileOutputStream(dexPath));
-                        InputStream in = new BufferedInputStream(conn.getInputStream())) {
-                    Utils.inToOut(in, out);
-                }
-                conn.disconnect();
-            }
-            loader = new DexClassLoader(dexPath.toString(), dexPath.getParent(),
-                    null, ClassLoader.getSystemClassLoader());
-        } catch (Exception e) {
-            return e;
-        }
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Exception err) {
-        MagiskManager mm = MagiskManager.get();
-        try {
-            if (err != null) throw err;
-            Class<?> helperClazz = loader.loadClass(Const.SNET_PKG + ".SafetyNetHelper");
-            Class<?> callbackClazz = loader.loadClass(Const.SNET_PKG + ".SafetyNetCallback");
-            Object helper = helperClazz.getConstructors()[0].newInstance(
-                    getActivity(), dexPath.getPath(), Proxy.newProxyInstance(
-                            loader, new Class[] { callbackClazz }, (proxy, method, args) -> {
-                                mm.safetyNetDone.publish(false, args[0]);
-                                return null;
-                            }));
-            helperClazz.getMethod("attest").invoke(helper);
-        } catch (Exception e) {
-            e.printStackTrace();
-            mm.safetyNetDone.publish(false, -1);
-        }
-        super.onPostExecute(err);
-    }
-}

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

@@ -1,146 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.widget.Toast;
-
-import com.topjohnwu.crypto.JarMap;
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ZipUtils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.security.SecureRandom;
-import java.util.List;
-import java.util.Locale;
-import java.util.jar.JarEntry;
-
-public class HideManager extends ParallelTask<Void, Void, Boolean> {
-
-    private String genPackageName(String prefix, int length) {
-        StringBuilder builder = new StringBuilder(length);
-        builder.append(prefix);
-        length -= prefix.length();
-        SecureRandom random = new SecureRandom();
-        String base = "abcdefghijklmnopqrstuvwxyz";
-        String alpha = base + base.toUpperCase();
-        String full = alpha + "0123456789..........";
-        char next, prev = '\0';
-        for (int i = 0; i < length; ++i) {
-            if (prev == '.' || i == length - 1 || i == 0) {
-                next = alpha.charAt(random.nextInt(alpha.length()));
-            } else {
-                next = full.charAt(random.nextInt(full.length()));
-            }
-            builder.append(next);
-            prev = next;
-        }
-        return builder.toString();
-    }
-
-    private int findOffset(byte buf[], byte pattern[]) {
-        int offset = -1;
-        for (int i = 0; i < buf.length - pattern.length; ++i) {
-            boolean match = true;
-            for (int j = 0; j < pattern.length; ++j) {
-                if (buf[i + j] != pattern[j]) {
-                    match = false;
-                    break;
-                }
-            }
-            if (match) {
-                offset = i;
-                break;
-            }
-        }
-        return offset;
-    }
-
-    /* It seems that AAPT sometimes generate another type of string format */
-    private boolean fallbackPatch(byte xml[], String from, String to) {
-
-        byte[] target = new byte[from.length() * 2 + 2];
-        for (int i = 0; i < from.length(); ++i) {
-            target[i * 2] = (byte) from.charAt(i);
-        }
-        int offset = findOffset(xml, target);
-        if (offset < 0)
-            return false;
-        byte[] dest = new byte[target.length - 2];
-        for (int i = 0; i < to.length(); ++i) {
-            dest[i * 2] = (byte) to.charAt(i);
-        }
-        System.arraycopy(dest, 0, xml, offset, dest.length);
-        return true;
-    }
-
-    private boolean findAndPatch(byte xml[], String from, String to) {
-        byte target[] = (from + '\0').getBytes();
-        int offset = findOffset(xml, target);
-        if (offset < 0)
-            return fallbackPatch(xml, from, to);
-        System.arraycopy(to.getBytes(), 0, xml, offset, to.length());
-        return true;
-    }
-
-    @Override
-    protected void onPreExecute() {
-        MagiskManager.toast(R.string.hide_manager_toast, Toast.LENGTH_SHORT);
-        MagiskManager.toast(R.string.hide_manager_toast2, Toast.LENGTH_LONG);
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... voids) {
-        MagiskManager mm = MagiskManager.get();
-
-        // Generate a new unhide app with random package name
-        File repack = new File(Const.EXTERNAL_PATH, "repack.apk");
-        repack.getParentFile().mkdirs();
-        String pkg = genPackageName("com.", Const.ORIG_PKG_NAME.length());
-
-        try {
-            // Read whole APK into memory
-            JarMap apk = new JarMap(new FileInputStream(mm.getPackageCodePath()));
-            JarEntry je = new JarEntry(Const.ANDROID_MANIFEST);
-            byte xml[] = apk.getRawData(je);
-
-            if (!findAndPatch(xml, Const.ORIG_PKG_NAME, pkg))
-                return false;
-            if (!findAndPatch(xml, Const.ORIG_PKG_NAME + ".provider", pkg + ".provider"))
-                return false;
-
-            // Write in changes
-            apk.getOutputStream(je).write(xml);
-
-            // Sign the APK
-            ZipUtils.signZip(apk, repack, false);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-
-        // Install the application
-
-        List<String> ret = Shell.su(String.format(Locale.US,
-                "pm install --user %d %s >/dev/null && echo true || echo false",
-                mm.userId, repack));
-        repack.delete();
-        if (!Utils.isValidShellResponse(ret) || !Boolean.parseBoolean(ret.get(0)))
-            return false;
-
-        mm.suDB.setStrings(Const.Key.SU_REQUESTER, pkg);
-        Shell.su_raw(String.format(Locale.US, "pm uninstall --user %d %s", mm.userId, mm.getPackageName()));
-
-        return true;
-    }
-
-    @Override
-    protected void onPostExecute(Boolean b) {
-        if (!b) {
-            MagiskManager.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
-        }
-        super.onPostExecute(b);
-    }
-}

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

@@ -1,48 +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.MagiskManager;
-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",
-                MagiskManager.get().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/RestoreStockBoot.java

@@ -1,40 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
-
-import java.util.List;
-
-public class RestoreStockBoot extends ParallelTask<Void, Void, Boolean> {
-
-    @Override
-    protected Boolean doInBackground(Void... voids) {
-        String sha1;
-        List<String> ret = Utils.readFile("/.backup/.sha1");
-        if (Utils.isValidShellResponse(ret)) {
-            sha1 = ret.get(0);
-        } else {
-            ret = Shell.su("cat /init.magisk.rc | grep STOCKSHA1");
-            if (!Utils.isValidShellResponse(ret))
-                return false;
-            sha1 = ret.get(0).substring(ret.get(0).indexOf('=') + 1);
-        }
-
-        ret = Shell.su("restore_imgs " + sha1 + " && echo true || echo false");
-
-        return Utils.isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(ret.size() - 1));
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        if (result) {
-            MagiskManager.toast(R.string.restore_done, Toast.LENGTH_SHORT);
-        } else {
-            MagiskManager.toast(R.string.restore_fail, Toast.LENGTH_LONG);
-        }
-    }
-}

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

@@ -1,211 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.content.SharedPreferences;
-import android.os.AsyncTask;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.ReposFragment;
-import com.topjohnwu.magisk.container.Repo;
-import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.utils.Const;
-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.net.HttpURLConnection;
-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> {
-
-    private static final int CHECK_ETAG = 0;
-    private static final int LOAD_NEXT = 1;
-    private static final int LOAD_PREV = 2;
-
-    private List<String> cached, etags, newEtags = new ArrayList<>();
-    private RepoDatabaseHelper repoDB;
-    private SharedPreferences prefs;
-    private boolean forceUpdate;
-
-    private int tasks = 0;
-
-    public UpdateRepos(boolean force) {
-        MagiskManager mm = MagiskManager.get();
-        prefs = mm.prefs;
-        repoDB = mm.repoDB;
-        mm.repoLoadDone.hasPublished = false;
-        // Legacy data cleanup
-        File old = new File(mm.getApplicationInfo().dataDir + "/shared_prefs", "RepoMap.xml");
-        if (old.exists() || prefs.getString("repomap", null) != null) {
-            old.delete();
-            prefs.edit().remove("version").remove("repomap").remove(Const.Key.ETAG_KEY).apply();
-            repoDB.clearRepo();
-        }
-        forceUpdate = force;
-    }
-
-    private void loadJSON(String jsonString) throws Exception {
-        JSONArray jsonArray = new JSONArray(jsonString);
-
-        // Empty page, throw error
-        if (jsonArray.length() == 0) throw new Exception();
-
-        for (int i = 0; i < jsonArray.length(); i++) {
-            JSONObject jsonobject = jsonArray.getJSONObject(i);
-            String id = jsonobject.getString("description");
-            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);
-            ++tasks;
-            AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
-                Repo repo = repoDB.getRepo(id);
-                Boolean updated;
-                try {
-                    if (repo == null) {
-                        repo = new Repo(name, updatedDate);
-                        updated = true;
-                    } else {
-                        // Popout from cached
-                        cached.remove(id);
-                        if (forceUpdate) {
-                            repo.update();
-                            updated = true;
-                        } else {
-                            updated = repo.update(updatedDate);
-                        }
-                    }
-                    if (updated) {
-                        repoDB.addRepo(repo);
-                        publishProgress();
-                    }
-                    if (!id.equals(repo.getId())) {
-                        Logger.error("Repo [" + name + "] id=[" + repo.getId() + "] has illegal repo id");
-                    }
-                } catch (Repo.IllegalRepoException e) {
-                    Logger.error(e.getMessage());
-                    repoDB.removeRepo(id);
-                }
-                --tasks;
-            });
-        }
-    }
-
-    private boolean loadPage(int page, int mode) {
-        Map<String, String> header = new HashMap<>();
-        String etag = "";
-        if (mode == CHECK_ETAG && page < etags.size()) {
-            etag = etags.get(page);
-        }
-        header.put(Const.Key.IF_NONE_MATCH, etag);
-        String url = String.format(Locale.US, Const.Url.REPO_URL, page + 1);
-        HttpURLConnection conn = WebService.request(url, header);
-
-        try {
-            if (conn == null) throw new Exception();
-            if (conn.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {
-                newEtags.add(etag);
-                return page + 1 < etags.size() && loadPage(page + 1, CHECK_ETAG);
-            }
-            loadJSON(WebService.getString(conn));
-        } catch (Exception e) {
-            e.printStackTrace();
-            // Don't continue
-            return true;
-        }
-
-        // Update ETAG
-        etag = header.get(Const.Key.ETAG_KEY);
-        etag = etag.substring(etag.indexOf('\"'), etag.lastIndexOf('\"') + 1);
-        newEtags.add(etag);
-
-        String links = header.get(Const.Key.LINK_KEY);
-        if (links != null) {
-            for (String s : links.split(", ")) {
-                if (mode != LOAD_PREV && s.contains("next")) {
-                    // Force load all next pages
-                    loadPage(page + 1, LOAD_NEXT);
-                } else if (mode != LOAD_NEXT && s.contains("prev")) {
-                    // Back propagation
-                    loadPage(page - 1, LOAD_PREV);
-                }
-            }
-        }
-        return true;
-    }
-
-    private Void waitTasks() {
-        while (tasks > 0) {
-            try {
-                Thread.sleep(5);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    protected void onProgressUpdate(Void... values) {
-        if (ReposFragment.adapter != null)
-            ReposFragment.adapter.notifyDBChanged();
-    }
-
-    @Override
-    protected Void doInBackground(Void... voids) {
-        etags = new ArrayList<>(Arrays.asList(prefs.getString(Const.Key.ETAG_KEY, "").split(",")));
-        cached = repoDB.getRepoIDList();
-
-        if (!loadPage(0, CHECK_ETAG)) {
-            // Nothing changed online
-            if (forceUpdate) {
-                for (String id : cached) {
-                    if (id == null) continue;
-                    ++tasks;
-                    AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
-                        Repo repo = repoDB.getRepo(id);
-                        try {
-                            repo.update();
-                            repoDB.addRepo(repo);
-                        } catch (Repo.IllegalRepoException e) {
-                            Logger.error(e.getMessage());
-                            repoDB.removeRepo(repo);
-                        }
-                        --tasks;
-                    });
-                }
-            }
-            return waitTasks();
-        }
-
-        // Wait till all tasks are done
-        waitTasks();
-
-        // The leftover cached means they are removed from online repo
-        repoDB.removeRepo(cached);
-
-        // Update ETag
-        StringBuilder etagBuilder = new StringBuilder();
-        for (int i = 0; i < newEtags.size(); ++i) {
-            if (i != 0) etagBuilder.append(",");
-            etagBuilder.append(newEtags.get(i));
-        }
-        prefs.edit().putString(Const.Key.ETAG_KEY, etagBuilder.toString()).apply();
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void v) {
-        MagiskManager.get().repoLoadDone.publish();
-        super.onPostExecute(v);
-    }
-}

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

@@ -1,125 +0,0 @@
-package com.topjohnwu.magisk.components;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.AssetManager;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.view.WindowManager;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
-
-public class Activity extends AppCompatActivity {
-
-    private AssetManager mAssetManager = null;
-    private Resources mResources = null;
-    private ActivityResultListener activityResultListener;
-
-    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) {
-        MagiskManager mm = getMagiskManager();
-        if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            if (mm.permissionGrantCallback != null) {
-                mm.permissionGrantCallback.run();
-            }
-        }
-        mm.permissionGrantCallback = null;
-    }
-
-    @Override
-    public AssetManager getAssets() {
-        return mAssetManager == null ? super.getAssets() : mAssetManager;
-    }
-
-    @Override
-    public Resources getResources() {
-        return mResources == null ? super.getResources() : mResources;
-    }
-
-    public MagiskManager getMagiskManager() {
-        return (MagiskManager) super.getApplicationContext();
-    }
-
-    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);
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (activityResultListener != null)
-            activityResultListener.onActivityResult(requestCode, resultCode, data);
-        activityResultListener = null;
-    }
-
-    @Override
-    public void startActivityForResult(Intent intent, int requestCode) {
-        startActivityForResult(intent, requestCode, this::onActivityResult);
-    }
-
-    public void startActivityForResult(Intent intent, int requestCode, ActivityResultListener listener) {
-        activityResultListener = listener;
-        super.startActivityForResult(intent, requestCode);
-    }
-
-    @Keep
-    public void swapResources(String dexPath) {
-        mAssetManager = Utils.getAssets(dexPath);
-        if (mAssetManager == null)
-            return;
-        Resources res = super.getResources();
-        mResources = new Resources(mAssetManager, res.getDisplayMetrics(), res.getConfiguration());
-        mResources.newTheme().setTo(super.getTheme());
-    }
-
-    @Keep
-    public void restoreResources() {
-        mAssetManager = null;
-        mResources = null;
-    }
-
-    public interface ActivityResultListener {
-        void onActivityResult(int requestCode, int resultCode, Intent data);
-    }
-
-}

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

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

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

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

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

@@ -1,43 +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.utils.Const;
-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.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                            install.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            Uri content = FileProvider.getUriForFile(context,
-                                    context.getPackageName() + ".provider", new File(uri.getPath()));
-                            install.setData(content);
-                            context.startActivity(install);
-                        } else {
-                            Intent install = new Intent(Intent.ACTION_VIEW);
-                            install.setDataAndType(uri, "application/vnd.android.package-archive");
-                            install.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            context.startActivity(install);
-                        }
-                    }
-                },
-                intent.getStringExtra(Const.Key.INTENT_SET_LINK),
-                Utils.getLegalFilename("MagiskManager-v" +
-                        intent.getStringExtra(Const.Key.INTENT_SET_VERSION) + ".apk"));
-    }
-}

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

@@ -1,36 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.util.Log;
-
-import java.util.Locale;
-
-public class Logger {
-
-    private static final boolean SHELL_LOGGING = false;
-
-    public static void debug(String line) {
-        Log.d(Const.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(Const.DEBUG_TAG, "ERROR: " + line);
-    }
-
-    public static void error(String fmt, Object... args) {
-        error(String.format(Locale.US, fmt, args));
-    }
-
-    public static void shell(boolean in, String line) {
-        if (SHELL_LOGGING) {
-            Log.d(Const.DEBUG_TAG, (in ? "SHELLIN : " : "SHELLOUT: ") + line);
-        }
-    }
-
-    public static void shell(boolean in, String fmt, Object... args) {
-        shell(in, String.format(Locale.US, fmt, args));
-    }
-}

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

@@ -1,209 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.text.TextUtils;
-
-import com.topjohnwu.magisk.MagiskManager;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Modified by topjohnwu, based on Chainfire's libsuperuser
- */
-
-public class Shell {
-
-    // -2 = not initialized; -1 = no shell; 0 = non root shell; 1 = root shell
-    public static int status = -2;
-
-    private final Process process;
-    private final OutputStream STDIN;
-    private final InputStream STDOUT;
-    private final InputStream STDERR;
-
-    private static void testRootShell(Shell shell) throws IOException {
-        shell.STDIN.write(("id\n").getBytes("UTF-8"));
-        shell.STDIN.flush();
-        String s = new BufferedReader(new InputStreamReader(shell.STDOUT)).readLine();
-        if (TextUtils.isEmpty(s) || !s.contains("uid=0")) {
-            shell.STDIN.close();
-            shell.STDIN.close();
-            throw new IOException();
-        }
-    }
-
-    public Shell(String command) throws IOException {
-        process = Runtime.getRuntime().exec(command);
-        STDIN = process.getOutputStream();
-        STDOUT = process.getInputStream();
-        STDERR = process.getErrorStream();
-    }
-
-    public static Shell getShell() {
-        MagiskManager mm = MagiskManager.get();
-        boolean needNewShell = mm.shell == null;
-
-        if (!needNewShell) {
-            try {
-                mm.shell.process.exitValue();
-                // The process is dead
-                needNewShell = true;
-            } catch (IllegalThreadStateException ignored) {
-                // This should be the expected result
-            }
-        }
-
-        if (needNewShell) {
-            status = 1;
-            try {
-                mm.shell = new Shell("su --mount-master");
-                testRootShell(mm.shell);
-            } catch (IOException e) {
-                // Mount master not implemented
-                try {
-                    mm.shell = new Shell("su");
-                    testRootShell(mm.shell);
-                } catch (IOException e1) {
-                    // No root exists
-                    status = 0;
-                    try {
-                        mm.shell = new Shell("sh");
-                    } catch (IOException e2) {
-                        status = -1;
-                        return null;
-                    }
-                }
-            }
-            if (rootAccess()) {
-                // Load utility shell scripts
-                try (InputStream in  = mm.getAssets().open(Const.UTIL_FUNCTIONS)) {
-                    mm.shell.loadInputStream(in);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-
-                // Root shell initialization
-                String bbpath = Const.BUSYBOX_PATH();
-                mm.shell.run_raw(false, false,
-                        "export PATH=" + bbpath + ":$PATH",
-                        "mount_partitions",
-                        "find_boot_image",
-                        "migrate_boot_backup");
-            }
-        }
-
-        return mm.shell;
-    }
-
-    public static boolean rootAccess() {
-        if (status == -2) getShell();
-        return status > 0;
-    }
-
-    public void run(Collection<String> output, Collection<String> error, String... commands) {
-        StreamGobbler out, err;
-        synchronized (process) {
-            try {
-                out = new StreamGobbler(STDOUT, output);
-                err = new StreamGobbler(STDERR, error);
-                out.start();
-                err.start();
-                run_raw(output != null, error != null, commands);
-                STDIN.write("echo \'-shell-done-\'\necho \'-shell-done-\' >&2\n".getBytes("UTF-8"));
-                STDIN.flush();
-                try {
-                    out.join();
-                    err.join();
-                } catch (InterruptedException ignored) {}
-            } catch (IOException e) {
-                e.printStackTrace();
-                process.destroy();
-            }
-        }
-    }
-
-    public void run_raw(boolean stdout, boolean stderr, String... commands) {
-        String suffix = "\n";
-        if (!stderr) suffix = " 2>/dev/null" + suffix;
-        if (!stdout) suffix = " >/dev/null" + suffix;
-        synchronized (process) {
-            try {
-                for (String command : commands) {
-                    Logger.shell(true, command);
-                    STDIN.write((command + suffix).getBytes("UTF-8"));
-                    STDIN.flush();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                process.destroy();
-            }
-        }
-    }
-
-    public void loadInputStream(InputStream in) {
-        synchronized (process) {
-            try {
-                Utils.inToOut(in, STDIN);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public static List<String> sh(String... commands) {
-        List<String> res = new ArrayList<>();
-        sh(res, commands);
-        return res;
-    }
-
-    public static void sh(Collection<String> output, String... commands) {
-        Shell shell = getShell();
-        if (shell == null)
-            return;
-        shell.run(output, null, commands);
-    }
-
-    public static void sh_raw(String... commands) {
-        Shell shell = getShell();
-        if (shell == null)
-            return;
-        shell.run_raw(false, false, commands);
-    }
-
-    public static List<String> su(String... commands) {
-        if (!rootAccess()) return sh();
-        return sh(commands);
-    }
-
-    public static void su(Collection<String> output, String... commands) {
-        if (!rootAccess()) return;
-        sh(output, commands);
-    }
-
-    public static void su_raw(String... commands) {
-        if (!rootAccess()) return;
-        sh_raw(commands);
-    }
-
-    public static abstract class AbstractList<E> extends java.util.AbstractList<E> {
-
-        @Override
-        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,63 +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;
-import java.util.Collections;
-
-/**
- * Modified by topjohnwu, based on Chainfire's libsuperuser
- */
-
-public class StreamGobbler extends Thread {
-
-    private BufferedReader reader;
-    private Collection<String> writer;
-
-    /**
-     * <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 in InputStream to read from
-     * @param out  {@literal List<String>} to write to, or null
-     */
-    public StreamGobbler(InputStream in, Collection<String> out) {
-        try {
-            while (in.available() != 0) {
-                in.skip(in.available());
-            }
-        } catch (IOException ignored) {}
-        reader = new BufferedReader(new InputStreamReader(in));
-        writer = out == null ? null : Collections.synchronizedCollection(out);
-    }
-
-    @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;
-                if (writer != null) writer.add(line);
-                Logger.shell(false, 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,75 +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, null);
-    }
-
-    public void publish(boolean record) {
-        publish(record, null);
-    }
-
-    public void publish(boolean record, Object result) {
-        hasPublished = record;
-        if (subscribers != null) {
-            for (WeakReference<Subscriber> subscriber : subscribers) {
-                if (subscriber.get() != null)
-                    subscriber.get().onTopicPublished(this, result);
-            }
-        }
-    }
-
-
-    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, null);
-        }
-        default void onTopicPublished(Topic topic) {
-            onTopicPublished(topic, null);
-        }
-        void onTopicPublished(Topic topic, Object result);
-        Topic[] getSubscription();
-    }
-}

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

@@ -1,253 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.Manifest;
-import android.app.Activity;
-import android.app.DownloadManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.content.res.AssetManager;
-import android.content.res.Configuration;
-import android.database.Cursor;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.provider.OpenableColumns;
-import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.text.TextUtils;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.SplashActivity;
-import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.receivers.DownloadReceiver;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-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 boolean isDownloading = false;
-
-    public static boolean itemExist(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(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(String path) {
-        String command = "rm -rf " + path + " 2>/dev/null";
-        Shell.su_raw(command);
-    }
-
-    public static List<String> readFile(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(Const.EXTERNAL_PATH, 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 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 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() {
-        ConnectivityManager manager = (ConnectivityManager)
-                MagiskManager.get().getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo networkInfo = manager.getActiveNetworkInfo();
-        return networkInfo != null && networkInfo.isConnected();
-    }
-
-    public static String getLocaleString(Locale locale, @StringRes int id) {
-        Context context = MagiskManager.get();
-        Configuration config = context.getResources().getConfiguration();
-        config.setLocale(locale);
-        Context localizedContext = context.createConfigurationContext(config);
-        return localizedContext.getString(id);
-    }
-
-    public static List<Locale> getAvailableLocale() {
-        List<Locale> locales = new ArrayList<>();
-        HashSet<String> set = new HashSet<>();
-        Locale locale;
-
-        @StringRes int compareId = R.string.download_file_error;
-
-        // Add default locale
-        locales.add(Locale.ENGLISH);
-        set.add(getLocaleString(Locale.ENGLISH, compareId));
-
-        // Add some special locales
-        locales.add(Locale.TAIWAN);
-        set.add(getLocaleString(Locale.TAIWAN, compareId));
-        locale = new Locale("pt", "BR");
-        locales.add(locale);
-        set.add(getLocaleString(locale, compareId));
-
-        // Other locales
-        for (String s : MagiskManager.get().getAssets().getLocales()) {
-            locale = Locale.forLanguageTag(s);
-            if (set.add(getLocaleString(locale, compareId))) {
-                locales.add(locale);
-            }
-        }
-
-        Collections.sort(locales, (l1, l2) -> l1.getDisplayName(l1).compareTo(l2.getDisplayName(l2)));
-
-        return locales;
-    }
-
-    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!
-            Utils.getMagiskManager(context).setPermissionGrantCallback(callback);
-            if (!(context instanceof com.topjohnwu.magisk.components.Activity)) {
-                // Start activity to show dialog
-                Intent intent = new Intent(context, SplashActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                intent.putExtra(Const.Key.INTENT_PERM, permission);
-                context.startActivity(intent);
-            } else {
-                ActivityCompat.requestPermissions((Activity) context, new String[] { permission }, 0);
-            }
-
-        } else {
-            callback.run();
-        }
-    }
-
-    public static File getDatabasePath(Context context, String dbName) {
-        return new File(context.getFilesDir().getParent() + "/databases", dbName);
-    }
-
-    public static AssetManager getAssets(String apk) {
-        try {
-            AssetManager asset = AssetManager.class.newInstance();
-            AssetManager.class.getMethod("addAssetPath", String.class).invoke(asset, apk);
-            return asset;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public static int inToOut(InputStream in, OutputStream out) throws IOException {
-        int read, total = 0;
-        byte buffer[] = new byte[4096];
-        while ((read = in.read(buffer)) > 0) {
-            out.write(buffer, 0, read);
-            total += read;
-        }
-        out.flush();
-        return total;
-    }
-
-    public static void patchDTBO() {
-        if (MagiskManager.get().magiskVersionCode >= 1446) {
-            List<String> ret = Shell.su("patch_dtbo_image && echo true || echo false");
-            if (Utils.isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(ret.size() - 1))) {
-                ShowUI.dtboPatchedNotification();
-            }
-        }
-    }
-
-    public static int dpInPx(int dp) {
-        Context context = MagiskManager.get();
-        float scale = context.getResources().getDisplayMetrics().density;
-        return (int) (dp * scale + 0.5);
-    }
-}

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

@@ -1,72 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-
-public class WebService {
-
-    public static String getString(String url) {
-        return getString(url, null);
-    }
-
-    public static String getString(String url, Map<String, String> header) {
-        HttpURLConnection conn = request(url, header);
-        if (conn == null) return "";
-        return getString(conn);
-    }
-
-    public static String getString(HttpURLConnection conn) {
-        try {
-            StringBuilder builder = new StringBuilder();
-            if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
-                BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-                int len;
-                char buf[] = new char[4096];
-                while ((len = br.read(buf)) != -1) {
-                    builder.append(buf, 0, len);
-                }
-            }
-            conn.disconnect();
-            return builder.toString();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    public static HttpURLConnection request(String address, Map<String, String> header) {
-        try {
-            URL url = new URL(address);
-
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            conn.setReadTimeout(15000);
-            conn.setConnectTimeout(15000);
-
-            if (header != null) {
-                for (Map.Entry<String, String> entry : header.entrySet()) {
-                    conn.setRequestProperty(entry.getKey(), entry.getValue());
-                }
-            }
-
-            conn.connect();
-
-            if (header != null) {
-                header.clear();
-                for (Map.Entry<String, List<String>> entry : conn.getHeaderFields().entrySet()) {
-                    List<String> l = entry.getValue();
-                    header.put(entry.getKey(), l.get(l.size() - 1));
-                }
-            }
-
-            return conn;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-}

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

@@ -1,72 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.content.res.AssetManager;
-
-import com.topjohnwu.crypto.JarMap;
-import com.topjohnwu.crypto.SignAPK;
-import com.topjohnwu.magisk.MagiskManager;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-
-public class ZipUtils {
-
-    static {
-        System.loadLibrary("zipadjust");
-    }
-
-    public native static void zipAdjust(String filenameIn, String filenameOut);
-
-    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 {
-        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();
-                }
-                File dest = new File(folder, name);
-                dest.getParentFile().mkdirs();
-                try (FileOutputStream out = new FileOutputStream(dest)) {
-                    Utils.inToOut(zipfile, out);
-                }
-            }
-        } catch(Exception e) {
-            e.printStackTrace();
-            throw e;
-        }
-    }
-
-    public static void signZip(InputStream is, File output, boolean minSign) throws Exception {
-        signZip(new JarMap(is, false), output, minSign);
-    }
-
-    public static void signZip(File input, File output, boolean minSign) throws Exception {
-        signZip(new JarMap(input, false), output, minSign);
-    }
-
-    public static void signZip(JarMap input, File output, boolean minSign) throws Exception {
-        AssetManager assets = MagiskManager.get().getAssets();
-        SignAPK.signZip(
-                assets.open(Const.PUBLIC_KEY_NAME), assets.open(Const.PRIVATE_KEY_NAME),
-                input, output, minSign);
-    }
-}

app/src/main/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.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