Small changes

2019-04-04 02:30:03 -04:00 · 2019-04-04 02:30:03 -04:00 · ceb21ced2b
commit ceb21ced2b
parent 86789a8694
36 changed files with 51 additions and 105 deletions
--- a/app/src/main/java/com/topjohnwu/magisk/components/BaseActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/components/BaseActivity.java
@ -15,6 +15,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.collection.SparseArrayCompat;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;

@ -32,7 +33,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au

    static int[] EMPTY_INT_ARRAY = new int[0];

-    private ActivityResultListener activityResultListener;
+    private SparseArrayCompat<ActivityResultListener> resultListeners = new SparseArrayCompat<>();
    public App app = App.self;

    static {
@ -117,13 +118,15 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au

    @Override
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (activityResultListener != null)
-            activityResultListener.onActivityResult(requestCode, resultCode, data);
-        activityResultListener = null;
+        ActivityResultListener listener = resultListeners.get(requestCode);
+        if (listener != null) {
+            resultListeners.remove(requestCode);
+            listener.onActivityResult(resultCode, data);
+        }
    }

    public void startActivityForResult(Intent intent, int requestCode, ActivityResultListener listener) {
-        activityResultListener = listener;
+        resultListeners.put(requestCode, listener);
        super.startActivityForResult(intent, requestCode);
    }

@ -145,7 +148,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
    }

    public interface ActivityResultListener {
-        void onActivityResult(int requestCode, int resultCode, Intent data);
+        void onActivityResult(int resultCode, Intent data);
    }

    @Override
--- a/app/src/main/java/com/topjohnwu/magisk/components/BaseFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/components/BaseFragment.java
@ -35,10 +35,12 @@ public abstract class BaseFragment extends Fragment implements Event.AutoListene

    @Override
    public void startActivityForResult(Intent intent, int requestCode) {
-        startActivityForResult(intent, requestCode, this::onActivityResult);
+        startActivityForResult(intent, requestCode, (resultCode, data) ->
+                onActivityResult(requestCode, resultCode, data));
    }

