Better progress notifications

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 {

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) {
+        Notifications.setup(this);
-            NotificationChannel channel = new NotificationChannel(Const.ID.NOTIFICATION_CHANNEL,
-                    getString(R.string.magisk_updates), NotificationManager.IMPORTANCE_DEFAULT);
-            getSystemService(NotificationManager.class).createNotificationChannel(channel);
-        }
 
         // Setup shortcuts
         sendBroadcast(new Intent(this, Data.classMap.get(ShortcutReceiver.class)));

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_title),
-                activity.getString(R.string.hide_manager_toast2));
+                activity.getString(R.string.hide_manager_msg));
         AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
             boolean b = patchAndHide();
             Data.mainHandler.post(() -> {

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);
+            int progress = (int) (bytesDownloaded * 100 / totalBytes);
-            builder.setContentText(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.setProgress(0, 0, false)
-        builder.setContentText(Data.MM().getString(R.string.download_complete));
+                .setContentText(Data.MM().getString(R.string.download_complete))
+                .setSmallIcon(R.drawable.ic_check_circle);
         update();
     }
 

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

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);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.PROGRESS_NOTIFICATION_CHANNEL);
-        builder.setSmallIcon(R.drawable.ic_magisk_outline)
+        builder.setPriority(NotificationCompat.PRIORITY_LOW)
+                .setSmallIcon(android.R.drawable.stat_sys_download)
                 .setContentTitle(title)
                 .setProgress(0, 0, true);
         return builder;

app/src/full/res/values-ar/strings.xml

@@ -134,8 +134,8 @@
   <string name="follow_twitter">تابعني على تويتر</string>
   <string name="global_summary">تستخدم كافة جلسات الجذر مساحة الأسم ذات التركيب العالمي</string>
   <string name="hide_manager_fail_toast">فشل إخفاء مدير Magisk …</string>
-  <string name="hide_manager_toast">إخفاء مدير Magisk…</string>
+  <string name="hide_manager_title">إخفاء مدير Magisk…</string>
-  <string name="hide_manager_toast2">هذا قد يستغرق بعض الوقت…</string>
+  <string name="hide_manager_msg">هذا قد يستغرق بعض الوقت…</string>
   <string name="install_inactive_slot">التثبيت على فتحة غير نشطة (بعد OTA)</string>
   <string name="install_inactive_slot_msg">"سيتم إجبار جهازك للتمهيد على الفتحة غير النشطة الحالية بعد إعادة التشغيل!
 فقط استخدام هذا الخيار بعد الانتهاء من OTA.
@@ -143,7 +143,7 @@
   <string name="invalid_update_channel">قناة تحديث غير صالحة</string>
   <string name="isolate_summary">سيكون لكل جلسة جذر مساحة الاسم الخاصة بها معزولة</string>
   <string name="language">اللغة</string>
-  <string name="magisk_updates">تحديثات Magisk</string>
+  <string name="update_channel">تحديثات Magisk</string>
   <string name="manager_download_install">اضغط للتنزيل والتثبيت</string>
   <string name="manager_update_title">تحديث مدير Magisk الجديد متوفر!</string>
   <string name="menuSaveLog">حفظ السجل</string>

app/src/full/res/values-bg/strings.xml

@@ -90,10 +90,10 @@
     <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="update_channel">Актуализации на Magisk</string>
     <string name="flashing">Инсталиране</string>
-    <string name="hide_manager_toast">Скриване на Magisk Manager…</string>
+    <string name="hide_manager_title">Скриване на Magisk Manager…</string>
-    <string name="hide_manager_toast2">Може да отнеме известно време.</string>
+    <string name="hide_manager_msg">Може да отнеме известно време.</string>
     <string name="hide_manager_fail_toast">Скриването на Magisk Manager бе неуспешно.</string>
     <string name="open_link_failed_toast">Не бе намерено приложение за отваряне на линка.</string>
     <string name="download_zip_only">Изтегляне само на архив</string>

app/src/full/res/values-ca/strings.xml

