Several small fixes

2017-11-21 02:11:20 +08:00 · 2017-11-21 02:11:20 +08:00 · b1ad691464
commit b1ad691464
parent f4e7baf31e
29 changed files with 27 additions and 43 deletions
--- 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)
--- 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
--- 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<String> 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();
            }
        }
    }
--- 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");
    }
 }
--- a/app/src/main/res/layout/fragment_magisk.xml
+++ b/app/src/main/res/layout/fragment_magisk.xml
@ -309,7 +309,7 @@

                    <TextView
                        android:id="@+id/install_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="180dp"
                        android:layout_height="match_parent"
                        android:layout_centerHorizontal="true"
                        android:layout_centerVertical="true"
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">البحث عن تحديثات…</string>
    <string name="magisk_update_available">Magisk v%1$s متاح!</string>
-    <string name="cannot_check_updates">لا يمكن التحقق من التحديثات، لا يوجد إنترنت؟</string>
    <string name="safetyNet_check_text">انقر لبدء فحص SafetyNet</string>
    <string name="checking_safetyNet_status">التحقق من حالة SafetyNet…</string>
    <string name="safetyNet_check_success">نجح فحص SafetyNet</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">Kontrola aktualizací…</string>
    <string name="magisk_update_available">Magisk v%1$s je dostupný!</string>
-    <string name="cannot_check_updates">Nelze zkontrolovat aktualizace. Jste připojeni k Internetu?</string>
    <string name="safetyNet_check_text">Kliknutím zahájíte SafetyNet kontrolu</string>
    <string name="checking_safetyNet_status">Kontrola stavu SafetyNet…</string>

--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -17,7 +17,6 @@

    <string name="checking_for_updates">Suche nach Updates…</string>
    <string name="magisk_update_available">Magisk %1$s ist verfügbar!</string>
-    <string name="cannot_check_updates">Updatesuche fehlgeschlagen.\nIst eine Internetverbindung verfügbar?</string>
    <string name="safetyNet_check_text">SafetyNet-Status abfragen</string>
    <string name="checking_safetyNet_status">Prüfe SafetyNet-Status…</string>
    <string name="safetyNet_check_success">SafetyNet-Test erfolgreich</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -12,7 +12,6 @@

    <string name="checking_for_updates">Έλεγχος για ενημερώσεις…</string>
    <string name="magisk_update_available">Το Magisk v%1$s είναι διαθέσιμο!</string>
-    <string name="cannot_check_updates">Αδυναμία ελέγχου για ενημερώσεις, δεν έχει internet;</string>
    <string name="safetyNet_check_text">Πατήστε για έλεγχο του SafetyNet</string>
    <string name="checking_safetyNet_status">Έλεγχος κατάστασης SafetyNet…</string>
    <string name="safetyNet_check_success">Ο Έλεγχος του SafetyNet Ήταν Επιτυχής</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">Comprobando actualizaciones…</string>
    <string name="magisk_update_available">¡Disponible Magisk v%1$s!</string>
-    <string name="cannot_check_updates">No se pueden comprobar actualizaciones ¿No tiene internet?</string>
    <string name="safetyNet_check_text">Toque para empezar la comprobación de SafetyNet</string>
    <string name="checking_safetyNet_status">Comprobando estado de SafetyNet…</string>
    <string name="safetyNet_check_success">La comprobación de SafetyNet fue exitosa</string>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">Kontrollin uuendusi...</string>
    <string name="magisk_update_available">Magisk v%1$s on saadaval!</string>
-    <string name="cannot_check_updates">Ei saanud uuendusi kontrollida, internet puudub?</string>
    <string name="safetyNet_check_text">Koputa, et alustada SafetyNet\'i kontrolli</string>
    <string name="checking_safetyNet_status">Kontrollin SafetyNet\'i olekut...</string>
    <string name="safetyNet_check_success">SafetyNet\'i kontroll edukas</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -10,7 +10,6 @@
    <string name="magisk_version_error">Magisk non installé</string>
    <string name="checking_for_updates">Vérification de mises à jour…</string>
    <string name="magisk_update_available">Magisk v%1$s disponible !</string>
-    <string name="cannot_check_updates">Impossible de vérifier les mises à jour, pas d\'Internet ?</string>
    <string name="safetyNet_check_text">Appuyer pour lancer le contrôle SafetyNet</string>
    <string name="checking_safetyNet_status">Vérification de l\'état de SafetyNet…</string>
    <string name="safetyNet_check_success">Contrôle SafetyNet passé avec succès</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">Provjera ažuriranja...</string>
    <string name="magisk_update_available">Dostupna je Maigsk inačica v%1$s!</string>