-    public void startActivityForResult(Intent intent, int requestCode, BaseActivity.ActivityResultListener listener) {
+    public void startActivityForResult(Intent intent, int requestCode,
+                                       BaseActivity.ActivityResultListener listener) {
        ((BaseActivity) requireActivity()).startActivityForResult(intent, requestCode, listener);
    }

--- a/app/src/main/java/com/topjohnwu/magisk/dialogs/InstallMethodDialog.java
+++ b/app/src/main/java/com/topjohnwu/magisk/dialogs/InstallMethodDialog.java
@ -26,7 +26,7 @@ class InstallMethodDialog extends AlertDialog.Builder {
    InstallMethodDialog(BaseActivity activity, List<String> options) {
        super(activity);
        setTitle(R.string.select_method);
-        setItems(options.toArray(new String [0]), (dialog, idx) -> {
+        setItems(options.toArray(new String[0]), (dialog, idx) -> {
            Intent intent;
            switch (idx) {
                case 1:
@ -48,25 +48,26 @@ class InstallMethodDialog extends AlertDialog.Builder {
        });
    }

-    private void patchBoot(BaseActivity a) {
-        Utils.toast(R.string.boot_file_patch_msg, Toast.LENGTH_LONG);
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT).setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);
-        a.runWithExternalRW(() ->
-                a.startActivityForResult(intent, Const.ID.SELECT_BOOT,
-                        (requestCode, resultCode, data) -> {
-                            if (requestCode == Const.ID.SELECT_BOOT &&
-                                    resultCode == Activity.RESULT_OK && data != null) {
-                                Intent i = new Intent(a, ClassMap.get(FlashActivity.class))
-                                        .setData(data.getData())
-                                        .putExtra(Const.Key.FLASH_ACTION, Const.Value.PATCH_BOOT);
-                                a.startActivity(i);
-                            }
-                        })
-        );
+    private void patchBoot(BaseActivity activity) {
+        activity.runWithExternalRW(() -> {
+            Utils.toast(R.string.patch_file_msg, Toast.LENGTH_LONG);
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT)
+                    .setType("*/*")
+                    .addCategory(Intent.CATEGORY_OPENABLE);
+            activity.startActivityForResult(intent, Const.ID.SELECT_BOOT,
+                    (resultCode, data) -> {
+                        if (resultCode == Activity.RESULT_OK && data != null) {
+                            Intent i = new Intent(activity, ClassMap.get(FlashActivity.class))
+                                    .setData(data.getData())
+                                    .putExtra(Const.Key.FLASH_ACTION, Const.Value.PATCH_BOOT);
+                            activity.startActivity(i);
+                        }
+                    });
+        });
    }

-    private void downloadOnly(BaseActivity a) {
-        a.runWithExternalRW(() -> {
+    private void downloadOnly(BaseActivity activity) {
+        activity.runWithExternalRW(() -> {
            String filename = Utils.fmt("Magisk-v%s(%d).zip",
                    Config.remoteMagiskVersionString, Config.remoteMagiskVersionCode);
            File zip = new File(Const.EXTERNAL_PATH, filename);
@ -76,8 +77,8 @@ class InstallMethodDialog extends AlertDialog.Builder {
                    .setErrorHandler(((conn, e) -> progress.dlFail()))
                    .getAsFile(zip, f -> {
                        progress.dlDone();
-                        SnackbarMaker.make(a,
-                                a.getString(R.string.internal_storage, "/Download/" + filename),
+                        SnackbarMaker.make(activity,
+                                activity.getString(R.string.internal_storage, "/Download/" + filename),
                                Snackbar.LENGTH_LONG).show();
                    });
        });
--- a/app/src/main/java/com/topjohnwu/magisk/dialogs/MagiskInstallDialog.java
+++ b/app/src/main/java/com/topjohnwu/magisk/dialogs/MagiskInstallDialog.java
@ -25,7 +25,7 @@ public class MagiskInstallDialog extends CustomAlertDialog {
        setPositiveButton(R.string.install, (d, i) -> {
            List<String> options = new ArrayList<>();
            options.add(a.getString(R.string.download_zip_only));
-            options.add(a.getString(R.string.patch_boot_file));
+            options.add(a.getString(R.string.select_patch_file));
            if (Shell.rootAccess()) {
                options.add(a.getString(R.string.direct_install));
                String s = ShellUtils.fastCmd("grep_prop ro.build.ab_update");
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -108,8 +108,7 @@
    <string name="android_o_not_support">لا يدعم إصدار الأندرويد +8.0</string>
  <string name="auth_fail">فشل المصادقة</string>
  <string name="auth_fingerprint">مصادقة البصمة</string>
-  <string name="boot_file_patch_msg">حدد الذاكرة المؤقتة لنسخة boot الأصلية بتنسيق img. أو .tar</string>
-  <string name="complete_uninstall">إلغاء التثبيت بالكامل</string>
+    <string name="complete_uninstall">إلغاء التثبيت بالكامل</string>
  <string name="direct_install">تثبيت مباشر (موصى به)</string>
  <string name="disable_fingerprint">لم يتم تعيين بصمات الأصابع أو لا يوجد جهاز مدعوم</string>
  <string name="download_zip_only">تحميل ملف zip فقط</string>
@ -134,8 +133,7 @@
  <string name="menuSaveLog">حفظ السجل</string>
  <string name="mount_namespace_mode">وضع تركيب مساحة الأسم</string>
    <string name="open_link_failed_toast">لم يتم العثور على تطبيق لفتح الرابط …</string>
-  <string name="patch_boot_file">تصحيح ملف صورة boot</string>
-  <string name="proprietary_notice">مدير Magisk هو FOSS ، والذي لا يحتوي على شفرة API الخاصة بشركة SafetyNet الخاصة بشركة Google.
+    <string name="proprietary_notice">مدير Magisk هو FOSS ، والذي لا يحتوي على شفرة API الخاصة بشركة SafetyNet الخاصة بشركة Google.

 هل تسمح لـ Magisk Manager بتنزيل ملحق (يحتوي على GoogleApiClient) لعمليات التحقق من SafetyNet؟ "</string>
  <string name="proprietary_title">تحميل رمز الملكية</string>
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@ -170,8 +170,6 @@

    <string name="download_zip_only">Yalnız Zip yüklə</string>

-    <string name="patch_boot_file">Yamaqlı Boot Təsvir Faylı</string>
-
    <string name="direct_install">Birdəfəlik Yüklə (Tövsiyə olunur)</string>

    <string name="install_inactive_slot">Fəal olmayan slota quraşdır (OTA\'dan sonra)</string>
@ -182,8 +180,6 @@

    <string name="select_method">Üsul Seçin</string>

-    <string name="boot_file_patch_msg">Standart boot surətinin yığılma formatını .img yaxud .tar kimi seçin.</string>
-
    <string name="complete_uninstall">Silməni Bitir</string>

    <string name="restore_img">Şəkilləri Geri Qaytar</string>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -84,13 +84,11 @@
    <string name="hide_manager_fail_toast">Скриването на Magisk Manager бе неуспешно.</string>
    <string name="open_link_failed_toast">Не бе намерено приложение за отваряне на линка.</string>
    <string name="download_zip_only">Изтегляне само на архив</string>
-    <string name="patch_boot_file">Модифициране на Boot образа</string>
    <string name="direct_install">Директно инсталиране (Препоръчва се.)</string>
    <string name="install_inactive_slot">Инсталиране на неактивен слот (След OTA)</string>
    <string name="warning">Внимание</string>
    <string name="install_inactive_slot_msg">Вашето устройство НАЛОЖИТЕЛНО ще стартира текущия неактивен слот при следващото рестартиране.\nИзползвайте тази опция само след като приключи инсталирането на OTA.\nПродължаване?</string>
 .   <string name="select_method">Избор на метод</string>
-    <string name="boot_file_patch_msg">Изберете стоков boot образ с формат .img или .tar.</string>
    <string name="complete_uninstall">Пълно деинсталиране</string>
    <string name="restore_img">Възстановяване на образи</string>
    <string name="restore_img_msg">Възстановяване…</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -92,13 +92,11 @@
    <string name="hide_manager_fail_toast">L\'amagament de Magisk Manager ha fallat.</string>
    <string name="open_link_failed_toast">No s\'ha trobat una aplicació per obrir l\'enllaç.</string>
    <string name="download_zip_only">Descarrega només el ZIP</string>
-    <string name="patch_boot_file">Arranja l\'imatge d\'arrencada</string>
    <string name="direct_install">Instal·lació directa (Recomanat)</string>
    <string name="install_inactive_slot">Instal·lar a la ranura inactiva (Després d\'una OTA)</string>
    <string name="warning">Avís</string>
    <string name="install_inactive_slot_msg">El teu dispositiu serà FORÇAT a arrancar en la ranura inactiva després de reiniciar!\nUtilitza aquesta opció només quan s\'hagi fet la OTA.\nContinuar?</string>
    <string name="select_method">Selecciona mètode</string>
-    <string name="boot_file_patch_msg">Seleccioneu l\'arxiu de bolcat de l\'arrencada en format .img o .tar.</string>
    <string name="complete_uninstall">Desinstal·lació completa</string>
    <string name="restore_img">Restaura imatges</string>
    <string name="restore_img_msg">Restaurant…</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -84,13 +84,11 @@
    <string name="hide_manager_fail_toast">Verbergen von Magisk Manager fehlgeschlagen…</string>
    <string name="open_link_failed_toast">Es wurde keine Anwendung gefunden, um diesen Link zu öffnen...</string>
    <string name="download_zip_only">Nur Zip-Datei herunterladen</string>
-    <string name="patch_boot_file">Boot-Image-Datei patchen</string>
    <string name="direct_install">Direkt installieren (empfohlen)</string>
    <string name="install_inactive_slot">Installiere auf inaktiven Slot (Nach OTA)</string>
    <string name="warning">Warnung</string>
    <string name="install_inactive_slot_msg">Dein Gerät wird GEZWUNGEN in den aktuell inaktiven Slot zu starten, nachdem nach dem ein Neustart durchgeführt wurde!\nBenutze diese Option nur, nachdem das OTA beendet wurde.\nFortsetzen?</string>
    <string name="select_method">Methode auswählen</string>
-    <string name="boot_file_patch_msg">Wähle das original Boot-Image-Dump im Format .img oder .tar</string>
    <string name="complete_uninstall">Komplette Deinstallation</string>
    <string name="restore_img">Images wiederherstellen</string>
    <string name="restore_img_msg">Wiederherstellen...</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -84,10 +84,8 @@
    <string name="hide_manager_title">Κρύβοντας το Magisk Manager…</string>
    <string name="hide_manager_fail_toast">Η απόκρυψη του Magisk Manager απέτυχε…</string>
    <string name="download_zip_only">Λήψη Zip Μόνο</string>
-    <string name="patch_boot_file">Εφαρμογή Patch στο Αρχείο Εικόνας Boot</string>
    <string name="direct_install">Απευθείας Εγκατάσταση (Προτείνεται)</string>
    <string name="select_method">Επιλογή Μεθόδου</string>
-    <string name="boot_file_patch_msg">Επιλογή stock boot image dump σε μορφή .img ή .tar</string>
    <string name="complete_uninstall">Πλήρης απεγκατάσταση</string>
    <string name="restore_done">Η ανάκτηση έγινε!</string>
    <string name="restore_fail">Δεν υπάρχει αντίγραφο ασφαλείας!</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -92,11 +92,9 @@
    <string name="hide_manager_fail_toast">La Ocultación de Magisk Manager ha fallado…</string>
    <string name="open_link_failed_toast">No se encontró ninguna aplicación para abrir el enlace…</string>
    <string name="download_zip_only">Descargar sólo el archivo ZIP</string>
-    <string name="patch_boot_file">Parcheo de la imagen boot</string>
    <string name="direct_install">Instalación Directa (Recomendado)</string>
    <string name="install_inactive_slot">Instalar en ranura inactiva (después de OTA)</string>
    <string name="select_method">Seleccionar Método</string>
-    <string name="boot_file_patch_msg">Seleccione el volcado de la imagen boot en formato .img o .tar</string>
    <string name="complete_uninstall">Desinstalación completa</string>
    <string name="restore_img">Restaurar imágenes</string>
    <string name="restore_done">¡Restauración Terminada!</string>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@ -92,13 +92,11 @@
    <string name="hide_manager_fail_toast">Magisk Manager\'i peitmine ebaõnnestus.</string>
    <string name="open_link_failed_toast">Lingi avamiseks sobivat rakendust ei leitud.</string>
    <string name="download_zip_only">Laadi ainult ZIP alla</string>
-    <string name="patch_boot_file">Paika käivitustõmmise fail</string>
    <string name="direct_install">Otsene install (soovitatud)</string>
    <string name="install_inactive_slot">Installi ebaaktiivsesse lahtrisse (pärast üle-õhu uuendust)</string>
    <string name="warning">Hoiatus</string>
    <string name="install_inactive_slot_msg">Sinu seade SUNNITAKSE peale taaskäivitust käivituma praegusesse ebaaktiivsesse lahtrisse!\nKasuta seda valikut vaid peale üle-õhu uuenduse teostamist.\nJätkad?</string>
    <string name="select_method">Vali meetod</string>
-    <string name="boot_file_patch_msg">Vali originaalne käivitustõmmis .img või .tar vormingus.</string>
    <string name="complete_uninstall">Täielik eemaldus</string>
    <string name="restore_img">Taasta tõmmised</string>
    <string name="restore_img_msg">Taastamine…</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -92,13 +92,11 @@
    <string name="hide_manager_fail_toast">Le masquage de Magisk Manager a échoué.</string>
    <string name="open_link_failed_toast">Aucune application permettant d’ouvrir le lien n’a été trouvée.</string>
    <string name="download_zip_only">Télécharger le ZIP seulement</string>
-    <string name="patch_boot_file">Modifier le fichier d’amorçage</string>
    <string name="direct_install">Installation directe (recommandée)</string>
    <string name="install_inactive_slot">Installer dans l’espace inactif (après mise à jour OTA)</string>
    <string name="warning">Avertissement</string>
    <string name="install_inactive_slot_msg">Votre appareil sera réamorcé à partir de l’espace actuellement inactif après un redémarrage !\nN’utilisez cette option qu’uniquement après que la mise à jour OTA a été effectuée.\nVoulez‐vous continuer ?</string>
    <string name="select_method">Sélectionnez la méthode</string>
-    <string name="boot_file_patch_msg">Sélectionnez l’image d’amorçage par défaut stockée au format .img ou .tar.</string>
    <string name="complete_uninstall">Désinstallation terminée</string>
    <string name="restore_img">Restauration des images</string>
    <string name="restore_img_msg">Restauration…</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -75,10 +75,8 @@
    <string name="hide_manager_title">Skrivanje Magisk Manager aplikacije…</string>
    <string name="hide_manager_fail_toast">Skrivanje Magisk Manager nije uspjelo</string>
    <string name="download_zip_only">Preuzmi samo zip</string>
-    <string name="patch_boot_file">Zakrpa datoteke za podizanje sustava</string>
    <string name="direct_install">Izravna instalacija (preporuča se)</string>
    <string name="select_method">Odaberite metodu</string>
-    <string name="boot_file_patch_msg">Odaberite standardnu datoteku za podizanje sustava u .img ili .tar formatu</string>
    <string name="complete_uninstall">Potpuna deinstalacija</string>
    <string name="restore_done">Obnova je dovršena!</string>
    <string name="restore_fail">Stock backup does not exist!</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -91,13 +91,11 @@
    <string name="hide_manager_fail_toast">Kesalahan menyembunyikan Magisk Manager.</string>
    <string name="open_link_failed_toast">Tidak ada aplikasi ditemukan untuk membuka tautan.</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 (Direkomendasikan)</string>
    <string name="install_inactive_slot">Pasang ke Slot Nonaktif (Setelah OTA)</string>
    <string name="warning">Peringatan</string>
    <string name="install_inactive_slot_msg">Perangkat Anda akan DIPAKSA untuk boot ke slot nonaktif saat ini setelah sebuah reboot!\nHanya gunakan opsi ini setelah OTA selesai.\nLanjutkan?</string>
    <string name="select_method">Pilih Metode</string>
-    <string name="boot_file_patch_msg">Pilih stock boot image dump dalam format .img atau .tar.</string>
    <string name="complete_uninstall">Copot Total</string>
    <string name="restore_img">Pulihkan Image</string>
    <string name="restore_img_msg">Memulihkan…</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -92,14 +92,12 @@
 	<string name="hide_manager_fail_toast">Non è stato possibile nascondere Magisk Manager.</string>
 	<string name="open_link_failed_toast">Nessuna app disponibile per aprire il link.</string>
 	<string name="download_zip_only">Scarica solo il file zip</string>
-	<string name="patch_boot_file">Aggiorna l\'immagine di boot</string>
-	<string name="direct_install">Installazione diretta (raccomandata)</string>
+    <string name="direct_install">Installazione diretta (raccomandata)</string>
 	<string name="install_inactive_slot">Installa nello slot inattivo (dopo un OTA)</string>
 	<string name="warning">Attenzione</string>
 	<string name="install_inactive_slot_msg">Questo dispositivo verrà FORZATO ad avviarsi usando lo slot inattivo!\nUsa questo metodo solo dopo che un OTA è stato installato.\nVuoi continuare?</string>
 	<string name="select_method">Seleziona un metodo</string>
-	<string name="boot_file_patch_msg">Seleziona l\'immagine originale di boot in formato .img o .tar.</string>
-	<string name="complete_uninstall">Disinstallazione completa</string>
+    <string name="complete_uninstall">Disinstallazione completa</string>
   	<string name="restore_img">Ripristina Immagini</string>
 	<string name="restore_img_msg">Ripristino…</string>
 	<string name="restore_done">Ripristino completato!</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -92,13 +92,11 @@
    <string name="hide_manager_fail_toast">Magisk Managerを隠せませんでした…</string>
    <string name="open_link_failed_toast">このリンクを開けるアプリがありません</string>
    <string name="download_zip_only">ZIPのみダウンロード</string>
-    <string name="patch_boot_file">Bootイメージのパッチ</string>
    <string name="direct_install">直接インストール (推奨)</string>
    <string name="install_inactive_slot">Inactive Slotにインストール (OTA後)</string>
    <string name="warning">警告</string>
    <string name="install_inactive_slot_msg">お使いのデバイスは再起動後に現在のInactive Slotで強制的に起動されます！\nこのオプションはOTAの完了後にのみ使用してください。\n続行しますか？</string>
    <string name="select_method">方法の選択</string>
-    <string name="boot_file_patch_msg">StockのBootイメージ (.img または .tar形式) を選択してください</string>
    <string name="complete_uninstall">完全にアンインストール</string>
    <string name="restore_img">イメージのリストア</string>
    <string name="restore_img_msg">リストア中…</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@ -83,10 +83,8 @@
    <string name="hide_manager_title">Magisk Manager paslėpiamas…</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 boot failą</string>
    <string name="direct_install">Tiesioginis instaliavimas (Rekomenduojamas)</string>
    <string name="select_method">Pasirinkite metodą</string>
-    <string name="boot_file_patch_msg">Pasirinkti boot failą .img ar .tar formate</string>
    <string name="complete_uninstall">Pilnas pašalinimas</string>
    <string name="restore_img">Atstatyti boot failą</string>
    <string name="restore_img_msg">Atstatome…</string>
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@ -89,13 +89,11 @@
    <string name="hide_manager_fail_toast">Skjulingen av Magisk Manager mislyktes.</string>
    <string name="open_link_failed_toast">Ingen apper som kunne åpne denne lenken ble funnet.</string>
    <string name="download_zip_only">Bare last ned ZIPen</string>
-    <string name="patch_boot_file">Patch oppstartsbildefilen</string>
    <string name="direct_install">Direkteinstallasjon (Anbefalt)</string>
    <string name="install_inactive_slot">Installer til et inaktivt felt (Etter OTA)</string>
    <string name="warning">Advarsel</string>
    <string name="install_inactive_slot_msg">Enheten din vil bli TVUNGET til å starte opp på det som for øyeblikket er et inaktivt felt, etter en omstart!\nBare bruk dette alternativet etter at OTA-oppdateringen er ferdig.\nVil du fortsette?</string>
    <string name="select_method">Velg metode</string>
-    <string name="boot_file_patch_msg">Velg oppstartsbildefilen som fulgte med mobilen din, i .img- eller .tar-format.</string>
    <string name="complete_uninstall">Fullstendig avinstallering</string>
    <string name="restore_img">Gjenopprett oppstartsbilde</string>
    <string name="restore_img_msg">Gjenoppretter …</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -84,10 +84,8 @@
    <string name="hide_manager_title">Magisk Manager verbergen…</string>
    <string name="hide_manager_fail_toast">Magisk Manager verbergen mislukt…</string>
    <string name="download_zip_only">Alleen zip downloaden</string>
-    <string name="patch_boot_file">Boot image-bestand patchen</string>
    <string name="direct_install">Direct installeren (aangeraden)</string>
    <string name="select_method">Methode kiezen</string>
-    <string name="boot_file_patch_msg">Kies originele boot image-dump in .img- of .tar-formaat</string>
    <string name="complete_uninstall">Compleet deïnstalleren</string>
    <string name="restore_img">Images herstellen</string>
    <string name="restore_done">Herstel voltooid!</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -92,13 +92,11 @@
    <string name="hide_manager_fail_toast">Błąd Ukrycia Magisk Managera.</string>
 	<string name="open_link_failed_toast">Nie znaleziono aplikacji pod linkiem.</string>
    <string name="download_zip_only">Pobierz Tylko Zip</string>
-    <string name="patch_boot_file">Patchowanie Pliku Boot Image</string>
    <string name="direct_install">Bezpośrednia instalacja (Zalecane)</string>
 	<string name="install_inactive_slot">Zainstaluj do Nieaktywnego Slotu (po OTA)</string>
    <string name="warning">Uwaga</string>
    <string name="install_inactive_slot_msg">Urządzenie będzie MUSIAŁO uruchomić się z bieżącego nieaktywnego slotu po restarcie! /\nUżyj tylko tej opcji po zakończeniu OTA.\nKontynuować?</string>
 	<string name="select_method">Wybierz Metodę</string>
-    <string name="boot_file_patch_msg">Wybierz stokowy obraz boot w formacie .img lub .tar</string>
    <string name="complete_uninstall">Odinstalowywanie Zakończone</string>
    <string name="restore_img">Przywróć Obraz</string>
 	<string name="restore_img_msg">Przywracanie…</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -85,11 +85,9 @@
    <string name="hide_manager_title">Ocultando Magisk Manager…</string>
    <string name="hide_manager_fail_toast">Falha ao ocultar Magisk Manager…</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_inactive_slot">Instalar no Slot Inativo (Após OTA)</string>
    <string name="select_method">Selecionar Método</string>
-    <string name="boot_file_patch_msg">Selecionar depósito de imagem de inicialização de fábrica no formato .img ou .tar</string>
    <string name="complete_uninstall">Completar Desinstalação</string>
    <string name="restore_img">Restaurar Imagens</string>
    <string name="restore_done">Restauração concluída!</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -73,7 +73,6 @@
    <string name="hide_manager_title">A esconder Magisk Manager…</string>
    <string name="hide_manager_fail_toast">Falha ao esconder Magisk Manager…</string>
    <string name="download_zip_only">Transferir Apenas Ficheiro Zip</string>
-    <string name="patch_boot_file">Patch a Imagem de Arranque</string>
    <string name="direct_install">Instalar Diretamente (Recomendado)</string>
    <string name="select_method">Selecionar Método</string>
    <string name="complete_uninstall">Desinstalação Completa</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -92,13 +92,11 @@
    <string name="hide_manager_fail_toast">Ascunderea Magisk Manager a eșuat.</string>
    <string name="open_link_failed_toast">Nu a fost găsită nicio aplicație pentru a deschide linkul.</string>
    <string name="download_zip_only">Doar descarcă fișierul zip</string>
-    <string name="patch_boot_file">Modifică fișierul de imagine boot</string>
    <string name="direct_install">Instalare directă (Recomandat)</string>
    <string name="install_inactive_slot">Instalare în slotul inactiv (După OTA)</string>
    <string name="warning">Avertisment</string>
    <string name="install_inactive_slot_msg">Dispozitivul va fi FORȚAT să se încarce în slotul inactiv actual după repornire!\nFolosește această opțiune numai după terminarea OTA.\nContinui?</string>
    <string name="select_method">Selectează metoda</string>
-    <string name="boot_file_patch_msg">Selectează formatul .img sau .tar pentru imaginea de boot stock.</string>
    <string name="complete_uninstall">Dezinstalare totală</string>
    <string name="restore_img">Restaurează imagini</string>
    <string name="restore_img_msg">Se restaurează…</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -92,13 +92,11 @@
    <string name="hide_manager_fail_toast">Не удалось замаскировать Magisk Manager</string>
    <string name="open_link_failed_toast">Не найдено приложений для открытия ссылки.</string>
    <string name="download_zip_only">Загрузка установочного ZIP</string>
-    <string name="patch_boot_file">Пропатчить образ ядра (boot.img)</string>
    <string name="direct_install">Прямая установка (Рекомендуется)</string>
    <string name="install_inactive_slot">Установка в неактивный слот (После OTA)</string>
    <string name="warning">Предупреждение</string>
    <string name="install_inactive_slot_msg">Ваше устройство будет принудительно перезагружено в неактивный слот!\nИспользуйте эту опцию только при установке OTA.\nПродолжить?</string>
    <string name="select_method">Выбор способа</string>
-    <string name="boot_file_patch_msg">Выберите файл ядра (boot) - *.img или *.tar</string>
    <string name="complete_uninstall">Полное удаление</string>
    <string name="restore_img">Восстановить разделы</string>
    <string name="restore_img_msg">Восстановление…</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -90,13 +90,11 @@
    <string name="flashing">Flashovanie</string>
    <string name="open_link_failed_toast">Nepodarilo sa nájsť vhodnú aplikáciu na otvorenie odkazu…</string>
    <string name="download_zip_only">Stiahnuť iba zip</string>
-    <string name="patch_boot_file">Zaplátať Boot Image File</string>
    <string name="direct_install">Priama inštalácia (Odporúča sa)</string>
    <string name="install_inactive_slot">Inštalovať na aktívny slot (Po OTA)</string>
    <string name="warning">Upozornenie</string>
    <string name="install_inactive_slot_msg">Vaše zariadenie bude po reštarte PRINÚTENÉ nabootovať do aktuálne neaktívneho slotu!\nTúto voľbu použite iba po skončení OTA.\nPokračovať?</string>
    <string name="select_method">Vyberte metódu</string>
-    <string name="boot_file_patch_msg">Vyberte stock boot image dump vo formáte .img alebo .tar</string>
    <string name="complete_uninstall">Úplne odinštalovať</string>
    <string name="restore_img">Obnoviť obrazy</string>
    <string name="restore_img_msg">Obnovovanie…</string>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -77,10 +77,8 @@
    <string name="hide_manager_title">Сакривам Магиск Менаџер…</string>
    <string name="hide_manager_fail_toast">Скривање Магиск Менаџера неуспешно…</string>
    <string name="download_zip_only">Преузми само Зип</string>
-    <string name="patch_boot_file">Закрпи фајл слике покретања</string>
    <string name="direct_install">Директна Инсталација (Препоручено)</string>
    <string name="select_method">Изабери Методу</string>
-    <string name="boot_file_patch_msg">Изабери испис фабричког фајла слике покретања у .img или .tar формату</string>
    <string name="complete_uninstall">Комплетна Унинсталација</string>
    <string name="restore_done">Повратак успешан!</string>
    <string name="restore_fail">Фабрички бекап не постоји!</string>
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@ -89,13 +89,11 @@
    <string name="hide_manager_fail_toast">การซ่อน Magisk Manager ล้มเหลว</string>
    <string name="open_link_failed_toast">ไม่พบแอปพลิเคชันสำหรับเปิดลิ้งค์</string>
    <string name="download_zip_only">ดาวน์โหลด Zip เท่านั้น</string>
-    <string name="patch_boot_file">แพตช์ไฟล์บู๊ต</string>
    <string name="direct_install">การติดตั้งโดยตรง (แนะนำ)</string>
    <string name="install_inactive_slot">ติดตั้งไปยัง Slot ที่ไม่ใช้งาน (หลังจาก OTA)</string>
    <string name="warning">คำเตือน</string>
    <string name="install_inactive_slot_msg">อุปกรณ์ของคุณจะถูกบังคับให้บู๊ตไป Slot ที่ไม่ใช่งานหลังจากรีบูต!\nใช้ตัวเลือกนี้หลังจาก OTA เสร็จเท่านั้น\nดำเนินการต่อ?</string>
    <string name="select_method">เลือกวิธี</string>
-    <string name="boot_file_patch_msg">เลือกไฟล์บู๊ตจากโรงงานในรูปแบบ .img or .tar</string>
    <string name="complete_uninstall">ถอนการติดตั้งแบบสมบูรณ์</string>
    <string name="restore_img">กู้คืน Images</string>
    <string name="restore_img_msg">กำลังกู้คืน…</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -92,13 +92,11 @@
    <string name="hide_manager_fail_toast">Magisk Manager\'ı Gizleme başarısız oldu…</string>
    <string name="open_link_failed_toast">Bağlantıyı açabilecek uygulama bulunamadı…</string>
    <string name="download_zip_only">Yalnızca Zip Dosyasını İndir</string>
-    <string name="patch_boot_file">Önyükleme İmaj Dosyasını Yamala</string>
    <string name="direct_install">Doğrudan Yükle (Önerilen)</string>
    <string name="install_inactive_slot">Pasif yuvaya yükle (OTA\'dan sonra)</string>
    <string name="warning">Uyarı</string>
    <string name="install_inactive_slot_msg">Cihazınız yeniden başlatıldıktan sonra mevcut pasif yuvaya ZORLA önyüklenecek!\nBu seçeneği yalnızca OTA tamamlandıktan sonra kullanın.\nDevam mı?</string>
    <string name="select_method">Yöntem Seçin</string>
-    <string name="boot_file_patch_msg">.img veya .tar formatında stok önyükleme imajını seçin</string>
    <string name="complete_uninstall">Tamamen Kaldır</string>
    <string name="restore_img">Önyükleme İmajını Geri Yükle</string>
    <string name="restore_img_msg">Geri Yükleniyor…</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -92,13 +92,11 @@
    <string name="hide_manager_fail_toast">Не вдалося приховати Magisk Manager…</string>
    <string name="open_link_failed_toast">Не знайдено програм для відкриття посилання…</string>
    <string name="download_zip_only">Тільки завантажити</string>
-    <string name="patch_boot_file">Пропатчити boot образ</string>
    <string name="direct_install">Пряме встановлення (рекомендовано)</string>
    <string name="install_inactive_slot">Встановити в неактивний слот (після OTA)</string>
    <string name="warning">Попередження</string>
    <string name="install_inactive_slot_msg">Ваш пристрій буде примусово перезавантажено в неактивний слот!\nВикористовуйте цю опцію тільки для встановлення OTA.\nПродовжити?</string>
    <string name="select_method">Виберіть спосіб</string>
-    <string name="boot_file_patch_msg">Виберіть оригінальний дамп boot образу в форматі .img чи .tar.</string>
    <string name="complete_uninstall">Видалення виконано</string>
    <string name="restore_img">Відновити образи</string>
    <string name="restore_img_msg">Відновлення…</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -84,13 +84,11 @@
    <string name="hide_manager_fail_toast">Ẩn Magisk Manager thất bại.</string>
    <string name="open_link_failed_toast">Không tìm thấy ứng dụng nào để mở liên kết.</string>
    <string name="download_zip_only">Chỉ tải xuống tập tin zip</string>
-    <string name="patch_boot_file">Tập tin hình ảnh bản vá khởi động</string>
    <string name="direct_install">Cài đặt trực tiếp (Được đề xuất)</string>
    <string name="install_inactive_slot">Cài đặt vào vùng không hoạt động (Sau khi OTA)</string>
    <string name="warning">Cảnh báo</string>
    <string name="install_inactive_slot_msg">Thiết bị của bạn sẽ bắt buộc phải khởi động tới vị trí không hoạt động hiện tại sau khi khởi động lại!\nChỉ sử dụng tuỳ chọn này sau khi cập nhật OTA hoàn tất.\nMuốn tiếp tục?</string>
    <string name="select_method">Chọn phương thức</string>
-    <string name="boot_file_patch_msg">Chọn kết xuất hình ảnh khởi động gốc theo định dạng .img hoặc .tar.</string>
    <string name="complete_uninstall">Xác nhận gỡ bỏ</string>
    <string name="restore_img">Khôi phục images</string>
    <string name="restore_img_msg">Đang khôi phục…</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -92,13 +92,11 @@
    <string name="hide_manager_fail_toast">隐藏 Magisk Manager 失败</string>
    <string name="open_link_failed_toast">找不到能够打开此链接的应用</string>
    <string name="download_zip_only">仅下载 Zip</string>
-    <string name="patch_boot_file">修补 Boot 镜像文件</string>
    <string name="direct_install">直接安装（推荐）</string>
    <string name="install_inactive_slot">安装到未使用的槽位（安装完OTA后）</string>
    <string name="warning">警告</string>
    <string name="install_inactive_slot_msg">重启后，设备将被强制切换到另一个槽位！\n请在安装完 OTA 后再使用。\n是否继续？</string>
    <string name="select_method">选择安装方法</string>
-    <string name="boot_file_patch_msg">选择原厂 Boot 镜像备份；支持 .img 以及 .tar 格式</string>
    <string name="complete_uninstall">完全卸载</string>
    <string name="restore_img">还原原厂镜像</string>
    <string name="restore_img_msg">还原中…</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -92,13 +92,11 @@
    <string name="hide_manager_fail_toast">隱藏 Magisk Manager 失敗</string>
    <string name="open_link_failed_toast">無可開啟此連結的應用程式</string>
    <string name="download_zip_only">僅下載 ZIP</string>
-    <string name="patch_boot_file">修改 Boot 映像檔</string>
    <string name="direct_install">直接安裝（建議）</string>
    <string name="install_inactive_slot">安裝至未使用的分割區（OTA 後）</string>
    <string name="warning">警告</string>
    <string name="install_inactive_slot_msg">此裝置將會在下次重新啟動後強制切換至未使用的分割區！\n請僅在 OTA 後使用此選項。\n是否繼續？</string>
    <string name="select_method">選擇模式</string>
-    <string name="boot_file_patch_msg">選擇原始 Boot 映像檔；應為 .img 及 .tar 格式</string>
    <string name="complete_uninstall">完整解除安裝</string>
    <string name="restore_img">還原映像檔</string>
    <string name="restore_img_msg">正在還原…</string>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -9,7 +9,6 @@

    <color name="red500">#F44336</color>
    <color name="green500">#4CAF50</color>
-    <color name="grey500">#9E9E9E</color>
    <color name="blue500">#2196f3</color>
    <color name="yellow500">#FFC107</color>

--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@ -7,8 +7,5 @@
    <dimen name="card_vertical_margin">3dip</dimen>
    <dimen name="card_corner_radius">2dp</dimen>
    <dimen name="card_elevation">2dp</dimen>
-    <dimen name="card_layout_padding">10dp</dimen>
-    <dimen name="card_textview_width">300dip</dimen>
-    <dimen name="checkbox_padding">3dp</dimen>
    <dimen name="fab_padding">16dp</dimen>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -74,6 +74,17 @@
    <string name="magisk_update_title">Magisk Update Available!</string>
    <string name="manager_update_title">Magisk Manager Update Available!</string>

+    <!-- Installation -->
+    <string name="manager_download_install">Press to download and install.</string>
+    <string name="download_zip_only">Download Zip Only</string>
+    <string name="direct_install">Direct Install (Recommended)</string>
+    <string name="install_inactive_slot">Install to Inactive Slot (After OTA)</string>
+    <string name="install_inactive_slot_msg">Your device will be FORCED to boot to the current inactive slot after a reboot!\nOnly use this option after OTA is done.\nContinue?</string>
+    <string name="select_method">Select Method</string>
+    <string name="setup_title">Additional Setup</string>
+    <string name="select_patch_file">Select and Patch a File</string>
+    <string name="patch_file_msg">Select a raw image (*.img) or an ODIN tarfile (*.tar)</string>
+
    <!--Toasts, Dialogs-->
    <string name="close">Close</string>
    <string name="repo_install_title">Install %1$s</string>
@ -84,21 +95,14 @@
    <string name="release_notes">Release notes</string>
    <string name="repo_cache_cleared">Repo cache cleared</string>
    <string name="internal_storage">The zip is stored in:\n[Internal Storage]%1$s</string>
-    <string name="manager_download_install">Press to download and install.</string>
+
    <string name="dtbo_patched_title">DTBO was patched!</string>
    <string name="dtbo_patched_reboot">Magisk Manager has patched dtbo.img. Please reboot.</string>
    <string name="flashing">Flashing</string>
    <string name="hide_manager_title">Hiding Magisk Manager…</string>
    <string name="hide_manager_fail_toast">Hide Magisk Manager failed.</string>
    <string name="open_link_failed_toast">No application found to open the link.</string>
-    <string name="download_zip_only">Download Zip Only</string>
-    <string name="patch_boot_file">Patch Boot Image File</string>
-    <string name="direct_install">Direct Install (Recommended)</string>
-    <string name="install_inactive_slot">Install to Inactive Slot (After OTA)</string>
    <string name="warning">Warning</string>
-    <string name="install_inactive_slot_msg">Your device will be FORCED to boot to the current inactive slot after a reboot!\nOnly use this option after OTA is done.\nContinue?</string>
-    <string name="select_method">Select Method</string>
-    <string name="boot_file_patch_msg">Select stock boot image dump in .img or .tar format.</string>
    <string name="complete_uninstall">Complete Uninstall</string>
    <string name="restore_img">Restore Images</string>
    <string name="restore_img_msg">Restoring…</string>
@ -110,7 +114,6 @@
    <string name="setup_fail">Setup failed.</string>
    <string name="env_fix_title">Requires Additional Setup</string>
    <string name="env_fix_msg">Your device needs additional setup for Magisk to work properly. It will download the Magisk setup zip, do you want to proceed now?</string>
-    <string name="setup_title">Additional Setup</string>
    <string name="setup_msg">Running environment setup…</string>
    <string name="downloading_toast">Downloading %1$s</string>
    <string name="no_rw_storage">This feature will not work without permission to write external storage.</string>