@@ -90,10 +90,10 @@
     <string name="manager_download_install">Premi per a descarregar i instal·lar</string>
     <string name="dtbo_patched_title">DTBO ha estat arranjat</string>
     <string name="dtbo_patched_reboot">Magisk Manager ha arranjat dtbo.img, per favor reinicia el dispositiu</string>
-    <string name="magisk_updates">Actualització de Magisk</string>
+    <string name="update_channel">Actualització de Magisk</string>
     <string name="flashing">Flashejat</string>
-    <string name="hide_manager_toast">Amagant Magisk Manager…</string>
+    <string name="hide_manager_title">Amagant Magisk Manager…</string>
-    <string name="hide_manager_toast2">Això pot tardar un temps…</string>
+    <string name="hide_manager_msg">Això pot tardar un temps…</string>
     <string name="hide_manager_fail_toast">L’amagament de Magisk Manager ha fallat…</string>
     <string name="open_link_failed_toast">No s’ha trobat cap aplicació per obrir l’enllaç…</string>
     <string name="download_zip_only">Descarregar només l’arxiu ZIP</string>

app/src/full/res/values-de/strings.xml

@@ -90,10 +90,10 @@
     <string name="manager_download_install">Herunterladen und installieren</string>
     <string name="dtbo_patched_title">DTBO wurde gepatched!</string>
     <string name="dtbo_patched_reboot">Magisk Manager hat dtbo.img gepatched, bitte neustarten</string>
-    <string name="magisk_updates">Magisk Update</string>
+    <string name="update_channel">Magisk Update</string>
     <string name="flashing">Flashing</string>
-    <string name="hide_manager_toast">Verberge Magisk Manager…</string>
+    <string name="hide_manager_title">Verberge Magisk Manager…</string>
-    <string name="hide_manager_toast2">Das könnte einige Zeit dauern...</string>
+    <string name="hide_manager_msg">Das könnte einige Zeit dauern...</string>
     <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>

app/src/full/res/values-el/strings.xml

@@ -90,10 +90,10 @@
     <string name="manager_download_install">Πιέστε για λήψη και εγκατάσταση</string>
     <string name="dtbo_patched_title">Έγινε patch στο DTBO!</string>
     <string name="dtbo_patched_reboot">Το Magisk Manager έκανε patch το dtbo.img, παρακαλώ κάντε επανεκκίνηση</string>
-    <string name="magisk_updates">Ενημερώσεις Magisk</string>
+    <string name="update_channel">Ενημερώσεις Magisk</string>
     <string name="flashing">Γίνεται flash</string>
-    <string name="hide_manager_toast">Κρύβοντας το Magisk Manager…</string>
+    <string name="hide_manager_title">Κρύβοντας το Magisk Manager…</string>
-    <string name="hide_manager_toast2">Αυτό μπορεί να πάρει λίγη ώρα…</string>
+    <string name="hide_manager_msg">Αυτό μπορεί να πάρει λίγη ώρα…</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>

app/src/full/res/values-es/strings.xml

@@ -91,10 +91,10 @@
     <string name="manager_download_install">Pulse para descargar e instalar</string>
     <string name="dtbo_patched_title">DTBO fue parchado!</string>
     <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="update_channel">Actualización de Magisk</string>
     <string name="flashing">Flasheando</string>
-    <string name="hide_manager_toast">Ocultando Magisk Manager…</string>
+    <string name="hide_manager_title">Ocultando Magisk Manager…</string>
-    <string name="hide_manager_toast2">Esto podría tomar un tiempo…</string>
+    <string name="hide_manager_msg">Esto podría tomar un tiempo…</string>
     <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>

app/src/full/res/values-et/strings.xml

@@ -89,10 +89,10 @@
     <string name="manager_download_install">Vajuta allalaadimiseks ja installimiseks</string>
     <string name="dtbo_patched_title">DTBO sai paigatud!</string>
     <string name="dtbo_patched_reboot">Magisk Manager on paiganud dtbo.img, palun taaskäivita</string>
-    <string name="magisk_updates">Magisk\'i uuendused</string>
+    <string name="update_channel">Magisk\'i uuendused</string>
     <string name="flashing">Välgutamine</string>