-    <string name="cannot_check_updates">Nije moguće provjeriti ažuriranja, nema interneta?</string>
    <string name="safetyNet_check_text">Dodirni za SafetyNet provjeru</string>
    <string name="checking_safetyNet_status">Provjera SafetyNet statusa</string>
    <string name="safetyNet_check_success">SafetyNet provjera uspješna</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -14,7 +14,6 @@
 	
    <string name="checking_for_updates">Controllo aggiornamenti…</string>
    <string name="magisk_update_available">È disponibile Magisk v%1$s!</string>
-    <string name="cannot_check_updates">Impossibile controllare gli aggiornamenti</string>
    <string name="safetyNet_check_text">Tocca per controllare SafetyNet</string>
    <string name="checking_safetyNet_status">Controllo stato di SafetyNet</string>
    <string name="safetyNet_check_success">Controllo di SafetyNet OK</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">更新を確認中...</string>
    <string name="magisk_update_available">Magisk v%1$s が利用可能です！</string>
-    <string name="cannot_check_updates">更新を確認できませんでした。インターネットに接続されていますか？</string>
    <string name="safetyNet_check_text">タップしてSafetyNetチェックを開始</string>
    <string name="checking_safetyNet_status">SafetyNet Statusをチェック中…</string>

--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">업데이트 확인 중…</string>
    <string name="magisk_update_available">Magisk v%1$s 사용 가능!</string>
-    <string name="cannot_check_updates">업데이트를 확인할 수 없음. 인터넷 연결을 확인하세요.</string>
    <string name="safetyNet_check_text">SafetyNet 체크를 시작하려면 누르기</string>
    <string name="checking_safetyNet_status">SafetyNet 상태 확인 중…</string>

--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">Controleren op updates…</string>
    <string name="magisk_update_available">Magisk v%1$s beschikbaar!</string>
-    <string name="cannot_check_updates">Kan niet controleren op updates. Geen internet?</string>
    <string name="safetyNet_check_text">Tik om SafetyNet controle te starten</string>
    <string name="checking_safetyNet_status">SafetyNet status controleren…</string>
    <string name="safetyNet_check_success">SafetyNet controle succesvol</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -17,7 +17,6 @@

    <string name="checking_for_updates">Sprawdzanie aktualizacji…</string>
    <string name="magisk_update_available">Magisk v%1$s dostępny!</string>
-    <string name="cannot_check_updates">Nie można sprawdzić dostępności aktualizacji, brak internetu</string>
    <string name="safetyNet_check_text">Dotknij aby sprawdzić SafetyNet</string>
    <string name="checking_safetyNet_status">Sprawdzanie statusu SafetyNet…</string>
    <string name="safetyNet_check_success">Sprawdzanie SafetyNet z Powodzeniem</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -17,7 +17,6 @@

 	<string name="checking_for_updates">Checando por atualizações…</string>
    <string name="magisk_update_available">Magisk v%1$s disponível!</string>
-    <string name="cannot_check_updates">Não é possível verificar se há atualizações</string>
    <string name="safetyNet_check_text">Pressione para checar o SafetyNet</string>
    <string name="checking_safetyNet_status">Verificando status do SafetyNet…</string>
 	<string name="safetyNet_check_success">SafetyNet verificado</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -14,7 +14,6 @@

 <string name="checking_for_updates">A procurar por atualizações…</string>
 <string name="magisk_update_available">Magisk v%1$s disponível!</string>
-<string name="cannot_check_updates">Não foi possível verificar atualizações, sem internet?</string>
    <string name="safetyNet_check_text">Pressione para verificar SafetyNet</string>
 <string name="checking_safetyNet_status">A verificar o estado do SafetyNet…</string>
 <string name="safetyNet_check_success">SafetyNet verificado com sucesso</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -12,7 +12,6 @@

    <string name="checking_for_updates">Verificare actualizări…</string>
    <string name="magisk_update_available">Magisk v%1$s disponibil!</string>
-    <string name="cannot_check_updates">Nu se pot verifica actualizările, nu este internet?</string>
    <string name="safetyNet_check_text">Verificare SafetyNet</string>
    <string name="checking_safetyNet_status">Verificarea stării SafetyNet…</string>

--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">Проверка обновлений…</string>
    <string name="magisk_update_available">Доступен Magisk v%1$s!</string>
