From 5f76a8620aeeeb4c90f4b50122fa78697048ed70 Mon Sep 17 00:00:00 2001 From: KOWX712 Date: Thu, 1 May 2025 16:44:06 +0800 Subject: [PATCH] misc: remove aosp fallback when no valid key found --- module/webui/locales/A-template.json | 2 +- module/webui/locales/ar-EG.json | 2 +- module/webui/locales/az-AZ.json | 2 +- module/webui/locales/en-US.json | 2 +- module/webui/locales/es-ES.json | 2 +- module/webui/locales/fr-FR.json | 2 +- module/webui/locales/id-ID.json | 2 +- module/webui/locales/it-IT.json | 2 +- module/webui/locales/ja-JP.json | 2 +- module/webui/locales/pl-PL.json | 2 +- module/webui/locales/pt-BR.json | 2 +- module/webui/locales/ru-RU.json | 2 +- module/webui/locales/tl-PH.json | 2 +- module/webui/locales/tr-TR.json | 2 +- module/webui/locales/zh-CN.json | 2 +- module/webui/locales/zh-TW.json | 2 +- module/webui/scripts/menu_option.js | 11 +++-------- 17 files changed, 19 insertions(+), 24 deletions(-) diff --git a/module/webui/locales/A-template.json b/module/webui/locales/A-template.json index 30f32ed..a1a0e2d 100644 --- a/module/webui/locales/A-template.json +++ b/module/webui/locales/A-template.json @@ -79,7 +79,7 @@ "key_set_error": "Failed to update keybox", "unknown_key_set": "Unknown keybox set successfully", "valid_key_set": "Valid keybox set successfully", - "no_valid_fallback": "No valid keybox found, replaced with AOSP keybox.", + "no_valid": "No valid keybox found.", "boot_hash_set": "Verified Boot Hash saved successfully", "boot_hash_set_error": "Failed to update Verified Boot Hash", "saved_target": "Config saved to target.txt", diff --git a/module/webui/locales/ar-EG.json b/module/webui/locales/ar-EG.json index e7d8df9..a6ef48b 100644 --- a/module/webui/locales/ar-EG.json +++ b/module/webui/locales/ar-EG.json @@ -79,7 +79,7 @@ "key_set_error": "فشل في تحديث keybox", "unknown_key_set": "تم تعيين Keybox غير معروف بنجاح", "valid_key_set": "تم تعيين keybox صالح بنجاح", - "no_valid_fallback": "لم يتم العثور على keybox صالح، تم الاستبدال بـ keybox AOSP.", + "no_valid": "لم يتم العثور على keybox صالح.", "boot_hash_set": "تم حفظ تجزئة التمهيد الموثوق بنجاح", "boot_hash_set_error": "فشل في تحديث تجزئة التمهيد الموثوق", "saved_target": "تم حفظ التكوين إلى target.txt", diff --git a/module/webui/locales/az-AZ.json b/module/webui/locales/az-AZ.json index c1518c4..17b6462 100644 --- a/module/webui/locales/az-AZ.json +++ b/module/webui/locales/az-AZ.json @@ -79,7 +79,7 @@ "key_set_error": "Keybox-u yeniləmək mümkün olmadı", "unknown_key_set": "Naməlum keybox uğurla təyin olundu", "valid_key_set": "Etibarlı keybox uğurla təyin olundu", - "no_valid_fallback": "Etibarlı keybox tapılmadı, AOSP keybox ilə dəyişdirildi.", + "no_valid": "Etibarlı keybox tapılmadı.", "boot_hash_set": "Təsdiqlənmiş Boot Hash uğurla yadda saxlanıldı", "boot_hash_set_error": "Təsdiqlənmiş Boot Hash yenilənə bilmədi", "saved_target": "Konfiqurasiya target.txt-yə yadda saxlanıldı", diff --git a/module/webui/locales/en-US.json b/module/webui/locales/en-US.json index 30f32ed..a1a0e2d 100644 --- a/module/webui/locales/en-US.json +++ b/module/webui/locales/en-US.json @@ -79,7 +79,7 @@ "key_set_error": "Failed to update keybox", "unknown_key_set": "Unknown keybox set successfully", "valid_key_set": "Valid keybox set successfully", - "no_valid_fallback": "No valid keybox found, replaced with AOSP keybox.", + "no_valid": "No valid keybox found.", "boot_hash_set": "Verified Boot Hash saved successfully", "boot_hash_set_error": "Failed to update Verified Boot Hash", "saved_target": "Config saved to target.txt", diff --git a/module/webui/locales/es-ES.json b/module/webui/locales/es-ES.json index 2e8b51d..fc5feb8 100644 --- a/module/webui/locales/es-ES.json +++ b/module/webui/locales/es-ES.json @@ -79,7 +79,7 @@ "key_set_error": "Error al actualizar el Keybox", "unknown_key_set": "Keybox desconocido configurado correctamente", "valid_key_set": "Keybox válido configurado correctamente", - "no_valid_fallback": "No se encontró un keybox válido, reemplazado con AOSP Keybox.", + "no_valid": "No se encontró un keybox válido.", "boot_hash_set": "Boot Hash verificado guardado correctamente", "boot_hash_set_error": "Error al actualizar el Boot Hash verificado", "saved_target": "Configuración guardada en target.txt", diff --git a/module/webui/locales/fr-FR.json b/module/webui/locales/fr-FR.json index 8bbf024..0abf4f0 100644 --- a/module/webui/locales/fr-FR.json +++ b/module/webui/locales/fr-FR.json @@ -79,7 +79,7 @@ "key_set_error": "Échec de la mise à jour de la Keybox", "unknown_key_set": "Keybox inconnue définie avec succès", "valid_key_set": "Keybox valide définie avec succès", - "no_valid_fallback": "Aucune Keybox valide trouvée, remplacée par le Keybox AOSP.", + "no_valid": "Aucune Keybox valide trouvée.", "boot_hash_set": "Hash Verified Boot enregistré avec succès", "boot_hash_set_error": "Échec de la mise à jour du hash Verified Boot", "saved_target": "Configuration enregistrée dans target.txt", diff --git a/module/webui/locales/id-ID.json b/module/webui/locales/id-ID.json index cadc96e..781c0af 100644 --- a/module/webui/locales/id-ID.json +++ b/module/webui/locales/id-ID.json @@ -79,7 +79,7 @@ "key_set_error": "Gagal memperbarui keybox", "unknown_key_set": "Keybox tidak dikenal berhasil digunakan", "valid_key_set": "Keybox valid berhasil digunakan", - "no_valid_fallback": "Tidak ada keybox valid, menggunakan keybox AOSP.", + "no_valid": "Tidak ada keybox valid.", "boot_hash_set": "Verified Boot Hash berhasil disimpan", "boot_hash_set_error": "Gagal memperbarui Verified Boot Hash", "saved_target": "Konfigurasi disimpan ke target.txt", diff --git a/module/webui/locales/it-IT.json b/module/webui/locales/it-IT.json index 2028881..2d23776 100644 --- a/module/webui/locales/it-IT.json +++ b/module/webui/locales/it-IT.json @@ -79,7 +79,7 @@ "key_set_error": "Impossibile aggiornare keybox", "unknown_key_set": "Keybox sconosciuta impostata correttamente", "valid_key_set": "Keybox valida impostata correttamente", - "no_valid_fallback": "Nessuna keybox valida trovata, sostituito con keybox AOSP.", + "no_valid": "Nessuna keybox valida trovata.", "boot_hash_set": "Boot Hash Verificato salvato correttamente", "boot_hash_set_error": "Impossibile aggiornare Boot Hash Verificato", "saved_target": "Configurazione salvata in target.txt", diff --git a/module/webui/locales/ja-JP.json b/module/webui/locales/ja-JP.json index 26b17cd..596e544 100644 --- a/module/webui/locales/ja-JP.json +++ b/module/webui/locales/ja-JP.json @@ -79,7 +79,7 @@ "key_set_error": "Keybox の更新に失敗しました。", "unknown_key_set": "不明な Keybox の設定に成功しました。", "valid_key_set": "有効な Keybox の設定に成功しました。", - "no_valid_fallback": "有効な Keybox がありません。AOSP Keybox に置き換えます。", + "no_valid": "有効な Keybox がありません。", "boot_hash_set": "確認付きブートハッシュの更新に成功しました。", "boot_hash_set_error": "確認付きブートハッシュの更新に失敗しました。", "saved_target": "設定を target.txt に保存しました。", diff --git a/module/webui/locales/pl-PL.json b/module/webui/locales/pl-PL.json index 806715b..a08f570 100644 --- a/module/webui/locales/pl-PL.json +++ b/module/webui/locales/pl-PL.json @@ -79,7 +79,7 @@ "key_set_error": "Nie udało się zaktualizować klucza", "unknown_key_set": "Nieznany klucz został pomyślnie ustawiony", "valid_key_set": "Prawidłowy klucz został pomyślnie ustawiony", - "no_valid_fallback": "Nie znaleziono prawidłowego klucza. Zastąpiono kluczem AOSP.", + "no_valid": "Nie znaleziono prawidłowego klucza.", "boot_hash_set": "Zweryfikowano skrót rozruchowy, który został pomyślnie zapisany", "boot_hash_set_error": "Nie udało się zaktualizować zweryfikowanego skrótu rozruchowego", "saved_target": "Konfiguracja zapisana w pliku target.txt", diff --git a/module/webui/locales/pt-BR.json b/module/webui/locales/pt-BR.json index 9fa4ae6..b918fd9 100644 --- a/module/webui/locales/pt-BR.json +++ b/module/webui/locales/pt-BR.json @@ -79,7 +79,7 @@ "key_set_error": "Falha ao atualizar o Keybox", "unknown_key_set": "Keybox desconhecido definido com sucesso", "valid_key_set": "Keybox válida definida com sucesso", - "no_valid_fallback": "Nenhuma Keybox encontrada, substituída por uma Keybox AOSP.", + "no_valid": "Nenhuma Keybox válida encontrada.", "boot_hash_set": "Hash de Boot Verificado salvo com sucesso", "boot_hash_set_error": "Falha ao atualizar Hash de Boot Verificado", "saved_target": "Config salvo para Target.txt", diff --git a/module/webui/locales/ru-RU.json b/module/webui/locales/ru-RU.json index 8d0c9ae..1048d46 100644 --- a/module/webui/locales/ru-RU.json +++ b/module/webui/locales/ru-RU.json @@ -79,7 +79,7 @@ "key_set_error": "Не удалось обновить keybox", "unknown_key_set": "Неизвестный keybox успешно установлен", "valid_key_set": "Действующий keybox успешно установлен", - "no_valid_fallback": "Не найден действующий keybox, заменен на AOSP keybox.", + "no_valid": "Не найден действующий keybox.", "boot_hash_set": "Verified Boot Hash успешно сохранен", "boot_hash_set_error": "Не удалось обновить Verified Boot Hash", "saved_target": "Конфигурация сохранена в target.txt", diff --git a/module/webui/locales/tl-PH.json b/module/webui/locales/tl-PH.json index f39a43f..a642c93 100644 --- a/module/webui/locales/tl-PH.json +++ b/module/webui/locales/tl-PH.json @@ -79,7 +79,7 @@ "key_set_error": "Nabigong i-update ang keybox", "unknown_key_set": "Matagumpay na na-set ang Hindi Kilalang Keybox", "valid_key_set": "Matagumpay na na-set ang Valid Keybox", - "no_valid_fallback": "Walang valid na keybox na natagpuan, pinalitan ng AOSP keybox.", + "no_valid": "Walang valid na keybox na natagpuan.", "boot_hash_set": "Matagumpay na na-save ang Verified Boot Hash", "boot_hash_set_error": "Nabigong i-update ang Verified Boot Hash", "saved_target": "Na-save ang configuration sa target.txt", diff --git a/module/webui/locales/tr-TR.json b/module/webui/locales/tr-TR.json index 0e36e8c..172821e 100644 --- a/module/webui/locales/tr-TR.json +++ b/module/webui/locales/tr-TR.json @@ -79,7 +79,7 @@ "key_set_error": "Keybox güncellenemedi", "unknown_key_set": "Bilinmeyen keybox başarıyla ayarlandı", "valid_key_set": "Geçerli keybox başarıyla ayarlandı", - "no_valid_fallback": "Geçerli keybox bulunamadı, AOSP keybox ile değiştirildi.", + "no_valid": "Geçerli keybox bulunamadı.", "boot_hash_set": "Doğrulanmış Boot Hash başarıyla kaydedildi", "boot_hash_set_error": "Doğrulanmış Boot Hash güncellenemedi", "saved_target": "Yapılandırma target.txt dosyasına kaydedildi", diff --git a/module/webui/locales/zh-CN.json b/module/webui/locales/zh-CN.json index 0cad31e..c8c2e94 100644 --- a/module/webui/locales/zh-CN.json +++ b/module/webui/locales/zh-CN.json @@ -79,7 +79,7 @@ "key_set_error": "更新密钥失败", "unknown_key_set": "成功设置未知密钥", "valid_key_set": "成功设置有效密钥", - "no_valid_fallback": "未找到有效密钥，已替换为 AOSP 密钥。", + "no_valid": "未找到有效密钥。", "boot_hash_set": "哈希值重置成功", "boot_hash_set_error": "哈希值重置失败", "saved_target": "成功保存配置", diff --git a/module/webui/locales/zh-TW.json b/module/webui/locales/zh-TW.json index 687f1b8..ec298ba 100644 --- a/module/webui/locales/zh-TW.json +++ b/module/webui/locales/zh-TW.json @@ -79,7 +79,7 @@ "key_set_error": "更新密鑰失敗", "unknown_key_set": "成功設置未知密鑰", "valid_key_set": "成功設置有效密鑰", - "no_valid_fallback": "未找到有效密鑰，已替換為 AOSP 密鑰。", + "no_valid": "未找到有效密鑰。", "boot_hash_set": "哈希值重置成功", "boot_hash_set_error": "哈希值重置失敗", "saved_target": "成功保存配置", diff --git a/module/webui/scripts/menu_option.js b/module/webui/scripts/menu_option.js index d8d7a7e..69509fe 100644 --- a/module/webui/scripts/menu_option.js +++ b/module/webui/scripts/menu_option.js @@ -238,21 +238,16 @@ async function fetchkb(link, fallbackLink, valid = false) { return response.text(); }); }) - .then(async data => { + .then(data => { if (!data.trim()) { - if (valid) { - await aospkb(); - showPrompt("prompt.no_valid_fallback", false); - } else { - showPrompt("prompt.key_set_error", false); - } + showPrompt(valid ? "prompt.no_valid" : "prompt.key_set_error", false); return; } try { const hexBytes = new Uint8Array(data.match(/.{1,2}/g).map(byte => parseInt(byte, 16))); const decodedHex = new TextDecoder().decode(hexBytes); const source = atob(decodedHex); - const result = await setKeybox(source); + const result = setKeybox(source); if (result) { showPrompt(valid ? "prompt.valid_key_set" : "prompt.unknown_key_set"); } else {