-    <string name="hide_manager_toast">Peidan Magisk Manager\'i…</string>
+    <string name="hide_manager_title">Peidan Magisk Manager\'i…</string>
-    <string name="hide_manager_toast2">See võib aega võtta…</string>
+    <string name="hide_manager_msg">See võib aega võtta…</string>
     <string name="hide_manager_fail_toast">Magisk Manager\'i peitmine ebaõnnestus…</string>
     <string name="download_zip_only">Laadi ainult ZIP alla</string>
     <string name="patch_boot_file">Paika käivituspildi fail</string>

app/src/full/res/values-fr/strings.xml

@@ -90,10 +90,10 @@
     <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 a vient de patcher dtbo.img, merci de redémarrer.</string>
-    <string name="magisk_updates">Mises à jours Magisk</string>
+    <string name="update_channel">Mises à jours Magisk</string>
     <string name="flashing">Installation</string>
-    <string name="hide_manager_toast">Masquer le Gestionnaire Magisk…</string>
+    <string name="hide_manager_title">Masquer le Gestionnaire Magisk…</string>
-    <string name="hide_manager_toast2">Cela pourrait prendre un certain temps.</string>
+    <string name="hide_manager_msg">Cela pourrait prendre un certain temps.</string>
     <string name="hide_manager_fail_toast">Masquage du Gestionnaire Magisk échoué.</string>
     <string name="open_link_failed_toast">Aucune application trouvée pour ouvrir le lien.</string>
     <string name="download_zip_only">Uniquement télécharger le zip</string>

app/src/full/res/values-hr/strings.xml

@@ -81,9 +81,9 @@
     <string name="zip_process_msg">Obrada zip datoteke …</string>
     <string name="manager_update_title">Dostupno je novo ažuriranje Magisk Manager aplikacije!</string>
     <string name="manager_download_install">Pritisnite za preuzimanje i instalaciju</string>
-    <string name="magisk_updates">Magisk ažuriranja</string>
+    <string name="update_channel">Magisk ažuriranja</string>
     <string name="flashing">Apliciranje</string>
-    <string name="hide_manager_toast">Skrivanje Magisk Manager aplikacije…</string>
+    <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>

app/src/full/res/values-in/strings.xml

@@ -89,10 +89,10 @@
     <string name="manager_download_install">Tekan untuk unduh dan pasang.</string>
     <string name="dtbo_patched_title">DTBO telah ditambal!</string>
     <string name="dtbo_patched_reboot">Magisk Manager telah menambal dtbo.img. Silahkan reboot.</string>
-    <string name="magisk_updates">Pembaruan Magisk</string>
+    <string name="update_channel">Pembaruan Magisk</string>
     <string name="flashing">Flashing</string>
-    <string name="hide_manager_toast">Menyembunyikan Magisk Manager…</string>
+    <string name="hide_manager_title">Menyembunyikan Magisk Manager…</string>
-    <string name="hide_manager_toast2">Ini mungkin membutuhkan beberapa saat.</string>
+    <string name="hide_manager_msg">Ini mungkin membutuhkan beberapa saat.</string>
     <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>

app/src/full/res/values-it/strings.xml

@@ -91,10 +91,10 @@
 	<string name="manager_download_install">Premere per scaricare e installare.</string>
 	<string name="dtbo_patched_title">DTBO è stato aggiornato!</string>
 	<string name="dtbo_patched_reboot">Magisk Manager ha aggiornato dtbo.img. Riavvia per completare.</string>
-	<string name="magisk_updates">Aggiornamenti di Magisk</string>
+	<string name="update_channel">Aggiornamenti di Magisk</string>
 	<string name="flashing">Flash in corso…</string>
-	<string name="hide_manager_toast">Nascondendo Magisk Manager…</string>
+	<string name="hide_manager_title">Nascondendo Magisk Manager…</string>
-	<string name="hide_manager_toast2">Potrebbe volerci un po\'.</string>
+	<string name="hide_manager_msg">Potrebbe volerci un po\'.</string>
 	<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>

app/src/full/res/values-ja/strings.xml

@@ -90,10 +90,10 @@
     <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="update_channel">Magiskの更新</string>
     <string name="flashing">書き込み中</string>
