diff --git a/app/src/main/java/com/topjohnwu/magisk/FlashActivity.java b/app/src/main/java/com/topjohnwu/magisk/FlashActivity.java index 07148acb2..83b329722 100644 --- a/app/src/main/java/com/topjohnwu/magisk/FlashActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/FlashActivity.java @@ -49,7 +49,7 @@ public class FlashActivity extends Activity { @OnClick(R.id.reboot) void reboot() { - Shell.su_raw("reboot"); + Shell.su_raw("/system/bin/reboot"); } @OnClick(R.id.save_logs) diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java b/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java index 38d35b916..57897df65 100644 --- a/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java @@ -230,20 +230,20 @@ public class MagiskFragment extends Fragment if (mm.remoteMagiskVersionCode < 0) { color = colorNeutral; image = R.drawable.ic_help; - magiskUpdateText.setText(R.string.cannot_check_updates); + magiskUpdateText.setText(R.string.invalid_update_channel); + installButton.setVisibility(View.GONE); } else { color = colorOK; image = R.drawable.ic_check_circle; magiskUpdateText.setText(getString(R.string.install_magisk_title, "v" + mm.remoteMagiskVersionString)); - } - - installButton.setVisibility(View.VISIBLE); - if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) { - installText.setText(getString(R.string.update, getString(R.string.app_name))); - } else if (mm.magiskVersionCode > 0 && mm.remoteMagiskVersionCode > mm.magiskVersionCode) { - installText.setText(getString(R.string.update, getString(R.string.magisk))); - } else { - installText.setText(R.string.install); + installButton.setVisibility(View.VISIBLE); + if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) { + installText.setText(getString(R.string.update, getString(R.string.app_name))); + } else if (mm.magiskVersionCode > 0 && mm.remoteMagiskVersionCode > mm.magiskVersionCode) { + installText.setText(getString(R.string.update, getString(R.string.magisk))); + } else { + installText.setText(R.string.install); + } } if (!shownDialog && (mm.remoteMagiskVersionCode > mm.magiskVersionCode diff --git a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java index 631354c58..6d39c9ee4 100644 --- a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java +++ b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java @@ -85,12 +85,16 @@ public class SuDatabaseHelper extends SQLiteOpenHelper { // Check if we are linked globally List ret = Shell.sh("ls -l " + suDbFile); if (Utils.isValidShellResponse(ret)) { - int links = Integer.parseInt(ret.get(0).trim().split("\\s+")[1]); - if (links < 2) { - mm.suDB.close(); - suDbFile.delete(); - new File(suDbFile + "-journal").delete(); - mm.suDB = new SuDatabaseHelper(); + try { + int links = Integer.parseInt(ret.get(0).trim().split("\\s+")[1]); + if (links < 2) { + mm.suDB.close(); + suDbFile.delete(); + new File(suDbFile + "-journal").delete(); + mm.suDB = new SuDatabaseHelper(); + } + } catch (Exception e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/topjohnwu/magisk/receivers/RebootReceiver.java b/app/src/main/java/com/topjohnwu/magisk/receivers/RebootReceiver.java index 41ce61ec0..f8032b273 100644 --- a/app/src/main/java/com/topjohnwu/magisk/receivers/RebootReceiver.java +++ b/app/src/main/java/com/topjohnwu/magisk/receivers/RebootReceiver.java @@ -9,6 +9,6 @@ import com.topjohnwu.magisk.utils.Shell; public class RebootReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - Shell.su_raw("reboot"); + Shell.su_raw("/system/bin/reboot"); } } diff --git a/app/src/main/res/layout/fragment_magisk.xml b/app/src/main/res/layout/fragment_magisk.xml index 06af199a3..ef6b6b14b 100644 --- a/app/src/main/res/layout/fragment_magisk.xml +++ b/app/src/main/res/layout/fragment_magisk.xml @@ -309,7 +309,7 @@ البحث عن تحديثات… Magisk v%1$s متاح! - لا يمكن التحقق من التحديثات، لا يوجد إنترنت؟ انقر لبدء فحص SafetyNet التحقق من حالة SafetyNet… نجح فحص SafetyNet diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b55f04992..4749531ec 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -14,7 +14,6 @@ Kontrola aktualizací… Magisk v%1$s je dostupný! - Nelze zkontrolovat aktualizace. Jste připojeni k Internetu? Kliknutím zahájíte SafetyNet kontrolu Kontrola stavu SafetyNet… diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2c5b6086e..fd927ee2a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -17,7 +17,6 @@ Suche nach Updates… Magisk %1$s ist verfügbar! - Updatesuche fehlgeschlagen.\nIst eine Internetverbindung verfügbar? SafetyNet-Status abfragen Prüfe SafetyNet-Status… SafetyNet-Test erfolgreich diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 260a67b74..8b49f2b9c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -12,7 +12,6 @@ Έλεγχος για ενημερώσεις… Το Magisk v%1$s είναι διαθέσιμο! - Αδυναμία ελέγχου για ενημερώσεις, δεν έχει internet; Πατήστε για έλεγχο του SafetyNet Έλεγχος κατάστασης SafetyNet… Ο Έλεγχος του SafetyNet Ήταν Επιτυχής diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 97f4210eb..f472418f6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -14,7 +14,6 @@ Comprobando actualizaciones… ¡Disponible Magisk v%1$s! - No se pueden comprobar actualizaciones ¿No tiene internet? Toque para empezar la comprobación de SafetyNet Comprobando estado de SafetyNet… La comprobación de SafetyNet fue exitosa diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index e215433ad..db5f943b3 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -14,7 +14,6 @@ Kontrollin uuendusi... Magisk v%1$s on saadaval! - Ei saanud uuendusi kontrollida, internet puudub? Koputa, et alustada SafetyNet\'i kontrolli Kontrollin SafetyNet\'i olekut... SafetyNet\'i kontroll edukas diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4f1b59fcd..0f9c51fe1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -10,7 +10,6 @@ Magisk non installé Vérification de mises à jour… Magisk v%1$s disponible ! - Impossible de vérifier les mises à jour, pas d\'Internet ? Appuyer pour lancer le contrôle SafetyNet Vérification de l\'état de SafetyNet… Contrôle SafetyNet passé avec succès diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 18272f4a4..807e2988d 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -14,7 +14,6 @@ Provjera ažuriranja... Dostupna je Maigsk inačica v%1$s! - Nije moguće provjeriti ažuriranja, nema interneta? Dodirni za SafetyNet provjeru Provjera SafetyNet statusa SafetyNet provjera uspješna diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 386ed9419..5ff947d37 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -14,7 +14,6 @@ Controllo aggiornamenti… È disponibile Magisk v%1$s! - Impossibile controllare gli aggiornamenti Tocca per controllare SafetyNet Controllo stato di SafetyNet Controllo di SafetyNet OK diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5c67b4f1a..84d8af4e3 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -14,7 +14,6 @@ 更新を確認中... Magisk v%1$s が利用可能です！ - 更新を確認できませんでした。インターネットに接続されていますか？ タップしてSafetyNetチェックを開始 SafetyNet Statusをチェック中… diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 39ad0fc65..792c9f0a7 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -14,7 +14,6 @@ 업데이트 확인 중… Magisk v%1$s 사용 가능! - 업데이트를 확인할 수 없음. 인터넷 연결을 확인하세요. SafetyNet 체크를 시작하려면 누르기 SafetyNet 상태 확인 중… diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 01f01eb8a..5ead3f612 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -14,7 +14,6 @@ Controleren op updates… Magisk v%1$s beschikbaar! - Kan niet controleren op updates. Geen internet? Tik om SafetyNet controle te starten SafetyNet status controleren… SafetyNet controle succesvol diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2e69bf9e2..3b757eafb 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -17,7 +17,6 @@ Sprawdzanie aktualizacji… Magisk v%1$s dostępny! - Nie można sprawdzić dostępności aktualizacji, brak internetu Dotknij aby sprawdzić SafetyNet Sprawdzanie statusu SafetyNet… Sprawdzanie SafetyNet z Powodzeniem diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 916ebb9dd..245c603a9 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -17,7 +17,6 @@ Checando por atualizações… Magisk v%1$s disponível! - Não é possível verificar se há atualizações Pressione para checar o SafetyNet Verificando status do SafetyNet… SafetyNet verificado diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 36801e967..9abfc0d02 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -14,7 +14,6 @@ A procurar por atualizações… Magisk v%1$s disponível! -Não foi possível verificar atualizações, sem internet? Pressione para verificar SafetyNet A verificar o estado do SafetyNet… SafetyNet verificado com sucesso diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 81ebb850f..f691cd252 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -12,7 +12,6 @@ Verificare actualizări… Magisk v%1$s disponibil! - Nu se pot verifica actualizările, nu este internet? Verificare SafetyNet Verificarea stării SafetyNet… diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9db853a26..e1527da7b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -14,7 +14,6 @@ Проверка обновлений… Доступен Magisk v%1$s! - Невозможно проверить наличие обновлений Проверить статус SafetyNet Проверка статуса SafetyNet… Проверка SafetyNet пройдена diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7dae735f6..3f56af7c7 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -14,7 +14,6 @@ Söker efter uppdateringar… Magisk v%1$s tillgänglig! - Kan inte söka efter uppdateringar, inget internet? Tryck för att starta SafetyNet-kontroll Kontrollerar SafetyNet-status… SafetyNet-kontroll lyckades diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 83ad49231..fb1afc9e2 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -13,7 +13,6 @@ Güncelleştirmeler denetleniyor… Magisk v%1$s mevcut! - Güncelleştirmeler denetlenemiyor, İnternet bağlantınız yok mu? SafetyNet kontrolünü başlatmak için dokunun SafetyNet durumu kontrol ediliyor… SafetyNet Kontrolü Başarılı diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 12e27e102..0e1d54b55 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -13,7 +13,6 @@ Перевірка оновлень… Доступно Magisk v%1$s! - Неможливо перевірити наявність оновлень Перевірити статус SafetyNet Перевірка статусу SafetyNet… Перевірку SafetyNet завершено diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c823bc9e7..7440cd585 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -14,7 +14,6 @@ Đang kiểm tra cập nhật… Magisk v%1$s available! - Không thể kiểm tra cập nhật, không có Internet? Chạm để bắt đầu kiểm tra SafetyNet Đang kiểm tra trạng thái SafetyNet… diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bc666cbb3..f12898dd1 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -13,7 +13,6 @@ 未安装 Magisk 正在检查更新… Magisk 可更新到 v%1$s！ - 无法检查更新，没有网络连接？ 点击启动 SafetyNet 检查 正在检查 SafetyNet 状态… SafetyNet 检查成功 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 2ab206c25..6bf4e5554 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -14,7 +14,6 @@ 正在檢查更新… Magisk 可更新到 v%1$s！ - 無法檢查更新，沒有網絡連線？ 點擊啟動 SafetyNet 檢查 正在檢查 SafetyNet 狀態… @@ -204,5 +203,8 @@ Magisk Manager 已為 dtbo.img 打上補丁，請立即重新啟動 這可能會花上一段時間… 將 Magisk Manager 以隨機套件名稱重新打包，以達成隱藏效果 + 不合法的更新頻道 + 自訂 + 請輸入自訂網址 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bed2ae5c4..f9b57dabc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,7 +17,7 @@ Checking for updates… Magisk v%1$s is available! - Cannot check for updates, no internet? + Invalid Update Channel Tap to start SafetyNet check Checking SafetyNet status… SafetyNet Check Success