-    <string name="cannot_check_updates">Невозможно проверить наличие обновлений</string>
    <string name="safetyNet_check_text">Проверить статус SafetyNet</string>
    <string name="checking_safetyNet_status">Проверка статуса SafetyNet…</string>
    <string name="safetyNet_check_success">Проверка SafetyNet пройдена</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">Söker efter uppdateringar…</string>
    <string name="magisk_update_available">Magisk v%1$s tillgänglig!</string>
-    <string name="cannot_check_updates">Kan inte söka efter uppdateringar, inget internet?</string>
    <string name="safetyNet_check_text">Tryck för att starta SafetyNet-kontroll</string>
    <string name="checking_safetyNet_status">Kontrollerar SafetyNet-status…</string>
    <string name="safetyNet_check_success">SafetyNet-kontroll lyckades</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -13,7 +13,6 @@

    <string name="checking_for_updates">Güncelleştirmeler denetleniyor…</string>
    <string name="magisk_update_available">Magisk v%1$s mevcut!</string>
-    <string name="cannot_check_updates">Güncelleştirmeler denetlenemiyor, İnternet bağlantınız yok mu?</string>
    <string name="safetyNet_check_text">SafetyNet kontrolünü başlatmak için dokunun</string>
    <string name="checking_safetyNet_status">SafetyNet durumu kontrol ediliyor…</string>
    <string name="safetyNet_check_success">SafetyNet Kontrolü Başarılı</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -13,7 +13,6 @@

    <string name="checking_for_updates">Перевірка оновлень…</string>
    <string name="magisk_update_available">Доступно Magisk v%1$s!</string>
-    <string name="cannot_check_updates">Неможливо перевірити наявність оновлень</string>
    <string name="safetyNet_check_text">Перевірити статус SafetyNet</string>
    <string name="checking_safetyNet_status">Перевірка статусу SafetyNet…</string>
    <string name="safetyNet_check_success">Перевірку SafetyNet завершено</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">Đang kiểm tra cập nhật…</string>
    <string name="magisk_update_available">Magisk v%1$s available!</string>
-    <string name="cannot_check_updates">Không thể kiểm tra cập nhật, không có Internet?</string>
    <string name="safetyNet_check_text">Chạm để bắt đầu kiểm tra SafetyNet</string>
    <string name="checking_safetyNet_status">Đang kiểm tra trạng thái SafetyNet…</string>

--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -13,7 +13,6 @@
    <string name="magisk_version_error">未安装 Magisk</string>
    <string name="checking_for_updates">正在检查更新…</string>
    <string name="magisk_update_available">Magisk 可更新到 v%1$s！</string>
-    <string name="cannot_check_updates">无法检查更新，没有网络连接？</string>
    <string name="safetyNet_check_text">点击启动 SafetyNet 检查</string>
    <string name="checking_safetyNet_status">正在检查 SafetyNet 状态…</string>
    <string name="safetyNet_check_success">SafetyNet 检查成功</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -14,7 +14,6 @@

    <string name="checking_for_updates">正在檢查更新…</string>
    <string name="magisk_update_available">Magisk 可更新到 v%1$s！</string>
-    <string name="cannot_check_updates">無法檢查更新，沒有網絡連線？</string>
    <string name="safetyNet_check_text">點擊啟動 SafetyNet 檢查</string>
    <string name="checking_safetyNet_status">正在檢查 SafetyNet 狀態…</string>

@ -204,5 +203,8 @@
    <string name="dtbo_patched_reboot">Magisk Manager 已為 dtbo.img 打上補丁，請立即重新啟動</string>
    <string name="hide_manager_toast2">這可能會花上一段時間…</string>
    <string name="settings_hide_manager_summary">將 Magisk Manager 以隨機套件名稱重新打包，以達成隱藏效果</string>
+    <string name="invalid_update_channel">不合法的更新頻道</string>
+    <string name="settings_update_custom">自訂</string>
+    <string name="settings_update_custom_msg">請輸入自訂網址</string>

 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -17,7 +17,7 @@

    <string name="checking_for_updates">Checking for updates…</string>
    <string name="magisk_update_available">Magisk v%1$s is available!</string>
-    <string name="cannot_check_updates">Cannot check for updates, no internet?</string>
+    <string name="invalid_update_channel">Invalid Update Channel</string>
    <string name="safetyNet_check_text">Tap to start SafetyNet check</string>
    <string name="checking_safetyNet_status">Checking SafetyNet status…</string>
    <string name="safetyNet_check_success">SafetyNet Check Success</string>