-    <string name="hide_manager_toast">Magisk Managerを隠しています…</string>
+    <string name="hide_manager_title">Magisk Managerを隠しています…</string>
-    <string name="hide_manager_toast2">しばらくお待ちください…</string>
+    <string name="hide_manager_msg">しばらくお待ちください…</string>
     <string name="hide_manager_fail_toast">Magisk Managerを隠せませんでした…</string>
     <string name="download_zip_only">ZIPのみダウンロード</string>
     <string name="patch_boot_file">Bootイメージのパッチ</string>

app/src/full/res/values-lt/strings.xml

@@ -89,10 +89,10 @@
     <string name="manager_download_install">Paspauskite, kad atsisiųstumėte ir instaliuotumėte</string>
     <string name="dtbo_patched_title">DTBO buvo ištaisytas!</string>
     <string name="dtbo_patched_reboot">Magisk Manager ištaisė dtbo.img, prašome perkrauti telefoną</string>
-    <string name="magisk_updates">Magisk Atnaujinimai</string>
+    <string name="update_channel">Magisk Atnaujinimai</string>
     <string name="flashing">Instaliuojama</string>
-    <string name="hide_manager_toast">Magisk Manager paslėpiamas…</string>
+    <string name="hide_manager_title">Magisk Manager paslėpiamas…</string>
-    <string name="hide_manager_toast2">Tai užtruks sekundėlę…</string>
+    <string name="hide_manager_msg">Tai užtruks sekundėlę…</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>

app/src/full/res/values-nl/strings.xml

@@ -90,10 +90,10 @@
     <string name="manager_download_install">Tik om te downloaden en installeren</string>
     <string name="dtbo_patched_title">DTBO is gepatched!</string>
     <string name="dtbo_patched_reboot">Magisk Manager heeft dtbo.img gepatched, herstarten a.u.b.</string>
-    <string name="magisk_updates">Magisk updates</string>
+    <string name="update_channel">Magisk updates</string>
     <string name="flashing">Flashen</string>
-    <string name="hide_manager_toast">Magisk Manager verbergen…</string>
+    <string name="hide_manager_title">Magisk Manager verbergen…</string>
-    <string name="hide_manager_toast2">Dit kan even duren…</string>
+    <string name="hide_manager_msg">Dit kan even duren…</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>

app/src/full/res/values-pl/strings.xml

@@ -89,10 +89,10 @@
     <string name="manager_download_install">Naciśnij aby pobrać i zainstalować</string>
     <string name="dtbo_patched_title">DTBO został wgrany!</string>
     <string name="dtbo_patched_reboot">Magisk Manager wgrał dtbo.img, uruchom ponownie</string>
-    <string name="magisk_updates">Aktualizacja Magisk</string>
+    <string name="update_channel">Aktualizacja Magisk</string>
     <string name="flashing">Flashowanie</string>
-    <string name="hide_manager_toast">Ukryj Magisk Manager…</string>
+    <string name="hide_manager_title">Ukryj Magisk Manager…</string>
-    <string name="hide_manager_toast2">To może chwilę potrwać…</string>
+    <string name="hide_manager_msg">To może chwilę potrwać…</string>
 	<string name="hide_manager_fail_toast">Błąd Ukrycia Magisk Managera</string>
     <string name="download_zip_only">Pobierz Tylko Zip</string>
     <string name="patch_boot_file">Patchowanie Pliku Boot Image</string>

app/src/full/res/values-pt-rBR/strings.xml

@@ -90,10 +90,10 @@
     <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="update_channel">Atualizações do Magisk</string>
     <string name="flashing">Gravando</string>
-    <string name="hide_manager_toast">Ocultando Magisk Manager…</string>
+    <string name="hide_manager_title">Ocultando Magisk Manager…</string>
-    <string name="hide_manager_toast2">Isto pode demorar um pouco…</string>
+    <string name="hide_manager_msg">Isto pode demorar um pouco…</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>

app/src/full/res/values-pt-rPT/strings.xml

