Bump version

Fixed typos, updated some translations.

.gitignore

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

build.gradle

@@ -1,19 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "com.topjohnwu.magisk"
         minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 90
-        versionName "5.5.4"
-        ndk {
-            moduleName 'zipadjust'
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-        }
+        targetSdkVersion rootProject.ext.compileSdkVersion
+        versionCode 112
+        versionName "5.6.4"
         javaCompileOptions {
             annotationProcessorOptions {
                 argument('butterknife.debuggable', 'false')
@@ -25,7 +21,7 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
@@ -36,32 +32,21 @@ android {
         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.2'
-    implementation 'com.android.support:cardview-v7:27.0.2'
-    implementation 'com.android.support:design:27.0.2'
-    implementation 'com.android.support:support-v4:27.0.2'
+    implementation project(':utils')
+    implementation 'com.github.topjohnwu:libsu:1.1.1'
+    implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
     implementation 'com.jakewharton:butterknife:8.8.1'
     implementation 'com.atlassian.commonmark:commonmark:0.10.0'
     implementation 'org.kamranzafar:jtar:2.3'
-    implementation 'com.google.code.gson:gson:2.8.2'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 }

proguard-rules.pro

@@ -20,7 +20,9 @@
 -keepnames class ** { *; }
 
 # BouncyCastle
--keep class org.bouncycastle.jcajce.provider.** { *; }
+-keep class org.bouncycastle.jcajce.provider.asymmetric.rsa.**SHA1** { *; }
+-keep class org.bouncycastle.jcajce.provider.asymmetric.RSA** { *; }
+-keep class org.bouncycastle.jcajce.provider.digest.SHA1** { *; }
 -dontwarn javax.naming.**
 
 # Gson

src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
 
     <application
         android:name=".MagiskManager"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"

src/main/assets/changelog.md

@@ -1,3 +0,0 @@
-### v5.5.4
-- Fix on-boot dtbo detection
-- Add fingerprint authentication for Superuser requests

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

@@ -14,8 +14,6 @@ import com.topjohnwu.magisk.components.AboutCardRow;
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.utils.Const;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Locale;
 
 import butterknife.BindView;
@@ -56,12 +54,8 @@ public class AboutActivity extends Activity {
 
         appChangelog.removeSummary();
         appChangelog.setOnClickListener(v -> {
-            try {
-                InputStream is = getAssets().open("changelog.md");
-                new MarkDownWindow(this, getString(R.string.app_changelog), is).exec();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+            new MarkDownWindow(this, getString(R.string.app_changelog),
+                    getResources().openRawResource(R.raw.changelog)).exec();
         });
 
         String translators = getString(R.string.translators);

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

@@ -16,9 +16,9 @@ import android.widget.Toast;
 import com.topjohnwu.magisk.asyncs.FlashZip;
 import com.topjohnwu.magisk.asyncs.InstallMagisk;
 import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.container.CallbackList;
 import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.superuser.CallbackList;
+import com.topjohnwu.superuser.Shell;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -49,7 +49,7 @@ public class FlashActivity extends Activity {
 
     @OnClick(R.id.reboot)
     void reboot() {
-        Shell.su_raw("/system/bin/reboot");
+        Shell.Async.su("/system/bin/reboot");
     }
 
     @OnClick(R.id.save_logs)
@@ -96,10 +96,10 @@ public class FlashActivity extends Activity {
             reboot.setVisibility(View.GONE);
 
         logs = new ArrayList<>();
-        List<String> console = new CallbackList<String>() {
+        CallbackList<String> console = new CallbackList<String>(new ArrayList<>()) {
             @Override
-            public synchronized void onAddElement(String e) {
-                logs.add(e);
+            public void onAddElement(String s) {
+                logs.add(s);
                 flashLogs.setText(TextUtils.join("\n", this));
                 sv.postDelayed(() -> sv.fullScroll(ScrollView.FOCUS_DOWN), 10);
             }

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

@@ -22,10 +22,10 @@ import com.topjohnwu.magisk.asyncs.CheckUpdates;
 import com.topjohnwu.magisk.components.AlertDialogBuilder;
 import com.topjohnwu.magisk.components.ExpandableView;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.ShowUI;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
 
 import butterknife.BindColor;
 import butterknife.BindView;
@@ -159,8 +159,8 @@ public class MagiskFragment extends Fragment
 
         safetyNetStatusText.setText(R.string.safetyNet_check_text);
 
-        mm.safetyNetDone.hasPublished = false;
-        mm.updateCheckDone.hasPublished = false;
+        mm.safetyNetDone.reset();
+        mm.updateCheckDone.reset();
         mm.remoteMagiskVersionString = null;
         mm.remoteMagiskVersionCode = -1;
         collapse();
@@ -176,11 +176,11 @@ public class MagiskFragment extends Fragment
     }
 
     @Override
-    public void onTopicPublished(Topic topic, Object result) {
+    public void onTopicPublished(Topic topic) {
         if (topic == mm.updateCheckDone) {
             updateCheckUI();
         } else if (topic == mm.safetyNetDone) {
-            updateSafetyNetUI((int) result);
+            updateSafetyNetUI((int) topic.getResults()[0]);
         }
     }
 

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

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

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

@@ -21,8 +21,9 @@ 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 com.topjohnwu.superuser.CallbackList;
+import com.topjohnwu.superuser.Shell;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -113,12 +114,18 @@ public class MagiskLogFragment extends Fragment {
             mode = (int) params[0];
             switch (mode) {
                 case 0:
-                    StringBuildingList logList = new StringBuildingList();
-                    Shell.su(logList, "cat " + Const.MAGISK_LOG + " | tail -n 5000");
-                    return logList.getCharSequence();
+                    StringBuilder builder = new StringBuilder();
+                    CallbackList<String> logs = new CallbackList<String>() {
+                        @Override
+                        public void onAddElement(String s) {
+                            builder.append(s).append('\n');
+                        }
+                    };
+                    Shell.Sync.su(logs, "cat " + Const.MAGISK_LOG + " | tail -n 5000");
+                    return builder;
 
                 case 1:
-                    Shell.su_raw("echo -n > " + Const.MAGISK_LOG);
+                    Shell.Async.su("echo -n > " + Const.MAGISK_LOG);
                     SnackbarMaker.make(txtLog, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
                     return "";
 
@@ -138,8 +145,16 @@ public class MagiskLogFragment extends Fragment {
                     }
 
                     try (FileWriter out = new FileWriter(targetFile)) {
-                        FileWritingList fileWritingList = new FileWritingList(out);
-                        Shell.su(fileWritingList, "cat " + Const.MAGISK_LOG);
+                        CallbackList<String> list = new CallbackList<String>() {
+                            @Override
+                            public void onAddElement(String s) {
+                                try {
+                                    out.write(s);
+                                    out.write("\n");
+                                } catch (IOException ignored) {}
+                            }
+                        };
+                        Shell.Sync.su(list, "cat " + Const.MAGISK_LOG);
                     } catch (IOException e) {
                         e.printStackTrace();
                         return false;
@@ -187,41 +202,4 @@ public class MagiskLogFragment extends Fragment {
             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;
-        }
-    }
-
 }

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

@@ -1,6 +1,8 @@
 package com.topjohnwu.magisk;
 
-import android.app.Application;
+import android.app.job.JobInfo;
+import android.app.job.JobScheduler;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -8,22 +10,29 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
 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.services.UpdateCheckService;
 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 com.topjohnwu.superuser.BusyBox;
+import com.topjohnwu.superuser.Shell;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-public class MagiskManager extends Application {
+public class MagiskManager extends Shell.ContainerApp {
 
     // Global weak reference to self
     private static WeakReference<MagiskManager> weakSelf;
@@ -78,7 +87,6 @@ public class MagiskManager extends Application {
     public SharedPreferences prefs;
     public SuDatabaseHelper suDB;
     public RepoDatabaseHelper repoDB;
-    public Shell shell;
     public Runnable permissionGrantCallback = null;
 
     private static Handler mHandler = new Handler();
@@ -90,6 +98,26 @@ public class MagiskManager extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+
+        Shell.setFlags(Shell.FLAG_MOUNT_MASTER);
+        Shell.verboseLogging(BuildConfig.DEBUG);
+        BusyBox.BB_PATH = new File(Const.BUSYBOX_PATH);
+        Shell.setInitializer(new Shell.Initializer() {
+            @Override
+            public void onRootShellInit(@NonNull Shell shell) {
+                try (InputStream utils = getAssets().open(Const.UTIL_FUNCTIONS);
+                     InputStream sudb = getResources().openRawResource(R.raw.sudb)) {
+                    shell.loadInputStream(null, null, utils);
+                    shell.loadInputStream(null, null, sudb);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                shell.run(null, null,
+                        "mount_partitions",
+                        "run_migrations");
+            }
+        });
+
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
         // Handle duplicate package
@@ -103,7 +131,15 @@ public class MagiskManager extends Application {
             } catch (PackageManager.NameNotFoundException ignored) { /* Expected */ }
         }
 
-        suDB = SuDatabaseHelper.getSuDB(false);
+        suDB = SuDatabaseHelper.getInstance(this);
+
+        String pkg = suDB.getStrings(Const.Key.SU_REQUESTER, Const.ORIG_PKG_NAME);
+        if (getPackageName().equals(Const.ORIG_PKG_NAME) && !pkg.equals(Const.ORIG_PKG_NAME)) {
+            suDB.setStrings(Const.Key.SU_REQUESTER, null);
+            Utils.uninstallPkg(pkg);
+            suDB = SuDatabaseHelper.getInstance(this);
+        }
+
         repoDB = new RepoDatabaseHelper(this);
         defaultLocale = Locale.getDefault();
         setLocale();
@@ -147,8 +183,8 @@ public class MagiskManager extends Application {
         prefs.edit()
                 .putBoolean(Const.Key.DARK_THEME, isDarkTheme)
                 .putBoolean(Const.Key.MAGISKHIDE, magiskHide)
-                .putBoolean(Const.Key.HOSTS, Utils.itemExist(Const.MAGISK_HOST_FILE()))
-                .putBoolean(Const.Key.COREONLY, Utils.itemExist(Const.MAGISK_DISABLE_FILE))
+                .putBoolean(Const.Key.HOSTS, Const.MAGISK_HOST_FILE().exists())
+                .putBoolean(Const.Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
                 .putString(Const.Key.SU_REQUEST_TIMEOUT, String.valueOf(suRequestTimeout))
                 .putString(Const.Key.SU_AUTO_RESPONSE, String.valueOf(suResponseType))
                 .putString(Const.Key.SU_NOTIFICATION, String.valueOf(suNotificationType))
@@ -172,72 +208,45 @@ public class MagiskManager extends Application {
     }
 
     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;
-        }
+            magiskVersionString = Utils.cmd("magisk -v").split(":")[0];
+            magiskVersionCode = Integer.parseInt(Utils.cmd("magisk -V"));
+            String s = Utils.cmd((magiskVersionCode > 1435 ? "resetprop -p " : "getprop ")
+                    + Const.MAGISKHIDE_PROP);
+            magiskHide = s == null || Integer.parseInt(s) != 0;
+        } catch (Exception ignored) {}
 
-        ret = Shell.su("echo \"$BOOTIMAGE\"");
-        if (Utils.isValidShellResponse(ret))
-            bootBlock = ret.get(0);
-
-        if (suDB != null && !SuDatabaseHelper.verified) {
-            suDB.close();
-            suDB = SuDatabaseHelper.getSuDB(true);
-        }
+        bootBlock = Utils.cmd("echo \"$BOOTIMAGE\"");
     }
 
     public void getDefaultInstallFlags() {
-        List<String> ret;
-        ret = Shell.su("echo \"$DTBOIMAGE\"");
-        if (Utils.isValidShellResponse(ret))
-            keepVerity = true;
+        keepVerity = Boolean.parseBoolean(Utils.cmd("getvar KEEPVERITY; echo $KEEPVERITY")) ||
+                Utils.cmd("echo \"$DTBOIMAGE\"") != null;
 
-        ret = Shell.su(
-                "getvar KEEPVERITY",
-                "echo $KEEPVERITY");
-        try {
-            if (Utils.isValidShellResponse(ret))
-                keepVerity = Boolean.parseBoolean(ret.get(0));
-        } catch (NumberFormatException ignored) {}
-
-        ret = Shell.sh("getprop ro.crypto.state");
-        if (Utils.isValidShellResponse(ret) && ret.get(0).equals("encrypted"))
-            keepEnc = true;
-
-        ret = Shell.su(
-                "getvar KEEPFORCEENCRYPT",
-                "echo $KEEPFORCEENCRYPT");
-        try {
-            if (Utils.isValidShellResponse(ret))
-                keepEnc = Boolean.parseBoolean(ret.get(0));
-        } catch (NumberFormatException ignored) {}
+        keepEnc = Boolean.parseBoolean(Utils.cmd("getvar KEEPFORCEENCRYPT; echo $KEEPFORCEENCRYPT")) ||
+                TextUtils.equals("encrypted", Utils.cmd("getprop ro.crypto.state"));
     }
 
     public void setPermissionGrantCallback(Runnable callback) {
         permissionGrantCallback = callback;
     }
+
+    public void setupUpdateCheck() {
+        JobScheduler scheduler = (JobScheduler) getSystemService(JOB_SCHEDULER_SERVICE);
+
+        if (prefs.getBoolean(Const.Key.CHECK_UPDATES, true)) {
+            if (scheduler.getAllPendingJobs().isEmpty() ||
+                    Const.UPDATE_SERVICE_VER > prefs.getInt(Const.Key.UPDATE_SERVICE_VER, -1)) {
+                ComponentName service = new ComponentName(this, UpdateCheckService.class);
+                JobInfo info = new JobInfo.Builder(Const.ID.UPDATE_SERVICE_ID, service)
+                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                        .setPersisted(true)
+                        .setPeriodic(8 * 60 * 60 * 1000)
+                        .build();
+                scheduler.schedule(info);
+            }
+        } else {
+            scheduler.cancel(Const.UPDATE_SERVICE_VER);
+        }
+    }
 }

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

@@ -19,12 +19,9 @@ import android.view.View;
 import com.topjohnwu.magisk.asyncs.MarkDownWindow;
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
-
-import java.io.IOException;
-import java.io.InputStream;
+import com.topjohnwu.superuser.Shell;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -99,12 +96,8 @@ public class MainActivity extends Activity
 
         if (mm.prefs.getInt(Const.Key.APP_VER, -1) < BuildConfig.VERSION_CODE) {
             prefs.edit().putInt(Const.Key.APP_VER, BuildConfig.VERSION_CODE).apply();
-            try {
-                InputStream is = getAssets().open("changelog.md");
-                new MarkDownWindow(this, getString(R.string.app_changelog), is).exec();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+            new MarkDownWindow(this, getString(R.string.app_changelog),
+                    getResources().openRawResource(R.raw.changelog)).exec();
         }
     }
 
@@ -134,7 +127,7 @@ public class MainActivity extends Activity
     }
 
     @Override
-    public void onTopicPublished(Topic topic, Object result) {
+    public void onTopicPublished(Topic topic) {
         recreate();
     }
 
@@ -197,22 +190,22 @@ public class MainActivity extends Activity
         navigationView.setCheckedItem(itemId);
         switch (itemId) {
             case R.id.magisk:
-                displayFragment(new MagiskFragment(), "magisk", true);
+                displayFragment(new MagiskFragment(), true);
                 break;
             case R.id.superuser:
-                displayFragment(new SuperuserFragment(), "superuser", true);
+                displayFragment(new SuperuserFragment(), true);
                 break;
             case R.id.modules:
-                displayFragment(new ModulesFragment(), "modules", true);
+                displayFragment(new ModulesFragment(), true);
                 break;
             case R.id.downloads:
-                displayFragment(new ReposFragment(), "downloads", true);
+                displayFragment(new ReposFragment(), true);
                 break;
             case R.id.magiskhide:
-                displayFragment(new MagiskHideFragment(), Const.Key.MAGISKHIDE, true);
+                displayFragment(new MagiskHideFragment(), true);
                 break;
             case R.id.log:
-                displayFragment(new LogFragment(), "log", false);
+                displayFragment(new LogFragment(), false);
                 break;
             case R.id.settings:
                 startActivity(new Intent(this, SettingsActivity.class));
@@ -225,12 +218,13 @@ public class MainActivity extends Activity
         }
     }
 
-    private void displayFragment(@NonNull Fragment navFragment, String tag, boolean setElevation) {
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+    private void displayFragment(@NonNull Fragment navFragment, boolean setElevation) {
         supportInvalidateOptionsMenu();
-        transaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out);
-        transaction.replace(R.id.content_frame, navFragment, tag).commitNow();
-        if (setElevation) toolbar.setElevation(toolbarElevation);
-        else toolbar.setElevation(0);
+        getSupportFragmentManager()
+                .beginTransaction()
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+                .replace(R.id.content_frame, navFragment)
+                .commitNow();
+        toolbar.setElevation(setElevation ? toolbarElevation : 0);
     }
 }

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

@@ -20,9 +20,9 @@ import com.topjohnwu.magisk.asyncs.LoadModules;
 import com.topjohnwu.magisk.components.Fragment;
 import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -79,7 +79,7 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
     }
 
     @Override
-    public void onTopicPublished(Topic topic, Object result) {
+    public void onTopicPublished(Topic topic) {
         updateUI();
     }
 
@@ -113,16 +113,16 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.reboot:
-                Shell.su_raw("/system/bin/reboot");
+                Shell.Async.su("/system/bin/reboot");
                 return true;
             case R.id.reboot_recovery:
-                Shell.su_raw("/system/bin/reboot recovery");
+                Shell.Async.su("/system/bin/reboot recovery");
                 return true;
             case R.id.reboot_bootloader:
-                Shell.su_raw("/system/bin/reboot bootloader");
+                Shell.Async.su("/system/bin/reboot bootloader");
                 return true;
             case R.id.reboot_download:
-                Shell.su_raw("/system/bin/reboot download");
+                Shell.Async.su("/system/bin/reboot download");
                 return true;
             default:
                 return false;

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

@@ -27,6 +27,7 @@ import butterknife.Unbinder;
 public class ReposFragment extends Fragment implements Topic.Subscriber {
 
     private Unbinder unbinder;
+    private MagiskManager mm;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
     @BindView(R.id.empty_rv) TextView emptyRv;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
@@ -44,8 +45,9 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_repos, container, false);
         unbinder = ButterKnife.bind(this, view);
+        mm = getApplication();
 
-        mSwipeRefreshLayout.setRefreshing(true);
+        mSwipeRefreshLayout.setRefreshing(mm.repoLoadDone.isPending());
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
             recyclerView.setVisibility(View.VISIBLE);
@@ -60,7 +62,7 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
 
     @Override
     public void onResume() {
-        adapter = new ReposAdapter(getApplication().repoDB, getApplication().moduleMap);
+        adapter = new ReposAdapter(mm.repoDB, mm.moduleMap);
         recyclerView.setAdapter(adapter);
         super.onResume();
     }
@@ -72,7 +74,7 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
     }
 
     @Override
-    public void onTopicPublished(Topic topic, Object result) {
+    public void onTopicPublished(Topic topic) {
         mSwipeRefreshLayout.setRefreshing(false);
         recyclerView.setVisibility(adapter.getItemCount() == 0 ? View.GONE : View.VISIBLE);
         emptyRv.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
@@ -80,7 +82,7 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
 
     @Override
     public Topic[] getSubscription() {
-        return new Topic[] { getApplication().repoLoadDone };
+        return new Topic[] { mm.repoLoadDone };
     }
 
     @Override
@@ -103,7 +105,6 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        MagiskManager mm = getApplication();
         if (item.getItemId() == R.id.repo_sort) {
             new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.sorting_order)

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

@@ -1,6 +1,7 @@
 package com.topjohnwu.magisk;
 
 import android.Manifest;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
@@ -21,12 +22,14 @@ import android.widget.Toast;
 import com.topjohnwu.magisk.asyncs.CheckUpdates;
 import com.topjohnwu.magisk.asyncs.HideManager;
 import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.receivers.ManagerUpdate;
 import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
-import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
 
+import java.io.IOException;
 import java.util.Locale;
 
 import butterknife.BindView;
@@ -66,7 +69,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
     }
 
     @Override
-    public void onTopicPublished(Topic topic, Object result) {
+    public void onTopicPublished(Topic topic) {
         recreate();
     }
 
@@ -98,6 +101,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
             PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
             PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
             Preference hideManager = findPreference("hide");
+            Preference restoreManager = findPreference("restore");
             findPreference("clear").setOnPreferenceClickListener((pref) -> {
                 prefs.edit().remove(Const.Key.ETAG_KEY).apply();
                 mm.repoDB.clearRepo();
@@ -146,19 +150,39 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
                 reauth.setSummary(R.string.android_o_not_support);
             }
 
-            // Remove fingerprint option if not possible
+            // Disable fingerprint option if not possible
             if (!FingerprintHelper.canUseFingerprint()) {
-                suCategory.removePreference(fingerprint);
+                fingerprint.setEnabled(false);
+                fingerprint.setSummary(R.string.disable_fingerprint);
             }
 
-            if (mm.getPackageName().equals(Const.ORIG_PKG_NAME) && mm.magiskVersionCode >= 1440) {
-                hideManager.setOnPreferenceClickListener((pref) -> {
-                    Utils.runWithPermission(getActivity(),
-                            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                            () -> new HideManager(getActivity()).exec());
-                    return true;
-                });
+            if (mm.magiskVersionCode >= 1440) {
+                if (mm.getPackageName().equals(Const.ORIG_PKG_NAME)) {
+                    hideManager.setOnPreferenceClickListener((pref) -> {
+                        new HideManager(getActivity()).exec();
+                        return true;
+                    });
+                    generalCatagory.removePreference(restoreManager);
+                } else {
+                    if (Utils.checkNetworkStatus()) {
+                        restoreManager.setOnPreferenceClickListener((pref) -> {
+                            Utils.runWithPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE, () -> {
+                                Intent intent = new Intent(mm, ManagerUpdate.class);
+                                intent.putExtra(Const.Key.INTENT_SET_LINK, mm.managerLink);
+                                intent.putExtra(Const.Key.INTENT_SET_FILENAME,
+                                        Utils.fmt("MagiskManager-v%s(%d).apk",
+                                        mm.remoteManagerVersionString, mm.remoteManagerVersionCode));
+                                mm.sendBroadcast(intent);
+                            });
+                            return true;
+                        });
+                    } else {
+                        generalCatagory.removePreference(restoreManager);
+                    }
+                    generalCatagory.removePreference(hideManager);
+                }
             } else {
+                generalCatagory.removePreference(restoreManager);
                 generalCatagory.removePreference(hideManager);
             }
 
@@ -223,26 +247,28 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
                     break;
                 case Const.Key.COREONLY:
                     if (prefs.getBoolean(key, false)) {
-                        Utils.createFile(Const.MAGISK_DISABLE_FILE);
+                        try {
+                            Const.MAGISK_DISABLE_FILE.createNewFile();
+                        } catch (IOException ignored) {}
                     } else {
-                        Utils.removeItem(Const.MAGISK_DISABLE_FILE);
+                        Const.MAGISK_DISABLE_FILE.delete();
                     }
                     Toast.makeText(getActivity(), R.string.settings_reboot_toast, Toast.LENGTH_LONG).show();
                     break;
                 case Const.Key.MAGISKHIDE:
                     if (prefs.getBoolean(key, false)) {
-                        Shell.su_raw("magiskhide --enable");
+                        Shell.Async.su("magiskhide --enable");
                     } else {
-                        Shell.su_raw("magiskhide --disable");
+                        Shell.Async.su("magiskhide --disable");
                     }
                     break;
                 case Const.Key.HOSTS:
                     if (prefs.getBoolean(key, false)) {
-                        Shell.su_raw(
+                        Shell.Async.su(
                                 "cp -af /system/etc/hosts " + Const.MAGISK_HOST_FILE(),
                                 "mount -o bind " + Const.MAGISK_HOST_FILE() + " /system/etc/hosts");
                     } else {
-                        Shell.su_raw(
+                        Shell.Async.su(
                                 "umount -l /system/etc/hosts",
                                 "rm -f " + Const.MAGISK_HOST_FILE());
                     }
@@ -259,6 +285,9 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
                 case Const.Key.UPDATE_CHANNEL:
                     new CheckUpdates().exec();
                     break;
+                case Const.Key.CHECK_UPDATES:
+                    mm.setupUpdateCheck();
+                    break;
             }
             mm.loadConfig();
             setSummary();
@@ -282,7 +311,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
         }
 
         @Override
-        public void onTopicPublished(Topic topic, Object result) {
+        public void onTopicPublished(Topic topic) {
             setLocalePreference((ListPreference) findPreference(Const.Key.LOCALE));
         }
 

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

@@ -2,10 +2,6 @@ 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;
@@ -15,18 +11,12 @@ 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.services.UpdateCheckService;
 import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
 
 public class SplashActivity extends Activity {
 
-    @Override
-    public int getDarkTheme() {
-        return -1;
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -50,31 +40,18 @@ public class SplashActivity extends Activity {
         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) {
-
-            // Add update checking service
-            if (Const.UPDATE_SERVICE_VER > mm.prefs.getInt(Const.Key.UPDATE_SERVICE_VER, -1)) {
-                ComponentName service = new ComponentName(this, UpdateCheckService.class);
-                JobInfo info = new JobInfo.Builder(Const.ID.UPDATE_SERVICE_ID, service)
-                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-                        .setPersisted(true)
-                        .setPeriodic(8 * 60 * 60 * 1000)
-                        .build();
-                ((JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE)).schedule(info);
-            }
-
+            // Update check service
+            mm.setupUpdateCheck();
             // Fire asynctasks
             loadModuleTask.exec();
-
             // Check dtbo status
             Utils.patchDTBO();
         }

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

@@ -18,9 +18,9 @@ import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -65,30 +65,17 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
         holder.appName.setText(info.loadLabel(pm));
         holder.appPackage.setText(info.packageName);
 
-        // Remove all listeners
-        holder.itemView.setOnClickListener(null);
         holder.checkBox.setOnCheckedChangeListener(null);
-
-        if (Const.SN_DEFAULTLIST.contains(info.packageName)) {
-            holder.checkBox.setChecked(true);
-            holder.checkBox.setEnabled(false);
-            holder.itemView.setOnClickListener(v ->
-                SnackbarMaker.make(holder.itemView,
-                        R.string.safetyNet_hide_notice, Snackbar.LENGTH_LONG).show()
-            );
-        } else {
-            holder.checkBox.setEnabled(true);
-            holder.checkBox.setChecked(mHideList.contains(info.packageName));
-            holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
-                if (isChecked) {
-                    Shell.su_raw("magiskhide --add " + info.packageName);
-                    mHideList.add(info.packageName);
-                } else {
-                    Shell.su_raw("magiskhide --rm " + info.packageName);
-                    mHideList.remove(info.packageName);
-                }
-            });
-        }
+        holder.checkBox.setChecked(mHideList.contains(info.packageName));
+        holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
+            if (isChecked) {
+                Shell.Async.su("magiskhide --add " + info.packageName);
+                mHideList.add(info.packageName);
+            } else {
+                Shell.Async.su("magiskhide --rm " + info.packageName);
+                mHideList.remove(info.packageName);
+            }
+        });
     }
 
     @Override
@@ -155,7 +142,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
             }
             Collections.sort(mOriginalList, (a, b) -> a.loadLabel(pm).toString().toLowerCase()
                     .compareTo(b.loadLabel(pm).toString().toLowerCase()));
-            mHideList = Shell.su("magiskhide --ls");
+            mHideList = Shell.Sync.su("magiskhide --ls");
             return null;
         }
 

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

@@ -14,7 +14,7 @@ import android.widget.TextView;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.superuser.Shell;
 
 import java.util.List;
 

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

@@ -4,9 +4,9 @@ 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 com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -32,13 +32,13 @@ public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
     }
 
     private void dlSnet() throws IOException {
-        Shell.sh("rm -rf " + dexPath.getParent());
+        Shell.Sync.sh("rm -rf " + dexPath.getParent());
         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);
+            ShellUtils.pump(in, out);
         }
         conn.disconnect();
     }

src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java

@@ -54,7 +54,7 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
     @Override
     protected void onPostExecute(Void v) {
         MagiskManager mm = MagiskManager.get();
-        if (showNotification && mm.prefs.getBoolean(Const.Key.UPDATE_NOTIFICATION, true)) {
+        if (showNotification) {
             if (BuildConfig.VERSION_CODE < mm.remoteManagerVersionCode) {
                 ShowUI.managerUpdateNotification();
             } else if (mm.magiskVersionCode < mm.remoteMagiskVersionCode) {

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

@@ -8,9 +8,10 @@ import android.view.View;
 import com.topjohnwu.magisk.FlashActivity;
 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.ZipUtils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -38,8 +39,8 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {
 
     private boolean unzipAndCheck() throws Exception {
         ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android", true);
-        List<String> ret = Utils.readFile(new File(mCachedFile.getParentFile(), "updater-script"));
-        return Utils.isValidShellResponse(ret) && ret.get(0).contains("#MAGISK");
+        String s = Utils.cmd("head -n 1 " + new File(mCachedFile.getParentFile(), "updater-script"));
+        return s != null && s.contains("#MAGISK");
     }
 
     @Override
@@ -55,7 +56,7 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {
             ) {
                 if (in == null) throw new FileNotFoundException();
                 InputStream buf= new BufferedInputStream(in);
-                Utils.inToOut(buf, out);
+                ShellUtils.pump(buf, out);
             } catch (FileNotFoundException e) {
                 console.add("! Invalid Uri");
                 throw e;
@@ -65,7 +66,7 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {
             }
             if (!unzipAndCheck()) return 0;
             console.add("- Installing " + Utils.getNameFromUri(mm, mUri));
-            Shell.getShell().run(console, logs,
+            Shell.Sync.su(console, logs,
                     "cd " + mCachedFile.getParent(),
                     "BOOTMODE=true sh update-binary dummy 1 " + mCachedFile + " || echo 'Failed!'"
             );
@@ -85,7 +86,7 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {
     @Override
     protected void onPostExecute(Integer result) {
         FlashActivity activity = (FlashActivity) getActivity();
-        Shell.su_raw(
+        Shell.Async.su(
                 "rm -rf " + mCachedFile.getParent(),
                 "rm -rf " + Const.TMP_FOLDER_PATH
         );

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

@@ -4,18 +4,19 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 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 com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileOutputStream;
+import com.topjohnwu.utils.JarMap;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.security.SecureRandom;
-import java.util.List;
 import java.util.jar.JarEntry;
 
 public class HideManager extends ParallelTask<Void, Void, Boolean> {
@@ -104,8 +105,7 @@ public class HideManager extends ParallelTask<Void, Void, Boolean> {
         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();
+        SuFile repack = new SuFile("/data/local/tmp/repack.apk", true);
         String pkg = genPackageName("com.", Const.ORIG_PKG_NAME.length());
 
         try {
@@ -123,19 +123,18 @@ public class HideManager extends ParallelTask<Void, Void, Boolean> {
             apk.getOutputStream(je).write(xml);
 
             // Sign the APK
-            ZipUtils.signZip(apk, repack, false);
+            ZipUtils.signZip(apk, new SuFileOutputStream(repack));
         } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
 
         // Install the application
-
-        List<String> ret = Shell.su(Utils.fmt("pm install %s >/dev/null && echo true || echo false", repack));
-        repack.delete();
-        if (!Utils.isValidShellResponse(ret) || !Boolean.parseBoolean(ret.get(0)))
+        if (!ShellUtils.fastCmdResult(Shell.getShell(), "pm install " + repack))
             return false;
 
+        repack.delete();
+
         mm.suDB.setStrings(Const.Key.SU_REQUESTER, pkg);
         Utils.dumpPrefs();
         Utils.uninstallPkg(Const.ORIG_PKG_NAME);

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

@@ -1,20 +1,22 @@
 package com.topjohnwu.magisk.asyncs;
 
 import android.app.Activity;
-import android.content.res.AssetManager;
 import android.net.Uri;
 import android.os.Build;
 import android.text.TextUtils;
 import android.view.View;
 
-import com.topjohnwu.crypto.SignBoot;
 import com.topjohnwu.magisk.FlashActivity;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.container.TarEntry;
 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 com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileInputStream;
+import com.topjohnwu.utils.SignBoot;
 
 import org.kamranzafar.jtar.TarInputStream;
 import org.kamranzafar.jtar.TarOutputStream;
@@ -28,7 +30,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -41,6 +42,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
     private List<String> console, logs;
     private String mBootLocation;
     private int mode;
+    private File install;
 
     private InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip) {
         super(context);
@@ -65,12 +67,12 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
     protected Boolean doInBackground(Void... voids) {
         MagiskManager mm = MagiskManager.get();
 
-        File install = new File(
+        install = new File(
                 (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ?
-                        mm.createDeviceProtectedStorageContext() :
-                        mm).getFilesDir().getParent()
+                        mm.createDeviceProtectedStorageContext() : mm)
+                        .getFilesDir().getParent()
                 , "install");
-        Shell.sh_raw("rm -rf " + install);
+        Shell.Sync.sh("rm -rf " + install);
 
         List<String> abis = Arrays.asList(Build.SUPPORTED_ABIS);
         String arch;
@@ -102,17 +104,15 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                 console.add("! Cannot unzip zip");
                 throw e;
             }
-            Shell.sh("chmod 755 " + install + "/*");
+            Shell.Sync.sh("chmod 755 " + install + "/*");
 
             File boot = new File(install, "boot.img");
             boolean highCompression = false;
             switch (mode) {
                 case PATCH_MODE:
-                    console.add("- Use boot image: " + boot);
                     // Copy boot image to local
-                    try (
-                        InputStream in = mm.getContentResolver().openInputStream(mBootImg);
-                        OutputStream out = new FileOutputStream(boot)
+                    try (InputStream in = mm.getContentResolver().openInputStream(mBootImg);
+                         OutputStream out = new FileOutputStream(boot)
                     ) {
                         InputStream source;
                         if (in == null) throw new FileNotFoundException();
@@ -130,7 +130,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                             // Direct copy raw image
                             source = new BufferedInputStream(in);
                         }
-                        Utils.inToOut(source, out);
+                        ShellUtils.pump(source, out);
                     } catch (FileNotFoundException e) {
                         console.add("! Invalid Uri");
                         throw e;
@@ -140,21 +140,16 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                     }
                     break;
                 case DIRECT_MODE:
-                    console.add("- Use boot image: " + mBootLocation);
+                    console.add("- Patch boot/ramdisk image: " + mBootLocation);
                     if (mm.remoteMagiskVersionCode >= 1463) {
-                        List<String> ret = new ArrayList<>();
-                         Shell.getShell().run(ret, logs,
-                                install + "/magiskboot --parse " + mBootLocation,
-                                "echo $?"
-                        );
-                        if (Utils.isValidShellResponse(ret)) {
-                            highCompression = Integer.parseInt(ret.get(ret.size() - 1)) == 2;
-                            if (highCompression)
-                                console.add("! Insufficient boot partition size detected");
-                        }
+                        highCompression = Integer.parseInt(Utils.cmd(Utils.fmt(
+                                "%s/magiskboot --parse %s; echo $?",
+                                install, mBootLocation))) == 2;
+                        if (highCompression)
+                            console.add("! Insufficient boot partition size detected");
                     }
                     if (boot.createNewFile()) {
-                        Shell.su("cat " + mBootLocation + " > " + boot);
+                        Shell.Sync.su("cat " + mBootLocation + " > " + boot);
                     } else {
                         console.add("! Dump boot image failed");
                         return false;
@@ -168,22 +163,15 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
             try (InputStream in = new FileInputStream(boot)) {
                 isSigned = SignBoot.verifySignature(in, null);
                 if (isSigned) {
-                    console.add("- Signed boot image detected");
+                    console.add("- Boot image is signed with AVB 1.0");
                 }
             } catch (Exception e) {
                 console.add("! Unable to check signature");
                 throw e;
             }
 
-            // Force non-root shell
-            Shell shell;
-            if (Shell.rootAccess())
-                shell = new Shell("sh");
-            else
-                shell = Shell.getShell();
-
             // Patch boot image
-            shell.run(console, logs,
+            Shell.Sync.sh(console, logs,
                     "cd " + install,
                     Utils.fmt("KEEPFORCEENCRYPT=%b KEEPVERITY=%b HIGHCOMP=%b " +
                                     "sh update-binary indep boot_patch.sh %s || echo 'Failed!'",
@@ -192,27 +180,22 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
             if (TextUtils.equals(console.get(console.size() - 1), "Failed!"))
                 return false;
 
-            shell.run(null, null,
-                    "mv -f new-boot.img ../",
+            Shell.Sync.sh("mv -f new-boot.img ../",
                     "mv bin/busybox busybox",
                     "rm -rf bin *.img update-binary",
                     "cd /");
 
-            File patched_boot = new File(install.getParent(), "new-boot.img");
+            SuFile patched_boot = new SuFile(install.getParent(), "new-boot.img");
 
             if (isSigned) {
-                console.add("- Signing boot image");
+                console.add("- Signing boot image with test keys");
                 File signed = new File(install.getParent(), "signed.img");
-                AssetManager assets = mm.getAssets();
-                try (
-                        InputStream in = new FileInputStream(patched_boot);
-                        OutputStream out = new BufferedOutputStream(new FileOutputStream(signed));
-                        InputStream keyIn = assets.open(Const.PRIVATE_KEY_NAME);
-                        InputStream certIn = assets.open(Const.PUBLIC_KEY_NAME)
+                try (InputStream in = new SuFileInputStream(patched_boot);
+                     OutputStream out = new BufferedOutputStream(new FileOutputStream(signed))
                 ) {
-                    SignBoot.doSignature("/boot", in, out, keyIn, certIn);
+                    SignBoot.doSignature("/boot", in, out, null, null);
                 }
-                shell.run_raw(false, false, "mv -f " + signed + " " + patched_boot);
+                Shell.Sync.sh("mv -f " + signed + " " + patched_boot);
             }
 
             switch (mode) {
@@ -230,8 +213,8 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                             out = new BufferedOutputStream(new FileOutputStream(dest));
                             break;
                     }
-                    try (InputStream in = new BufferedInputStream(new FileInputStream(patched_boot))) {
-                        Utils.inToOut(in, out);
+                    try (InputStream in = new SuFileInputStream(patched_boot)) {
+                        ShellUtils.pump(in, out);
                         out.close();
                     }
                     console.add("");
@@ -242,7 +225,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                     break;
                 case DIRECT_MODE:
                     String binPath = mm.remoteMagiskVersionCode >= 1464 ? "/data/adb/magisk" : "/data/magisk";
-                    Shell.getShell().run(console, logs,
+                    Shell.Sync.su(console, logs,
                             Utils.fmt("rm -rf %s/*; mkdir -p %s; chmod 700 /data/adb", binPath, binPath),
                             Utils.fmt("cp -af %s/* %s; rm -rf %s", install, binPath, install),
                             Utils.fmt("flash_boot_image %s %s", patched_boot, mBootLocation),
@@ -267,6 +250,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
     protected void onPostExecute(Boolean result) {
         FlashActivity activity = (FlashActivity) getActivity();
         if (!result) {
+            Shell.Async.sh("rm -rf " + install);
             console.add("! Installation failed");
             activity.reboot.setVisibility(View.GONE);
         }

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

@@ -4,7 +4,7 @@ import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.container.ValueSortedMap;
 import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.superuser.Shell;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@ public class LoadModules extends ParallelTask<Void, Void, Void> {
 
     private List<String> getModList() {
         String command = "ls -d " + Const.MAGISK_PATH() + "/* | grep -v lost+found";
-        return Shell.su(command);
+        return Shell.Sync.su(command);
     }
 
     @Override

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

@@ -6,8 +6,8 @@ import android.webkit.WebView;
 
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.WebService;
+import com.topjohnwu.superuser.ShellUtils;
 
 import org.commonmark.node.Node;
 import org.commonmark.parser.Parser;
@@ -44,7 +44,7 @@ public class MarkDownWindow extends ParallelTask<Void, Void, String> {
             md = WebService.getString(mUrl);
         } else {
             try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-                Utils.inToOut(is, out);
+                ShellUtils.pump(is, out);
                 md = out.toString();
                 is.close();
             } catch (IOException e) {
@@ -54,11 +54,13 @@ public class MarkDownWindow extends ParallelTask<Void, Void, String> {
         }
         String css;
         try (
-            InputStream in = mm.getAssets().open(mm.isDarkTheme ? "dark.css" : "light.css");
+            InputStream in = mm.getResources().openRawResource(
+                    mm.isDarkTheme ? R.raw.dark : R.raw.light);
             ByteArrayOutputStream out = new ByteArrayOutputStream()
         ) {
-            Utils.inToOut(in, out);
+            ShellUtils.pump(in, out);
             css = out.toString();
+            in.close();
         } catch (IOException e) {
             e.printStackTrace();
             return "";

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

@@ -13,10 +13,11 @@ import com.topjohnwu.magisk.FlashActivity;
 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.WebService;
 import com.topjohnwu.magisk.utils.ZipUtils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -68,7 +69,7 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
                     continue;
                 }
                 out.putNextEntry(new JarEntry(path));
-                Utils.inToOut(in, out);
+                ShellUtils.pump(in, out);
             }
         }
     }
@@ -107,7 +108,7 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
                 InputStream in = new BufferedInputStream(new ProgressInputStream(conn.getInputStream()));
                 OutputStream out = new BufferedOutputStream(new FileOutputStream(temp1))
             ) {
-                Utils.inToOut(in, out);
+                ShellUtils.pump(in, out);
                 in.close();
             }
             conn.disconnect();
@@ -120,14 +121,8 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
             // First remove top folder in Github source zip, temp1 -> temp2
             removeTopFolder(temp1, temp2);
 
-            // Then sign the zip for the first time, temp2 -> temp1
-            ZipUtils.signZip(temp2, temp1, false);
-
-            // Adjust the zip to prevent unzip issues, temp1 -> temp2
-            ZipUtils.zipAdjust(temp1.getPath(), temp2.getPath());
-
-            // Finally, sign the whole zip file again, temp2 -> target
-            ZipUtils.signZip(temp2, mFile, true);
+            // Then sign the zip
+            ZipUtils.signZip(temp2, mFile);
 
             // Delete temp files
             temp1.delete();

src/main/java/com/topjohnwu/magisk/asyncs/RestoreImages.java

@@ -4,29 +4,24 @@ 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;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
 
 public class RestoreImages 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))
+        sha1 = Utils.cmd("cat /.backup/.sha1");
+        if (sha1 == null) {
+            sha1 = Utils.cmd("cat /init.magisk.rc | grep STOCKSHA1");
+            if (sha1 == null)
                 return false;
-            sha1 = ret.get(0).substring(ret.get(0).indexOf('=') + 1);
+            sha1 = sha1.substring(sha1.indexOf('=') + 1);
         }
 
-        ret = Shell.su("restore_imgs " + sha1 + " && echo true || echo false");
-
-        return Utils.isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(ret.size() - 1));
+        return ShellUtils.fastCmdResult(Shell.getShell(), "restore_imgs " + sha1);
     }
 
     @Override

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

@@ -42,7 +42,7 @@ public class UpdateRepos extends ParallelTask<Void, Void, Void> {
         MagiskManager mm = MagiskManager.get();
         prefs = mm.prefs;
         repoDB = mm.repoDB;
-        mm.repoLoadDone.hasPublished = false;
+        mm.repoLoadDone.reset();
         // Legacy data cleanup
         File old = new File(mm.getApplicationInfo().dataDir + "/shared_prefs", "RepoMap.xml");
         if (old.exists() || prefs.getString("repomap", null) != null) {
@@ -160,6 +160,11 @@ public class UpdateRepos extends ParallelTask<Void, Void, Void> {
             ReposFragment.adapter.notifyDBChanged();
     }
 
+    @Override
+    protected void onPreExecute() {
+        MagiskManager.get().repoLoadDone.setPending();
+    }
+
     @Override
     protected Void doInBackground(Void... voids) {
         etags = new ArrayList<>(Arrays.asList(prefs.getString(Const.Key.ETAG_KEY, "").split(",")));

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

@@ -33,7 +33,9 @@ public abstract class Activity extends AppCompatActivity {
     }
 
     @StyleRes
-    abstract public int getDarkTheme();
+    public int getDarkTheme() {
+        return -1;
+    }
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -41,7 +43,7 @@ public abstract class Activity extends AppCompatActivity {
         if (this instanceof Topic.Subscriber) {
             ((Topic.Subscriber) this).subscribeTopics();
         }
-        if (getMagiskManager().isDarkTheme && getDarkTheme() > 0) {
+        if (getMagiskManager().isDarkTheme && getDarkTheme() != -1) {
             setTheme(getDarkTheme());
         }
     }

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

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

@@ -1,21 +1,24 @@
 package com.topjohnwu.magisk.container;
 
-import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.io.SuFile;
+
+import java.io.IOException;
 
 public class Module extends BaseModule {
 
-    private String mRemoveFile, mDisableFile, mUpdateFile;
+    private SuFile mRemoveFile, mDisableFile, mUpdateFile;
     private boolean mEnable, mRemove, mUpdated;
 
     public Module(String path) {
 
         try {
-            parseProps(Utils.readFile(path + "/module.prop"));
+            parseProps(Shell.Sync.su("cat " + path + "/module.prop"));
         } catch (NumberFormatException ignored) {}
 
-        mRemoveFile = path + "/remove";
-        mDisableFile = path + "/disable";
-        mUpdateFile = path + "/update";
+        mRemoveFile = new SuFile(path + "/remove", true);
+        mDisableFile = new SuFile(path + "/disable", true);
+        mUpdateFile = new SuFile(path + "/update", true);
 
         if (getId() == null) {
             int sep = path.lastIndexOf('/');
@@ -26,19 +29,21 @@ public class Module extends BaseModule {
             setName(getId());
         }
 
-        mEnable = !Utils.itemExist(mDisableFile);
-        mRemove = Utils.itemExist(mRemoveFile);
-        mUpdated = Utils.itemExist(mUpdateFile);
+        mEnable = !mDisableFile.exists();
+        mRemove = mRemoveFile.exists();
+        mUpdated = mUpdateFile.exists();
     }
 
     public void createDisableFile() {
         mEnable = false;
-        Utils.createFile(mDisableFile);
+        try {
+            mDisableFile.createNewFile();
+        } catch (IOException ignored) {}
     }
 
     public void removeDisableFile() {
         mEnable = true;
-        Utils.removeItem(mDisableFile);
+        mDisableFile.delete();
     }
 
     public boolean isEnabled() {
@@ -47,12 +52,14 @@ public class Module extends BaseModule {
 
     public void createRemoveFile() {
         mRemove = true;
-        Utils.createFile(mRemoveFile);
+        try {
+            mRemoveFile.createNewFile();
+        } catch (IOException ignored) {}
     }
 
     public void deleteRemoveFile() {
         mRemove = false;
-        Utils.removeItem(mRemoveFile);
+        mRemoveFile.delete();
     }
 
     public boolean willBeRemoved() {

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

@@ -5,8 +5,9 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
+import android.os.Process;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.widget.Toast;
 
@@ -15,8 +16,9 @@ import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.container.SuLogEntry;
 import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.io.SuFile;
 
 import java.io.File;
 import java.text.DateFormat;
@@ -25,194 +27,138 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-public class SuDatabaseHelper extends SQLiteOpenHelper {
-
-    public static final String DB_NAME = "su.db";
-    public static boolean verified = false;
+public class SuDatabaseHelper {
 
     private static final int DATABASE_VER = 5;
     private static final String POLICY_TABLE = "policies";
     private static final String LOG_TABLE = "logs";
     private static final String SETTINGS_TABLE = "settings";
     private static final String STRINGS_TABLE = "strings";
-    private static final File GLOBAL_DB = new File("/data/adb/magisk.db");
 
-    private Context mContext;
     private PackageManager pm;
     private SQLiteDatabase mDb;
+    private File DB_FILE;
 
-    private static void unmntDB() {
-        Shell.su(Utils.fmt("umount -l /data/user*/*/%s/*/*.db", MagiskManager.get().getPackageName()));
-    }
-
-    private static Context initDB(boolean verify) {
-        Context context, de = null;
-        MagiskManager ce = MagiskManager.get();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            de = ce.createDeviceProtectedStorageContext();
-            File ceDB = Utils.getDB(ce, DB_NAME);
-            if (ceDB.exists()) {
-                context = ce;
-            } else {
-                context = de;
-            }
-        } else {
-            context = ce;
-        }
-
-        File db = Utils.getDB(context, DB_NAME);
-        if (!verify) {
-            if (db.exists() && db.length() == 0) {
-                ce.loadMagiskInfo();
-                // Continue verification
-            } else {
-                return context;
-            }
-        }
-
-        // Encryption storage
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            if (ce.magiskVersionCode < 1410) {
-                if (context == de) {
-                    unmntDB();
-                    ce.moveDatabaseFrom(de, DB_NAME);
-                    context = ce;
-                }
-            } else {
-                if (context == ce) {
-                    unmntDB();
-                    de.moveDatabaseFrom(ce, DB_NAME);
-                    context = de;
-                }
-            }
-        }
-        // Context might be updated
-        db = Utils.getDB(context, DB_NAME);
-
-        if (!Shell.rootAccess())
-            return context;
-
-        // Verify the global db matches the local with the same inode
-        if (ce.magiskVersionCode >= 1450 && ce.magiskVersionCode < 1460) {
-            // v14.5 global su db
-            File OLD_GLOBAL_DB = new File(context.getFilesDir().getParentFile().getParentFile(), "magisk.db");
-            verified = TextUtils.equals(Utils.checkInode(OLD_GLOBAL_DB), Utils.checkInode(db));
-            if (!verified) {
-                context.deleteDatabase(DB_NAME);
-                db.getParentFile().mkdirs();
-                Shell.su(Utils.fmt("magisk --clone-attr %s %s; chmod 600 %s; ln %s %s",
-                        context.getFilesDir(), OLD_GLOBAL_DB, OLD_GLOBAL_DB, OLD_GLOBAL_DB, db));
-                verified = TextUtils.equals(Utils.checkInode(OLD_GLOBAL_DB), Utils.checkInode(db));
-            }
-        } else if (ce.magiskVersionCode >= 1464) {
-            // New global su db
-            Shell.su(Utils.fmt("mkdir %s 2>/dev/null; chmod 700 %s", GLOBAL_DB.getParent(), GLOBAL_DB.getParent()));
-            if (!Utils.itemExist(GLOBAL_DB)) {
-                context.openOrCreateDatabase(DB_NAME, 0, null).close();
-                Shell.su(Utils.fmt("cp -af %s %s; rm -f %s*", db, GLOBAL_DB, db));
-            }
-            verified = TextUtils.equals(Utils.checkInode(GLOBAL_DB), Utils.checkInode(db));
-            if (!verified) {
-                context.deleteDatabase(DB_NAME);
-                Utils.javaCreateFile(db);
-                Shell.su(Utils.fmt(
-                        "chown 0.0 %s; chmod 666 %s; chcon u:object_r:su_file:s0 %s;" +
-                                "mount -o bind %s %s",
-                        GLOBAL_DB, GLOBAL_DB, GLOBAL_DB, GLOBAL_DB, db));
-                verified = TextUtils.equals(Utils.checkInode(GLOBAL_DB), Utils.checkInode(db));
-            }
-        }
-        return context;
-    }
-
-    public static SuDatabaseHelper getSuDB(boolean verify) {
+    @NonNull
+    public static SuDatabaseHelper getInstance(MagiskManager mm) {
         try {
-            return new SuDatabaseHelper(initDB(verify));
-        } catch(Exception e) {
-            // Try to catch runtime exceptions and remove all db for retry
-            unmntDB();
-            Shell.su(Utils.fmt("rm -rf /data/user*/*/magisk.db /data/adb/magisk.db /data/user*/*/%s/databases",
-                    MagiskManager.get().getPackageName()));
-            e.printStackTrace();
-            return new SuDatabaseHelper(initDB(false));
-        }
-    }
-
-    private SuDatabaseHelper(Context context) {
-        super(context, DB_NAME, null, DATABASE_VER);
-        mContext = context;
-        pm = context.getPackageManager();
-        mDb = getWritableDatabase();
-        cleanup();
-
-        if (context.getPackageName().equals(Const.ORIG_PKG_NAME)) {
-            String pkg = getStrings(Const.Key.SU_REQUESTER, null);
-            if (pkg != null) {
-                Utils.uninstallPkg(pkg);
-                setStrings(Const.Key.SU_REQUESTER, null);
-            }
-        }
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        onUpgrade(db, 0, DATABASE_VER);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        try {
-            if (oldVersion == 0) {
-                createTables(db);
-                oldVersion = 3;
-            }
-            if (oldVersion == 1) {
-                // We're dropping column app_name, rename and re-construct table
-                db.execSQL(Utils.fmt("ALTER TABLE %s RENAME TO %s_old", POLICY_TABLE));
-
-                // Create the new tables
-                createTables(db);
-
-                // Migrate old data to new tables
-                db.execSQL(Utils.fmt("INSERT INTO %s SELECT " +
-                        "uid, package_name, policy, until, logging, notification FROM %s_old",
-                        POLICY_TABLE, POLICY_TABLE));
-                db.execSQL(Utils.fmt("DROP TABLE %s_old", POLICY_TABLE));
-
-                MagiskManager.get().deleteDatabase("sulog.db");
-                ++oldVersion;
-            }
-            if (oldVersion == 2) {
-                db.execSQL(Utils.fmt("UPDATE %s SET time=time*1000", LOG_TABLE));
-                ++oldVersion;
-            }
-            if (oldVersion == 3) {
-                db.execSQL(Utils.fmt("CREATE TABLE IF NOT EXISTS %s (key TEXT, value TEXT, PRIMARY KEY(key))", STRINGS_TABLE));
-                ++oldVersion;
-            }
-            if (oldVersion == 4) {
-                db.execSQL(Utils.fmt("UPDATE %s SET uid=uid%%100000", POLICY_TABLE));
-                ++oldVersion;
-            }
+            return new SuDatabaseHelper(mm);
         } catch (Exception e) {
-            e.printStackTrace();
-            onDowngrade(db, DATABASE_VER, 0);
+            // Let's cleanup everything and try again
+            Shell.Sync.su("sudb_clean '*'");
+            return new SuDatabaseHelper(mm);
         }
     }
 
-    @Override
-    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    private SuDatabaseHelper(MagiskManager mm) {
+        pm = mm.getPackageManager();
+        mDb = openDatabase(mm);
+        mDb.disableWriteAheadLogging();
+        int version = mDb.getVersion();
+        if (version < DATABASE_VER) {
+            onUpgrade(mDb, version);
+        } else if (version > DATABASE_VER) {
+            onDowngrade(mDb);
+        }
+        mDb.setVersion(DATABASE_VER);
+        clearOutdated();
+    }
+
+    private SQLiteDatabase openDatabase(MagiskManager mm) {
+        final SuFile GLOBAL_DB = new SuFile("/data/adb/magisk.db", true);
+        DB_FILE = new File(Utils.fmt("/sbin/.core/db-%d/magisk.db", Const.USER_ID));
+        Context de = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
+                ? mm.createDeviceProtectedStorageContext() : mm;
+        if (!DB_FILE.canWrite()) {
+            if (!Shell.rootAccess()) {
+                // We don't want the app to crash, create a db and return
+                DB_FILE = mm.getDatabasePath("su.db");
+                return mm.openOrCreateDatabase("su.db", Context.MODE_PRIVATE, null);
+            }
+            mm.loadMagiskInfo();
+            // Cleanup
+            Shell.Sync.su("sudb_clean " + Const.USER_ID);
+            if (mm.magiskVersionCode < 1410) {
+                // Super old legacy mode
+                DB_FILE = mm.getDatabasePath("su.db");
+                return mm.openOrCreateDatabase("su.db", Context.MODE_PRIVATE, null);
+            } else if (mm.magiskVersionCode < 1450) {
+                // Legacy mode with FBE aware
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    de.moveDatabaseFrom(mm, "su.db");
+                }
+                DB_FILE = de.getDatabasePath("su.db");
+                return de.openOrCreateDatabase("su.db", Context.MODE_PRIVATE, null);
+            } else {
+                mm.deleteDatabase("su.db");
+                de.deleteDatabase("su.db");
+                if (mm.magiskVersionCode < 1460) {
+                    // Link to new path
+                    File oldDB = new File(de.getFilesDir().getParentFile().getParentFile(),
+                            "magisk.db");
+                    Shell.Sync.su(Utils.fmt("mv -f %s %s; ln -s %s %s",
+                            oldDB, GLOBAL_DB, GLOBAL_DB, oldDB));
+                }
+                if (mm.magiskVersionCode < 1550) {
+                    // We need some additional policies on old versions
+                    Shell.Sync.su("magiskpolicy --live " +
+                            "'create su_file' 'allow * su_file file *' 'allow * su_file dir *'");
+                }
+                if (!GLOBAL_DB.exists()) {
+                    Shell.Sync.su("sudb_init");
+                    SQLiteDatabase.openOrCreateDatabase(GLOBAL_DB, null).close();
+                    Shell.Sync.su("sudb_restore");
+                }
+                Shell.Sync.su("sudb_setup " + Process.myUid());
+            }
+        }
+        // Not using legacy mode, open the mounted global DB
+        return SQLiteDatabase.openOrCreateDatabase(DB_FILE, null);
+    }
+
+    public void onUpgrade(SQLiteDatabase db, int oldVersion) {
+        if (oldVersion == 0) {
+            createTables(db);
+            oldVersion = 3;
+        }
+        if (oldVersion == 1) {
+            // We're dropping column app_name, rename and re-construct table
+            db.execSQL(Utils.fmt("ALTER TABLE %s RENAME TO %s_old", POLICY_TABLE));
+
+            // Create the new tables
+            createTables(db);
+
+            // Migrate old data to new tables
+            db.execSQL(Utils.fmt("INSERT INTO %s SELECT " +
+                            "uid, package_name, policy, until, logging, notification FROM %s_old",
+                    POLICY_TABLE, POLICY_TABLE));
+            db.execSQL(Utils.fmt("DROP TABLE %s_old", POLICY_TABLE));
+
+            MagiskManager.get().deleteDatabase("sulog.db");
+            ++oldVersion;
+        }
+        if (oldVersion == 2) {
+            db.execSQL(Utils.fmt("UPDATE %s SET time=time*1000", LOG_TABLE));
+            ++oldVersion;
+        }
+        if (oldVersion == 3) {
+            db.execSQL(Utils.fmt("CREATE TABLE IF NOT EXISTS %s (key TEXT, value TEXT, PRIMARY KEY(key))", STRINGS_TABLE));
+            ++oldVersion;
+        }
+        if (oldVersion == 4) {
+            db.execSQL(Utils.fmt("UPDATE %s SET uid=uid%%100000", POLICY_TABLE));
+            ++oldVersion;
+        }
+    }
+
+    // Remove everything, we do not support downgrade
+    public void onDowngrade(SQLiteDatabase db) {
         MagiskManager.toast(R.string.su_db_corrupt, Toast.LENGTH_LONG);
-        // Remove everything, we do not support downgrade
         db.execSQL("DROP TABLE IF EXISTS " + POLICY_TABLE);
         db.execSQL("DROP TABLE IF EXISTS " + LOG_TABLE);
         db.execSQL("DROP TABLE IF EXISTS " + SETTINGS_TABLE);
         db.execSQL("DROP TABLE IF EXISTS " + STRINGS_TABLE);
-        onUpgrade(db, 0, DATABASE_VER);
-    }
-
-    public File getDbFile() {
-        return mContext.getDatabasePath(DB_NAME);
+        onUpgrade(db, 0);
     }
 
     private void createTables(SQLiteDatabase db) {
@@ -235,7 +181,7 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
                 "(key TEXT, value INT, PRIMARY KEY(key))");
     }
 
-    public void cleanup() {
+    public void clearOutdated() {
         // Clear outdated policies
         mDb.delete(POLICY_TABLE, Utils.fmt("until > 0 AND until < %d", System.currentTimeMillis() / 1000), null);
         // Clear outdated logs

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

@@ -40,7 +40,7 @@ public class ManagerUpdate extends BroadcastReceiver {
                     }
                 },
                 intent.getStringExtra(Const.Key.INTENT_SET_LINK),
-                Utils.fmt("MagiskManager-v%s.apk", intent.getStringExtra(Const.Key.INTENT_SET_VERSION))
+                intent.getStringExtra(Const.Key.INTENT_SET_FILENAME)
         );
     }
 }

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

@@ -6,8 +6,8 @@ import android.content.Intent;
 
 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.superuser.Shell;
 
 public class PackageReceiver extends BroadcastReceiver {
     @Override
@@ -25,7 +25,7 @@ public class PackageReceiver extends BroadcastReceiver {
                 break;
             case Intent.ACTION_PACKAGE_FULLY_REMOVED:
                 mm.suDB.deletePolicy(pkg);
-                Shell.su_raw("magiskhide --rm " + pkg);
+                Shell.Async.su("magiskhide --rm " + pkg);
                 break;
         }
     }

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

@@ -4,11 +4,11 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.topjohnwu.magisk.utils.Shell;
+import com.topjohnwu.superuser.Shell;
 
 public class RebootReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        Shell.su_raw("/system/bin/reboot");
+        Shell.Async.su("/system/bin/reboot");
     }
 }

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

@@ -8,8 +8,8 @@ import android.support.v4.app.NotificationCompat;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
 
 public class OnBootIntentService extends IntentService {
 

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

@@ -68,7 +68,7 @@ public class RequestActivity extends Activity {
 
         pm = getPackageManager();
         mm = Utils.getMagiskManager(this);
-        mm.suDB.cleanup();
+        mm.suDB.clearOutdated();
 
         Intent intent = getIntent();
         socketPath = intent.getStringExtra("socket");

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

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

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

@@ -4,6 +4,7 @@ import android.os.Environment;
 import android.os.Process;
 
 import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.superuser.io.SuFile;
 
 import java.io.File;
 import java.util.Arrays;
@@ -17,8 +18,6 @@ public class Const {
     public static final String MAGISKHIDE_PROP = "persist.magisk.hide";
 
     // APK content
-    public static final String PUBLIC_KEY_NAME = "public.certificate.x509.pem";
-    public static final String PRIVATE_KEY_NAME = "private.key.pk8";
     public static final String UNINSTALLER = "magisk_uninstaller.sh";
     public static final String UTIL_FUNCTIONS= "util_functions.sh";
     public static final String ANDROID_MANIFEST = "AndroidManifest.xml";
@@ -26,7 +25,9 @@ public class Const {
     public static final String SU_KEYSTORE_KEY = "su_key";
 
     // Paths
-    public static final String MAGISK_DISABLE_FILE = "/cache/.disable_magisk";
+    private static SuFile MAGISK_PATH = null;
+    public static final SuFile MAGISK_DISABLE_FILE = new SuFile("/cache/.disable_magisk", true);
+    public static final String BUSYBOX_PATH = "/sbin/.core/busybox";
     public static final String TMP_FOLDER_PATH = "/dev/tmp";
     public static final String MAGISK_LOG = "/cache/magisk.log";
     public static final File EXTERNAL_PATH = new File(Environment.getExternalStorageDirectory(), "MagiskManager");
@@ -37,26 +38,23 @@ public class Const {
     public static final int SNET_VER = 7;
     public static final int MIN_MODULE_VER = 1400;
 
-    public static String BUSYBOX_PATH() {
-        if (Utils.itemExist("/sbin/.core/busybox/busybox")) {
-            return "/sbin/.core/busybox";
-        } else {
-            return "/dev/magisk/bin";
+    public synchronized static SuFile MAGISK_PATH() {
+        SuFile file;
+        if (MAGISK_PATH == null) {
+            file = new SuFile("/sbin/.core/img", true);
+            if (file.exists()) {
+                MAGISK_PATH = file;
+            } else if ((file = new SuFile("/dev/magisk/img", true)).exists()) {
+                MAGISK_PATH = file;
+            } else {
+                MAGISK_PATH = new SuFile("/magisk", true);
+            }
         }
+        return MAGISK_PATH;
     }
 
-    public static String MAGISK_PATH() {
-        if (Utils.itemExist("/sbin/.core/img")) {
-            return "/sbin/.core/img";
-        } else if (Utils.itemExist("/dev/magisk/img")) {
-            return "/dev/magisk/img";
-        } else {
-            return "/magisk";
-        }
-    }
-
-    public static String MAGISK_HOST_FILE() {
-        return MAGISK_PATH() + "/.core/hosts";
+    public static SuFile MAGISK_HOST_FILE() {
+        return new SuFile(MAGISK_PATH() + "/.core/hosts");
     }
 
     /* A list of apps that should not be shown as hide-able */
@@ -66,13 +64,6 @@ public class Const {
             "com.google.android.gms"
     );
 
-    /* A list of apps that already uses SafetyNet
-     * They DO NOT need to be added to hide list */
-    public static final List<String> SN_DEFAULTLIST =  Arrays.asList(
-            "com.google.android.apps.walletnfcrel",
-            "com.nianticlabs.pokemongo"
-    );
-
     public static final int USER_ID = Process.myUid() / 100000;
 
     public static class ID {
@@ -115,14 +106,14 @@ public class Const {
 
         // intents
         public static final String OPEN_SECTION = "section";
-        public static final String INTENT_SET_VERSION = "version";
+        public static final String INTENT_SET_FILENAME = "filename";
         public static final String INTENT_SET_LINK = "link";
         public static final String INTENT_PERM = "perm_dialog";
         public static final String FLASH_ACTION = "action";
         public static final String FLASH_SET_BOOT = "boot";
 
         // others
-        public static final String UPDATE_NOTIFICATION = "notification";
+        public static final String CHECK_UPDATES = "check_update";
         public static final String UPDATE_CHANNEL = "update_channel";
         public static final String CUSTOM_CHANNEL = "custom_channel";
         public static final String BOOT_FORMAT = "boot_format";

src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.java

@@ -18,7 +18,7 @@ import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 
 @TargetApi(Build.VERSION_CODES.M)
-public abstract class FingerprintHelper extends FingerprintManager.AuthenticationCallback {
+public abstract class FingerprintHelper {
 
     private FingerprintManager manager;
     private Cipher cipher;
@@ -30,7 +30,7 @@ public abstract class FingerprintHelper extends FingerprintManager.Authenticatio
         MagiskManager mm = MagiskManager.get();
         KeyguardManager km = mm.getSystemService(KeyguardManager.class);
         FingerprintManager fm = mm.getSystemService(FingerprintManager.class);
-        return km.isKeyguardSecure() && fm.isHardwareDetected() && fm.hasEnrolledFingerprints();
+        return km.isKeyguardSecure() && fm != null && fm.isHardwareDetected() && fm.hasEnrolledFingerprints();
     }
 
     protected FingerprintHelper() throws Exception {
@@ -54,10 +54,38 @@ public abstract class FingerprintHelper extends FingerprintManager.Authenticatio
         }
     }
 
+    public abstract void onAuthenticationError(int errorCode, CharSequence errString);
+
+    public abstract void onAuthenticationHelp(int helpCode, CharSequence helpString);
+
+    public abstract void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result);
+
+    public abstract void onAuthenticationFailed();
+
     public void startAuth() {
         cancel = new CancellationSignal();
         FingerprintManager.CryptoObject cryptoObject = new FingerprintManager.CryptoObject(cipher);
-        manager.authenticate(cryptoObject, cancel, 0, this, null);
+        manager.authenticate(cryptoObject, cancel, 0, new FingerprintManager.AuthenticationCallback() {
+            @Override
+            public void onAuthenticationError(int errorCode, CharSequence errString) {
+                FingerprintHelper.this.onAuthenticationError(errorCode, errString);
+            }
+
+            @Override
+            public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
+                FingerprintHelper.this.onAuthenticationHelp(helpCode, helpString);
+            }
+
+            @Override
+            public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+                FingerprintHelper.this.onAuthenticationSucceeded(result);
+            }
+
+            @Override
+            public void onAuthenticationFailed() {
+                FingerprintHelper.this.onAuthenticationFailed();
+            }
+        }, null);
     }
 
     public void cancel() {

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

@@ -1,207 +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
-                mm.shell.run_raw(false, false,
-                        "export PATH=" + Const.BUSYBOX_PATH() + ":$PATH",
-                        "mount_partitions",
-                        "run_migrations");
-            }
-        }
-
-        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;
-        }
-    }
-}

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

@@ -22,6 +22,8 @@ import com.topjohnwu.magisk.components.AlertDialogBuilder;
 import com.topjohnwu.magisk.receivers.DownloadReceiver;
 import com.topjohnwu.magisk.receivers.ManagerUpdate;
 import com.topjohnwu.magisk.receivers.RebootReceiver;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -57,10 +59,12 @@ public class ShowUI {
 
     public static void managerUpdateNotification() {
         MagiskManager mm = MagiskManager.get();
+        String filename = Utils.fmt("MagiskManager-v%s(%d).apk",
+                mm.remoteManagerVersionString, mm.remoteManagerVersionCode);
 
         Intent intent = new Intent(mm, ManagerUpdate.class);
         intent.putExtra(Const.Key.INTENT_SET_LINK, mm.managerLink);
-        intent.putExtra(Const.Key.INTENT_SET_VERSION, mm.remoteManagerVersionString);
+        intent.putExtra(Const.Key.INTENT_SET_FILENAME, filename);
         PendingIntent pendingIntent = PendingIntent.getBroadcast(mm,
                 Const.ID.APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 
@@ -98,7 +102,8 @@ public class ShowUI {
 
     public static void magiskInstallDialog(Activity activity) {
         MagiskManager mm = Utils.getMagiskManager(activity);
-        String filename = Utils.fmt("Magisk-v%s.zip", mm.remoteMagiskVersionString);
+        String filename = Utils.fmt("Magisk-v%s(%d).zip",
+                mm.remoteMagiskVersionString, mm.remoteMagiskVersionCode);
         new AlertDialogBuilder(activity)
             .setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.magisk)))
             .setMessage(mm.getString(R.string.repo_install_msg, filename))
@@ -110,11 +115,11 @@ public class ShowUI {
                 if (Shell.rootAccess()) {
                     options.add(mm.getString(R.string.direct_install));
                 }
-                List<String> res = Shell.su("echo $SLOT");
-                if (Utils.isValidShellResponse(res)) {
+                String s = Utils.cmd("echo $SLOT");
+                if (s != null) {
                     options.add(mm.getString(R.string.install_second_slot));
                 }
-                char[] slot = Utils.isValidShellResponse(res) ? res.get(0).toCharArray() : null;
+                char[] slot = s == null ? null : s.toCharArray();
                 new AlertDialog.Builder(activity)
                     .setTitle(R.string.select_method)
                     .setItems(
@@ -184,13 +189,12 @@ public class ShowUI {
                                     if (slot[1] == 'a') slot[1] = 'b';
                                     else slot[1] = 'a';
                                     // Then find the boot image again
-                                    List<String> ret = Shell.su(
-                                            "SLOT=" + String.valueOf(slot),
-                                            "find_boot_image",
+                                    boot = Utils.cmd(
+                                            "SLOT=" + String.valueOf(slot) +
+                                            "; find_boot_image;" +
                                             "echo \"$BOOTIMAGE\""
                                     );
-                                    boot = Utils.isValidShellResponse(ret) ? ret.get(ret.size() - 1) : null;
-                                    Shell.su_raw("mount_partitions");
+                                    Shell.Async.su("mount_partitions");
                                     if (boot == null)
                                         return;
                                     receiver = new DownloadReceiver() {
@@ -205,12 +209,7 @@ public class ShowUI {
                                     };
                                 default:
                             }
-                            Utils.dlAndReceive(
-                                    activity,
-                                    receiver,
-                                    mm.magiskLink,
-                                    filename
-                            );
+                            Utils.dlAndReceive(activity, receiver, mm.magiskLink, filename);
                         }
                     ).show();
             })
@@ -227,16 +226,17 @@ public class ShowUI {
 
     public static void managerInstallDialog(Activity activity) {
         MagiskManager mm = Utils.getMagiskManager(activity);
+        String filename = Utils.fmt("MagiskManager-v%s(%d).apk",
+                mm.remoteManagerVersionString, mm.remoteManagerVersionCode);
         new AlertDialogBuilder(activity)
             .setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.app_name)))
-            .setMessage(mm.getString(R.string.repo_install_msg,
-                    Utils.fmt("MagiskManager-v%s.apk", mm.remoteManagerVersionString)))
+            .setMessage(mm.getString(R.string.repo_install_msg, filename))
             .setCancelable(true)
             .setPositiveButton(R.string.install, (d, i) -> {
                 Utils.runWithPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE, () -> {
                     Intent intent = new Intent(mm, ManagerUpdate.class);
                     intent.putExtra(Const.Key.INTENT_SET_LINK, mm.managerLink);
-                    intent.putExtra(Const.Key.INTENT_SET_VERSION, mm.remoteManagerVersionString);
+                    intent.putExtra(Const.Key.INTENT_SET_FILENAME, filename);
                     mm.sendBroadcast(intent);
                 });
             })
@@ -252,20 +252,20 @@ public class ShowUI {
             .setPositiveButton(R.string.complete_uninstall, (d, i) -> {
                 ByteArrayOutputStream uninstaller = new ByteArrayOutputStream();
                 try (InputStream in = mm.getAssets().open(Const.UNINSTALLER)) {
-                    Utils.inToOut(in, uninstaller);
+                    ShellUtils.pump(in, uninstaller);
                 } catch (IOException e) {
                     e.printStackTrace();
                     return;
                 }
                 ByteArrayOutputStream utils = new ByteArrayOutputStream();
                 try (InputStream in = mm.getAssets().open(Const.UTIL_FUNCTIONS)) {
-                    Utils.inToOut(in, utils);
+                    ShellUtils.pump(in, utils);
                 } catch (IOException e) {
                     e.printStackTrace();
                     return;
                 }
 
-                Shell.su(
+                Shell.Sync.su(
                         Utils.fmt("echo '%s' > /cache/%s", uninstaller.toString().replace("'", "'\\''"), Const.UNINSTALLER),
                         Utils.fmt("echo '%s' > %s/%s", utils.toString().replace("'", "'\\''"),
                                 mm.magiskVersionCode >= 1464 ? "/data/adb/magisk" : "/data/magisk", Const.UTIL_FUNCTIONS)

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

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

@@ -7,8 +7,13 @@ import java.util.List;
 
 public class Topic {
 
-    public boolean hasPublished = false;
+    private static final int NON_INIT = 0;
+    private static final int PENDING = 1;
+    private static final int PUBLISHED = 2;
+
+    private int state = NON_INIT;
     private List<WeakReference<Subscriber>> subscribers;
+    private Object[] results;
 
     public void subscribe(Subscriber sub) {
         if (subscribers == null) {
@@ -30,29 +35,47 @@ public class Topic {
         }
     }
 
+    public void reset() {
+        state = NON_INIT;
+        results = null;
+    }
+
+    public boolean isPublished() {
+        return state == PUBLISHED;
+    }
+
     public void publish() {
-        publish(true, null);
+        publish(true);
     }
 
-    public void publish(boolean record) {
-        publish(record, null);
-    }
-
-    public void publish(boolean record, Object result) {
-        hasPublished = record;
+    public void publish(boolean record, Object... results) {
+        if (record)
+            state = PUBLISHED;
+        this.results = results;
         if (subscribers != null) {
             for (WeakReference<Subscriber> subscriber : subscribers) {
                 if (subscriber.get() != null)
-                    subscriber.get().onTopicPublished(this, result);
+                    subscriber.get().onTopicPublished(this);
             }
         }
     }
 
+    public Object[] getResults() {
+        return results;
+    }
+
+    public boolean isPending() {
+        return state == PENDING;
+    }
+
+    public void setPending() {
+        state = PENDING;
+    }
 
     public interface Subscriber {
         default void subscribeTopics() {
             for (Topic topic : getSubscription()) {
-                if (topic.hasPublished) {
+                if (topic.isPublished()) {
                     onTopicPublished(topic);
                 }
                 topic.subscribe(this);
@@ -63,13 +86,7 @@ public class Topic {
                 event.unsubscribe(this);
             }
         }
-        default void onTopicPublished() {
-            onTopicPublished(null, null);
-        }
-        default void onTopicPublished(Topic topic) {
-            onTopicPublished(topic, null);
-        }
-        void onTopicPublished(Topic topic, Object result);
+        void onTopicPublished(Topic topic);
         Topic[] getSubscription();
     }
 }

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

@@ -19,67 +19,40 @@ 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.util.Xml;
 import android.widget.Toast;
 
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
 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 com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileInputStream;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.File;
 import java.io.IOException;
-import java.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;
-import java.util.Map;
 
 public class Utils {
 
     public static boolean isDownloading = false;
 
-    public static boolean itemExist(Object path) {
-        List<String> ret = Shell.su(fmt("[ -e %s ] && echo true || echo false", path));
-        return isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(0));
-    }
-
-    public static void createFile(Object path) {
-        Shell.su_raw(fmt("mkdir -p `dirname '%s'` 2>/dev/null; touch '%s' 2>/dev/null", path, path));
-    }
-
-    public static boolean javaCreateFile(File path) {
-        path.getParentFile().mkdirs();
-        try {
-            path.createNewFile();
-            return true;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    public static void removeItem(Object path) {
-        Shell.su_raw(fmt("rm -rf %s 2>/dev/null", path));
-    }
-
-    public static List<String> readFile(Object path) {
-        return Shell.su(fmt("cat %s | sed '$a\\ ' | sed '$d'", path));
-    }
-
-    public static String checkInode(Object path) {
-        List<String> ret = Shell.su(fmt("ls -i %s", path));
-        return isValidShellResponse(ret) ? ret.get(0).trim().split("\\s+")[0] : path.toString();
+    public static String cmd(String cmd) {
+        return ShellUtils.fastCmd(Shell.getShell(), cmd);
     }
 
     public static void uninstallPkg(String pkg) {
-        Shell.su(fmt("umount -l /data/user*/*/%s/*/*.db 2>/dev/null; pm uninstall %s", pkg, pkg));
+        Shell.Sync.su("sudb_clean " + Const.USER_ID, "pm uninstall " + pkg);
     }
 
     public static void dlAndReceive(Context context, DownloadReceiver receiver, String link, String filename) {
@@ -110,18 +83,8 @@ public class Utils {
 
     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;
+                .replace("$", "").replace("`", "").replace("*", "").replace("/", "_")
+                .replace("#", "").replace("@", "").replace("\\", "_");
     }
 
     public static int getPrefsInt(SharedPreferences prefs, String key, int def) {
@@ -226,14 +189,6 @@ public class Utils {
         }
     }
 
-    public static File getDB(String dbName) {
-        return getDB(MagiskManager.get(), dbName);
-    }
-
-    public static File getDB(Context context, String dbName) {
-        return new File(context.getFilesDir().getParent() + "/databases", dbName);
-    }
-
     public static AssetManager getAssets(String apk) {
         try {
             AssetManager asset = AssetManager.class.newInstance();
@@ -245,22 +200,10 @@ public class Utils {
         }
     }
 
-    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() {
         MagiskManager mm = MagiskManager.get();
         if (mm.magiskVersionCode >= 1446 && !mm.keepVerity) {
-            List<String> ret = Shell.su("patch_dtbo_image && echo true || echo false");
-            if (Utils.isValidShellResponse(ret) && Boolean.parseBoolean(ret.get(ret.size() - 1))) {
+            if (ShellUtils.fastCmdResult(Shell.getShell(), "patch_dtbo_image")) {
                 ShowUI.dtboPatchedNotification();
             }
         }
@@ -273,36 +216,72 @@ public class Utils {
     }
 
     public static void dumpPrefs() {
-        Gson gson = new Gson();
-        Map<String, ?> prefs = MagiskManager.get().prefs.getAll();
-        prefs.remove("App Restrictions");
-        String json = gson.toJson(prefs, new TypeToken<Map<String, ?>>(){}.getType());
-        Shell.su(fmt("for usr in /data/user/*; do echo '%s' > ${usr}/%s; done", json, Const.MANAGER_CONFIGS));
+        MagiskManager mm = MagiskManager.get();
+        // Flush prefs to disk
+        mm.prefs.edit().commit();
+        File xml = new File(mm.getFilesDir().getParent() + "/shared_prefs",
+                mm.getPackageName() + "_preferences.xml");
+        Shell.Sync.su(fmt("for usr in /data/user/*; do cat %s > ${usr}/%s; done", xml, Const.MANAGER_CONFIGS));
     }
 
     public static void loadPrefs() {
-        String config = fmt("/data/user/%d/%s", Const.USER_ID, Const.MANAGER_CONFIGS);
-        List<String> ret = readFile(config);
-        if (isValidShellResponse(ret)) {
-            SharedPreferences.Editor editor = MagiskManager.get().prefs.edit();
-            String json = ret.get(0);
-            Gson gson = new Gson();
-            Map<String, ?> prefMap = gson.fromJson(json, new TypeToken<Map<String, ?>>(){}.getType());
-            editor.clear();
-            for (Map.Entry<String, ?> entry : prefMap.entrySet()) {
-                Object value = entry.getValue();
-                if (value instanceof String) {
-                    editor.putString(entry.getKey(), (String) value);
-                } else if (value instanceof Boolean) {
-                    editor.putBoolean(entry.getKey(), (boolean) value);
-                } else if (value instanceof Number) {
-                    editor.putInt(entry.getKey(), ((Number) value).intValue());
+        SuFile config = new SuFile(fmt("/data/user/%d/%s", Const.USER_ID, Const.MANAGER_CONFIGS), true);
+        if (config.exists()) {
+            MagiskManager mm = MagiskManager.get();
+            SharedPreferences.Editor editor = mm.prefs.edit();
+            try {
+                SuFileInputStream is = new SuFileInputStream(config);
+                XmlPullParser parser = Xml.newPullParser();
+                parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
+                parser.setInput(is, "UTF-8");
+                parser.nextTag();
+                parser.require(XmlPullParser.START_TAG, null, "map");
+                while (parser.next() != XmlPullParser.END_TAG) {
+                    if (parser.getEventType() != XmlPullParser.START_TAG)
+                        continue;
+                    String key = parser.getAttributeValue(null, "name");
+                    String value = parser.getAttributeValue(null, "value");
+                    switch (parser.getName()) {
+                        case "string":
+                            parser.require(XmlPullParser.START_TAG, null, "string");
+                            editor.putString(key, parser.nextText());
+                            parser.require(XmlPullParser.END_TAG, null, "string");
+                            break;
+                        case "boolean":
+                            parser.require(XmlPullParser.START_TAG, null, "boolean");
+                            editor.putBoolean(key, Boolean.parseBoolean(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "boolean");
+                            break;
+                        case "int":
+                            parser.require(XmlPullParser.START_TAG, null, "int");
+                            editor.putInt(key, Integer.parseInt(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "int");
+                            break;
+                        case "long":
+                            parser.require(XmlPullParser.START_TAG, null, "long");
+                            editor.putLong(key, Long.parseLong(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "long");
+                            break;
+                        case "float":
+                            parser.require(XmlPullParser.START_TAG, null, "int");
+                            editor.putFloat(key, Float.parseFloat(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "int");
+                            break;
+                        default:
+                            parser.next();
+                    }
                 }
+            } catch (IOException | XmlPullParserException e) {
+                e.printStackTrace();
             }
             editor.remove(Const.Key.ETAG_KEY);
             editor.apply();
-            MagiskManager.get().loadConfig();
-            removeItem(config);
+            mm.loadConfig();
+            config.delete();
         }
     }
 

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

@@ -1,27 +1,21 @@
 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 com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.utils.JarMap;
+import com.topjohnwu.utils.SignAPK;
 
 import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 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);
@@ -46,7 +40,7 @@ public class ZipUtils {
                 File dest = new File(folder, name);
                 dest.getParentFile().mkdirs();
                 try (FileOutputStream out = new FileOutputStream(dest)) {
-                    Utils.inToOut(zipfile, out);
+                    ShellUtils.pump(zipfile, out);
                 }
             }
         } catch(Exception e) {
@@ -55,18 +49,14 @@ public class ZipUtils {
         }
     }
 
-    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) throws Exception {
+        try (JarMap map = new JarMap(input, false);
+             BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(output))) {
+            signZip(map, out);
+        }
     }
 
-    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);
+    public static void signZip(JarMap input, OutputStream output) throws Exception {
+        SignAPK.signZip(null, null, input, output);
     }
 }

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

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

src/main/jni/zipadjust.c

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

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

src/main/res/raw/changelog.md

@@ -0,0 +1,2 @@
+### v5.6.4
+- Remove the blacklisted apps using SafetyNet (e.g. Pokemon GO)

src/main/res/raw/sudb.sh

@@ -0,0 +1,32 @@
+sudb_clean() {
+  local USERID=$1
+  local DIR="/sbin/.core/db-${USERID}"
+  umount -l /data/user*/*/*/databases/su.db $DIR $DIR/*
+  rm -rf $DIR
+  [ "$USERID" = "*" ] && rm -f /data/adb/magisk.db
+}
+
+sudb_init() {
+  ADB_CONTEXT=`/system/bin/ls -dZ /data/adb | awk '{print $1}'`
+  chcon u:object_r:su_file:s0 /data/adb
+  chmod 777 /data/adb
+}
+
+sudb_restore() {
+  chcon $ADB_CONTEXT /data/adb
+  chmod 700 /data/adb
+}
+
+sudb_setup() {
+  local USER=$1
+  local USERID=$(($USER / 100000))
+  local DIR=/sbin/.core/db-${USERID}
+  mkdir -p $DIR
+  touch $DIR/magisk.db
+  mount -o bind /data/adb/magisk.db $DIR/magisk.db
+  rm -f /data/adb/magisk.db-journal
+  chcon u:object_r:su_file:s0 $DIR $DIR/*
+  chmod 700 $DIR
+  chown $USER.$USER $DIR
+  chmod 666 $DIR/*
+}

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

@@ -135,9 +135,13 @@
     <string name="settings_clear_cache_summary">Löscht die zwischengespeicherten Informationen der Online-Repos. Erzwingt eine Online-Aktualisierung</string>
     <string name="settings_hide_manager_title">Magisk Manager verbergen</string>
     <string name="settings_hide_manager_summary">Magisk Manager mit zufälligem Paketnamen neu packen</string>
+    <string name="settings_restore_manager_title">Stelle Magisk Manager wieder her</string>
+    <string name="settings_restore_manager_summary">Stelle Magisk Manager mit ursprünglichem Paket wieder her</string>
     <string name="language">Sprache</string>
     <string name="system_default">(Systemstandard)</string>
     <string name="settings_update">Aktualisierungs-Einstellungen</string>
+    <string name="settings_check_update_title">Prüfe nach Aktualisierungen</string>
+    <string name="settings_check_update_summary">Prüfe regelmäßig im Hintergrund nach Aktualisierungen</string>
     <string name="settings_update_channel_title">Aktualisierungs-Kanal</string>
     <string name="settings_update_stable">Stabil</string>
     <string name="settings_update_beta">Beta</string>
@@ -166,6 +170,8 @@
     <string name="request_timeout_summary">%1$s Sekunden</string>
     <string name="settings_su_reauth_title">Nach Aktualisierung erneut authentifizieren</string>
     <string name="settings_su_reauth_summary">Superuser-Zugriff nach App-Aktualisierung erneut abfragen</string>
+    <string name="settings_su_fingerprint_title">Aktiviere Authentifizierung durch Fingerabdruck</string>
+    <string name="settings_su_fingerprint_summary">Fingerabdrucksensor benutzen um Superuser-Anfragen zu erlauben</string>
 
     <string name="multiuser_mode">Mehrbenutzermodus</string>
     <string name="settings_owner_only">Nur der Gerätebesitzer</string>
@@ -184,6 +190,7 @@
     <string name="requester_summary">Root-Sitzungen erben den Namensraum des Abfragenden</string>
     <string name="isolate_summary">Jede Root-Sitzung hat ihren isolierten Namensraum</string>
     <string name="android_o_not_support">Android 8.0+ wird nicht unterstützt</string>
+    <string name="disable_fingerprint">Keine Fingerabdrücke gespeichert oder keine Geräteunterstützung</string>
 
     <!--Superuser-->
     <string name="su_request_title">Superuser-Anfrage</string>
@@ -193,7 +200,7 @@
     <string name="grant">Gewähren</string>
     <string name="su_warning">Erlaubt den vollen Zugriff auf das Gerät.\nVerweigere, wenn du dir unsicher bist!</string>
     <string name="forever">Dauerhaft</string>
-    <string name="once">Nur diesmal</string>
+    <string name="once">Einmalig</string>
     <string name="tenmin">10 Min.</string>
     <string name="twentymin">20 Min.</string>
     <string name="thirtymin">30 Min.</string>
@@ -212,6 +219,7 @@
     <string name="su_revoke_msg">Möchtest du die Rechte für %1$s entziehen?</string>
     <string name="toast">Popup</string>
     <string name="none">Keine</string>
+    <string name="auth_fail">Authentifizierung fehlgeschlagen</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

src/main/res/values-es/strings.xml

@@ -11,14 +11,14 @@
 
     <!--Status Fragment-->
     <string name="magisk_version_error">Magisk no está instalado</string>
-    <string name="checking_for_updates">Comprobando actualizaciones…</string>
+    <string name="checking_for_updates">Comprobando Actualizaciones…</string>
     <string name="magisk_update_available">¡Disponible Magisk v%1$s!</string>
     <string name="invalid_update_channel">Canal de actualización inválido</string>
-    <string name="safetyNet_check_text">Toque para empezar la comprobación de SafetyNet</string>
+    <string name="safetyNet_check_text">Comprobar el estado de SafetyNet</string>
     <string name="checking_safetyNet_status">Comprobando estado de SafetyNet…</string>
-    <string name="safetyNet_check_success">La comprobación de SafetyNet fue exitosa</string>
+    <string name="safetyNet_check_success">La comprobación fue exitosa</string>
     <string name="safetyNet_api_error">Error en la API de SafetyNet</string>
-    <string name="safetyNet_network_loss">Conexión de red perdida</string>
+    <string name="safetyNet_network_loss">Red no Disponible</string>
     <string name="safetyNet_service_disconnected">Se ha detenido el servicio</string>
     <string name="safetyNet_res_invalid">La respuesta no es válida</string>
 
@@ -29,13 +29,13 @@
     <string name="current_magisk_title">Versión instalada: %1$s</string>
     <string name="install_magisk_title">Última versión: %1$s</string>
     <string name="uninstall">Desinstalar</string>
-    <string name="uninstall_magisk_msg">Todos los módulos serán desactivados / eliminados. El acceso Root se eliminará y, posiblemente, encriptará los datos si los datos no están cifrados actualmente.</string>
+    <string name="uninstall_magisk_msg">Todos los módulos serán desactivados / eliminados. El acceso Root se eliminará y, posiblemente, cifrará los datos si los datos no están cifrados actualmente.</string>
     <string name="uninstall_magisk_title">Desinstalar Magisk</string>
     <string name="update">Actualización %1$s</string>
     
     <!--Module Fragment-->
     <string name="no_info_provided">(No hay información)</string>
-    <string name="no_modules_found">No se han encontrado módulos</string>
+    <string name="no_modules_found">No se encontraron módulos</string>
     <string name="update_file_created">El módulo se actualizará en el siguiente reinicio</string>
     <string name="remove_file_created">El módulo se eliminará en el siguiente reinicio</string>
     <string name="remove_file_deleted">El módulo no se eliminará en el siguiente reinicio</string>
@@ -47,10 +47,10 @@
     <string name="reboot_download">Reiniciar en Modo Download</string>
 
     <!--Repo Fragment-->
-    <string name="update_available">Actualización disponible</string>
+    <string name="update_available">Actualización Disponible</string>
     <string name="installed">Instalado</string>
     <string name="not_installed">No Instalado</string>
-    <string name="updated_on">Actualizando en: %1$s</string>
+    <string name="updated_on">Actualizado el: %1$s</string>
     <string name="sorting_order">Orden de Clasificación</string>
     <string name="sort_by_name">Ordenar por nombre</string>
     <string name="sort_by_update">Ordenar según la última actualización</string>
@@ -84,7 +84,7 @@
     <string name="download">Descargar</string>
     <string name="download_file_error">Error descargando archivo</string>
     <string name="reboot">Reiniciar</string>
-    <string name="zip_process_msg">Procesando archivo zip …</string>
+    <string name="zip_process_msg">Procesando archivo zip…</string>
     <string name="downloading_toast">Descargando %1$s</string>
     <string name="magisk_update_title">¡Nueva actualización de Magisk disponible!</string>
     <string name="settings_reboot_toast">Reinicia para aplicar los ajustes</string>
@@ -94,7 +94,7 @@
     <string name="process_error">Error de proceso</string>
     <string name="internal_storage">El zip es almacenado en:\n[Internal Storage]%1$s</string>
     <string name="zip_download_title">Descargando</string>
-    <string name="zip_download_msg">Descargando el archivo zip (%1$d%%) …</string>
+    <string name="zip_download_msg">Descargando el archivo zip (%1$d%%)…</string>
     <string name="zip_process_title">Procesando</string>
     <string name="manager_update_title">Nueva actualización de Magisk Manager disponible!</string>
     <string name="manager_download_install">Pulse para descargar e instalar</string>
@@ -102,8 +102,8 @@
     <string name="dtbo_patched_reboot">Magisk Manager ha parcheado dtbo.img, por favor reinicia</string>
     <string name="magisk_updates">Actualización de Magisk</string>
     <string name="flashing">Flasheando</string>
-    <string name="hide_manager_toast">Ocultando Magisk Manager...</string>
-    <string name="hide_manager_toast2">Esto podría tomar un tiempo...</string>
+    <string name="hide_manager_toast">Ocultando Magisk Manager…</string>
+    <string name="hide_manager_toast2">Esto podría tomar un tiempo…</string>
     <string name="hide_manager_fail_toast">La Ocultación de Magisk Manager ha fallado…</string>
     <string name="download_zip_only">Descargar sólo el archivo ZIP</string>
     <string name="patch_boot_file">Parcheo de la imagen boot</string>
@@ -132,9 +132,13 @@
     <string name="settings_clear_cache_summary">Limpiar la información en caché para los repositorios en línea, fuerza a la aplicación a actualizar en línea</string>
     <string name="settings_hide_manager_title">Ocultar Magisk Manager</string>
     <string name="settings_hide_manager_summary">Re-empaquetar Magisk Manager con un nombre de paquete al azar</string>
+    <string name="settings_restore_manager_title">Restaurar Magisk Manager</string>
+    <string name="settings_restore_manager_summary">Restaura Magisk Manager con el paquete original</string>
     <string name="language">Idioma</string>
     <string name="system_default">(Idioma del sistema)</string>
     <string name="settings_update">Ajustes de Actualización</string>
+    <string name="settings_check_update_title">Comprobar Actualizaciones</string>
+    <string name="settings_check_update_summary">Comprobar periódicamente en segundo plano si existen actualizaciones</string>
     <string name="settings_update_channel_title">Canal de Actualización</string>
     <string name="settings_update_stable">Estable</string>
     <string name="settings_update_beta">Beta</string>
@@ -143,10 +147,10 @@
     <string name="settings_boot_format_title">Parchear imagen boot por tipo de formato</string>
     <string name="settings_boot_format_summary">Seleccionar el formato de salida para parchear la imagen boot.\nEscoja .img para flashear mediante fastboot/download mode; escoja .img.tar para flashear con ODIN.</string>
     
-    <string name="settings_core_only_summary">Habilitar sólo funciones principales, no se cargarán todos los módulos. MagiskSU, MagiskHide, y archivo hosts fuera de la partición de sistema seguirán habilitados</string>
+    <string name="settings_core_only_summary">Habilitar sólo funciones principales, no se cargarán todos los módulos. MagiskSU, MagiskHide, y Systemless Hosts seguirán habilitados</string>
     <string name="settings_magiskhide_summary">Ocultar Magisk de varias detecciones</string>
-    <string name="settings_hosts_title">Habilitar archivo hosts fuera de la partición de sistema</string>
-    <string name="settings_hosts_summary">Soporte para aplicaciones de bloqueo de publicidad fuera de la partición de sistema</string>
+    <string name="settings_hosts_title">Systemless Hosts</string>
+    <string name="settings_hosts_summary">Soporte para aplicaciones Adblock fuera de la partición system</string>
 
     <string name="settings_su_app_adb">Aplicaciones y ADB</string>
     <string name="settings_su_app">Sólo aplicaciones</string>
@@ -163,6 +167,9 @@
     <string name="request_timeout_summary">%1$s segundos</string>
     <string name="settings_su_reauth_title">Re-autenticación</string>
     <string name="settings_su_reauth_summary">Pedir permisos de superusuario nuevamente si una aplicación es actualizada o reinstalada</string>
+    <string name="settings_su_fingerprint_title">Autenticación por Huella Dactilar</string>
+    <string name="settings_su_fingerprint_summary">Utilizar el sensor de Huella Dactilar para permitir las solicitudes de superusuario</string>
+ 
     
     <string name="multiuser_mode">Modo MultiUsuario</string> 
     <string name="settings_owner_only">Sólo Administrador del Dispositivo</string>
@@ -181,6 +188,7 @@
     <string name="requester_summary">Las sesiones de root heredarán las peticiones Namespace</string>
     <string name="isolate_summary">Cada sesión root tendrá su propia Namespace</string>
     <string name="android_o_not_support">No es compatible con Android 8.0+</string>
+    <string name="disable_fingerprint">No se establecieron huellas dactilares o no existe soporte del dispositivo</string>
 
     <!--Superuser-->
     <string name="su_request_title">Petición de superusuario</string>
@@ -209,6 +217,7 @@
     <string name="su_revoke_msg">¿Confirmar para revocar derechos de %1$s?</string>
     <string name="toast">Aviso</string>
     <string name="none">Nada</string>
+    <string name="auth_fail">Autenticación fallida</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

src/main/res/values-et/strings.xml

@@ -50,6 +50,10 @@
     <string name="update_available">Uuendus saadaval</string>
     <string name="installed">Installitud</string>
     <string name="not_installed">Pole installitud</string>
+    <string name="updated_on">Uuendatud: %1$s</string>
+    <string name="sorting_order">Sorteerimisjärjekord</string>
+    <string name="sort_by_name">Sorteeri nime järgi</string>
+    <string name="sort_by_update">Sorteeri viimase uuenduse järgi</string>
 
     <!--Log Fragment-->
     <string name="menuSaveLog">Salvesta logi</string>
@@ -85,9 +89,11 @@
     <string name="settings_reboot_toast">Taaskäivita seadete rakendamiseks</string>
     <string name="release_notes">Väljalaskemärkmed</string>
     <string name="repo_cache_cleared">Hoidla vahemälu tühjendatud</string>
-    <string name="safetyNet_hide_notice">See rakendus kasutab SafetyNet\'i\nJuba vaikimisi hallatud MagiskHide poolt</string>
+    <string name="safetyNet_hide_notice">See rakendus kasutab SafetyNet\'i\n
+  Juba vaikimisi hallatud MagiskHide poolt</string>
     <string name="process_error">Protsessi viga</string>
-    <string name="internal_storage">ZIP on salvestatud:\n[Sisemälu]%1$s</string>
+    <string name="internal_storage">ZIP on salvestatud:\n
+  [Sisemälu]%1$s</string>
     <string name="zip_download_title">Laadin alla</string>
     <string name="zip_download_msg">Laadin ZIP-faili alla (%1$d%%)...</string>
     <string name="zip_process_title">Töötlen</string>
@@ -115,7 +121,9 @@
     <string name="restore_fail">Originaalne varundus puudub!</string>
     <string name="uninstall_toast">Eemaldan Magisk Manager\'i 5 sekundi pärast, palun tee peale seda käsitsi taaskäivitus</string>
     <string name="proprietary_title">Laadi alla suletud koodi</string>
-    <string name="proprietary_notice">Magisk Manager on vaba ja avatud lähtekoodiga, seega ei sisalda Google\'i suletud SafetyNet\'i API koodi.\n\nKas lubad Magisk Manager\'il SafetyNet\'i kontrollide jaoks laadida alla laiendus (sisaldab GoogleApiClient\'i)?</string>
+    <string name="proprietary_notice">Magisk Manager on vaba ja avatud lähtekoodiga, mis ei sisalda Google\'i suletud SafetyNet\'i API koodi.\n
+  \n
+  Kas lubad Magisk Manager\'il SafetyNet\'i kontrollide jaoks laadida alla laiendus (sisaldab GoogleApiClient\'i)?</string>
     <string name="su_db_corrupt">Superkasutaja andmebaas on korrumpteerunud, loon uue andmebaasi</string>
 
     <!--Settings Activity -->
@@ -135,12 +143,12 @@
     <string name="settings_update_stable">Stabiilne</string>
     <string name="settings_update_beta">Beeta</string>
     <string name="settings_update_custom">Kohandatud</string>
-	<string name="settings_update_custom_msg">Sisesta kohandatud URL</string> 
+    <string name="settings_update_custom_msg">Sisesta kohandatud URL</string>
     <string name="settings_boot_format_title">Paigatud käivitusväljundi vorming</string>
-    <string name="settings_boot_format_summary">Vali väljutatava paigatud käivituspildi vorming.\nVali .img, mida välgutada fastboot/allalaadimisrežiimi kaudu; vali .img.tar, mida välgutada ODIN\'i kaudu.</string>
-
+    <string name="settings_boot_format_summary">Vali väljutatava paigatud käivituspildi vorming.\n
+  Vali .img, mida välgutada fastboot/allalaadimisrežiimi kaudu; vali .img.tar, mida välgutada ODIN\'i kaudu.</string>
     <string name="settings_core_only_title">Magisk\'i ainult tuuma režiim</string>
-    <string name="settings_core_only_summary">Luba ainult põhifunktsioonid, kõiki mooduleid ei laadita. MagiskSU, MagiskHide ja süsteemivaba hosts siiski lubatakse</string>
+    <string name="settings_core_only_summary">Luba ainult põhifunktsioonid. MagiskSU, MagiskHide ja süsteemivaba hosts siiski lubatakse, ent mooduleid ei laadita.</string>
     <string name="settings_magiskhide_summary">Peida Magisk erinevate tuvastuste eest</string>
     <string name="settings_hosts_title">Süsteemivaba hosts</string>
     <string name="settings_hosts_summary">Süsteemivaba hosts-tugi reklaamiblokeerijatest rakendustele</string>
@@ -160,6 +168,8 @@
     <string name="request_timeout_summary">%1$s sekundit</string>
     <string name="settings_su_reauth_title">Taas-autendi peale uuendust</string>
     <string name="settings_su_reauth_summary">Taas-autendi superkasutaja õigused peale rakenduse uuendust</string>
+    <string name="settings_su_fingerprint_title">Luba sõrmejäljega autentimine</string>
+    <string name="settings_su_fingerprint_summary">Kasuta sõrmejäljelugejat superkasutaja taotluste lubamiseks</string>
 
     <string name="multiuser_mode">Mitmikkasutaja režiim</string>
     <string name="settings_owner_only">Ainult seadme omanik</string>
@@ -168,7 +178,7 @@
     <string name="owner_only_summary">Ainult omanikul on juurkasutaja õigused</string>
     <string name="owner_manage_summary">Ainult omanik saab hallata juurkasutaja ligipääsu ja saada taotlusküsimusi</string>
     <string name="user_indepenent_summary">Igal kasutajal on oma isiklikud juurkasutaja reeglid</string>
-    <string name="multiuser_hint_owner_request">Taotlus on saadetud seadme omanikule. Palun lülitu omanikule ja anna luba</string>
+    <string name="multiuser_hint_owner_request">Taotlus on saadetud seadme omanikule. Palun lülitu omanikule ja anna vajalikud load</string>
 
     <string name="mount_namespace_mode">Nimeruumi monteerimisrežiim</string>
     <string name="settings_ns_global">Globaalne nimeruum</string>
@@ -185,7 +195,8 @@
     <string name="deny">Keela</string>
     <string name="prompt">Küsi</string>
     <string name="grant">Luba</string>
-    <string name="su_warning">Annab täieliku ligipääsu sinu seadmele.\nKeela, kui sa pole kindel!</string>
+    <string name="su_warning">Annab täieliku ligipääsu sinu seadmele.\n
+  Keela, kui sa pole kindel!</string>
     <string name="forever">Igavesti</string>
     <string name="once">Üks kord</string>
     <string name="tenmin">10 min</string>
@@ -195,17 +206,18 @@
     <string name="su_allow_toast">Rakendusele %1$s anti superkasutaja õigused</string>
     <string name="su_deny_toast">Rakendusel %1$s keelati superkasutaja õigused</string>
     <string name="no_apps_found">Rakendusi ei leitud</string>
-    <string name="su_snack_grant">Rakenduse %1$s superkasutaja õigused on antud</string>
-    <string name="su_snack_deny">Rakenduse %1$s superkasutaja õigused on keelatud</string>
-    <string name="su_snack_notif_on">Rakenduse %1$s teated on lubatud</string>
-    <string name="su_snack_notif_off">Rakenduse %1$s teated on keelatud</string>
-    <string name="su_snack_log_on">Rakenduse %1$s logimine on lubatud</string>
-    <string name="su_snack_log_off">Rakenduse %1$s logimine on keelatud</string>
+    <string name="su_snack_grant">Superkasutaja õigused antud rakendusele %1$s</string>
+    <string name="su_snack_deny">Superkasutaja õigused keelatud rakendusele %1$s</string>
+    <string name="su_snack_notif_on">Teated lubatud rakendusele %1$s</string>
+    <string name="su_snack_notif_off">Teated keelatud rakendusele %1$s</string>
+    <string name="su_snack_log_on">Logimine lubatud rakendusele %1$s</string>
+    <string name="su_snack_log_off">Logimine keelatud rakendusele %1$s</string>
     <string name="su_snack_revoke">Rakenduse %1$s õigused on eemaldatud</string>
     <string name="su_revoke_title">Eemaldad?</string>
     <string name="su_revoke_msg">Kinnitad rakenduse %1$s õiguste eemaldamise?</string>
     <string name="toast">Hüpik</string>
     <string name="none">Puudub</string>
+    <string name="auth_fail">Autentimine ebaõnnestus</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\\u0020</string>

src/main/res/values-fr/strings.xml

@@ -1,46 +1,60 @@
 <resources>
+	<!--Universal-->
+
     <!--Welcome Activity-->
     <string name="modules">Modules</string>
     <string name="downloads">Téléchargements</string>
-    <string name="superuser">Superuser</string>
+    <string name="superuser">Superutilisateur</string>
     <string name="log">Journal</string>
     <string name="settings">Paramètres</string>
     <string name="install">Installer</string>
+
     <!--Status Fragment-->
-    <string name="magisk_version_error">Magisk non installé</string>
-    <string name="checking_for_updates">Vérification de mises à jour…</string>
+    <string name="magisk_version_error">Magisk n\'est pas installé</string>
+    <string name="checking_for_updates">Vérification des mises à jours…</string>
     <string name="magisk_update_available">Magisk v%1$s disponible !</string>
     <string name="invalid_update_channel">Canal de mise à jour invalide</string>
     <string name="safetyNet_check_text">Appuyer pour lancer le contrôle SafetyNet</string>
-    <string name="checking_safetyNet_status">Vérification de l\'état de SafetyNet…</string>
+    <string name="checking_safetyNet_status">Vérification de l\'état SafetyNet…</string>
     <string name="safetyNet_check_success">Contrôle SafetyNet passé avec succès</string>
     <string name="safetyNet_api_error">Erreur d\'API SafetyNet</string>
     <string name="safetyNet_network_loss">Connexion réseau indisponible</string>
     <string name="safetyNet_service_disconnected">Le service a été tué</string>
     <string name="safetyNet_res_invalid">La réponse est invalide</string>
+
     <!--Install Fragment-->
     <string name="advanced_settings_title">Paramètres avancés</string>
     <string name="keep_force_encryption">Garder le chiffrement forcé</string>
     <string name="keep_dm_verity">Garder AVB 2.0/dm-verity</string>
     <string name="current_magisk_title">Version installée : %1$s</string>
-    <string name="install_magisk_title">Dernière Magisk : %1$s</string>
+    <string name="install_magisk_title">Dernière version : %1$s</string>
     <string name="uninstall">Désinstaller</string>
     <string name="uninstall_magisk_title">Désinstaller Magisk</string>
 	<string name="uninstall_magisk_msg">Tous les modules seront désactivés/effacés. Le root sera enlevé et vos données seront potentiellement chiffrées si elles ne le sont pas actuellement</string>
 	<string name="update">Mise à jour %1$s</string>
+
     <!--Module Fragment-->
     <string name="no_info_provided">(Aucune information transmise)</string>
     <string name="no_modules_found">Aucun module trouvé</string>
     <string name="update_file_created">Le module va être mis à jour au prochain redémarrage</string>
     <string name="remove_file_created">Le module va être supprimé au prochain redémarrage</string>
-    <string name="remove_file_deleted">Le module ne va pas être supprimé au prochain redémarrage</string>
+    <string name="remove_file_deleted">Le module ne sera pas supprimé au prochain redémarrage</string>
     <string name="disable_file_created">Le module va être désactivé au prochain redémarrage</string>
     <string name="disable_file_removed">Le module va être activé au prochain redémarrage</string>
     <string name="author">Créé par %1$s</string>
+    <string name="reboot_recovery">Redémarrer en récupération</string>
+    <string name="reboot_bootloader">Redémarrer en chargement d\'image système</string>
+    <string name="reboot_download">Redémarrer en mode téléchargement</string>
+
     <!--Repo Fragment-->
     <string name="update_available">Mise à jour disponible</string>
     <string name="installed">Installé</string>
     <string name="not_installed">Non installé</string>
+    <string name="updated_on">Mis à jour le: %1$s</string>
+    <string name="sorting_order">Mode de tri</string>
+    <string name="sort_by_name">Trier par nom</string>
+    <string name="sort_by_update">Trier par dernière mise à jour</string>
+
     <!--Log Fragment-->
     <string name="menuSaveLog">Enregistrer journal</string>
     <string name="menuReload">Actualiser</string>
@@ -48,17 +62,19 @@
     <string name="logs_cleared">Journal effacé avec succès</string>
     <string name="log_is_empty">Journal vide</string>
     <string name="logs_save_failed">Impossible d\'écrire le journal sur la carte SD:</string>
+
     <!--About Activity-->
     <string name="about">À propos</string>
-    <string name="app_changelog">Modifications de l\'application</string>
-    <string name="translators">Primokorn, Naboleo, tonymanou</string>
-    <string name="app_version">Version de l\'application</string>
+    <string name="app_changelog">Journal</string>
+    <string name="translators"></string>
+    <string name="app_version">Version</string>
     <string name="app_source_code">Code source</string>
     <string name="donation">Dons</string>
     <string name="app_translators">Traducteurs de l\'application</string>
-    <string name="support_thread">Fil de discussion pour support</string>
+    <string name="support_thread">Fil d\'assistance</string>
+
     <!--Toasts, Dialogs-->
-    <string name="permissionNotGranted">Cette fonctionnalité ne marchera pas sans la permission d\'écriture sur le stockage externe.</string>
+    <string name="permissionNotGranted">Cette fonctionnalité ne fonctionnera pas sans la permission d\'écriture sur le stockage externe.</string>
     <string name="no_thanks">Non merci</string>
     <string name="yes">Oui</string>
     <string name="ok">OK</string>
@@ -68,42 +84,45 @@
     <string name="download">Télécharger</string>
     <string name="download_file_error">Erreur de téléchargement du fichier</string>
     <string name="reboot">Redémarrer</string>
-    <string name="zip_process_msg">Exécution du fichier zip…</string>
     <string name="downloading_toast">Téléchargement %1$s</string>
-    <string name="magisk_update_title">Nouvelle mise à jour de Magisk disponible !</string>
-    <string name="settings_reboot_toast">Redémarrer pour appliquer les changements</string>
+    <string name="magisk_update_title">Nouvelle mise à jour Magisk disponible!</string>
+    <string name="settings_reboot_toast">Redémarrer afin d\'appliquer les réglages</string>
     <string name="release_notes">Notes de version</string>
-    <string name="repo_cache_cleared">Cache du dépôt effacé</string>
-    <string name="safetyNet_hide_notice">Cette application utilise SafetyNet\nDéjà pris en charge par MagiskHide par défaut</string>
-    <string name="process_error">Erreur de traitement</string>
-    <string name="internal_storage">Le zip est stocké dans :\n[Stockage interne]%1$s</string>
-    <string name="zip_process_title">Traitement</string>
+    <string name="repo_cache_cleared">Cache du dépôt éffacé</string>
+    <string name="safetyNet_hide_notice">Cette application utilise SafetyNet\nDéjà masqué par MagiskHide par défaut</string>
+    <string name="process_error">Erreur du processus</string>
+    <string name="internal_storage">Le zip est enregistré dans:\n[Stockage Interne]%1$s</string>
     <string name="zip_download_title">Téléchargement</string>
-	<string name="zip_download_msg">Téléchargement du fichier zip (%1$d%%)…</string>
-	<string name="manager_update_title">Nouvelle mise à jour de Magisk Manager disponible !</string>
-	<string name="manager_download_install">Appuyez pour télécharger et installer</string>
-    <string name="dtbo_patched_title">DTBO a été patché !</string>
-    <string name="dtbo_patched_reboot">Magisk Manager a patché dtbo.img, veuillez redémarrer</string>
-	<string name="magisk_updates">Mises à jour Magisk</string>
-	<string name="flashing">Flashage en cours</string>
-	<string name="hide_manager_toast">Masquage de Magisk Manager…</string>
-	<string name="hide_manager_toast2">Cela peut prendre du temps…</string>
-	<string name="hide_manager_fail_toast">Échec du masquage de Magisk Manager…</string>
-	<string name="download_zip_only">Télécharger uniquement le zip</string>
-	<string name="patch_boot_file">Patcher le fichier image Boot</string>
-	<string name="direct_install">Installation directe (recommandée)</string>
-    <string name="install_second_slot">Intaller sur le second slot (après une OTA)</string>
-	<string name="select_method">Choisir une méthode</string>
-	<string name="no_boot_file_patch_support">La version cible de Magisk ne supporte pas la modification du fichier image Boot</string>
-    <string name="boot_file_patch_msg">Sélectionnez l\'image Boot stock au format .img ou .img.tar</string>
-	<string name="complete_uninstall">Désinstaller complètement</string>
-    <string name="restore_done">Restauration effectuée !</string>
-	<string name="restore_fail">Pas de sauvegarde stock disponible !</string>
-    <string name="uninstall_toast">Désinstallation de Magisk Manager dans 5 secondes, n\'oubliez pas de redémarrer par la suite</string>
-    <string name="proprietary_title">Télécharger le code propriétaire</string>
-    <string name="proprietary_notice">Magisk Manager est un logiciel FOSS et ne contient donc pas le code propriétaire de l\'API SafetyNet de Google. Autorisez-vous Magisk Manager à télécharger une extension (qui contient GoogleApiClient) afin de tester SafetyNet ?</string>
-    <string name="su_db_corrupt">La base de données SU est corrompue, création d\'une nouvelle base de données prévue</string>
-    <!--Settings Activity -->
+    <string name="zip_download_msg">Téléchargement du fichier zip (%1$d%%) …</string>
+    <string name="zip_process_title">Traitement en cours</string>
+    <string name="zip_process_msg">Traitement du fichier zip…</string>
+    <string name="manager_update_title">Nouvelle mise à jour du Gestionnaire Magisk disponible!</string>
+    <string name="manager_download_install">Appuyer pour télécharger et installer</string>
+    <string name="dtbo_patched_title">DTBO a été patché!</string>
+    <string name="dtbo_patched_reboot">Le Gestionnaire Magisk vient de patcher dtbo.img, merci de redémarrer</string>
+    <string name="magisk_updates">Mises à jour Magisk</string>
+    <string name="flashing">Flashage</string>
+    <string name="hide_manager_toast">Masquage du Gestionnaire Magisk...</string>
+    <string name="hide_manager_toast2">Cela pourrait prendre un certain temps...</string>
+    <string name="hide_manager_fail_toast">Masquage du Gestionnaire Magisk échoué…</string>
+    <string name="download_zip_only">Uniquement télécharger le zip</string>
+    <string name="patch_boot_file">Patch Fichier Image Démarrage</string>
+    <string name="direct_install">Installation directe (Recommandé)</string>
+    <string name="install_second_slot">Installer dans le second Slot (Après OTA)</string>
+    <string name="select_method">Sélectionner la méthode</string>
+    <string name="no_boot_file_patch_support">La version cible de Magisk ne prend pas en charge la correction de fichier image de démarrage</string>
+    <string name="boot_file_patch_msg">Sélectionnez l\'image de démarrage par défaut stockée au format .img ou .img.tar</string>
+    <string name="complete_uninstall">Désinstallation terminée</string>
+    <string name="restore_img">Restauration des images</string>
+    <string name="uninstall_app">Désinstallation de l\'application</string>
+    <string name="restore_done">Restauration terminée!</string>
+    <string name="restore_fail">Le sauvegarde par défaut n\'existe pas!</string>
+    <string name="uninstall_toast">Désinstallation du Gestionnaire Magisk dans 5 secondes, merci de redémarrer manuellement par la suite</string>
+    <string name="proprietary_title">Télécharger Code Propriétaire</string>
+    <string name="proprietary_notice">Magisk Manager est Libre, il ne contient pas le code API SafetyNet propriétaire de Google. \ N \ nAutorisez vous le Gestionnaire Magisk à télécharger une extension (contenant GoogleApiClient) pour les contrôles SafetyNet?</string>
+    <string name = "su_db_corrupt"> La base de données SU est corrompue, une nouvelle base de donnée va être re-créée</string>
+    
+<!--Settings Activity -->
     <string name="settings_general_category">Général</string>
     <string name="settings_dark_theme_title">Thème sombre</string>
     <string name="settings_dark_theme_summary">Activer le thème sombre</string>
@@ -111,11 +130,28 @@
     <string name="settings_notification_summary">Afficher des notifications de mises à jour quand une nouvelle version est disponible</string>
     <string name="settings_clear_cache_title">Effacer le cache du dépôt</string>
     <string name="settings_clear_cache_summary">Effacer les informations en cache des dépôts distants, pour forcer une actualisation de l\'application</string>
+    <string name="settings_hide_manager_title">Masquer le Gestionnaire Magisk</string>
+    <string name="settings_hide_manager_summary">Reconstruire le Gestionnaire Magisk avec un nom de paquet aléatoire</string>
+    <string name="settings_restore_manager_title">Restaurer le Gestionnaire Magisk</string>
+    <string name="settings_restore_manager_summary">Restaurer le Gestionnaire Magisk avec le paquet originel</string>
+    <string name="language">Language</string>
+    <string name="system_default">(Système par Défaut)</string>
+    <string name="settings_update">Mise à jour des réglages</string>
+    <string name="settings_check_update_title">Vérification des mises à jour</string>
+    <string name="settings_check_update_summary">Vérifier l\'existence de mises à jour en tâche de fond de façon périodique</string>
+    <string name="settings_update_channel_title">Mise à jour du canal</string>
+    <string name="settings_update_stable">Stable</string>
+    <string name="settings_update_beta">Béta</string>
+    <string name="settings_update_custom">Personalisé</string>
+    <string name="settings_update_custom_msg">Insérer une URL personalisée</string>
+    <string name="settings_boot_format_title">Patcher Format Fichier Démarrage</string>
+    <string name="settings_boot_format_summary">Sélectioner le format de sortie de l\'image de boot.\nChoisir .img pour flasher à traver le mode démarrage rapide/téléchargement; choisir .img.tar pour flasher via ODIN.</string>
     <string name="settings_core_only_title">Mode Magisk Core uniquement</string>
     <string name="settings_core_only_summary">Activer uniquement les fonctionnalités de base, tous les modules ne seront pas chargés. MagiskSU, MagiskHide et les hosts systemless restent activés</string>
     <string name="settings_magiskhide_summary">Masquer Magisk de diverses détections</string>
     <string name="settings_hosts_title">Hosts systemless</string>
     <string name="settings_hosts_summary">Support hosts systemless pour les applications type Adblock</string>
+
     <string name="settings_su_app_adb">Applications et ADB</string>
     <string name="settings_su_app">Applications uniquement</string>
     <string name="settings_su_adb">ADB uniquement</string>
@@ -124,69 +160,67 @@
     <string name="settings_su_request_20">20 secondes</string>
     <string name="settings_su_request_30">30 secondes</string>
     <string name="settings_su_request_60">60 secondes</string>
-    <string name="superuser_access">Accès Superuser</string>
+    <string name="superuser_access">Accès Superulisateur</string>
     <string name="auto_response">Réponse automatique</string>
     <string name="request_timeout">Délai de requête</string>
-    <string name="superuser_notification">Notification Superuser</string>
+    <string name="superuser_notification">Notification Superutilisateur</string>
     <string name="request_timeout_summary">%1$s secondes</string>
-    <string name="settings_hide_manager_title">Masquer Magisk Manager</string>
-    <string name="settings_hide_manager_summary">Reconstruire Magisk Manager avec un nom de paquet aléatoire</string>
-    <string name="language">Langue</string>
-	<string name="system_default">(Selon système)</string>
-	<string name="settings_update">Paramètres de mises à jour</string>
-	<string name="settings_update_channel_title">Canal de mise à jour</string>
-	<string name="settings_update_stable">Stable</string>
-	<string name="settings_update_beta">Beta</string>
-	<string name="settings_update_custom">Personnaliser</string>
-	<string name="settings_update_custom_msg">Insérer une URL personnalisée</string>
-	<string name="settings_boot_format_title">Format de sortie du boot patché</string>
-	<string name="settings_boot_format_summary">Sélectionner le format de l\'image boot patchée finale.\nChoisir .img pour flasher via fastboot/mode download ; choisir .img.tar pour flasher via ODIN.</string>
-	<string name="settings_su_reauth_title">Ré-authentifier après mise à jour</string>
-	<string name="settings_su_reauth_summary">Ré-authentifier les permissions superuser après les mises à jour d\'une application</string>
-	<string name="multiuser_mode">Mode multi-utilisateurs</string>
-	<string name="settings_owner_only">Appareil du propriétaire uniquement</string>
-	<string name="settings_owner_manage">Appareil du propriétaire géré</string>
-	<string name="settings_user_independent">Utilisateur indépendant</string>
-	<string name="owner_only_summary">Seul le propriétaire a l\'accès root</string>
-	<string name="owner_manage_summary">Seul le propriétaire peut gérer les accès root et recevoir des demandes de permissions</string>
-	<string name="user_indepenent_summary">Chaque utilisateur dispose de ses propres règles root</string>
-	<string name="multiuser_hint_owner_request">Une requête a été envoyée au propriétaire de l\'appareil. Veuillez basculer sur le profil du propriétaire et accorder la permission</string>
-	<string name="mount_namespace_mode">Monter le mode espace de noms</string>
-	<string name="settings_ns_global">Espace de noms global</string>
-	<string name="settings_ns_requester">Hériter de l\'espace de noms</string>
-	<string name="settings_ns_isolate">Espace de noms isolé</string>
-	<string name="global_summary">Toutes les sessions root utilisent l\'espace de noms global monté</string>
-	<string name="requester_summary">Les sessions root hériteront des espaces de noms du demandeur</string>
-	<string name="isolate_summary">Chaque session root aura son propre espace de noms isolé</string>
-    <!--Superuser-->
-    <string name="su_request_title">Requête Superuser</string>
+    <string name="settings_su_reauth_title">Ré-authentifier après la mise à niveau</string>
+    <string name="settings_su_reauth_summary">Réauthentifier les autorisations de superutilisateur après une mise à niveau d\'application</string>
+    <string name="settings_su_fingerprint_title">Activer l\'authentification par empreinte digitale</string>
+    <string name="settings_su_fingerprint_summary">Utiliser un scanner d\'empreintes digitales pour autoriser les demandes superutilisateur</string>
+
+    <string name="multiuser_mode">Mode Multi-utilisateurs</string>
+    <string name="settings_owner_only">Propriétaire de l\'appareil uniquement</string>
+    <string name="settings_owner_manage">Propriétaire de l\'appareil géré</string>
+    <string name="settings_user_independent">Utilisateur indépendant</string>
+    <string name="owner_only_summary">Seul le propriétaire a un accès root</string>
+    <string name="owner_manage_summary">Seul le propriétaire peut gérer l\'accès root et recevoir des demandes de requêtes</string>
+    <string name="user_indepenent_summary">Chaque utilisateur a ses propres règles de root séparées</string>
+    <string name="multiuser_hint_owner_request">Une requête a été envoyée au propriétaire du périphérique. Merci de basculer en propriétaire et d\'accepter les permissions requises</string>
+
+    <string name="mount_namespace_mode">Mode Montage Espace de Noms</string>
+    <string name="settings_ns_global">Espace de Nom Global</string>
+    <string name="settings_ns_requester">Hériter de l\'espace de noms</string>
+    <string name="settings_ns_isolate">Espace de noms isolé</string>
+    <string name="global_summary">Toutes les sessions racines utilisent l\'espace de noms de montage global</string>
+    <string name="requester_summary">Les sessions racines hériteront de l\'espace de noms de son demandeur</string>
+    <string name="isolate_summary">Chaque session racine aura son propre espace de noms isolé</string>
+    <string name="android_o_not_support">Android 8.0+ n\'est pas supporté</string>
+    <string name="disable_fingerprint">Aucune empreinte digitale n\'a été définie ou aucun support de périphérique</string>
+
+<!--Superuser-->
+    <string name="su_request_title">Requête Superutilisateur</string>
     <string name="deny_with_str">Refuser%1$s</string>
     <string name="deny">Refuser</string>
     <string name="prompt">Demander</string>
     <string name="grant">Accepter</string>
-    <string name="su_warning">Accepter un accès complet à votre appareil.\nRefuser si vous n\'êtes pas sûr!</string>
+    <string name="su_warning">Accepter un accès complet à votre appareil.\nRefuser si vous n\'êtes pas sûr !</string>
     <string name="forever">Toujours</string>
     <string name="once">Une fois</string>
     <string name="tenmin">10 min</string>
     <string name="twentymin">20 min</string>
     <string name="thirtymin">30 min</string>
     <string name="sixtymin">60 min</string>
-    <string name="su_allow_toast">%1$s a obtenu les droits Superuser</string>
-    <string name="su_deny_toast">%1$s n\'a pas obtenu les droits Superuser</string>
-    <string name="no_apps_found">Aucun application trouvée</string>
-    <string name="su_snack_grant">Les droits Superuser de %1$s sont accordés</string>
-    <string name="su_snack_deny">Les droits Superuser de %1$s sont refusés</string>
+    <string name="su_allow_toast">%1$s a obtenu les droits Superutilisateur</string>
+    <string name="su_deny_toast">%1$s n\'a pas obtenu les droits Superutilisateur</string>
+    <string name="no_apps_found">Aucune application trouvée</string>
+    <string name="su_snack_grant">Les droits Superutilisateur de %1$s sont accordés</string>
+    <string name="su_snack_deny">Les droits Superutilisateur de %1$s sont refusés</string>
     <string name="su_snack_notif_on">Les notifications pour %1$s sont activées</string>
     <string name="su_snack_notif_off">Les notifications pour %1$s sont désactivées</string>
     <string name="su_snack_log_on">La journalisation pour %1$s est activée</string>
     <string name="su_snack_log_off">La journalisation pour %1$s est désactivée</string>
     <string name="su_snack_revoke">Les droits de %1$s sont annulés</string>
     <string name="su_revoke_title">Annuler ?</string>
-    <string name="su_revoke_msg">Vous confirmez l\'annulation des droits pour %1$s ?</string>
+    <string name="su_revoke_msg">Confirmez-vous l\'annulation des droits pour %1$s ?</string>
     <string name="toast">Toast</string>
     <string name="none">Aucun</string>
+	<string name="auth_fail">Authentication Échouée</string>
+
     <!--Superuser logs-->
     <string name="pid">PID :\u0020</string>
     <string name="target_uid">UID cible :\\u0020</string>
     <string name="command">Commande :\u0020</string>
+
 </resources>

src/main/res/values-hr/strings.xml

@@ -30,7 +30,7 @@
     <string name="install_magisk_title">Najnovija inačica: %1$s</string>
     <string name="uninstall">Deinstaliraj</string>
     <string name="uninstall_magisk_title">Deinstaliraj Magisk</string>
-    <string name="uninstall_magisk_msg">Svi moduli će biti onemogućeni/uklonjeni. Root će biti uklonjen i potencijalno šifrirati vaše podatke, ukoliko vaši podaci trenutačno nisu šifrirani</string>
+    <string name="uninstall_magisk_msg">Svi moduli će biti onemogućeni/uklonjeni. Root će biti uklonjen i potencijalno šifrirati Vaše podatke, ukoliko Vaši podaci trenutačno nisu šifrirani</string>
     <string name="update">Ažuriraj %1$s</string>
 
     <!--Module Fragment-->
@@ -54,7 +54,7 @@
     <string name="menuClearLog">Očisti zapisnik sada</string>
     <string name="logs_cleared">Zapisnik je uspješno izbrisan</string>
     <string name="log_is_empty">Zapisnik je prazan</string>
-    <string name="logs_save_failed">Nije moguće napisati zapisnik na SD karticu:</string>
+    <string name="logs_save_failed">Nije moguće spremiti zapisnik na SD karticu:</string>
 
     <!--About Activity-->
     <string name="about">O aplikaciji</string>
@@ -73,7 +73,7 @@
     <string name="ok">OK</string>
     <string name="close">Zatvori</string>
     <string name="repo_install_title">Instaliraj %1$s</string>
-    <string name="repo_install_msg">Da li želiš instalirati %1$s sada?</string>
+    <string name="repo_install_msg">Da li želite instalirati %1$s sada?</string>
     <string name="download">Preuzmi</string>
     <string name="download_file_error">Pogreška prilikom preuzimanja datoteke</string>
     <string name="reboot">Ponovno podizanje sustava</string>
@@ -134,7 +134,7 @@
     <string name="settings_hosts_title">Systemless hostovi</string>
     <string name="settings_hosts_summary">Systemless hostovi podržavaju Adblock aplikacije</string>
 
-    <string name="settings_su_app_adb">Aplikacije and ADB</string>
+    <string name="settings_su_app_adb">Aplikacije i ADB</string>
     <string name="settings_su_app">Samo aplikacije</string>
     <string name="settings_su_adb">Samo ADB</string>
     <string name="settings_su_disable">Onemogućeno</string>
@@ -161,10 +161,10 @@
 
     <string name="mount_namespace_mode">Postavljanje imenskog prostora</string>
     <string name="settings_ns_global">Globalni imenski prostor</string>
-    <string name="settings_ns_requester">Naslijedit imenski prostor</string>
+    <string name="settings_ns_requester">Naslijediti imenski prostor</string>
     <string name="settings_ns_isolate">Izolirani imenski prostor</string>
     <string name="global_summary">Sve root sesije koriste globalni imenski prostor</string>
-    <string name="requester_summary">Root sesije će nasljediti imenski prostor tražitelja</string>
+    <string name="requester_summary">Root sesije će naslijediti imenski prostor tražitelja</string>
     <string name="isolate_summary">Svaka root sesija ima svoj vlastiti imenski prostor</string>
 
     <!--Superuser-->
@@ -173,7 +173,7 @@
     <string name="deny">Odbij</string>
     <string name="prompt">Upitaj</string>
     <string name="grant">Odobri</string>
-    <string name="su_warning">Omogućuje potpuni pristup vašem uređaju.\nOdbijte ako niste sigurni!</string>
+    <string name="su_warning">Omogućuje potpuni pristup Vašem uređaju.\nOdbijte ako niste sigurni!</string>
     <string name="forever">Zauvijek</string>
     <string name="once">Jednom</string>
     <string name="tenmin">10 min</string>

src/main/res/values-in/strings.xml

@@ -24,8 +24,8 @@
 
     <!--Install Fragment-->
     <string name="advanced_settings_title">Pengaturan Lanjutan</string>
-    <string name="keep_force_encryption">Biarkan enkripsi paksa</string>
-    <string name="keep_dm_verity">Biarkan AVB 2.0/dm-verity</string>
+    <string name="keep_force_encryption">Pertahankan enkripsi paksa</string>
+    <string name="keep_dm_verity">Pertahankan AVB 2.0/dm-verity</string>
     <string name="current_magisk_title">Versi yang Terpasang: %1$s</string>
     <string name="install_magisk_title">Versi Terbaru: %1$s</string>
     <string name="uninstall">Copot</string>
@@ -42,11 +42,18 @@
     <string name="disable_file_created">Modul akan dinonaktifkan pada reboot berikutnya</string>
     <string name="disable_file_removed">Modul akan diaktifkan pada reboot berikutnya</string>
     <string name="author">Dibuat oleh %1$s</string>
+    <string name="reboot_recovery">Reboot ke Recovery</string>
+    <string name="reboot_bootloader">Reboot ke Bootloader</string>
+    <string name="reboot_download">Reboot ke Download</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Pembaruan Tersedia</string>
     <string name="installed">Terpasang</string>
     <string name="not_installed">Tidak Terpasang</string>
+    <string name="updated_on">Diperbarui pada: %1$s</string>
+    <string name="sorting_order">Urutkan Susunan</string>
+    <string name="sort_by_name">Urut berdasarkan nama</string>
+    <string name="sort_by_update">Urut berdasarkan pembaruan terakhir</string>
 
     <!--Log Fragment-->
     <string name="menuSaveLog">Simpan log</string>
@@ -58,12 +65,12 @@
 
     <!--About Activity-->
     <string name="about">Tentang</string>
-    <string name="app_changelog">Log pembaruan apl</string>
+    <string name="app_changelog">Log pembaruan</string>
     <string name="translators"><![CDATA[<a href="https://github.com/krasCGQ">Albert I (krasCGQ)</a>]]></string>
-    <string name="app_version">Versi apl</string>
+    <string name="app_version">Versi</string>
     <string name="app_source_code">Kode sumber</string>
     <string name="donation">Donasi</string>
-    <string name="app_translators">Penerjemah apl</string>
+    <string name="app_translators">Penerjemah</string>
     <string name="support_thread">Thread dukungan</string>
 
     <!--Toasts, Dialogs-->
@@ -100,17 +107,19 @@
     <string name="hide_manager_fail_toast">Kesalahan menyembunyikan Magisk Manager…</string>
     <string name="download_zip_only">Unduh Zip Saja</string>
     <string name="patch_boot_file">Tambal File Boot Image</string>
-    <string name="direct_install">Pasang Langsung (Rekomendasikan)</string>
+    <string name="direct_install">Pasang Langsung (Direkomendasikan)</string>
     <string name="install_second_slot">Pasang ke Slot Kedua (Setelah OTA)</string>
     <string name="select_method">Pilih Metode</string>
     <string name="no_boot_file_patch_support">Versi target Magisk tidak mendukung penambalan file boot image</string>
     <string name="boot_file_patch_msg">Pilih stock boot image dump dalam format .img atau .img.tar</string>
+    <string name="restore_img">Pulihkan Image</string>
+    <string name="uninstall_app">Copot Apl</string>
     <string name="complete_uninstall">Copot Total</string>
     <string name="restore_done">Pemulihan selesai!</string>
     <string name="restore_fail">Cadangan stock tidak ada!</string>
     <string name="uninstall_toast">Mencopot Magisk Manager dalam 5 detik, silahkan reboot secara manual setelahnya</string>
     <string name="proprietary_title">Unduh Kode Proprieter</string>
-    <string name="proprietary_notice">Magisk Manager adalah aplikasi FOSS sehingga tidak menyertakan kode API proprieter Google SafetyNet.\n\nApakah Anda mengizinkan Magisk Manager untuk mengunduh sebuah ekstensi (berisi GoogleApiClient) untuk pemeriksaan SafetyNet?</string>
+    <string name="proprietary_notice">Magisk Manager adalah aplikasi FOSS, yang tidak menyertakan kode API proprieter Google SafetyNet.\n\nApakah Anda mengizinkan Magisk Manager untuk mengunduh sebuah ekstensi (berisi GoogleApiClient) untuk pemeriksaan SafetyNet?</string>
     <string name="su_db_corrupt">Database SU rusak, akan membuat db baru</string>
 
     <!--Settings Activity -->
@@ -123,6 +132,8 @@
     <string name="settings_clear_cache_summary">Bersihkan informasi ter-cache untuk repo online, memaksa apl untuk menyegarkan online</string>
     <string name="settings_hide_manager_title">Sembunyikan Magisk Manager</string>
     <string name="settings_hide_manager_summary">Pak ulang Magisk Manager dengan nama paket acak</string>
+    <string name="settings_restore_manager_title">Pulihkan Magisk Manager</string>
+    <string name="settings_restore_manager_summary">Pulihkan Magisk Manager dengan paket asli</string>
     <string name="language">Bahasa</string>
     <string name="system_default">(Default Sistem)</string>
     <string name="settings_update">Pengaturan Pembaruan</string>
@@ -134,7 +145,7 @@
     <string name="settings_boot_format_title">Format Keluaran Boot yang Ditambal</string>
     <string name="settings_boot_format_summary">Pilih format keluaran boot image yang ditambal.\nPilih .img untuk flash melalui mode recovery/download; pilih .img.tar untuk flash melalui ODIN.</string>
     <string name="settings_core_only_title">Magisk Mode Inti Saja</string>
-    <string name="settings_core_only_summary">Aktifkan fitur inti saja, semua modul tidak akan dimuat. MagiskSU, MagiskHide, dan host tanpa sistem akan tetap diaktifkan</string>
+    <string name="settings_core_only_summary">Aktifkan fitur inti saja. MagiskSU, MagiskHide, dan host tanpa sistem akan tetap diaktifkan</string>
     <string name="settings_magiskhide_summary">Sembunyikan Magisk dari berbagai pendeteksian</string>
     <string name="settings_hosts_title">Host tanpa sistem</string>
     <string name="settings_hosts_summary">Dukungan host tanpa sistem untuk apl pemblokir iklan</string>
@@ -154,6 +165,8 @@
     <string name="request_timeout_summary">%1$s detik</string>
     <string name="settings_su_reauth_title">Otentikasi ulang setelah pembaruan</string>
     <string name="settings_su_reauth_summary">Otentikasi ulang izin superuser setelah pembaruan sebuah aplikasi</string>
+    <string name="settings_su_fingerprint_title">Aktifkan Otentikasi Sidik Jari</string>
+    <string name="settings_su_fingerprint_summary">Gunakan pemindai sidik jari untuk mengizinkan permintaan superuser</string>
 
     <string name="multiuser_mode">Mode Multipengguna</string>
     <string name="settings_owner_only">Pemilik Perangkat Saja</string>
@@ -162,7 +175,7 @@
     <string name="owner_only_summary">Hanya pemilik yang memiliki akses root</string>
     <string name="owner_manage_summary">Hanya pemilik yang dapat mengelola akses root dan menerima permintaan</string>
     <string name="user_indepenent_summary">Setiap pengguna memiliki aturan root tersendiri</string>
-    <string name="multiuser_hint_owner_request">Permintaan telah dikirim kepada pemilik perangkat. Silakan beralih ke pemilik dan berikan izin</string>
+    <string name="multiuser_hint_owner_request">Permintaan telah dikirim kepada pemilik perangkat. Silakan beralih ke pemilik dan berikan izin yang diperlukan</string>
 
     <string name="mount_namespace_mode">Mode Mount Ruang Nama</string>
     <string name="settings_ns_global">Ruang Nama Global</string>
@@ -171,6 +184,8 @@
     <string name="global_summary">Semua sesi root menggunakan mount ruang nama global</string>
     <string name="requester_summary">Sesi root akan mewarisi ruang nama pemintanya</string>
     <string name="isolate_summary">Setiap sesi root akan memiliki ruang nama tersendiri</string>
+    <string name="android_o_not_support">Tidak mendukung Android 8.0+</string>
+    <string name="disable_fingerprint">Tidak ada sidik jari diatur atau tidak ada dukungan perangkat</string>
 
     <!--Superuser-->
     <string name="su_request_title">Permintaan Superuser</string>
@@ -199,6 +214,7 @@
     <string name="su_revoke_msg">Konfirmasi untuk mencabut akses %1$s?</string>
     <string name="toast">Toast</string>
     <string name="none">Tidak ada</string>
+    <string name="auth_fail">Otentikasi Gagal</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

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

@@ -132,9 +132,13 @@
 	<string name="settings_clear_cache_summary">Svuota la cache delle repository e forza l\'aggiornamento online dell\'app</string>
 	<string name="settings_hide_manager_title">Nascondi Magisk Manager</string>
 	<string name="settings_hide_manager_summary">Reinstalla Magisk Manager con un nome pacchetto casuale</string>
+	<string name="settings_restore_manager_title">Ripristina Magisk Manager</string>
+	<string name="settings_restore_manager_summary">Ripristina Magisk Manager con il nome pacchetto originale</string>
 	<string name="language">Lingua</string>
 	<string name="system_default">(Sistema)</string>
 	<string name="settings_update">Impostazioni aggiornamento</string>
+	<string name="settings_check_update_title">Controlla aggiornamenti</string>
+	<string name="settings_check_update_summary">Controlla automaticamente gli aggiornamenti in background</string>
 	<string name="settings_update_channel_title">Canale di aggiornamento</string>
 	<string name="settings_update_stable">Stabile</string>
 	<string name="settings_update_beta">Beta</string>
@@ -163,6 +167,8 @@
 	<string name="request_timeout_summary">%1$s secondi</string>
 	<string name="settings_su_reauth_title">Ri-autentica dopo aggiornamento</string>
 	<string name="settings_su_reauth_summary">Ri-autentica i permessi Superuser dopo un aggiornamento dell\'app</string>
+	<string name="settings_su_fingerprint_title">Abilita autenticazione impronta</string>
+	<string name="settings_su_fingerprint_summary">Utilizza il sensore di impronte per accettare le richieste Superuser</string>
 
 	<string name="multiuser_mode">Modalità multiutente</string>    
 	<string name="settings_owner_only">Solo proprietario del dispositivo</string>
@@ -181,6 +187,7 @@
 	<string name="requester_summary">Le sessioni di root erediteranno il namespace del loro richiedente</string>
 	<string name="isolate_summary">Ogni sessione di root avrà il suo namespace isolato</string>
 	<string name="android_o_not_support">Non è supportato da Android 8.0+</string>
+	<string name="disable_fingerprint">Non è presente alcuna impronta o il dispositivo non è supportato</string>
 	
 	<!--Superuser-->
 	<string name="su_request_title">Richiesta Superuser</string>
@@ -209,6 +216,7 @@
 	<string name="su_revoke_msg">Confermi la revoca dei diritti di %1$s?</string>
 	<string name="toast">Toast</string>
 	<string name="none">Nessuno</string>
+	<string name="auth_fail">Autenticatione fallita</string>
 	
 	<!--Superuser logs-->
 	<string name="pid">PID:\u0020</string>

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

@@ -163,6 +163,8 @@
     <string name="request_timeout_summary">%1$s秒</string>
     <string name="settings_su_reauth_title">アップグレード後の再認証</string>
     <string name="settings_su_reauth_summary">アプリのアップグレード後にスーパーユーザー権限を再認証します</string>
+    <string name="settings_su_fingerprint_title">指紋認証の有効化</string>
+    <string name="settings_su_fingerprint_summary">スーパーユーザー権限のリクエストの許可に指紋認証を使います</string>
 
     <string name="multiuser_mode">マルチユーザーモード</string>
     <string name="settings_owner_only">端末の管理者のみ</string>
@@ -206,9 +208,10 @@
     <string name="su_snack_log_off">%1$s のログは無効です</string>
     <string name="su_snack_revoke">%1$s の権限は取り消されました</string>
     <string name="su_revoke_title">確認</string>
-    <string name="su_revoke_msg">%1$s の権限を取り消すことを承認しますか？</string>
+    <string name="su_revoke_msg">%1$s の権限を取り消しますか？</string>
     <string name="toast">トースト通知</string>
     <string name="none">なし</string>
+    <string name="auth_fail">認証に失敗しました</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

src/main/res/values-lt/strings.xml

@@ -2,10 +2,10 @@
     <!--Universal-->
     
     <!--Welcome Activity-->
-    <string name="modules">Moduliai</string>
+    <string name="modules">Papildiniai</string>
     <string name="downloads">Atsisiuntimai</string>
-    <string name="superuser">Super Naudotojas</string>
-    <string name="log">Surašyti (Log)</string>
+    <string name="superuser">Supervartotojas</string>
+    <string name="log">Surašymai</string>
     <string name="settings">Nustatymai</string>
     <string name="install">Instaliuoti</string>
 
@@ -28,46 +28,51 @@
     <string name="keep_dm_verity">Palikti dm-verity</string>
     <string name="current_magisk_title">Instaliuota versija: %1$s</string>
     <string name="install_magisk_title">Naujausia versija: %1$s</string>
-    <string name="uninstall">Ištrinti</string>
-    <string name="uninstall_magisk_title">Ištrinti Magisk</string>
-    <string name="uninstall_magisk_msg">Visi moduliai bus išjungti/panaikinti. Roo bus panaikintas ir duomenys bus potencialiai užšifruoti, jeigu jie nėra užšifruoti.</string>
+    <string name="uninstall">Pašalinti</string>
+    <string name="uninstall_magisk_title">Pašalinti Magisk</string>
+    <string name="uninstall_magisk_msg">Visi papildiniai bus išjungti/pašalinti. Root bus panaikintas. Jei duomenys nėra užšifruoti, yra galimybė, kad jie taps užšifruotais..</string>
     <string name="update">Atnaujinti %1$s</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(Nėra informacijos)</string>
-    <string name="no_modules_found">Modulių nesurasta</string>
-    <string name="update_file_created">Perkrovus sistemą modulis bus atnaulintas</string>
-    <string name="remove_file_created">Perkrovus sistemą modulis bus panaikintas</string>
-    <string name="remove_file_deleted">Perkrovus sistemą modulis nebus panaikintas</string>
-    <string name="disable_file_created">Perkrovus sistemą modulis bus išjungtas, bet ne panaikintas</string>
-    <string name="disable_file_removed">Perkrovus sistemą modulis bus įjungtas</string>
+    <string name="no_modules_found">Papildinių nesurasta</string>
+    <string name="update_file_created">Perkrovus sistemą papildinys bus atnaujintas</string>
+    <string name="remove_file_created">Perkrovus sistemą papildinys bus panaikintas</string>
+    <string name="remove_file_deleted">Perkrovus sistemą papildinys nebus panaikintas</string>
+    <string name="disable_file_created">Perkrovus sistemą papildinys bus išjungtas, bet ne panaikintas</string>
+    <string name="disable_file_removed">Perkrovus sistemą papildinys bus įjungtas</string>
     <string name="author">Sukūrė %1$s</string>
     <string name="reboot_recovery">Perkrauti į Recovery</string>
     <string name="reboot_bootloader">Perkrauti į Bootloader</string>
-    <string name="reboot_download">Perkraukite, kad atsisiųstumėte</string>
+    <string name="reboot_download">Perkrauti į Download režimą</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Galimas atnaujinimas</string>
     <string name="installed">Instaliuota</string>
     <string name="not_installed">Ne instaliuota</string>
+    <string name="updated_on">Atnaujinta: %1$s</string>
+    <string name="sorting_order">Išdėliojimo tvarka</string>
+    <string name="sort_by_name">Išdėlioti pagal pavadinimą (A-Z)</string>
+    <string name="sort_by_update">Išdėlioti pagal atnaujinimo datą (Naujausi-Seniausi)</string>
     
     <!--Log Fragment-->
-    <string name="menuSaveLog">Išsauguti surašymus (log)</string>
+    <string name="menuSaveLog">Išsaugoti surašymus</string>
     <string name="menuReload">Iš naujo</string>
-    <string name="menuClearLog">Išvalyti surašymus (log)</string>
-    <string name="logs_cleared">Surašymas (log) sėkmingai užrašytas</string>
-    <string name="log_is_empty">Surašymas yra tuščias</string>
+    <string name="menuClearLog">Išvalyti surašymus</string>
+    <string name="logs_cleared">Surašymai pašalinti</string>
+    <string name="log_is_empty">Surašymų nėra</string>
     <string name="logs_save_failed">Nesugebėjome įrašyti surašymų į SD kortelę:</string>
 
     <!--About Activity-->
     <string name="about">Apie</string>
     <string name="app_changelog">Pakeitimų sąrašas</string>
-    <string name="translators" />Vv2233Bb
+    <string name="translators">Vv2233Bb</string>
     <string name="app_version">Versija</string>
-    <string name="app_source_code">Pagrindinis kodas</string>
-    <string name="donation">Auka</string>
+
+    <string name="app_source_code">Prisidėkite</string>
+    <string name="donation">Paaukoti</string>
     <string name="app_translators">Vertėjai</string>
-    <string name="support_thread">Paremti mūsų XDA puslapį</string>
+    <string name="support_thread">Mūsų XDA puslapis</string>
 
     <!--Toasts, Dialogs-->
     <string name="permissionNotGranted">Ši įpatybė neveiks be prieigos prie saugyklos.</string>
@@ -81,9 +86,9 @@
     <string name="download_file_error">Atsisiunčiant failą įvyko klaida</string>
     <string name="reboot">Perkrauti</string>
     <string name="downloading_toast">Atsisiunčiamas %1$s</string>
-    <string name="magisk_update_title">Naujas Magisk atnaujinimas egzistuoja!</string>
+    <string name="magisk_update_title">Atsirado nauja Magisk versija!</string>
     <string name="settings_reboot_toast">Nustatymų įgalinimui prašome perkrauti telefoną</string>
-    <string name="release_notes">Šios versijos naujos įpatybės</string>
+    <string name="release_notes">Pakeitimai</string>
     <string name="repo_cache_cleared">Repo failai išvalyti</string>
     <string name="safetyNet_hide_notice">Ši programėlė naudoja SafetyNet\nMagiskHide tai automatiškai sutvarko</string>
     <string name="process_error">Proceso klaida</string>
@@ -100,17 +105,17 @@
     <string name="flashing">Instaliuojama</string>
     <string name="hide_manager_toast">Magisk Manager paslėpiamas…</string>
     <string name="hide_manager_toast2">Tai užtruks sekundėlę…</string>
-    <string name="hide_manager_fail_toast">Magisk Manager paslėpimas nepavyko…</string>
+    <string name="hide_manager_fail_toast">Magisk Manager paslėpimas žlugo…</string>
     <string name="download_zip_only">Atsisiųsti zip failą</string>
-    <string name="patch_boot_file">Ištaisyti įsijungimo failą</string>
+    <string name="patch_boot_file">Ištaisyti boot failą</string>
     <string name="direct_install">Tiesioginis atsisiuntimas (Rekomenduojamas)</string>
     <string name="install_second_slot">Instaliuoti į antrą vietą (Po OTA)</string>
     <string name="select_method">Pasirinkite metodą</string>
-    <string name="no_boot_file_patch_support">Pasirinkta Magisk versija nepalaiko pakeitimų įjungimo faile.</string>
-    <string name="boot_file_patch_msg">Pasirinkti įsijungimo failą .img ar .img.tar formate.</string>
+    <string name="no_boot_file_patch_support">Pasirinkta Magisk versija nepalaiko pakeitimų boot faile.</string>    
+    <string name="boot_file_patch_msg">Pasirinkti boot failą .img ar .img.tar formate.</string>
     <string name="complete_uninstall">Pilnas pašalinimas</string>
-    <string name="restore_img">Atstatyti įsijungimo failą.</string>
-    <string name="uninstall_app">Ištrinti programėlę</string>
+    <string name="restore_img">Atstatyti boot failą.</string>
+    <string name="uninstall_app">Pašalinti programėlę</string>
     <string name="restore_done">Atstatymas įvykdytas!</string>
     <string name="restore_fail">Gamyklinis atstatymo failas neegzistuoja!</string>
     <string name="uninstall_toast">Magisk Manager bus pašalintas po 5 sekundžių, pašalinus perkraukite telefoną.</string>
@@ -124,25 +129,29 @@
     <string name="settings_dark_theme_summary">Įjungti tamsią temą</string>
     <string name="settings_notification_title">Pranešimai atsiradus atnaujinimui</string>
     <string name="settings_notification_summary">Parodyti pranešmus atsiradus naujai versijai</string>
-    <string name="settings_clear_cache_title">Išvalyti saugyklos nereikalingus failus</string>
-    <string name="settings_clear_cache_summary">Išvalyti patalpintą informaciją talpykloms internete, priverčia perkrauti inerneto jungtį</string>
+    <string name="settings_clear_cache_title">Išvalyti nereikalingus saugyklos failus</string>
+    <string name="settings_clear_cache_summary">Išvalyti patalpintą informaciją talpykloms internete, priverčia perkrauti interneto jungtį</string>
     <string name="settings_hide_manager_title">Paslėpti Magisk Manager</string>
     <string name="settings_hide_manager_summary">Perpakuoti Magisk Manager su atsitiktiniu pakuotės pavadinimu</string>
-    <string name="language">Kalbas</string>
+    <string name="settings_restore_manager_title">Grąžinti Magisk Manager</string>
+    <string name="settings_restore_manager_summary">Grąžinti Magisk Manager su orginalia pakuote</string>
+    <string name="language">Kalba</string>
     <string name="system_default">(Sistemos)</string>
     <string name="settings_update">Atnaujinimų nustatymai</string>
+    <string name="settings_check_update_title">Automatiškas atnaujinimų ieškojimas</string>
+    <string name="settings_check_update_summary">Automatiškai ieškoti Magisk ir Magisk Manager atnaujinimų.</string>
     <string name="settings_update_channel_title">Atnaujinimų tipai</string>
     <string name="settings_update_stable">Stabilūs</string>
-    <string name="settings_update_beta"> Esantys Beta versijoje</string>
+    <string name="settings_update_beta">Beta</string>
     <string name="settings_update_custom">Pasirinktiniai</string>
     <string name="settings_update_custom_msg">Įvesti pasirinktinį URL</string>
-    <string name="settings_boot_format_title">Įsijungimo failo formatas</string>
-    <string name="settings_boot_format_summary">Pasirinkite įsijungimo failo formatą.\nPasirinkite .img įdiegimui per fastboot/download; Pasirinkite .img.tar įdiegimui per ODIN.</string>
-    <string name="settings_core_only_title">Magisk Pagrindinis režimas</string>
-    <string name="settings_core_only_summary">Įgalinkite tik pagrindines funkcijas, visi moduliai bus išjungti. MagiskSU, MagiskHide, ir Sistemos pedejėjai liks įgalinti</string>
+    <string name="settings_boot_format_title">Boot failo formatas</string>
+    <string name="settings_boot_format_summary">Pasirinkti boot failo formatą.\n.img naudojamas įdiegimui per fastboot/download; .img.tar naudojamas įdiegimui per ODIN.</string>
+    <string name="settings_core_only_title">Pagrindinis Magisk režimas</string>
+    <string name="settings_core_only_summary">Įgalinti tik pagrindines funkcijos, išjungti visus papildinius. MagiskSU, Magisk Hide ir Sistemos pedejėjai liks įgalinti</string>
     <string name="settings_magiskhide_summary">Paslėpti Magisk nuo įvairių susekimų</string>
     <string name="settings_hosts_title">Sistemos padejėjai</string>
-    <string name="settings_hosts_summary">Sistemų padejėjų įgalinimas Adblock programėlėms</string>
+    <string name="settings_hosts_summary">Įgalinti sistemos padejėjus Adblock programėlėms</string>
 
     <string name="settings_su_app_adb">Programėlėms ir ADB</string>
     <string name="settings_su_app">Tik programėlėms</string>
@@ -154,11 +163,13 @@
     <string name="settings_su_request_60">60 sekundžių</string>
     <string name="superuser_access">Supervartotojo prieiga</string>
     <string name="auto_response">Automatinis atsakymas</string>
-    <string name="request_timeout">Prašymo laikas baigėsi</string>
+    <string name="request_timeout">Prašymo laikas baigiasi po</string>
     <string name="superuser_notification">Supervartotojo pranešimai</string>
     <string name="request_timeout_summary">%1$s sekundžių</string>
     <string name="settings_su_reauth_title">Pakartotinai patvirtinti po atnaujinimo</string>
-    <string name="settings_su_reauth_summary">Pakartotinai patvirtint supervartotojo leidimus po programėlės atnaujinimo</string>
+    <string name="settings_su_reauth_summary">Pakartotinai patvirtinti supervartotojo leidimus po programėlės atnaujinimo</string>
+    <string name="settings_su_fingerprint_title">Įgalinti patvirtinimą piršto antspaudu</string>
+    <string name="settings_su_fingerprint_summary">Naudoti piršto antspaudą supervartotojo leidimo prašymų atsakymui</string>
     
     <string name="multiuser_mode">Daugialypio vartotojo režimas</string>
     <string name="settings_owner_only">Tik įrenginio savininkas</string>
@@ -177,13 +188,14 @@
     <string name="requester_summary">Root sesijos paveldi jos išprašytojo/s vardų sritį</string>
     <string name="isolate_summary">Kiekviena root sesija turi savo izoliuotą vardų sritį</string>
     <string name="android_o_not_support">Negalima įrenginiams naudojantiems Android 8.0+</string>
+    <string name="disable_fingerprint">Jūsų įrenginyje nebuvo surasta pirštų antspaudų arba jūsų įrenginys neturi pirštų antspaudų skaitytuvo</string>
     
     <!--Superuser-->
     <string name="su_request_title">Supervartotojo prašymas</string>
     <string name="deny_with_str">Atmesti%1$s</string>
     <string name="deny">Atmesti</string>
     <string name="prompt">Klausti</string>
-    <string name="grant">Suteikti</string>
+    <string name="grant">Suteikti(a)</string>
     <string name="su_warning">Suteikia pilną prieigą prie jūsų įrenginio\nAtmeskite jei neesate tikri dėl programėlės šaltinio!</string>
     <string name="forever">Visados</string>
     <string name="once">Vieną kartą</string>
@@ -194,17 +206,18 @@
     <string name="su_allow_toast">%1$s gavo Supervartotojo teises</string>
     <string name="su_deny_toast">%1$s negavo Supervartotojo teisių</string>
     <string name="no_apps_found">Nėra surastų programėlių</string>
-    <string name="su_snack_grant">Supervartotojo teisių buvo %1$s suteikta</string>
-    <string name="su_snack_deny">Supervartotojo teisių buvo %1$s atmesta</string>
-    <string name="su_snack_notif_on">Buvo įjungta %1$s pranešimų</string>
-    <string name="su_snack_notif_off">Buvo išjungta %1$s pranešimų</string>
-    <string name="su_snack_log_on">%1$s surašymų buvo įjungta</string>
-    <string name="su_snack_log_off">%1$s surašymų buvo išjungta</string>
+    <string name="su_snack_grant">%1$s supervartotojo teisių prašymas buvo atsakytas teigiamai</string>
+    <string name="su_snack_deny">%1$s supervartotojo teisių prašymas buvo atmestas</string>
+    <string name="su_snack_notif_on">Buvo įjungta %1$s pranešimai</string>
+    <string name="su_snack_notif_off">Buvo išjungta %1$s pranešimai</string>
+    <string name="su_snack_log_on">%1$s veiksmų surašymas yra įgalintas</string>
+    <string name="su_snack_log_off">%1$s veiksmų surašymas yra išjungtas</string>
     <string name="su_snack_revoke">%1$s teisių atšaukta</string>
-    <string name="su_revoke_title">Atšaukti?</string>
-    <string name="su_revoke_msg">Atšaukti %1$s teisių?</string>
+    <string name="su_revoke_title">Neleisti?</string>
+    <string name="su_revoke_msg">Neleisti %1$s naudotis supervartotojo teisėmis?</string>
     <string name="toast">Išmesti</string>
     <string name="none">Nėra</string>
+    <string name="auth_fail">Patvirtinimas žlugo</string>
     
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

src/main/res/values-nl/strings.xml

@@ -50,6 +50,10 @@
     <string name="update_available">Update beschikbaar</string>
     <string name="installed">Geïnstalleerd</string>
     <string name="not_installed">Niet geïnstalleerd</string>
+    <string name="updated_on">Bijgewerkt op: %1$s</string>
+    <string name="sorting_order">Sorteervolgorde</string>
+    <string name="sort_by_name">Sorteren op naam</string>
+    <string name="sort_by_update">Sorteren op laatste update</string>
 
     <!--Log Fragment-->
     <string name="menuSaveLog">Opslaan log</string>
@@ -128,9 +132,13 @@
     <string name="settings_clear_cache_summary">Wis de gecachte informatie voor online opslagplaatsen. Dit dwingt de app om online te verversen</string>
     <string name="settings_hide_manager_title">Magisk Manager verbergen</string>
     <string name="settings_hide_manager_summary">Magisk Manager opnieuw inpakken met een willekeurige pakketnaam</string>
+    <string name="settings_restore_manager_title">Magisk Manager herstellen</string>
+    <string name="settings_restore_manager_summary">Magisk Manager met oorspronkelijk pakket herstellen</string>
     <string name="language">Taal</string>
     <string name="system_default">(Systeem standaard)</string>
     <string name="settings_update">Instellingen bijwerken</string>
+    <string name="settings_check_update_title">Updates controleren</string>
+    <string name="settings_check_update_summary">Periodiek op updates controleren in de achtergrond</string>
     <string name="settings_update_channel_title">Update-kanaal</string>
     <string name="settings_update_stable">Stabiel</string>
     <string name="settings_update_beta">Beta</string>
@@ -159,6 +167,8 @@
     <string name="request_timeout_summary">%1$s seconden</string>
     <string name="settings_su_reauth_title">Opnieuw verzoeken na bijwerken</string>
     <string name="settings_su_reauth_summary">Superuser rechten opnieuw opvragen na bijwerken applicatie</string>
+    <string name="settings_su_fingerprint_title">Vingerafdruk authenticatie inschakelen</string>
+    <string name="settings_su_fingerprint_summary">Vingerafdruk gebruiken om superuser verzoeken toe te staan</string>
     
     <string name="multiuser_mode">Multi-gebruiker modus</string>
     <string name="settings_owner_only">Alleen apparaateigenaar</string>
@@ -177,6 +187,7 @@
     <string name="requester_summary">Rootsessies verkrijgen de verzoeker\'s naamruimte</string>
     <string name="isolate_summary">Iedere rootsessie heeft een eigen geïsoleerde naamruimte</string>
     <string name="android_o_not_support">Ondersteunt geen Android 8.0+</string>
+    <string name="disable_fingerprint">Geen vingerafdrukken ingesteld, of geen apparaatondersteuning</string>
 
     <!--Superuser-->
     <string name="su_request_title">Superuser verzoek</string>
@@ -205,6 +216,7 @@
     <string name="su_revoke_msg">De rechten van %1$s intrekken?</string>
     <string name="toast">Toast</string>
     <string name="none">Geen</string>
+    <string name="auth_fail">Authenticatie mislukt</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

src/main/res/values-pl/strings.xml

@@ -135,10 +135,14 @@
     <string name="settings_clear_cache_summary">Wymusza na aplikacji odświeżenie online repozytorium</string>
     <string name="settings_hide_manager_title">Ukryj Magisk Manager</string>
     <string name="settings_hide_manager_summary">Przepakowanie Magisk Manager z losową nazwą pakietu</string>
-	<string name="language">Język</string>
+    <string name="settings_restore_manager_title">Przywróć Magisk Manager</string>
+    <string name="settings_restore_manager_summary">Przywróć oryginalną paczkę Magisk Manager</string>
+    <string name="language">Język</string>
     <string name="system_default">(Domyślny Systemu)</string>
     <string name="settings_update">Aktualizacja Ustawień</string>
-    <string name="settings_update_channel_title">Kanał Aktualizacji</string>
+        <string name="settings_check_update_title">Sprawdź Aktualizację</string>
+    <string name="settings_check_update_summary">Regularnie sprawdzaj aktualizacje w tle</string>
+	<string name="settings_update_channel_title">Kanał Aktualizacji</string>
     <string name="settings_update_stable">Stabilny</string>
     <string name="settings_update_beta">Beta</string>
     <string name="settings_update_custom">Własny</string>
@@ -166,8 +170,10 @@
     <string name="request_timeout_summary">%1$s sekund</string>
     <string name="settings_su_reauth_title">Ponowienie uwierzytelnienia po aktualizacji</string>
     <string name="settings_su_reauth_summary">Ponowne uwierzytelnianie uprawnienia superużytkownika po aktualizacji aplikacji</string>
+    <string name="settings_su_fingerprint_title">Włącz Uwierzytelnienie Odciskiem Palca</string>
+    <string name="settings_su_fingerprint_summary">Użyj skanera linii papilarnych, aby zezwolić na żądania supersu</string>
     
-    <string name="multiuser_mode">Tryb Multiusera</string>
+	<string name="multiuser_mode">Tryb Multiusera</string>
     <string name="settings_owner_only">Tylko Właściciel Urządzenia</string>
     <string name="settings_owner_manage">Zarządzanie Właścicielami Urządzenia</string>
     <string name="settings_user_independent">Niezależny Użytkownik</string>
@@ -184,6 +190,7 @@
     <string name="requester_summary">Sesje Root będzie dziedziczyć prośby i nazwy</string>
     <string name="isolate_summary">W każdej sesji root będzie miał własną odosobnioną nazwę</string>
     <string name="android_o_not_support">Brak wsparcia dla Androida 8.0+</string>
+	    <string name="disable_fingerprint">Nie ustawiono żadnych odcisków palców lub brak obsługi urządzenia</string>
 		
     <!--Superuser-->
     <string name="su_request_title">Prośba o dostęp Superusera</string>
@@ -212,6 +219,7 @@
     <string name="su_revoke_msg">Potwierdzasz odwołanie uprawnień %1$s?</string>
     <string name="toast">Powiadomienie</string>
     <string name="none">Brak</string>
+    <string name="auth_fail">Uwierzytelnienie Nieudane</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

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

@@ -1,206 +1,229 @@
 <resources>
-	
-	
-	
+    <!--Universal-->
 
     <!--Welcome Activity-->
-
     <string name="modules">Módulos</string>
-    <string name="downloads">Baixar</string>
-	<string name="superuser">Superusuário</string>
+    <string name="downloads">Downloads</string>
+    <string name="superuser">Superusuário</string>
     <string name="log">Registro</string>
-    <string name="settings">Configurações</string>
+    <string name="settings">Definições</string>
     <string name="install">Instalar</string>
 
     <!--Status Fragment-->
-    <string name="magisk_version_error">Magisk não instalado</string>
-
-	<string name="checking_for_updates">Checando por atualizações…</string>
-    <string name="magisk_update_available">Magisk v%1$s disponível!</string>
-    <string name="safetyNet_check_text">Pressione para checar o SafetyNet</string>
-    <string name="checking_safetyNet_status">Verificando status do SafetyNet…</string>
-	<string name="safetyNet_check_success">SafetyNet verificado</string>
-	<string name="safetyNet_api_error">SafetyNet erro na API</string>
-    <string name="safetyNet_network_loss">Conexão com a rede perdida</string>
+    <string name="magisk_version_error">Magisk não está instalado</string>
+    <string name="checking_for_updates">Verificando por atualizações…</string>
+    <string name="magisk_update_available">Magisk v%1$s está disponível!</string>
+    <string name="invalid_update_channel">Canal de Atualização Inválido</string>
+    <string name="safetyNet_check_text">Toque para iniciar verificação de SafetyNet</string>
+    <string name="checking_safetyNet_status">Verificando status de SafetyNet…</string>
+    <string name="safetyNet_check_success">SafetyNet Verificado Com Sucesso</string>
+    <string name="safetyNet_api_error">Erro de SafetyNet API</string>
+    <string name="safetyNet_network_loss">Conexão de rede indisponível</string>
     <string name="safetyNet_service_disconnected">O serviço foi morto</string>
     <string name="safetyNet_res_invalid">A resposta é inválida</string>
 
     <!--Install Fragment-->
-    <string name="advanced_settings_title">Configurações avançadas</string>
-    <string name="keep_force_encryption">Keep force encryption</string>
-    <string name="keep_dm_verity">Keep AVB 2.0/dm-verity</string>
-    <string name="current_magisk_title">Versão instalada: %1$s</string>
-    <string name="install_magisk_title">Última versão: %1$s</string>
-	<string name="uninstall">Desinstalar</string>
+    <string name="advanced_settings_title">Definições Avançadas</string>
+    <string name="keep_force_encryption">Preservar criptografia forçada</string>
+    <string name="keep_dm_verity">Preservar AVB 2.0/dm-verity</string>
+    <string name="current_magisk_title">Versão Instalada: %1$s</string>
+    <string name="install_magisk_title">Última Versão: %1$s</string>
+    <string name="uninstall">Desinstalar</string>
     <string name="uninstall_magisk_title">Desinstalar Magisk</string>
-	<string name="uninstall_magisk_msg">Todos os modulos magisk será desativado/removido. O root será removido, e possivelmente a encriptação de seus dados se seus dados não foram encriptado.</string>
+    <string name="uninstall_magisk_msg">Todos os módulos serão desativados/removidos. O root será removido, e potencialmente criptografará seus dados se seus dados não estiverem atualmente criptografados</string>
     <string name="update">Atualizar %1$s</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(Nenhuma informação fornecida)</string>
     <string name="no_modules_found">Nenhum módulo encontrado</string>
-    <string name="update_file_created">Módulo será atualizado na próxima reinicialização</string>
-    <string name="remove_file_created">Módulo será removido na próxima reinicialização</string>
-    <string name="remove_file_deleted">Módulo não será removido na próxima reinicialização</string>
-    <string name="disable_file_created">Módulo será desativado na próxima reinicialização</string>
-    <string name="disable_file_removed">Módulo será ativado na próxima reinicialização</string>
+    <string name="update_file_created">O módulo será atualizado na próxima reinicialização</string>
+    <string name="remove_file_created">O módulo será removido na próxima reinicialização</string>
+    <string name="remove_file_deleted">O módulo não será removido na próxima reinicialização</string>
+    <string name="disable_file_created">O módulo será desativado na próxima reinicialização</string>
+    <string name="disable_file_removed">O módulo será ativado na próxima reinicialização</string>
     <string name="author">Criado por %1$s</string>
+    <string name="reboot_recovery">Reiniciar na Recuperação</string>
+    <string name="reboot_bootloader">Reiniciar no Bootloader</string>
+    <string name="reboot_download">Reiniciar no Download</string>
 
     <!--Repo Fragment-->
-    <string name="update_available">Atualização disponível</string>
+    <string name="update_available">Atualização Disponível</string>
     <string name="installed">Instalado</string>
     <string name="not_installed">Não Instalado</string>
+    <string name="updated_on">Atualizado em: %1$s</string>
+    <string name="sorting_order">Ordem de Ordenação</string>
+    <string name="sort_by_name">Ordenar por nome</string>
+    <string name="sort_by_update">Ordenar por última atualização</string>
 
     <!--Log Fragment-->
     <string name="menuSaveLog">Salvar registro</string>
     <string name="menuReload">Recarregar</string>
     <string name="menuClearLog">Limpar registro agora</string>
-    <string name="logs_cleared">Registro limpado com sucesso</string>
-    <string name="log_is_empty">Registro está vazio</string>
-    <string name="logs_save_failed">Não foi possível gravar o registro para o cartão SD:</string>
+    <string name="logs_cleared">Registro limpo com sucesso</string>
+    <string name="log_is_empty">O registro está vazio</string>
+    <string name="logs_save_failed">Não foi possível gravar o registro no cartão SD:</string>
 
     <!--About Activity-->
     <string name="about">Sobre</string>
-    <string name="app_changelog">Registro de Mudanças do App</string>
-    <string name="translators">Killer7Mod</string>
-    <string name="app_version">Versão do App</string>
+    <string name="app_changelog">Registro de mudanças</string>
+    <string name="translators" />
+    <string name="app_version">Versão</string>
     <string name="app_source_code">Código fonte</string>
     <string name="donation">Doação</string>
-    <string name="app_translators">Tradutores do App</string>
-    <string name="support_thread">Suporte</string>
+    <string name="app_translators">Tradutores</string>
+    <string name="support_thread">Tópico de suporte</string>
 
     <!--Toasts, Dialogs-->
-    <string name="permissionNotGranted">Este recurso não funcionará sem permissão de escrita do armazenamento externo.</string>
-    <string name="no_thanks">Não, Obrigado</string>
-	<string name="yes">Sim</string>
-	<string name="ok">OK</string>
+    <string name="permissionNotGranted">Este recurso não funcionará sem permissão para gravar no armazenamento externo.</string>
+    <string name="no_thanks">Não, obrigado</string>
+    <string name="yes">Sim</string>
+    <string name="ok">OK</string>
     <string name="close">Fechar</string>
     <string name="repo_install_title">Instalar %1$s</string>
-    <string name="repo_install_msg">Você deseja instalar%1$s ?</string>
+    <string name="repo_install_msg">Instalar %1$s agora?</string>
     <string name="download">Baixar</string>
-    <string name="download_file_error">Erro ao baixar o arquivo</string>
+    <string name="download_file_error">Erro ao baixar arquivo</string>
     <string name="reboot">Reiniciar</string>
     <string name="downloading_toast">Baixando %1$s</string>
-    <string name="magisk_update_title">Nova atualização do Magisk disponível!</string>
-    <string name="settings_reboot_toast">Reinicie para aplicar configurações</string>
-    <string name="release_notes">Notas da atualização</string>
-	<string name="repo_cache_cleared">Cache do Repo. limpado</string>
-    <string name="safetyNet_hide_notice">Este aplicativo usa SafetyNet\nJá manipulado pelo MagiskHide por padrão</string>
-    <string name="process_error">Erro no processo</string>
-    <string name="internal_storage">O zip foi salvo em:\n[Armazenamento interno]%1$s</string>
-	<string name="zip_download_title">Baixando</string>
-    <string name="zip_download_msg">Baixando o arquivo zip (%1$d%%) …</string>
+    <string name="magisk_update_title">Nova Atualização do Magisk Disponível!</string>
+    <string name="settings_reboot_toast">Reinicie para aplicar as definições</string>
+    <string name="release_notes">Notas de lançamento</string>
+    <string name="repo_cache_cleared">Cache de repositório limpado</string>
+    <string name="safetyNet_hide_notice">Este app usa SafetyNet\nJá manipulado por MagiskHide por padrão</string>
+    <string name="process_error">Erro de processo</string>
+    <string name="internal_storage">O zip está armazenado em:\n[Armazenamento Interno]%1$s</string>
+    <string name="zip_download_title">Baixando</string>
+    <string name="zip_download_msg">Baixando arquivo zip (%1$d%%) …</string>
     <string name="zip_process_title">Processando</string>
-	<string name="zip_process_msg">Processando arquivo zip …</string>
-    <string name="manager_update_title">Nova atualização do Magisk Manager disponível!</string>
-    <string name="manager_download_install">Pressione para baixar e instalar</string>
+    <string name="zip_process_msg">Processando arquivo zip …</string>
+    <string name="manager_update_title">Nova Atualização do Magisk Manager Disponível!</string>
+    <string name="manager_download_install">Toque para baixar e instalar</string>
+    <string name="dtbo_patched_title">DTBO foi emendado!</string>
+    <string name="dtbo_patched_reboot">Magisk Manager emendou dtbo.img, reinicie</string>
     <string name="magisk_updates">Atualizações do Magisk</string>
     <string name="flashing">Flasheando</string>
     <string name="hide_manager_toast">Ocultando Magisk Manager…</string>
-    <string name="hide_manager_fail_toast">Falha ao ocultar o Magisk Manager…</string>
-    <string name="download_zip_only">Baixar somente o zip</string>
-    <string name="patch_boot_file">Arquivo Patch Boot Image</string>
+    <string name="hide_manager_toast2">Isto pode demorar um pouco…</string>
+    <string name="hide_manager_fail_toast">Ocultar Magisk Manager falhou…</string>
+    <string name="download_zip_only">Baixar Zip Apenas</string>
+    <string name="patch_boot_file">Emendar Arquivo de Imagem de Inicialização</string>
     <string name="direct_install">Instalação Direta (Recomendado)</string>
-    <string name="install_second_slot">Instalação no segundo Slot (Depois do OTA)</string>
+    <string name="install_second_slot">Instalar no Segundo Slot (Após OTA)</string>
     <string name="select_method">Selecionar Método</string>
-    <string name="no_boot_file_patch_support">Versão do Magisk escolhida não suporta arquivo de patch boot image</string>
-    <string name="boot_file_patch_msg">Selecione a stock boot image despejada(dump) no formato .img ou img.tar</string>
-    <string name="complete_uninstall">Desinstalação Completa</string>
-    <string name="restore_done">Restauração Completa!</string>
-    <string name="restore_fail">backup da Stock não existe!</string>
-    <string name="uninstall_toast">Desinstalando o Magisk Manager em 5 segundos, por favor reinicie manualmente depois</string>
-    <string name="proprietary_title">Baixar Código do Proprietário</string>
-    <string name="proprietary_notice">Magisk Manager é FOSS então não contém o código proprietário da API SafetyNet do Google.\n\nVocê permite que o Magisk Manager baixe uma extensão (contém o GoogleApiClient) para verificações SafetyNet?</string>
+    <string name="no_boot_file_patch_support">A versão alvo do Magisk não suporta emendamento de imagem de inicialização</string>
+    <string name="boot_file_patch_msg">Selecione o depósito de imagem de inicialização de stock em formato .img ou .img.tar</string>
+    <string name="complete_uninstall">Concluir Desinstalação</string>
+    <string name="restore_img">Restaurar Imagens</string>
+    <string name="uninstall_app">Desinstalar App</string>
+    <string name="restore_done">Restauração concluída!</string>
+    <string name="restore_fail">O backup da stock não existe!</string>
+    <string name="uninstall_toast">Desinstalando Magisk Manager em 5 segundos, manualmente reinicie logo após</string>
+    <string name="proprietary_title">Baixar Código de Propriedade</string>
+    <string name="proprietary_notice">Magisk Manager é FOSS(Software Livre de Código Aberto), que não contém o código de propriedade de SafetyNet API da Google.\n\nPermitir ao Magisk Manager baixar uma extensão (que contém a GoogleApiClient) para verificação de SafetyNet?</string>
+    <string name="su_db_corrupt">O banco de dados do SU está corrompido, será recriado novo db</string>
 
-    <!--Settings Fragment -->
+    <!--Settings Activity -->
     <string name="settings_general_category">Geral</string>
-    <string name="settings_dark_theme_title">Tema escuro</string>
-    <string name="settings_dark_theme_summary">Ativa o tema escuro</string>
-	<string name="settings_notification_title">Notificação de Atualização</string>
-    <string name="settings_notification_summary">Mostrar notificações de atualização quando a nova versão estiver disponível</string>
-    <string name="settings_clear_cache_title">Limpar Repo Cache</string>
-    <string name="settings_clear_cache_summary">Limpe as informações armazenadas em cache para repos. online, forçando o aplicativo a atualizar online</string>
-	<string name="settings_hide_manager_title">Ocultar Magisk Manager</string>
-    <string name="language">Linguagem</string>
+    <string name="settings_dark_theme_title">Tema Escuro</string>
+    <string name="settings_dark_theme_summary">Ativar tema escuro</string>
+    <string name="settings_notification_title">Notificação de Atualização</string>
+    <string name="settings_notification_summary">Mostrar notificação de atualização quando nova versão estiver disponível</string>
+    <string name="settings_clear_cache_title">Limpar Cache de Repositório</string>
+    <string name="settings_clear_cache_summary">Limpar as informações no cache para repositórios onlines, força o app a reatualizar online</string>
+    <string name="settings_hide_manager_title">Ocultar Magisk Manager</string>
+    <string name="settings_hide_manager_summary">Reempacotar Magisk Manager com nome de pacote aleatório</string>
+    <string name="settings_restore_manager_title">Restaurar Magisk Manager</string>
+    <string name="settings_restore_manager_summary">Restaurar Magisk Manager com pacote original</string>
+    <string name="language">Idioma</string>
     <string name="system_default">(Padrão do Sistema)</string>
-    <string name="settings_update">Atualizar Configurações</string>
-    <string name="settings_update_channel_title">Canal de atualizações</string>
+    <string name="settings_update">Definições de Atualizações</string>
+    <string name="settings_check_update_title">Verificar Atualizações</string>
+    <string name="settings_check_update_summary">Verificar atualizações em segundo plano periodicamente</string>
+    <string name="settings_update_channel_title">Canal de Atualização</string>
     <string name="settings_update_stable">Estável</string>
     <string name="settings_update_beta">Beta</string>
-    <string name="settings_boot_format_title">Formato de Saida do Boot Patcheado</string>
-    <string name="settings_boot_format_summary">Selecione o formato de saida do Boot Image Patcheado.\nSelecione .img para flashear através do fastboot/modo de download; Selecione .img.tar para flashear com o ODIN.</string>
-	
-	<string name="settings_core_only_title">Magisk modo somente Core</string>
-    <string name="settings_core_only_summary">Ativar somente recursos principais, todos os módulos não serão carregados. MagiskSU, MagiskHide, e systemless hosts ainda estará ativado</string>
+    <string name="settings_update_custom">Personalizado</string>
+    <string name="settings_update_custom_msg">Inserir uma URL personalizada</string>
+    <string name="settings_boot_format_title">Formato de Saída de Inicialização Emendada</string>
+    <string name="settings_boot_format_summary">Selecionar formato de saída de imagem de inicialização emendada.\nEscolha .img para flashear através do modo fastboot/download; escolha .img.tar para flashear com ODIN.</string>
+    <string name="settings_core_only_title">Modo Magisk de Núcleo Apenas</string>
+    <string name="settings_core_only_summary">Ativar apenas recursos de núcleo. MagiskSU, MagiskHide e hosts systemless ainda serão ativados, mas nenhum módulo será carregado.</string>
     <string name="settings_magiskhide_summary">Ocultar Magisk de várias detecções</string>
-    <string name="settings_hosts_title">Ativar systemless hosts</string>
-    <string name="settings_hosts_summary">Suporte do systemless para Adblock apps</string>
+    <string name="settings_hosts_title">Hosts systemless</string>
+    <string name="settings_hosts_summary">Suporte de hosts systemless para apps de Adblock</string>
 
-	<string name="settings_su_app_adb">Aplicativos e ADB</string>
-    <string name="settings_su_app">Somente Aplicativos</string>
-    <string name="settings_su_adb">Somente ADB</string>
+    <string name="settings_su_app_adb">Apps e ADB</string>
+    <string name="settings_su_app">Apps apenas</string>
+    <string name="settings_su_adb">ADB apenas</string>
     <string name="settings_su_disable">Desativado</string>
     <string name="settings_su_request_10">10 segundos</string>
     <string name="settings_su_request_20">20 segundos</string>
     <string name="settings_su_request_30">30 segundos</string>
     <string name="settings_su_request_60">60 segundos</string>
-    <string name="superuser_access">Acesso de superusuário</string>
+    <string name="superuser_access">Acesso de Superusuário</string>
     <string name="auto_response">Resposta Automática</string>
-    <string name="request_timeout">Tempo limite de solicitação</string>
-    <string name="superuser_notification">Notificação do superusuário</string>
+    <string name="request_timeout">Tempo Limite de Solicitação</string>
+    <string name="superuser_notification">Notificação de Superusuário</string>
     <string name="request_timeout_summary">%1$s segundos</string>
-	<string name="settings_su_reauth_title">Re-autenticar após a atualização</string>
-    <string name="settings_su_reauth_summary">Re-autenticar permissões de superusuário após as atualizações de um aplicativo</string>
+    <string name="settings_su_reauth_title">Reautenticar após atualizar</string>
+    <string name="settings_su_reauth_summary">Reautenticar permissões de superusuário após um app atualizar</string>
+    <string name="settings_su_fingerprint_title">Ativar Autenticação de Impressão Digital</string>
+    <string name="settings_su_fingerprint_summary">Usar escaneador de impressão digital para permitir solicitações de superusuário</string>
 
-	<string name="multiuser_mode">Modo Multiusuário</string>
-    <string name="settings_owner_only">Apenas Proprietário do Dispositivo</string>
-    <string name="settings_owner_manage">Proprietário do dispositivo gerenciado</string>
+    <string name="multiuser_mode">Modo de Multiusuário</string>
+    <string name="settings_owner_only">Proprietário do Dispositivo Apenas</string>
+    <string name="settings_owner_manage">Proprietário do Dispositivo Gerenciado</string>
     <string name="settings_user_independent">Usuário Independente</string>
-    <string name="owner_only_summary">Somente o proprietário possui acesso de root</string>
-    <string name="owner_manage_summary">Somente o proprietário pode gerenciar o acesso root e receber paineis de solicitações</string>
-    <string name="user_indepenent_summary">Cada usuário tem suas próprias regras raiz separadas</string>
-    <string name="multiuser_hint_owner_request">Um pedido foi enviado ao proprietário do dispositivo. Mude para o proprietário e conceda a permissão</string>
+    <string name="owner_only_summary">Apenas proprietário tem acesso root</string>
+    <string name="owner_manage_summary">Apenas proprietário pode gerenciar acesso root e receber expedições de solicitações</string>
+    <string name="user_indepenent_summary">Cada usuário tem suas próprias regras root separadas</string>
+    <string name="multiuser_hint_owner_request">Uma solicitação foi enviada ao proprietário do dispositivo. Mude para proprietário e conceda as permissões requeridas</string>
 
-    <string name="mount_namespace_mode">Modo namespace de montagem</string>
-    <string name="settings_ns_global">Global namespace</string>
-    <string name="settings_ns_requester">Herdar namespace</string>
-    <string name="settings_ns_isolate">Isolar namespace</string>
-    <string name="global_summary">Todas as sessões raiz usam o namespace de montagem global</string>
-    <string name="requester_summary">As sessões de raiz herdarão o namespace do seu solicitante</string>
-    <string name="isolate_summary">Cada sessão raiz terá seu próprio namespace isolado</string>
+    <string name="mount_namespace_mode">Montar Modo de Espaço de Nome</string>
+    <string name="settings_ns_global">Espaço de Nome Global</string>
+    <string name="settings_ns_requester">Espaço de Nome Herdado</string>
+    <string name="settings_ns_isolate">Espaço de Nome Isolado</string>
+    <string name="global_summary">Todas as sessões root usam montagem de espaço de nome global</string>
+    <string name="requester_summary">As sessões root herdarão espaço de nome de seu solicitante</string>
+    <string name="isolate_summary">Cada sessão root terá seu próprio espaço de nome isolado</string>
+    <string name="android_o_not_support">Não suporta Android 8.0+</string>
+    <string name="disable_fingerprint">Nenhuma impressão digital foi definida ou dispostivo sem suporte</string>
 
     <!--Superuser-->
-	<string name="su_request_title">Solicitação de superusuário</string>
+    <string name="su_request_title">Solicitação de Superusuário</string>
     <string name="deny_with_str">Negar%1$s</string>
     <string name="deny">Negar</string>
-    <string name="prompt">Perguntar</string>
-    <string name="grant">Permitir</string>
-    <string name="su_warning">Concede acesso total ao seu dispositivo.\nNegue se você não tiver certeza!</string>
+    <string name="prompt">Expedir</string>
+    <string name="grant">Conceder</string>
+    <string name="su_warning">Concede acesso total ao seu dispositivo.\nNegue se você não tem certeza!</string>
     <string name="forever">Sempre</string>
-    <string name="once">Uma vez</string>
-    <string name="tenmin">10 minutos</string>
-    <string name="twentymin">20 minutos</string>
-    <string name="thirtymin">30 minutos</string>
-    <string name="sixtymin">60 minutos</string>
-    <string name="su_allow_toast">%1$s foi permitido o acesso de superusuário</string>
-    <string name="su_deny_toast">%1$s foi negado o acesso de superusuário</string>
-    <string name="no_apps_found">Não foram encontrados apps</string>
-    <string name="su_snack_grant">Acesso de superusuário do %1$s está permitido</string>
-    <string name="su_snack_deny">Acesso de superusuário do %1$s está negado</string>
-    <string name="su_snack_notif_on">Notificações do %1$s está ativado</string>
-    <string name="su_snack_notif_off">Notificações do %1$s está desativado</string>
-    <string name="su_snack_log_on">Registro do %1$s está ativado</string>
-    <string name="su_snack_log_off">Registro do %1$s está desativado</string>
-    <string name="su_snack_revoke">%1$s Direitos foi revogados</string>
+    <string name="once">Uma Vez</string>
+    <string name="tenmin">10 mins</string>
+    <string name="twentymin">20 mins</string>
+    <string name="thirtymin">30 mins</string>
+    <string name="sixtymin">60 mins</string>
+    <string name="su_allow_toast">%1$s teve concedido direitos de Superusuário</string>
+    <string name="su_deny_toast">%1$s teve negado direitos de Superusuário</string>
+    <string name="no_apps_found">Nenhum app encontrado</string>
+    <string name="su_snack_grant">Os direitos de Superusuário de %1$s estão concedidos</string>
+    <string name="su_snack_deny">Os direitos de Superusuário de %1$s estão negados</string>
+    <string name="su_snack_notif_on">As notificações de %1$s estão ativadas</string>
+    <string name="su_snack_notif_off">As notificações de %1$s estão desativadas</string>
+    <string name="su_snack_log_on">A registração de %1$s está ativada</string>
+    <string name="su_snack_log_off">A registração de %1$s está desativada</string>
+    <string name="su_snack_revoke">Os direitos de %1$s estão revogados</string>
     <string name="su_revoke_title">Revogar?</string>
-    <string name="su_revoke_msg">Revogar os diretos do %1$s, Confirmar?</string>
-    <string name="toast">Notificação(Toast)</string>
-    <string name="none">Nenhum</string>
+    <string name="su_revoke_msg">Revogar os direitos de %1$s?</string>
+    <string name="toast">Torrada</string>
+    <string name="none">Nenhuma</string>
+    <string name="auth_fail">Falha de Autenticação</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>
     <string name="target_uid">Alvo UID:\u0020</string>
     <string name="command">Comando:\u0020</string>
 
-
 </resources>
+
+
+

src/main/res/values-ro/strings.xml

@@ -124,9 +124,13 @@
     <string name="settings_clear_cache_summary">Ștergeți informațiile memorate în cache, forțează actualizarea aplicației online</string>
     <string name="settings_hide_manager_title">Ascundeţi Magisk Manager</string>
     <string name="settings_hide_manager_summary">Reîmpachetare Magisk Manager cu nume de pachet aleatoriu</string>
+    <string name="settings_restore_manager_title">Restabilire Magisk Manager</string>
+    <string name="settings_restore_manager_summary">Restabilire Magisk Manager cu pachetul original</string>
     <string name="language">Limbă</string>
     <string name="system_default">(Implicit)</string>
     <string name="settings_update">Setări actualizare</string>
+    <string name="settings_check_update_title">Verificare actualizări</string>
+    <string name="settings_check_update_summary">Se verifică periodic în fundal dacă există actualizări</string>
     <string name="settings_update_channel_title">Canal de actualizare</string>
     <string name="settings_update_stable">Stabil</string>
     <string name="settings_update_beta">Beta</string>
@@ -155,6 +159,8 @@
     <string name="request_timeout_summary">%1$s secunde</string>
     <string name="settings_su_reauth_title">Reautentificare după actualizare</string>
     <string name="settings_su_reauth_summary">Reautentificare permisiuni pentru superuser după o actualizare a aplicației</string>
+    <string name="settings_su_fingerprint_title">Activați autentificarea cu amprenta digitală</string>
+    <string name="settings_su_fingerprint_summary">Utilizați scanerul de amprentă pentru a permite solicitările superuser</string>
  
     <string name="multiuser_mode">Mod Multiutilizator</string>
     <string name="settings_owner_only">Numai proprietarul dispozitivului</string>
@@ -173,6 +179,7 @@
     <string name="requester_summary">Sesiunile de root vor moșteni spațiul de nume al solicitantului</string>
     <string name="isolate_summary">Fiecare sesiune de root va avea propriul spațiu de nume izolat</string>
     <string name="android_o_not_support">Nu se acceptă pe Android 8.0+</string>
+    <string name="disable_fingerprint">Nu au fost setate amprente sau scanerul de apmrentă lipseşte</string>
 
     <!--Superuser-->
     <string name="su_request_title">Solicitare Superuser</string>
@@ -201,6 +208,7 @@
     <string name="su_revoke_msg">Confirmați revocarea drepturilor pentru %1$s?</string>
     <string name="toast">Mesaj</string>
     <string name="none">Nimic</string>
+    <string name="auth_fail">Autentificare eşuată</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

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

@@ -16,24 +16,24 @@
     <string name="magisk_version_error">Magisk не установлен</string>
     <string name="checking_for_updates">Проверка обновлений…</string>
     <string name="magisk_update_available">Доступен Magisk v%1$s!</string>
-    <string name="invalid_update_channel">Неверный канал обновлений</string>
+    <string name="invalid_update_channel">Некорректный канал обновлений</string>
     <string name="safetyNet_check_text">Проверить статус SafetyNet</string>
     <string name="checking_safetyNet_status">Проверка статуса SafetyNet…</string>
     <string name="safetyNet_check_success">Результат проверки SafetyNet</string>
     <string name="safetyNet_api_error">Ошибка SafetyNet API</string>
     <string name="safetyNet_network_loss">Нет подключения к сети</string>
     <string name="safetyNet_service_disconnected">Служба была остановлена</string>
-    <string name="safetyNet_res_invalid">Неверный ответ</string>
+    <string name="safetyNet_res_invalid">Некорректный ответ</string>
 
     <!--Install Fragment-->
-    <string name="advanced_settings_title">Расширенные настройки</string>
+    <string name="advanced_settings_title">Расширенные опции</string>
     <string name="keep_force_encryption">Сохранить шифрование</string>
     <string name="keep_dm_verity">Сохранить AVB 2.0/dm-verity</string>
     <string name="current_magisk_title">Установлена версия: %1$s</string>
     <string name="install_magisk_title">Последняя версия: %1$s</string>
     <string name="uninstall">Удаление</string>
     <string name="uninstall_magisk_title">Удаление Magisk</string>
-    <string name="uninstall_magisk_msg">Все модули будут отключены/удалены. Root-права будут удалены. Данные будут зашифрованы.</string>
+    <string name="uninstall_magisk_msg">Все модули будут отключены/удалены. Root-права будут удалены. Шифрование будет активировано.</string>
     <string name="update">Обновить %1$s</string>
 
     <!--Module Fragment-->
@@ -53,6 +53,10 @@
     <string name="update_available">Доступно обновление</string>
     <string name="installed">Установлены</string>
     <string name="not_installed">Не установлены</string>
+    <string name="updated_on">Обновлено: %1$s</string>
+    <string name="sorting_order">Сортировка</string>
+    <string name="sort_by_name">По имени</string>
+    <string name="sort_by_update">По дате обновления</string>
 
     <!--Log Fragment-->
     <string name="menuSaveLog">Сохранить лог</string>
@@ -65,12 +69,12 @@
     <!--About Activity-->
     <string name="about">О приложении</string>
     <string name="app_changelog">Список изменений</string>
-    <string name="translators">Displax</string>
+    <string name="translators">Displax [4PDA]</string>
     <string name="app_version">Версия</string>
     <string name="app_source_code">Исходный код</string>
     <string name="donation">Поддержать проект</string>
     <string name="app_translators">Переводчики</string>
-    <string name="support_thread">Страница поддержки</string>
+    <string name="support_thread">Домашняя страница</string>
 
     <!--Toasts, Dialogs-->
     <string name="permissionNotGranted">Требуется разрешение на запись во внешнее хранилище.</string>
@@ -88,7 +92,7 @@
     <string name="settings_reboot_toast">Для применения настроек перезагрузите устройство</string>
     <string name="release_notes">О версии</string>
     <string name="repo_cache_cleared">Кэш репозитория очищен</string>
-    <string name="safetyNet_hide_notice">Приложение использует SafetyNet.\nПо умолчанию обработано MagiskHide.</string>
+    <string name="safetyNet_hide_notice">Приложение использует SafetyNet API.\nПо умолчанию добавлено в MagiskHide.</string>
     <string name="process_error">Ошибка обработки</string>
     <string name="internal_storage">Расположение архива:\n[Внутреннее Хранилище]%1$s</string>
     <string name="zip_download_title">Загрузка</string>
@@ -98,54 +102,58 @@
     <string name="manager_update_title">Доступно обновление Magisk Manager!</string>
     <string name="manager_download_install">Нажмите для установки</string>
     <string name="dtbo_patched_title">DTBO пропатчен!</string>
-    <string name="dtbo_patched_reboot">Magisk Manager пропатчил dtbo.img. Перезагрузитесь.</string>
+    <string name="dtbo_patched_reboot">Magisk Manager пропатчил dtbo.img. Перезагрузите устройство.</string>
     <string name="magisk_updates">Обновления Magisk</string>
     <string name="flashing">Прошивка…</string>
     <string name="hide_manager_toast">Скрытие Magisk Manager…</string>
     <string name="hide_manager_toast2">Может занять некоторое время…</string>
     <string name="hide_manager_fail_toast">Скрытие Magisk Manager неудачно!</string>
-    <string name="download_zip_only">Только загрузка архива</string>
-    <string name="patch_boot_file">Пропатчить образ ядра</string>
-    <string name="direct_install">Прямая установка (рекомендуется)</string>
-    <string name="install_second_slot">Установка во Второй Слот (после OTA)</string>
+    <string name="download_zip_only">Загрузка установочного ZIP</string>
+    <string name="patch_boot_file">Пропатчить образ ядра (boot.img)</string>
+    <string name="direct_install">Прямая установка (Рекомендуется)</string>
+    <string name="install_second_slot">Установка во Второй Слот (После OTA)</string>
     <string name="select_method">Выбор способа</string>
     <string name="no_boot_file_patch_support">Целевая версия Magisk не поддерживает патчинг boot-образов</string>
-    <string name="boot_file_patch_msg">Выберите файл ядра (boot), .img либо .img.tar формата</string>
-    <string name="complete_uninstall">Удалить</string>
-    <string name="restore_img">Восстановить образы</string>
+    <string name="boot_file_patch_msg">Выберите файл ядра (boot), *.img либо *.img.tar формата</string>
+    <string name="complete_uninstall">Полное удаление</string>
+    <string name="restore_img">Восстановить разделы</string>
     <string name="uninstall_app">Удалить приложение</string>
     <string name="restore_done">Восстановление завершено!</string>
     <string name="restore_fail">Резервная копия отсутствует!</string>
-    <string name="uninstall_toast">Удаление Magisk Manager в течении 5 секунд. Выполните перезагрузку.</string>
+    <string name="uninstall_toast">Удаление Magisk Manager в течении 5 секунд. Перезагрузите устройство.</string>
     <string name="proprietary_title">Загрузка SafetyNet</string>
     <string name="proprietary_notice">Magisk Manager — свободно распространяемый продукт, он не содержит собственный код SafetyNet API от Google.\n\nРазрешить Magisk Manager загрузить расширение (содержит GoogleApiClient) для проверки SafetyNet?</string>
     <string name="su_db_corrupt">База данных SU повреждена, будет создана новая</string>
 
     <!--Settings Activity -->
     <string name="settings_general_category">Основные</string>
-    <string name="settings_dark_theme_title">Темная тема</string>
+    <string name="settings_dark_theme_title">Тёмная тема</string>
     <string name="settings_dark_theme_summary">Включить темное оформление</string>
     <string name="settings_notification_title">Уведомление об обновлении</string>
     <string name="settings_notification_summary">Показывать уведомления о выходе новой версии</string>
     <string name="settings_clear_cache_title">Очистка кэша репозитория</string>
-    <string name="settings_clear_cache_summary">Очистить сохранённую информацию о репозиториях. Список будет обновлен принудительно.</string>
-    <string name="settings_hide_manager_title">Скрыть Magisk Manager</string>
+    <string name="settings_clear_cache_summary">Очистить сохранённую информацию о репозитории. Будет обновлено принудительно</string>
+    <string name="settings_hide_manager_title">Скрытие Magisk Manager</string>
     <string name="settings_hide_manager_summary">Пересобрать Magisk Manager со случайным именем пакета</string>
+    <string name="settings_restore_manager_title">Восстановление Magisk Manager</string>
+    <string name="settings_restore_manager_summary">Восстановить Magisk Manager с оригинальным именем пакета</string>
     <string name="language">Язык</string>
-    <string name="system_default">По умолчанию (системный)</string>
+    <string name="system_default">По умолчанию (Системный)</string>
     <string name="settings_update">Настройки обновления</string>
+    <string name="settings_check_update_title">Проверка обновлений</string>
+    <string name="settings_check_update_summary">Периодически проверять обновления в фоне</string>
     <string name="settings_update_channel_title">Источник обновлений</string>
     <string name="settings_update_stable">Стабильный канал</string>
     <string name="settings_update_beta">Beta канал</string>
     <string name="settings_update_custom">Сторонний канал</string>
-    <string name="settings_update_custom_msg">Вставьте ссылку</string>
-    <string name="settings_boot_format_title">Формат образа ядра</string>
-    <string name="settings_boot_format_summary">Выберите формат патченого образа ядра.\n.img - для прошивки через fastboot/download режим.\n.img.tar - для прошивки через ODIN.</string>
-    <string name="settings_core_only_title">Режим Magisk Core</string>
-    <string name="settings_core_only_summary">Включает возможности только Core уровня, модули не будут загружены. MagiskSU, MagiskHide и внесистемные хосты останутся активными.</string>
-    <string name="settings_magiskhide_summary">Скрыть Magisk от различных проверок</string>
+    <string name="settings_update_custom_msg">Укажите ссылку</string>
+    <string name="settings_boot_format_title">Тип образа ядра</string>
+    <string name="settings_boot_format_summary">Выберите тип патченого образа ядра:\n*.img - для прошивки через fastboot/download режимы\n*.img.tar - для прошивки через ODIN (Samsung)</string>
+    <string name="settings_core_only_title">Magisk Core режим</string>
+    <string name="settings_core_only_summary">Включить только основные (Core) возможности. Модули не будут загружены. MagiskSU, MagiskHide и внесистемные хосты останутся активными</string>
+    <string name="settings_magiskhide_summary">Скрывать Magisk от различных проверок</string>
     <string name="settings_hosts_title">Внесистемные хосты</string>
-    <string name="settings_hosts_summary">Поддержка внесистемных хостов для приложений блокировки рекламы</string>
+    <string name="settings_hosts_summary">Поддержка внесистемных хостов для приложений, блокирующих рекламу</string>
 
     <string name="settings_su_app_adb">Приложения и ADB</string>
     <string name="settings_su_app">Только приложения</string>
@@ -157,29 +165,32 @@
     <string name="settings_su_request_60">60 секунд</string>
     <string name="superuser_access">Уровень доступа</string>
     <string name="auto_response">Автоматический ответ</string>
-    <string name="request_timeout">Период запроса</string>
+    <string name="request_timeout">Ожидание ответа</string>
     <string name="superuser_notification">Уведомление Суперпользователя</string>
     <string name="request_timeout_summary">%1$s секунд</string>
     <string name="settings_su_reauth_title">Повторная аутентификация</string>
-    <string name="settings_su_reauth_summary">Повторный запрос прав Суперпользователя после обновления приложения</string>
+    <string name="settings_su_reauth_summary">Повторный запрос прав Суперпользователя после обновления приложений</string>
+    <string name="settings_su_fingerprint_title">Биометрическая аутентификация</string>
+    <string name="settings_su_fingerprint_summary">Использовать дактилоскопический сканер для подтверждения запросов Суперпользователя</string>
 
     <string name="multiuser_mode">Многопользовательский режим</string>
     <string name="settings_owner_only">Только владелец</string>
     <string name="settings_owner_manage">Регулировка владельцем</string>
-    <string name="settings_user_independent">Независимый пользователь</string>
+    <string name="settings_user_independent">Правила пользователей</string>
     <string name="owner_only_summary">Только владелец имеет Root-доступ</string>
-    <string name="owner_manage_summary">Только владелец может управлять root-доступом и обрабатывать запросы на предоставление</string>
-    <string name="user_indepenent_summary">Каждый пользователь имеет свои собственные правила root-доступа</string>
-    <string name="multiuser_hint_owner_request">Запрос был отправлен владельцу устройства. Пожалуйста, переключитесь на профиль владельца и предоставьте разрешение</string>
+    <string name="owner_manage_summary">Только владелец может управлять Root-доступом и обрабатывать запросы</string>
+    <string name="user_indepenent_summary">Каждый пользователь имеет свои собственные правила Root-доступа</string>
+    <string name="multiuser_hint_owner_request">Запрос отправлен владельцу устройства. Переключитесь на профиль владельца для обработки запроса</string>
 
-    <string name="mount_namespace_mode">Режим монтирования пространства имён</string>
-    <string name="settings_ns_global">Глобальное пространство имён</string>
-    <string name="settings_ns_requester">Наследуемое пространство имён</string>
-    <string name="settings_ns_isolate">Изолированное пространство имён</string>
-    <string name="global_summary">Все сеансы Суперпользователя используют глобальное пространство имён</string>
-    <string name="requester_summary">Сессии Суперпользователя наследуют пространство имен запрашивающего</string>
-    <string name="isolate_summary">Каждая сессия Суперпользователя будет иметь собственное изолированное пространство имен</string>
+    <string name="mount_namespace_mode">Настройка именных пространств</string>
+    <string name="settings_ns_global">Общее именное пространство</string>
+    <string name="settings_ns_requester">Наследуемое именное пространство</string>
+    <string name="settings_ns_isolate">Изолированное именное пространство</string>
+    <string name="global_summary">Сессии Суперпользователя используют общее именное пространство</string>
+    <string name="requester_summary">Сессии Суперпользователя наследуют именное пространство запрашивающего</string>
+    <string name="isolate_summary">Сессии Суперпользователя будут иметь изолированные именные пространства</string>
     <string name="android_o_not_support">Не поддерживается в Android 8.0+</string>
+    <string name="disable_fingerprint">Не поддерживается устройством или не заданы опечатки</string>
 
     <!--Superuser-->
     <string name="su_request_title">Запрос прав Суперпользователя</string>
@@ -189,7 +200,7 @@
     <string name="grant">Предоставить</string>
     <string name="su_warning">Предоставить полный доступ к устройству.\nЕсли не уверены, что желаете продолжить, отклоните данное действие!</string>
     <string name="forever">Навсегда</string>
-    <string name="once">Единожды</string>
+    <string name="once">Сейчас</string>
     <string name="tenmin">10 мин.</string>
     <string name="twentymin">20 мин.</string>
     <string name="thirtymin">30 мин.</string>
@@ -201,13 +212,14 @@
     <string name="su_snack_deny">%1$s отказано в правах Суперпользователя</string>
     <string name="su_snack_notif_on">Уведомления для %1$s включены</string>
     <string name="su_snack_notif_off">Уведомления для %1$s отключены</string>
-    <string name="su_snack_log_on">История событий для %1$s включена</string>
-    <string name="su_snack_log_off">История событий для %1$s отключена</string>
-    <string name="su_snack_revoke">Права для %1$s отозваны</string>
-    <string name="su_revoke_title">Отозвать?</string>
-    <string name="su_revoke_msg">Подтвердить отзыв прав для %1$s?</string>
+    <string name="su_snack_log_on">Логирование для %1$s включено</string>
+    <string name="su_snack_log_off">Логирование для %1$s отключено</string>
+    <string name="su_snack_revoke">Настройки для %1$s сброшены</string>
+    <string name="su_revoke_title">Сброс настроек</string>
+    <string name="su_revoke_msg">Сбросить настройки для %1$s?</string>
     <string name="toast">Всплывающее уведомление</string>
     <string name="none">Ничего</string>
+    <string name="auth_fail">Ошибка аутентификации</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

src/main/res/values-tr/strings.xml

@@ -24,7 +24,7 @@
     <!--Install Fragment-->
     <string name="advanced_settings_title">Gelişmiş Ayarlar</string>
     <string name="keep_force_encryption">Şifrelemeyi zorlamayı sürdür</string>
-    <string name="keep_dm_verity">AVB 2.0/dm-verity \'yi koru</string>
+    <string name="keep_dm_verity">AVB 2.0/dm-verity\'yi koru</string>
     <string name="current_magisk_title">Yüklü Sürüm: %1$s</string>
     <string name="install_magisk_title">Yeni Sürüm: %1$s</string>
     <string name="uninstall">Kaldır</string>
@@ -49,7 +49,7 @@
     <string name="update_available">Güncelleme Mevcut</string>
     <string name="installed">Yüklenmiş</string>
     <string name="not_installed">Yüklenmemiş</string>
-    <string name="updated_on">Updated on: %1$s</string>
+    <string name="updated_on">Güncelleme: %1$s</string>
     <string name="sorting_order">Sıralama Düzeni</string>
     <string name="sort_by_name">İsme göre sırala</string>
     <string name="sort_by_update">Son güncellemeye göre sırala</string>
@@ -130,17 +130,21 @@
     <string name="settings_clear_cache_title">Repo Önbelleğini Temizle</string>
     <string name="settings_clear_cache_summary">Çevrimiçi repolar için önbellek bilgilerini temizle, uygulamayı çevrimiçi yenilemeye zorla</string>
     <string name="settings_hide_manager_title">Magisk Manager\'ı Gizle</string>
-    <string name="settings_hide_manager_summary">Rastgele seçilen bir paket adı ile Magisk Manager yeniden paketlenecek</string>
+    <string name="settings_hide_manager_summary">Rastgele paket adı ile Magisk Manager\'ı yeniden paketle</string>
+    <string name="settings_restore_manager_title">Magisk Manager\'ı Geri Yükle</string>
+    <string name="settings_restore_manager_summary">Orijinal paket adı ile Magisk Manager\'ı geri yükle</string>
     <string name="language">Dil</string>
     <string name="system_default">(Sistem Varsayılanı)</string>
     <string name="settings_update">Güncelleme Ayarları</string>
+    <string name="settings_check_update_title">Güncellemeleri denetle</string>
+    <string name="settings_check_update_summary">Düzenli aralıklarla arka planda güncellemeleri denetle</string>
     <string name="settings_update_channel_title">Güncelleme Kanalı</string>
     <string name="settings_update_stable">Kararlı</string>
     <string name="settings_update_beta">Beta</string>
     <string name="settings_update_custom">Özel</string>
     <string name="settings_update_custom_msg">Özel bir URL ekleyin</string>
     <string name="settings_boot_format_title">Yamalı Önyükleme Formatı</string>
-    <string name="settings_boot_format_summary">Yamalı önyükleme imaj dosyasının formatını seçin\nFastboot/indirme modunda yüklemek için .img seçeneğini seçin; ODIN ile yüklemek için .img.tar\'ı seçin.</string>
+    <string name="settings_boot_format_summary">Yamalı önyükleme imaj dosyasının formatını seçin\nFastboot/download modunda yüklemek için .img seçeneğini seçin; ODIN ile yüklemek için .img.tar\'ı seçin.</string>
     <string name="settings_core_only_title">Magisk Sadece Çekirdek Modu</string>
     <string name="settings_core_only_summary">Sadece temel özellikleri etkinleştirin, tüm modüller yüklenmez. MagiskSU, MagiskHide ve host yine de etkinleştirilecektir</string>
     <string name="settings_magiskhide_summary">"Magisk\'i çeşitli algılamalardan gizle"</string>
@@ -160,8 +164,10 @@
     <string name="request_timeout">İstek Zaman Aşımı</string>
     <string name="superuser_notification">Yetkili Kullanıcı Bildirimi</string>
     <string name="request_timeout_summary">%1$s saniye</string>
-    <string name="settings_su_reauth_title">Yükseltmeden sonra yeniden kimlik doğrulaması yapın</string>
-    <string name="settings_su_reauth_summary">Uygulama yükseltmeleri sonrasında yetkili kullanıcı izinlerini yeniden doğrulama</string>
+    <string name="settings_su_reauth_title">Yükseltmeden sonra yeniden kimlik doğrula</string>
+    <string name="settings_su_reauth_summary">Uygulama yükseltmeleri sonrasında yetkili kullanıcı izinlerini yeniden doğrula</string>
+    <string name="settings_su_fingerprint_title">Parmak İzi Kimlik Doğrulamayı Etkinleştir</string>
+    <string name="settings_su_fingerprint_summary">Yetkili kullanıcı isteklerine izin vermek için parmak izi tarayıcısını kullan</string>
 
     <string name="multiuser_mode">Çok Kullanıcılı Mod</string>
     <string name="settings_owner_only">Yalnızca Cihaz Sahibi</string>
@@ -180,6 +186,7 @@
     <string name="requester_summary">Kök oturumları, istekte bulunanın ad alanını devralır</string>
     <string name="isolate_summary">Her bir kök oturumunun kendi izole ad alanı olacaktır</string>
     <string name="android_o_not_support">Android 8.0 ve üzerinde desteklenmiyor</string>
+    <string name="disable_fingerprint">Parmak izi ayarlanmadı veya cihaz desteği yok</string>
 
     <!--Superuser-->
     <string name="su_request_title">Yetkili Kullanıcı İsteği</string>
@@ -208,6 +215,7 @@
     <string name="su_revoke_msg">%1$s hakları geri alınsın mı?</string>
     <string name="toast">Pencere</string>
     <string name="none">Hiçbiri</string>
+    <string name="auth_fail">Kimlik Doğrulama Başarısız</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

src/main/res/values-uk/strings.xml

@@ -10,12 +10,12 @@
 
     <!--Status Fragment-->
     <string name="magisk_version_error">Magisk не встановлено</string>
-
     <string name="checking_for_updates">Перевірка оновлень…</string>
     <string name="magisk_update_available">Доступно Magisk v%1$s!</string>
+    <string name="invalid_update_channel">Неправильний канал оновлень</string>
     <string name="safetyNet_check_text">Перевірити статус SafetyNet</string>
     <string name="checking_safetyNet_status">Перевірка статусу SafetyNet…</string>
-    <string name="safetyNet_check_success">Перевірку SafetyNet завершено</string>
+    <string name="safetyNet_check_success">Результат перевірки SafetyNet</string>
     <string name="safetyNet_api_error">Помилка в API SafetyNet</string>
     <string name="safetyNet_network_loss">Підключення до інтернету втрачено</string>
     <string name="safetyNet_service_disconnected">Службу зупинено</string>
@@ -41,11 +41,18 @@
     <string name="disable_file_created">Модуль вимкнеться при перезавантаженні</string>
     <string name="disable_file_removed">Модуль увімкнеться при перезавантаженні</string>
     <string name="author">Автор: %1$s</string>
+    <string name="reboot_recovery">Перезавантаження в Recovery</string>
+    <string name="reboot_bootloader">Перезавантаження в Bootloader</string>
+    <string name="reboot_download">Перезавантаження в Download</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Доступне оновлення</string>
     <string name="installed">Встановлено</string>
     <string name="not_installed">Не встановлено</string>
+    <string name="updated_on">Оновлено: %1$s</string>
+    <string name="sorting_order">Порядок сортування</string>
+    <string name="sort_by_name">Сортувати за назвою</string>
+    <string name="sort_by_update">Сортувати за оновленням</string>
 
     <!--Log Fragment-->
     <string name="menuSaveLog">Зберегти логи</string>
@@ -90,6 +97,8 @@
     <string name="zip_process_msg">Опрацювання архіву …</string>
     <string name="manager_update_title">Доступне оновлення Magisk Manager!</string>
     <string name="manager_download_install">Натисніть, щоб завантажити і встановити</string>
+    <string name="dtbo_patched_title">DTBO пропатчено!</string>
+    <string name="dtbo_patched_reboot">Magisk Manager пропатчив dtbo.img, будь ласка, перезавантажте пристрій</string>
     <string name="magisk_updates">Оновлення Magisk</string>
     <string name="flashing">Прошивання</string>
     <string name="hide_manager_toast">Приховування Magisk Manager…</string>
@@ -103,11 +112,14 @@
     <string name="no_boot_file_patch_support">Цільова версія Magisk не підтримує пропатчування boot образу</string>
     <string name="boot_file_patch_msg">Виберіть оригінальний дамп boot образу в форматі .img чи .img.tar</string>
     <string name="complete_uninstall">Видалення виконано</string>
+    <string name="restore_img">Відновити образ</string>
+    <string name="uninstall_app">Видалити додаток</string>
     <string name="restore_done">Відновлення завершено!</string>
     <string name="restore_fail">Немає резервної копії оригінального boot образу</string>
-    <string name="uninstall_toast">Видалення Менеджера Magisk протягом 5 секунд, потім, будь ласка, вручну перезавантажте</string>
+    <string name="uninstall_toast">Видалення Magisk Manager протягом 5 секунд, потім, будь ласка, вручну перезавантажте пристрій</string>
     <string name="proprietary_title">Завантажити пропрієтарний код</string>
-    <string name="proprietary_notice">Менеджер Magisk - це безкоштовний додаток з відкритим вихідним кодом, тому він не містить пропрієтарний код API SafetyNet від компанії Google.\n\nДозволити Менеджеру Magisk завантажити розширення (яке містить GoogleApiClient) для перевірки SafetyNet?</string>
+    <string name="proprietary_notice">Magisk Manager — це безкоштовний додаток з відкритим вихідним кодом, тому він не містить пропрієтарний код API SafetyNet від компанії Google.\n\nДозволити Magisk Manager завантажити розширення (яке містить GoogleApiClient) для перевірки SafetyNet?</string>
+    <string name="su_db_corrupt">База даних SU пошкоджена, буде створено нову БД</string>
 
     <!--Settings Activity -->
     <string name="settings_general_category">Основні</string>
@@ -118,13 +130,19 @@
     <string name="settings_clear_cache_title">Очищення кешу</string>
     <string name="settings_clear_cache_summary">Очистити збережену інформацію про мережеві репозиторії, змушуючи програму примусово оновлюватися через Інтернет</string>
     <string name="settings_hide_manager_title">Приховати Magisk Manager</string>
-    <string name="settings_hide_manager_summary">Перезібрати Менеджер Magisk з випадковим іменем пакету</string>
+    <string name="settings_hide_manager_summary">Перезібрати Magisk Manager з випадковим іменем пакету</string>
+    <string name="settings_restore_manager_title">Відновити Magisk Manager</string>
+    <string name="settings_restore_manager_summary">Відновити Magisk Manager з оригінального пакету</string>
     <string name="language">Мова</string>
     <string name="system_default">Стандартна (системна)</string>
     <string name="settings_update">Оновити налаштування</string>
+    <string name="settings_check_update_title">Перевіряти оновлення</string>
+    <string name="settings_check_update_summary">Періодично перевіряти оновлення у фоновому режимі</string>
     <string name="settings_update_channel_title">Канал оновлення</string>
     <string name="settings_update_stable">Стабільний реліз</string>
     <string name="settings_update_beta">Бета реліз</string>
+    <string name="settings_update_custom">Власний</string>
+    <string name="settings_update_custom_msg">Вставте власний URL</string>
     <string name="settings_boot_format_title">Формат пропатченого образу</string>
     <string name="settings_boot_format_summary">Виберіть формат вихідного пропатченого boot образу.\n.img - для прошивання через fastboot/download режим;\n.img.tar - для прошивання через ODIN.</string>
     <string name="settings_core_only_title">Режим ядра Magisk</string>
@@ -148,6 +166,8 @@
     <string name="request_timeout_summary">%1$s сек.</string>
     <string name="settings_su_reauth_title">Повторна автентифікація</string>
     <string name="settings_su_reauth_summary">Перевидача прав суперкористувача після оновлення програм</string>
+    <string name="settings_su_fingerprint_title">Увімкнути автентифікацію за відбитком</string>
+    <string name="settings_su_fingerprint_summary">Використовувати сканер відбитків пальців, щоб надавати дозвіл суперкористувача</string>
 
     <string name="multiuser_mode">Багатокористувацький режим</string>
     <string name="settings_owner_only">Тільки власник</string>
@@ -165,6 +185,8 @@
     <string name="global_summary">Всі сеанси Суперкористувача використовують глобальний простір імен</string>
     <string name="requester_summary">Сеанси Суперкористувача наслідують простір імен запитувача</string>
     <string name="isolate_summary">Кожнен сеанс Суперкористувача має власний ізольований простір імен</string>
+    <string name="android_o_not_support">Не підтримує Android 8.0+</string>
+    <string name="disable_fingerprint">Немає відбитків пальців або пристрій не підтримується</string>
 
     <!--Superuser-->
     <string name="su_request_title">Запит прав Суперкористувача</string>
@@ -193,6 +215,7 @@
     <string name="su_revoke_msg">Підтвердити відкликання прав для %1$s?</string>
     <string name="toast">Спливаюче сповіщення</string>
     <string name="none">Нічого</string>
+    <string name="auth_fail">Помилка автентифікації</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

src/main/res/values-zh-rCN/strings.xml

@@ -14,7 +14,7 @@
     <string name="checking_for_updates">正在检查更新…</string>
     <string name="magisk_update_available">Magisk 可更新到 v%1$s！</string>
     <string name="invalid_update_channel">无效的更新通道</string>
-    <string name="safetyNet_check_text">点击启动 SafetyNet 检查</string>
+    <string name="safetyNet_check_text">点按启动 SafetyNet 检查</string>
     <string name="checking_safetyNet_status">正在检查 SafetyNet 状态…</string>
     <string name="safetyNet_check_success">SafetyNet 检查成功</string>
     <string name="safetyNet_api_error">SafetyNet API 错误</string>
@@ -59,7 +59,7 @@
     <string name="menuSaveLog">保存日志</string>
     <string name="menuReload">刷新</string>
     <string name="menuClearLog">清除日志</string>
-    <string name="logs_cleared">日志已成功清除</string>
+    <string name="logs_cleared">日志已清除</string>
     <string name="log_is_empty">日志为空</string>
     <string name="logs_save_failed">无法将日志写入内置存储：</string>
 
@@ -97,7 +97,7 @@
     <string name="zip_process_title">正在处理</string>
     <string name="zip_process_msg">正在处理 zip 文件…</string>
     <string name="manager_update_title">Magisk Manager 有更新！</string>
-    <string name="manager_download_install">点击以下载并安装</string>
+    <string name="manager_download_install">点按以下载并安装</string>
     <string name="dtbo_patched_title">已修补 DTBO!</string>
     <string name="dtbo_patched_reboot">Magisk Manager 为 dtbo 分区进行了修补，请立即重新启动</string>
     <string name="magisk_updates">Magisk 更新</string>
@@ -124,17 +124,21 @@
 
     <!--Settings Activity -->
     <string name="settings_general_category">常规</string>
-    <string name="settings_dark_theme_title">深色主题</string>
-    <string name="settings_dark_theme_summary">使用深色主题</string>
+    <string name="settings_dark_theme_title">暗色主题</string>
+    <string name="settings_dark_theme_summary">使用暗色主题</string>
     <string name="settings_notification_title">更新通知</string>
     <string name="settings_notification_summary">当有新版本时显示更新通知</string>
     <string name="settings_clear_cache_title">清除仓库缓存</string>
     <string name="settings_clear_cache_summary">清除已缓存的在线仓库信息，强制刷新在线数据</string>
     <string name="settings_hide_manager_title">隐藏 Magisk Manager</string>
     <string name="settings_hide_manager_summary">用随机包名重新安装 Magisk Manager</string>
+    <string name="settings_restore_manager_title">还原 Magisk Manager</string>
+    <string name="settings_restore_manager_summary">用原安装包还原 Magisk Manager</string>
     <string name="language">语言</string>
     <string name="system_default">（系统默认）</string>
     <string name="settings_update">更新设定</string>
+    <string name="settings_check_update_title">检查更新</string>
+    <string name="settings_check_update_summary">在后台定期检查更新</string>
     <string name="settings_update_channel_title">更新通道</string>
     <string name="settings_update_stable">稳定版</string>
     <string name="settings_update_beta">测试版</string>
@@ -163,6 +167,8 @@
     <string name="request_timeout_summary">%1$s 秒</string>
     <string name="settings_su_reauth_title">更新后重新认证</string>
     <string name="settings_su_reauth_summary">应用更新后重新认证超级用户权限</string>
+    <string name="settings_su_fingerprint_title">启用指纹验证</string>
+    <string name="settings_su_fingerprint_summary">使用指纹识别来允许超级用户请求</string>
 
     <string name="multiuser_mode">多用户模式</string>
     <string name="settings_owner_only">仅设备所有者</string>
@@ -181,6 +187,7 @@
     <string name="requester_summary">ROOT 会话继承原程序的命名空间</string>
     <string name="isolate_summary">每一个 ROOT 会话使用自己独立的命名空间</string>
     <string name="android_o_not_support">不支持 Android 8.0+</string>
+    <string name="disable_fingerprint">没有设置指纹或设备不支持</string>
 
     <!--Superuser-->
     <string name="su_request_title">超级用户请求</string>
@@ -209,6 +216,7 @@
     <string name="su_revoke_msg">确认撤销 %1$s 的权限？</string>
     <string name="toast">消息提示</string>
     <string name="none">无</string>
+    <string name="auth_fail">验证失败</string>
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>

src/main/res/values-zh-rTW/strings.xml

@@ -217,5 +217,10 @@
     <string name="settings_su_fingerprint_title">啟用指紋認證</string>
     <string name="settings_su_fingerprint_summary">用指紋辨識來允許超級用戶權限</string>
     <string name="auth_fail">認證失敗</string>
+    <string name="settings_restore_manager_title">還原 Magisk Manager</string>
+    <string name="settings_restore_manager_summary">以原安裝包還原 Magisk Manager</string>
+    <string name="settings_check_update_title">檢查更新</string>
+    <string name="settings_check_update_summary">在背景定期檢查更新</string>
+    <string name="disable_fingerprint">沒有指紋加入或是裝置不支援</string>
 
 </resources>

src/main/res/values/strings.xml

@@ -135,9 +135,13 @@
     <string name="settings_clear_cache_summary">Clear the cached information for online repos, forces the app to refresh online</string>
     <string name="settings_hide_manager_title">Hide Magisk Manager</string>
     <string name="settings_hide_manager_summary">Repackage Magisk Manager with random package name</string>
+    <string name="settings_restore_manager_title">Restore Magisk Manager</string>
+    <string name="settings_restore_manager_summary">Restore Magisk Manager with original package</string>
     <string name="language">Language</string>
     <string name="system_default">(System Default)</string>
     <string name="settings_update">Update Settings</string>
+    <string name="settings_check_update_title">Check Updates</string>
+    <string name="settings_check_update_summary">Check updates in the background periodically</string>
     <string name="settings_update_channel_title">Update Channel</string>
     <string name="settings_update_stable">Stable</string>
     <string name="settings_update_beta">Beta</string>
@@ -186,6 +190,7 @@
     <string name="requester_summary">Root sessions will inherit its requester\'s namespace</string>
     <string name="isolate_summary">Each root session will have its own isolated namespace</string>
     <string name="android_o_not_support">Does not support Android 8.0+</string>
+    <string name="disable_fingerprint">No fingerprints were set or no device support</string>
 
     <!--Superuser-->
     <string name="su_request_title">Superuser Request</string>

src/main/res/xml/app_settings.xml

@@ -20,6 +20,11 @@
             android:title="@string/settings_hide_manager_title"
             android:summary="@string/settings_hide_manager_summary" />
 
+        <Preference
+            android:key="restore"
+            android:summary="@string/settings_restore_manager_summary"
+            android:title="@string/settings_restore_manager_title" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -27,9 +32,10 @@
         android:title="@string/settings_update">
 
         <SwitchPreference
-            android:key="notification"
-            android:title="@string/settings_notification_title"
-            android:summary="@string/settings_notification_summary" />
+            android:key="check_update"
+            android:defaultValue="true"
+            android:title="@string/settings_check_update_title"
+            android:summary="@string/settings_check_update_summary" />
 
         <ListPreference
             android:key="update_channel"