From ee2c801fe0e1e70023f81fcbf291a5442416ff6f Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sun, 2 Dec 2018 15:15:42 -0500 Subject: [PATCH] Better progress notifications --- .../full/java/com/topjohnwu/magisk/Const.java | 3 +- .../com/topjohnwu/magisk/SplashActivity.java | 10 ++----- .../com/topjohnwu/magisk/asyncs/PatchAPK.java | 4 +-- .../components/NotificationProgress.java | 12 ++++---- .../magisk/utils/DlInstallManager.java | 4 +-- .../topjohnwu/magisk/utils/Notifications.java | 29 +++++++++++++++---- app/src/full/res/values-ar/strings.xml | 6 ++-- app/src/full/res/values-bg/strings.xml | 6 ++-- app/src/full/res/values-ca/strings.xml | 6 ++-- app/src/full/res/values-de/strings.xml | 6 ++-- app/src/full/res/values-el/strings.xml | 6 ++-- app/src/full/res/values-es/strings.xml | 6 ++-- app/src/full/res/values-et/strings.xml | 6 ++-- app/src/full/res/values-fr/strings.xml | 6 ++-- app/src/full/res/values-hr/strings.xml | 4 +-- app/src/full/res/values-in/strings.xml | 6 ++-- app/src/full/res/values-it/strings.xml | 6 ++-- app/src/full/res/values-ja/strings.xml | 6 ++-- app/src/full/res/values-lt/strings.xml | 6 ++-- app/src/full/res/values-nl/strings.xml | 6 ++-- app/src/full/res/values-pl/strings.xml | 6 ++-- app/src/full/res/values-pt-rBR/strings.xml | 6 ++-- app/src/full/res/values-pt-rPT/strings.xml | 6 ++-- app/src/full/res/values-ro/strings.xml | 6 ++-- app/src/full/res/values-ru/strings.xml | 6 ++-- app/src/full/res/values-sk/strings.xml | 6 ++-- app/src/full/res/values-sr/strings.xml | 6 ++-- app/src/full/res/values-sv/strings.xml | 2 +- app/src/full/res/values-tr/strings.xml | 6 ++-- app/src/full/res/values-uk/strings.xml | 6 ++-- app/src/full/res/values-vi/strings.xml | 6 ++-- app/src/full/res/values-zh-rCN/strings.xml | 6 ++-- app/src/full/res/values-zh-rTW/strings.xml | 6 ++-- app/src/full/res/values/strings.xml | 15 ++++++---- 34 files changed, 126 insertions(+), 107 deletions(-) diff --git a/app/src/full/java/com/topjohnwu/magisk/Const.java b/app/src/full/java/com/topjohnwu/magisk/Const.java index 11a15fed8..5bde3ac61 100644 --- a/app/src/full/java/com/topjohnwu/magisk/Const.java +++ b/app/src/full/java/com/topjohnwu/magisk/Const.java @@ -62,7 +62,8 @@ public class Const { public static final int APK_UPDATE_NOTIFICATION_ID = 5; public static final int DTBO_NOTIFICATION_ID = 7; public static final int DOWNLOAD_PROGRESS_ID = 8; - public static final String NOTIFICATION_CHANNEL = "magisk_notification"; + public static final String UPDATE_NOTIFICATION_CHANNEL = "update"; + public static final String PROGRESS_NOTIFICATION_CHANNEL = "progress"; } public static class Url { diff --git a/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java index f7c077c33..cfe55748f 100644 --- a/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java @@ -1,10 +1,7 @@ package com.topjohnwu.magisk; -import android.app.NotificationChannel; -import android.app.NotificationManager; import android.content.Intent; import android.content.pm.PackageManager; -import android.os.Build; import android.os.Bundle; import android.text.TextUtils; @@ -14,6 +11,7 @@ import com.topjohnwu.magisk.components.BaseActivity; import com.topjohnwu.magisk.receivers.ShortcutReceiver; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.LocaleManager; +import com.topjohnwu.magisk.utils.Notifications; import com.topjohnwu.magisk.utils.RootUtils; import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.superuser.Shell; @@ -51,11 +49,7 @@ public class SplashActivity extends BaseActivity { LocaleManager.loadAvailableLocales(); // Create notification channel on Android O - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - NotificationChannel channel = new NotificationChannel(Const.ID.NOTIFICATION_CHANNEL, - getString(R.string.magisk_updates), NotificationManager.IMPORTANCE_DEFAULT); - getSystemService(NotificationManager.class).createNotificationChannel(channel); - } + Notifications.setup(this); // Setup shortcuts sendBroadcast(new Intent(this, Data.classMap.get(ShortcutReceiver.class))); diff --git a/app/src/full/java/com/topjohnwu/magisk/asyncs/PatchAPK.java b/app/src/full/java/com/topjohnwu/magisk/asyncs/PatchAPK.java index be53fdba3..0f85e607a 100644 --- a/app/src/full/java/com/topjohnwu/magisk/asyncs/PatchAPK.java +++ b/app/src/full/java/com/topjohnwu/magisk/asyncs/PatchAPK.java @@ -126,8 +126,8 @@ public class PatchAPK { public static void hideManager(Activity activity) { ProgressDialog dialog = ProgressDialog.show(activity, - activity.getString(R.string.hide_manager_toast), - activity.getString(R.string.hide_manager_toast2)); + activity.getString(R.string.hide_manager_title), + activity.getString(R.string.hide_manager_msg)); AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> { boolean b = patchAndHide(); Data.mainHandler.post(() -> { diff --git a/app/src/full/java/com/topjohnwu/magisk/components/NotificationProgress.java b/app/src/full/java/com/topjohnwu/magisk/components/NotificationProgress.java index 85ec147a5..43883051b 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/NotificationProgress.java +++ b/app/src/full/java/com/topjohnwu/magisk/components/NotificationProgress.java @@ -33,13 +33,14 @@ public class NotificationProgress implements DownloadProgressListener { long cur = System.currentTimeMillis(); if (cur - prevTime >= 1000) { prevTime = cur; - builder.setProgress((int) totalBytes, (int) bytesDownloaded, false); - builder.setContentText(bytesDownloaded * 100 / totalBytes + "%"); + int progress = (int) (bytesDownloaded * 100 / totalBytes); + builder.setProgress(100, progress, false); + builder.setContentText(progress + "%"); update(); } } - public NotificationCompat.Builder getBuilder() { + public NotificationCompat.Builder getNotification() { return builder; } @@ -48,8 +49,9 @@ public class NotificationProgress implements DownloadProgressListener { } public void dlDone() { - builder.setProgress(0, 0, false); - builder.setContentText(Data.MM().getString(R.string.download_complete)); + builder.setProgress(0, 0, false) + .setContentText(Data.MM().getString(R.string.download_complete)) + .setSmallIcon(R.drawable.ic_check_circle); update(); } diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/DlInstallManager.java b/app/src/full/java/com/topjohnwu/magisk/utils/DlInstallManager.java index d16079c08..5fd985446 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/DlInstallManager.java +++ b/app/src/full/java/com/topjohnwu/magisk/utils/DlInstallManager.java @@ -71,9 +71,9 @@ public class DlInstallManager { File patched = apk; MagiskManager mm = Data.MM(); if (!mm.getPackageName().equals(Const.ORIG_PKG_NAME)) { - progress.getBuilder() + progress.getNotification() .setProgress(0, 0, true) - .setContentTitle(mm.getString(R.string.hide_manager_toast)) + .setContentTitle(mm.getString(R.string.hide_manager_title)) .setContentText(""); progress.update(); patched = new File(apk.getParent(), "patched.apk"); diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/Notifications.java b/app/src/full/java/com/topjohnwu/magisk/utils/Notifications.java index 2c052ffdf..2c7795a19 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/Notifications.java +++ b/app/src/full/java/com/topjohnwu/magisk/utils/Notifications.java @@ -1,7 +1,11 @@ package com.topjohnwu.magisk.utils; +import android.app.NotificationChannel; +import android.app.NotificationManager; import android.app.PendingIntent; +import android.content.Context; import android.content.Intent; +import android.os.Build; import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; @@ -17,6 +21,20 @@ import androidx.core.app.TaskStackBuilder; public class Notifications { + public static void setup(Context c) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + NotificationManager mgr = c.getSystemService(NotificationManager.class); + mgr.deleteNotificationChannel("magisk_notification"); + NotificationChannel channel = + new NotificationChannel(Const.ID.UPDATE_NOTIFICATION_CHANNEL, + c.getString(R.string.update_channel), NotificationManager.IMPORTANCE_DEFAULT); + mgr.createNotificationChannel(channel); + channel = new NotificationChannel(Const.ID.PROGRESS_NOTIFICATION_CHANNEL, + c.getString(R.string.progress_channel), NotificationManager.IMPORTANCE_LOW); + mgr.createNotificationChannel(channel); + } + } + public static void magiskUpdate() { MagiskManager mm = Data.MM(); @@ -28,7 +46,7 @@ public class Notifications { PendingIntent pendingIntent = stackBuilder.getPendingIntent(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID, PendingIntent.FLAG_UPDATE_CURRENT); - NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL); + NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.UPDATE_NOTIFICATION_CHANNEL); builder.setSmallIcon(R.drawable.ic_magisk_outline) .setContentTitle(mm.getString(R.string.magisk_update_title)) .setContentText(mm.getString(R.string.magisk_update_available, Data.remoteMagiskVersionString)) @@ -51,7 +69,7 @@ public class Notifications { PendingIntent pendingIntent = PendingIntent.getBroadcast(mm, Const.ID.APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT); - NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL); + NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.UPDATE_NOTIFICATION_CHANNEL); builder.setSmallIcon(R.drawable.ic_magisk_outline) .setContentTitle(mm.getString(R.string.manager_update_title)) .setContentText(mm.getString(R.string.manager_download_install)) @@ -70,7 +88,7 @@ public class Notifications { PendingIntent pendingIntent = PendingIntent.getBroadcast(mm, Const.ID.DTBO_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT); - NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL); + NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.UPDATE_NOTIFICATION_CHANNEL); builder.setSmallIcon(R.drawable.ic_magisk_outline) .setContentTitle(mm.getString(R.string.dtbo_patched_title)) .setContentText(mm.getString(R.string.dtbo_patched_reboot)) @@ -83,8 +101,9 @@ public class Notifications { public static NotificationCompat.Builder progress(String title) { MagiskManager mm = Data.MM(); - NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL); - builder.setSmallIcon(R.drawable.ic_magisk_outline) + NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.PROGRESS_NOTIFICATION_CHANNEL); + builder.setPriority(NotificationCompat.PRIORITY_LOW) + .setSmallIcon(android.R.drawable.stat_sys_download) .setContentTitle(title) .setProgress(0, 0, true); return builder; diff --git a/app/src/full/res/values-ar/strings.xml b/app/src/full/res/values-ar/strings.xml index 7be7789c3..02fee127b 100644 --- a/app/src/full/res/values-ar/strings.xml +++ b/app/src/full/res/values-ar/strings.xml @@ -134,8 +134,8 @@ تابعني على تويتر تستخدم كافة جلسات الجذر مساحة الأسم ذات التركيب العالمي فشل إخفاء مدير Magisk … - إخفاء مدير Magisk… - هذا قد يستغرق بعض الوقت… + إخفاء مدير Magisk… + هذا قد يستغرق بعض الوقت… التثبيت على فتحة غير نشطة (بعد OTA) "سيتم إجبار جهازك للتمهيد على الفتحة غير النشطة الحالية بعد إعادة التشغيل! فقط استخدام هذا الخيار بعد الانتهاء من OTA. @@ -143,7 +143,7 @@ قناة تحديث غير صالحة سيكون لكل جلسة جذر مساحة الاسم الخاصة بها معزولة اللغة - تحديثات Magisk + تحديثات Magisk اضغط للتنزيل والتثبيت تحديث مدير Magisk الجديد متوفر! حفظ السجل diff --git a/app/src/full/res/values-bg/strings.xml b/app/src/full/res/values-bg/strings.xml index 8ed55f9f7..992786e03 100644 --- a/app/src/full/res/values-bg/strings.xml +++ b/app/src/full/res/values-bg/strings.xml @@ -90,10 +90,10 @@ Докоснете за изтегляне и инсталиране. DTBO беше модифициран! Magisk Manager модифицира dtbo.img, моля да рестартирате устройството. - Актуализации на Magisk + Актуализации на Magisk Инсталиране - Скриване на Magisk Manager… - Може да отнеме известно време. + Скриване на Magisk Manager… + Може да отнеме известно време. Скриването на Magisk Manager бе неуспешно. Не бе намерено приложение за отваряне на линка. Изтегляне само на архив diff --git a/app/src/full/res/values-ca/strings.xml b/app/src/full/res/values-ca/strings.xml index 11d373b15..d1b169097 100644 --- a/app/src/full/res/values-ca/strings.xml +++ b/app/src/full/res/values-ca/strings.xml @@ -90,10 +90,10 @@ Premi per a descarregar i instal·lar DTBO ha estat arranjat Magisk Manager ha arranjat dtbo.img, per favor reinicia el dispositiu - Actualització de Magisk + Actualització de Magisk Flashejat - Amagant Magisk Manager… - Això pot tardar un temps… + Amagant Magisk Manager… + Això pot tardar un temps… L’amagament de Magisk Manager ha fallat… No s’ha trobat cap aplicació per obrir l’enllaç… Descarregar només l’arxiu ZIP diff --git a/app/src/full/res/values-de/strings.xml b/app/src/full/res/values-de/strings.xml index 44c23a611..6b18c1a23 100644 --- a/app/src/full/res/values-de/strings.xml +++ b/app/src/full/res/values-de/strings.xml @@ -90,10 +90,10 @@ Herunterladen und installieren DTBO wurde gepatched! Magisk Manager hat dtbo.img gepatched, bitte neustarten - Magisk Update + Magisk Update Flashing - Verberge Magisk Manager… - Das könnte einige Zeit dauern... + Verberge Magisk Manager… + Das könnte einige Zeit dauern... Verbergen von Magisk Manager fehlgeschlagen… Es wurde keine Anwendung gefunden, um diesen Link zu öffnen... Nur Zip-Datei herunterladen diff --git a/app/src/full/res/values-el/strings.xml b/app/src/full/res/values-el/strings.xml index a649ad67e..58c251551 100644 --- a/app/src/full/res/values-el/strings.xml +++ b/app/src/full/res/values-el/strings.xml @@ -90,10 +90,10 @@ Πιέστε για λήψη και εγκατάσταση Έγινε patch στο DTBO! Το Magisk Manager έκανε patch το dtbo.img, παρακαλώ κάντε επανεκκίνηση - Ενημερώσεις Magisk + Ενημερώσεις Magisk Γίνεται flash - Κρύβοντας το Magisk Manager… - Αυτό μπορεί να πάρει λίγη ώρα… + Κρύβοντας το Magisk Manager… + Αυτό μπορεί να πάρει λίγη ώρα… Η απόκρυψη του Magisk Manager απέτυχε… Λήψη Zip Μόνο Εφαρμογή Patch στο Αρχείο Εικόνας Boot diff --git a/app/src/full/res/values-es/strings.xml b/app/src/full/res/values-es/strings.xml index 153af9e0b..18e9be649 100644 --- a/app/src/full/res/values-es/strings.xml +++ b/app/src/full/res/values-es/strings.xml @@ -91,10 +91,10 @@ Pulse para descargar e instalar DTBO fue parchado! Magisk Manager ha parcheado dtbo.img, por favor reinicia - Actualización de Magisk + Actualización de Magisk Flasheando - Ocultando Magisk Manager… - Esto podría tomar un tiempo… + Ocultando Magisk Manager… + Esto podría tomar un tiempo… La Ocultación de Magisk Manager ha fallado… No se encontró ninguna aplicación para abrir el enlace… Descargar sólo el archivo ZIP diff --git a/app/src/full/res/values-et/strings.xml b/app/src/full/res/values-et/strings.xml index 31a6cf623..003b57a48 100644 --- a/app/src/full/res/values-et/strings.xml +++ b/app/src/full/res/values-et/strings.xml @@ -89,10 +89,10 @@ Vajuta allalaadimiseks ja installimiseks DTBO sai paigatud! Magisk Manager on paiganud dtbo.img, palun taaskäivita - Magisk\'i uuendused + Magisk\'i uuendused Välgutamine - Peidan Magisk Manager\'i… - See võib aega võtta… + Peidan Magisk Manager\'i… + See võib aega võtta… Magisk Manager\'i peitmine ebaõnnestus… Laadi ainult ZIP alla Paika käivituspildi fail diff --git a/app/src/full/res/values-fr/strings.xml b/app/src/full/res/values-fr/strings.xml index 6d92e518d..7b9ea6c94 100644 --- a/app/src/full/res/values-fr/strings.xml +++ b/app/src/full/res/values-fr/strings.xml @@ -90,10 +90,10 @@ Appuyer pour télécharger et installer. DTBO a été patché! Le Gestionnaire Magisk a vient de patcher dtbo.img, merci de redémarrer. - Mises à jours Magisk + Mises à jours Magisk Installation - Masquer le Gestionnaire Magisk… - Cela pourrait prendre un certain temps. + Masquer le Gestionnaire Magisk… + Cela pourrait prendre un certain temps. Masquage du Gestionnaire Magisk échoué. Aucune application trouvée pour ouvrir le lien. Uniquement télécharger le zip diff --git a/app/src/full/res/values-hr/strings.xml b/app/src/full/res/values-hr/strings.xml index 78c3257ab..929c4ba42 100644 --- a/app/src/full/res/values-hr/strings.xml +++ b/app/src/full/res/values-hr/strings.xml @@ -81,9 +81,9 @@ Obrada zip datoteke … Dostupno je novo ažuriranje Magisk Manager aplikacije! Pritisnite za preuzimanje i instalaciju - Magisk ažuriranja + Magisk ažuriranja Apliciranje - Skrivanje Magisk Manager aplikacije… + Skrivanje Magisk Manager aplikacije… Skrivanje Magisk Manager nije uspjelo Preuzmi samo zip Zakrpa datoteke za podizanje sustava diff --git a/app/src/full/res/values-in/strings.xml b/app/src/full/res/values-in/strings.xml index a27f0e11f..1975c3db3 100644 --- a/app/src/full/res/values-in/strings.xml +++ b/app/src/full/res/values-in/strings.xml @@ -89,10 +89,10 @@ Tekan untuk unduh dan pasang. DTBO telah ditambal! Magisk Manager telah menambal dtbo.img. Silahkan reboot. - Pembaruan Magisk + Pembaruan Magisk Flashing - Menyembunyikan Magisk Manager… - Ini mungkin membutuhkan beberapa saat. + Menyembunyikan Magisk Manager… + Ini mungkin membutuhkan beberapa saat. Kesalahan menyembunyikan Magisk Manager. Tidak ada aplikasi ditemukan untuk membuka tautan. Unduh Zip Saja diff --git a/app/src/full/res/values-it/strings.xml b/app/src/full/res/values-it/strings.xml index 68ce8ebbd..4a0730ce9 100644 --- a/app/src/full/res/values-it/strings.xml +++ b/app/src/full/res/values-it/strings.xml @@ -91,10 +91,10 @@ Premere per scaricare e installare. DTBO è stato aggiornato! Magisk Manager ha aggiornato dtbo.img. Riavvia per completare. - Aggiornamenti di Magisk + Aggiornamenti di Magisk Flash in corso… - Nascondendo Magisk Manager… - Potrebbe volerci un po\'. + Nascondendo Magisk Manager… + Potrebbe volerci un po\'. Non è stato possibile nascondere Magisk Manager. Nessuna app disponibile per aprire il link. Scarica solo il file zip diff --git a/app/src/full/res/values-ja/strings.xml b/app/src/full/res/values-ja/strings.xml index 6ac9311e1..eadc5b5bd 100644 --- a/app/src/full/res/values-ja/strings.xml +++ b/app/src/full/res/values-ja/strings.xml @@ -90,10 +90,10 @@ タップでダウンロードしてインストールします DTBOをパッチしました！ Magisk Managerはdtbo.imgをパッチしました。再起動してください - Magiskの更新 + Magiskの更新 書き込み中 - Magisk Managerを隠しています… - しばらくお待ちください… + Magisk Managerを隠しています… + しばらくお待ちください… Magisk Managerを隠せませんでした… ZIPのみダウンロード Bootイメージのパッチ diff --git a/app/src/full/res/values-lt/strings.xml b/app/src/full/res/values-lt/strings.xml index e94e5c3eb..a409377e5 100644 --- a/app/src/full/res/values-lt/strings.xml +++ b/app/src/full/res/values-lt/strings.xml @@ -89,10 +89,10 @@ Paspauskite, kad atsisiųstumėte ir instaliuotumėte DTBO buvo ištaisytas! Magisk Manager ištaisė dtbo.img, prašome perkrauti telefoną - Magisk Atnaujinimai + Magisk Atnaujinimai Instaliuojama - Magisk Manager paslėpiamas… - Tai užtruks sekundėlę… + Magisk Manager paslėpiamas… + Tai užtruks sekundėlę… Magisk Manager paslėpimas žlugo… Atsisiųsti zip failą Ištaisyti boot failą diff --git a/app/src/full/res/values-nl/strings.xml b/app/src/full/res/values-nl/strings.xml index 170d0ce49..39bfb4e82 100644 --- a/app/src/full/res/values-nl/strings.xml +++ b/app/src/full/res/values-nl/strings.xml @@ -90,10 +90,10 @@ Tik om te downloaden en installeren DTBO is gepatched! Magisk Manager heeft dtbo.img gepatched, herstarten a.u.b. - Magisk updates + Magisk updates Flashen - Magisk Manager verbergen… - Dit kan even duren… + Magisk Manager verbergen… + Dit kan even duren… Magisk Manager verbergen mislukt… Alleen zip downloaden Boot image-bestand patchen diff --git a/app/src/full/res/values-pl/strings.xml b/app/src/full/res/values-pl/strings.xml index d78b4defa..7630c5857 100644 --- a/app/src/full/res/values-pl/strings.xml +++ b/app/src/full/res/values-pl/strings.xml @@ -89,10 +89,10 @@ Naciśnij aby pobrać i zainstalować DTBO został wgrany! Magisk Manager wgrał dtbo.img, uruchom ponownie - Aktualizacja Magisk + Aktualizacja Magisk Flashowanie - Ukryj Magisk Manager… - To może chwilę potrwać… + Ukryj Magisk Manager… + To może chwilę potrwać… Błąd Ukrycia Magisk Managera Pobierz Tylko Zip Patchowanie Pliku Boot Image diff --git a/app/src/full/res/values-pt-rBR/strings.xml b/app/src/full/res/values-pt-rBR/strings.xml index 2adbf6ffc..f50b16b02 100644 --- a/app/src/full/res/values-pt-rBR/strings.xml +++ b/app/src/full/res/values-pt-rBR/strings.xml @@ -90,10 +90,10 @@ Toque para baixar e instalar DTBO foi emendado! Magisk Manager emendou dtbo.img, reinicie - Atualizações do Magisk + Atualizações do Magisk Gravando - Ocultando Magisk Manager… - Isto pode demorar um pouco… + Ocultando Magisk Manager… + Isto pode demorar um pouco… Falha ao ocultar Magisk Manager… Baixar Zip Apenas Emendar Arquivo de Imagem de Inicialização diff --git a/app/src/full/res/values-pt-rPT/strings.xml b/app/src/full/res/values-pt-rPT/strings.xml index 8cc7c5815..0865d4454 100644 --- a/app/src/full/res/values-pt-rPT/strings.xml +++ b/app/src/full/res/values-pt-rPT/strings.xml @@ -78,10 +78,10 @@ A processar ficheiro zip … Nova atualização do Magisk Manager disponível! Pressione para transferir e instalar - Atualizações do Magisk + Atualizações do Magisk A instalar - A esconder Magisk Manager… - Isto pode demorar algum tempo... + A esconder Magisk Manager… + Isto pode demorar algum tempo... Falha ao esconder Magisk Manager… Transferir Apenas Ficheiro Zip Patch a Imagem de Arranque diff --git a/app/src/full/res/values-ro/strings.xml b/app/src/full/res/values-ro/strings.xml index a00e8e2cc..7fdda5eb2 100644 --- a/app/src/full/res/values-ro/strings.xml +++ b/app/src/full/res/values-ro/strings.xml @@ -85,10 +85,10 @@ Apăsați pentru a descărca și instala DTBO a fost modificat! Magisk Manager a modificat dtbo.img, reporniţi - Actualizări Magisk + Actualizări Magisk Flashing - Ascundere Magisk Manager… - Ar putea dura ceva timp… + Ascundere Magisk Manager… + Ar putea dura ceva timp… Ascunderea Magisk Manager a eşuat Nu a fost găsită nicio aplicație pentru a deschide linkul… Doar descărcare fişier Zip diff --git a/app/src/full/res/values-ru/strings.xml b/app/src/full/res/values-ru/strings.xml index 2f2258142..3ce369e50 100644 --- a/app/src/full/res/values-ru/strings.xml +++ b/app/src/full/res/values-ru/strings.xml @@ -90,10 +90,10 @@ Нажмите для установки DTBO пропатчен! Magisk Manager пропатчил dtbo.img. Перезагрузите устройство. - Обновления Magisk + Обновления Magisk Прошивка… - Скрытие Magisk Manager… - Может занять некоторое время… + Скрытие Magisk Manager… + Может занять некоторое время… Скрытие Magisk Manager неудачно! Не найдено приложений для открытия ссылки… Загрузка установочного ZIP diff --git a/app/src/full/res/values-sk/strings.xml b/app/src/full/res/values-sk/strings.xml index 7ec36ffc2..2f281aeb1 100644 --- a/app/src/full/res/values-sk/strings.xml +++ b/app/src/full/res/values-sk/strings.xml @@ -89,10 +89,10 @@ Stlačte pre stiahnutie a inštaláciu DTBO bol zaplátaný! Magisk Manager zaplátal dtbo.img, prosím, reštartujte - Aktualizácie Magisk + Aktualizácie Magisk Flashovanie - Pracuje sa na skrytí Magisk Manager… - Môže to chvíľu trvať… + Pracuje sa na skrytí Magisk Manager… + Môže to chvíľu trvať… Skrytie Magisk Manager zlyhalo… Nepodarilo sa nájsť vhodnú aplikáciu na otvorenie odkazu… Stiahnuť iba zip diff --git a/app/src/full/res/values-sr/strings.xml b/app/src/full/res/values-sr/strings.xml index c112bf762..8962e8c93 100644 --- a/app/src/full/res/values-sr/strings.xml +++ b/app/src/full/res/values-sr/strings.xml @@ -83,10 +83,10 @@ Притисни да преузмеш и инсталираш DTBO је закрпљен! Магиск Менаџер је закрпио dtbo.img, рестартујте телефон - Магиск Ажурирање + Магиск Ажурирање Флешовање - Сакривам Магиск Менаџер… - Ово може потрајати… + Сакривам Магиск Менаџер… + Ово може потрајати… Скривање Магиск Менаџера неуспешно… Преузми само Зип Закрпи фајл слике покретања diff --git a/app/src/full/res/values-sv/strings.xml b/app/src/full/res/values-sv/strings.xml index 9108d45e4..4b2fe55c6 100644 --- a/app/src/full/res/values-sv/strings.xml +++ b/app/src/full/res/values-sv/strings.xml @@ -77,7 +77,7 @@ Arbetar En uppdatering av Magisk maneger finns tillgänglig! Tryck för att ladda ner och installera - Magiska uppdateringar + Magiska uppdateringar Fel vid nerladdning av fil Laddar ner %1$s Denna funktionen måste ha behörighet att skriva till externt lagringsutrymme. diff --git a/app/src/full/res/values-tr/strings.xml b/app/src/full/res/values-tr/strings.xml index 5cd3fa3d3..2d5febf04 100644 --- a/app/src/full/res/values-tr/strings.xml +++ b/app/src/full/res/values-tr/strings.xml @@ -90,10 +90,10 @@ İndirmek ve yüklemek için dokunun DTBO yamalandı! Magisk Manager dtbo.img\'yi yamaladı, lütfen yeniden başlatın - Magisk Güncellemeleri + Magisk Güncellemeleri Yükleniyor - Magisk Manager Gizleniyor… - Bu biraz zaman alabilir… + Magisk Manager Gizleniyor… + Bu biraz zaman alabilir… Magisk Manager\'ı Gizleme başarısız oldu… Bağlantıyı açabilecek uygulama bulunamadı… Yalnızca Zip Dosyasını İndir diff --git a/app/src/full/res/values-uk/strings.xml b/app/src/full/res/values-uk/strings.xml index cf1d90e1b..0830e2668 100644 --- a/app/src/full/res/values-uk/strings.xml +++ b/app/src/full/res/values-uk/strings.xml @@ -90,10 +90,10 @@ Натисніть, щоб завантажити і встановити DTBO пропатчено! Magisk Manager пропатчив dtbo.img, будь ласка, перезавантажте пристрій - Оновлення Magisk + Оновлення Magisk Прошивання - Приховування Magisk Manager… - Це може зайняти деякий час… + Приховування Magisk Manager… + Це може зайняти деякий час… Не вдалося приховати Magisk Manager… Не знайдено програм для відкриття посилання… Тільки завантажити diff --git a/app/src/full/res/values-vi/strings.xml b/app/src/full/res/values-vi/strings.xml index b12a97245..fa9542469 100644 --- a/app/src/full/res/values-vi/strings.xml +++ b/app/src/full/res/values-vi/strings.xml @@ -90,10 +90,10 @@ Nhấn để tải xuống và cài đặt. DTBO đã được vá! Magisk Manager đã vá dtbo.img. Hãy khởi động lại. - Cập nhật Magisk + Cập nhật Magisk Đang flash - Ẩn Magisk Manager… - Điều này có thể mất chút thời gian. + Ẩn Magisk Manager… + Điều này có thể mất chút thời gian. Ẩn Magisk Manager thất bại. Không tìm thấy ứng dụng nào để mở liên kết. Chỉ tải xuống tập tin zip diff --git a/app/src/full/res/values-zh-rCN/strings.xml b/app/src/full/res/values-zh-rCN/strings.xml index 0cea5595a..e663203b3 100644 --- a/app/src/full/res/values-zh-rCN/strings.xml +++ b/app/src/full/res/values-zh-rCN/strings.xml @@ -90,10 +90,10 @@ 下载并安装 已修补 DTBO! Magisk Manager 为 dtbo 分区进行了修补，请立即重新启动 - Magisk 更新 + Magisk 更新 正在刷入 - 正在隐藏 Magisk Manager… - 这可能需要一点时间… + 正在隐藏 Magisk Manager… + 这可能需要一点时间… 隐藏 Magisk Manager 失败 找不到能够打开此链接的应用 仅下载 Zip diff --git a/app/src/full/res/values-zh-rTW/strings.xml b/app/src/full/res/values-zh-rTW/strings.xml index 2dc150e24..85eeea265 100644 --- a/app/src/full/res/values-zh-rTW/strings.xml +++ b/app/src/full/res/values-zh-rTW/strings.xml @@ -159,11 +159,11 @@ 獨立 Namespace 繼承 Namespace 更新 %1$s - Magisk 更新 + Magisk 更新 (系統預設) 語言 正在刷入 - 正在隱藏 Magisk Manager… + 正在隱藏 Magisk Manager… 隱藏 Magisk Manager 失敗 隱藏 Magisk Manager 更新頻道 @@ -188,7 +188,7 @@ Magisk Manager 是一個 100% 開源的程式，因此不會包含 Google 私有所有權的 SafetyNet API 程式碼。\n\n你允許 Magisk Manager 下載一個擴充包 (包含 GoogleApiClient) 以執行 SafetyNet 檢查嗎？ DTBO 已被打上補丁！ Magisk Manager 已為 dtbo.img 打上補丁，請立即重新啟動 - 這可能會花上一段時間… + 這可能會花上一段時間… 將 Magisk Manager 以隨機套件名稱重新打包，以達成隱藏效果 不合法的更新頻道 自訂 diff --git a/app/src/full/res/values/strings.xml b/app/src/full/res/values/strings.xml index 8ccde553a..58d7520e3 100644 --- a/app/src/full/res/values/strings.xml +++ b/app/src/full/res/values/strings.xml @@ -70,13 +70,19 @@ Support thread Follow me on Twitter + + Magisk Updates + Progress Notifications + Download complete + New Magisk Update Available! + New Magisk Manager Update Available! + Close Install %1$s Do you want to install %1$s now? Download Reboot - New Magisk Update Available! Reboot to apply settings. Release notes Repo cache cleared @@ -86,14 +92,12 @@ Downloading zip file (%1$d%%) … Processing Processing zip file… - New Magisk Manager Update Available! Press to download and install. DTBO was patched! Magisk Manager has patched dtbo.img. Please reboot. - Magisk Updates Flashing - Hiding Magisk Manager… - This might take a while. + Hiding Magisk Manager… + This might take a while. Hide Magisk Manager failed. No application found to open the link. Download Zip Only @@ -122,7 +126,6 @@ Error downloading file Downloading %1$s This feature will not work without permission to write external storage. - Download complete General