@@ -78,10 +78,10 @@
     <string name="zip_process_msg">A processar ficheiro zip …</string>
     <string name="manager_update_title">Nova atualização do Magisk Manager disponível!</string>
     <string name="manager_download_install">Pressione para transferir e instalar</string>
-    <string name="magisk_updates">Atualizações do Magisk</string>
+    <string name="update_channel">Atualizações do Magisk</string>
     <string name="flashing">A instalar</string>
-    <string name="hide_manager_toast">A esconder Magisk Manager…</string>
+    <string name="hide_manager_title">A esconder Magisk Manager…</string>
-    <string name="hide_manager_toast2">Isto pode demorar algum tempo...</string>
+    <string name="hide_manager_msg">Isto pode demorar algum tempo...</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>

app/src/full/res/values-ro/strings.xml

@@ -85,10 +85,10 @@
     <string name="manager_download_install">Apăsați pentru a descărca și instala</string>
     <string name="dtbo_patched_title">DTBO a fost modificat!</string>
     <string name="dtbo_patched_reboot">Magisk Manager a modificat dtbo.img, reporniţi</string>
-    <string name="magisk_updates">Actualizări Magisk</string>
+    <string name="update_channel">Actualizări Magisk</string>
     <string name="flashing">Flashing</string>
-    <string name="hide_manager_toast">Ascundere Magisk Manager…</string>
+    <string name="hide_manager_title">Ascundere Magisk Manager…</string>
-    <string name="hide_manager_toast2">Ar putea dura ceva timp…</string>
+    <string name="hide_manager_msg">Ar putea dura ceva timp…</string>
     <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 descărcare fişier Zip</string>

app/src/full/res/values-ru/strings.xml

@@ -90,10 +90,10 @@
     <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="update_channel">Обновления Magisk</string>
     <string name="flashing">Прошивка…</string>
-    <string name="hide_manager_toast">Скрытие Magisk Manager…</string>
+    <string name="hide_manager_title">Скрытие Magisk Manager…</string>
-    <string name="hide_manager_toast2">Может занять некоторое время…</string>
+    <string name="hide_manager_msg">Может занять некоторое время…</string>
     <string name="hide_manager_fail_toast">Скрытие Magisk Manager неудачно!</string>
     <string name="open_link_failed_toast">Не найдено приложений для открытия ссылки…</string>
     <string name="download_zip_only">Загрузка установочного ZIP</string>

app/src/full/res/values-sk/strings.xml

@@ -89,10 +89,10 @@
     <string name="manager_download_install">Stlačte pre stiahnutie a inštaláciu</string>
     <string name="dtbo_patched_title">DTBO bol zaplátaný!</string>
     <string name="dtbo_patched_reboot">Magisk Manager zaplátal dtbo.img, prosím, reštartujte</string>
-    <string name="magisk_updates">Aktualizácie Magisk</string>
+    <string name="update_channel">Aktualizácie Magisk</string>
     <string name="flashing">Flashovanie</string>
-    <string name="hide_manager_toast">Pracuje sa na skrytí Magisk Manager…</string>
+    <string name="hide_manager_title">Pracuje sa na skrytí Magisk Manager…</string>
-    <string name="hide_manager_toast2">Môže to chvíľu trvať…</string>
+    <string name="hide_manager_msg">Môže to chvíľu trvať…</string>
     <string name="hide_manager_fail_toast">Skrytie Magisk Manager zlyhalo…</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>

app/src/full/res/values-sr/strings.xml

@@ -83,10 +83,10 @@
     <string name="manager_download_install">Притисни да преузмеш и инсталираш</string>
     <string name="dtbo_patched_title">DTBO је закрпљен!</string>
     <string name="dtbo_patched_reboot">Магиск Менаџер је закрпио dtbo.img, рестартујте телефон</string>
-    <string name="magisk_updates">Магиск Ажурирање</string>
+    <string name="update_channel">Магиск Ажурирање</string>
     <string name="flashing">Флешовање</string>
-    <string name="hide_manager_toast">Сакривам Магиск Менаџер…</string>
+    <string name="hide_manager_title">Сакривам Магиск Менаџер…</string>
-    <string name="hide_manager_toast2">Ово може потрајати…</string>
+    <string name="hide_manager_msg">Ово може потрајати…</string>
     <string name="hide_manager_fail_toast">Скривање Магиск Менаџера неуспешно…</string>
     <string name="download_zip_only">Преузми само Зип</string>
     <string name="patch_boot_file">Закрпи фајл слике покретања</string>

app/src/full/res/values-sv/strings.xml

@@ -77,7 +77,7 @@
     <string name="zip_process_title">Arbetar</string>
     <string name="manager_update_title">En uppdatering av Magisk maneger finns tillgänglig!</string>
     <string name="manager_download_install">Tryck för att ladda ner och installera</string>
-    <string name="magisk_updates">Magiska uppdateringar</string>
+    <string name="update_channel">Magiska uppdateringar</string>
     <string name="download_file_error">Fel vid nerladdning av fil</string>
     <string name="downloading_toast">Laddar ner %1$s</string>
     <string name="no_rw_storage">Denna funktionen måste ha behörighet att skriva till externt lagringsutrymme.</string>

app/src/full/res/values-tr/strings.xml

@@ -90,10 +90,10 @@
     <string name="manager_download_install">İndirmek ve yüklemek için dokunun</string>
     <string name="dtbo_patched_title">DTBO yamalandı!</string>
     <string name="dtbo_patched_reboot">Magisk Manager dtbo.img\'yi yamaladı, lütfen yeniden başlatın</string>
-    <string name="magisk_updates">Magisk Güncellemeleri</string>
+    <string name="update_channel">Magisk Güncellemeleri</string>
     <string name="flashing">Yükleniyor</string>
-    <string name="hide_manager_toast">Magisk Manager Gizleniyor…</string>
+    <string name="hide_manager_title">Magisk Manager Gizleniyor…</string>
-    <string name="hide_manager_toast2">Bu biraz zaman alabilir…</string>
+    <string name="hide_manager_msg">Bu biraz zaman alabilir…</string>
     <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>

app/src/full/res/values-uk/strings.xml

@@ -90,10 +90,10 @@
     <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="update_channel">Оновлення Magisk</string>
     <string name="flashing">Прошивання</string>
-    <string name="hide_manager_toast">Приховування Magisk Manager…</string>
+    <string name="hide_manager_title">Приховування Magisk Manager…</string>
-    <string name="hide_manager_toast2">Це може зайняти деякий час…</string>
+    <string name="hide_manager_msg">Це може зайняти деякий час…</string>
     <string name="hide_manager_fail_toast">Не вдалося приховати Magisk Manager…</string>
     <string name="open_link_failed_toast">Не знайдено програм для відкриття посилання…</string>
     <string name="download_zip_only">Тільки завантажити</string>

app/src/full/res/values-vi/strings.xml

@@ -90,10 +90,10 @@
     <string name="manager_download_install">Nhấn để tải xuống và cài đặt.</string>
     <string name="dtbo_patched_title">DTBO đã được vá!</string>
     <string name="dtbo_patched_reboot">Magisk Manager đã vá dtbo.img. Hãy khởi động lại.</string>
-    <string name="magisk_updates">Cập nhật Magisk</string>
+    <string name="update_channel">Cập nhật Magisk</string>
     <string name="flashing">Đang flash</string>
-    <string name="hide_manager_toast">Ẩn Magisk Manager…</string>
+    <string name="hide_manager_title">Ẩn Magisk Manager…</string>
-    <string name="hide_manager_toast2">Điều này có thể mất chút thời gian.</string>
+    <string name="hide_manager_msg">Điều này có thể mất chút thời gian.</string>
     <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>

app/src/full/res/values-zh-rCN/strings.xml

@@ -90,10 +90,10 @@
     <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>
+    <string name="update_channel">Magisk 更新</string>
     <string name="flashing">正在刷入</string>
-    <string name="hide_manager_toast">正在隐藏 Magisk Manager…</string>
+    <string name="hide_manager_title">正在隐藏 Magisk Manager…</string>
-    <string name="hide_manager_toast2">这可能需要一点时间…</string>
+    <string name="hide_manager_msg">这可能需要一点时间…</string>
     <string name="hide_manager_fail_toast">隐藏 Magisk Manager 失败</string>
     <string name="open_link_failed_toast">找不到能够打开此链接的应用</string>
     <string name="download_zip_only">仅下载 Zip</string>

app/src/full/res/values-zh-rTW/strings.xml

@@ -159,11 +159,11 @@
     <string name="settings_ns_isolate">獨立 Namespace</string>
     <string name="settings_ns_requester">繼承 Namespace</string>
     <string name="update">更新 %1$s</string>
-    <string name="magisk_updates">Magisk 更新</string>
+    <string name="update_channel">Magisk 更新</string>
     <string name="system_default">(系統預設)</string>
     <string name="language">語言</string>
     <string name="flashing">正在刷入</string>
-    <string name="hide_manager_toast">正在隱藏 Magisk Manager…</string>
+    <string name="hide_manager_title">正在隱藏 Magisk Manager…</string>
     <string name="hide_manager_fail_toast">隱藏 Magisk Manager 失敗</string>
     <string name="settings_hide_manager_title">隱藏 Magisk Manager</string>
     <string name="settings_update_channel_title">更新頻道</string>
@@ -188,7 +188,7 @@
     <string name="proprietary_notice">Magisk Manager 是一個 100% 開源的程式，因此不會包含 Google 私有所有權的 SafetyNet API 程式碼。\n\n你允許 Magisk Manager 下載一個擴充包 (包含 GoogleApiClient) 以執行 SafetyNet 檢查嗎？</string>
     <string name="dtbo_patched_title">DTBO 已被打上補丁！</string>
     <string name="dtbo_patched_reboot">Magisk Manager 已為 dtbo.img 打上補丁，請立即重新啟動</string>
-    <string name="hide_manager_toast2">這可能會花上一段時間…</string>
+    <string name="hide_manager_msg">這可能會花上一段時間…</string>
     <string name="settings_hide_manager_summary">將 Magisk Manager 以隨機套件名稱重新打包，以達成隱藏效果</string>
     <string name="invalid_update_channel">不合法的更新頻道</string>
     <string name="settings_update_custom">自訂</string>

app/src/full/res/values/strings.xml

@@ -70,13 +70,19 @@
     <string name="support_thread">Support thread</string>
     <string name="follow_twitter">Follow me on Twitter</string>
 
+    <!-- System Components, Notifications -->
+    <string name="update_channel">Magisk Updates</string>
+    <string name="progress_channel">Progress Notifications</string>
+    <string name="download_complete">Download complete</string>
+    <string name="magisk_update_title">New Magisk Update Available!</string>
+    <string name="manager_update_title">New Magisk Manager Update Available!</string>
+
     <!--Toasts, Dialogs-->
     <string name="close">Close</string>
     <string name="repo_install_title">Install %1$s</string>
     <string name="repo_install_msg">Do you want to install %1$s now?</string>
     <string name="download">Download</string>
     <string name="reboot">Reboot</string>
-    <string name="magisk_update_title">New Magisk Update Available!</string>
     <string name="settings_reboot_toast">Reboot to apply settings.</string>
     <string name="release_notes">Release notes</string>
     <string name="repo_cache_cleared">Repo cache cleared</string>
@@ -86,14 +92,12 @@
     <string name="zip_download_msg">Downloading zip file (%1$d%%) …</string>
     <string name="zip_process_title">Processing</string>
     <string name="zip_process_msg">Processing zip file…</string>
-    <string name="manager_update_title">New Magisk Manager Update Available!</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="magisk_updates">Magisk Updates</string>
     <string name="flashing">Flashing</string>
-    <string name="hide_manager_toast">Hiding Magisk Manager…</string>
+    <string name="hide_manager_title">Hiding Magisk Manager…</string>
-    <string name="hide_manager_toast2">This might take a while.</string>
+    <string name="hide_manager_msg">This might take a while.</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>
@@ -122,7 +126,6 @@
     <string name="download_file_error">Error downloading file</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>
-    <string name="download_complete">Download complete</string>
 
     <!--Settings Activity -->
     <string name="settings_general_category">General</string>