From e20a59c15ff2786ac2505942f56d0ca9b742ddb5 Mon Sep 17 00:00:00 2001 From: crschnick Date: Tue, 27 Aug 2024 23:37:23 +0000 Subject: [PATCH] Add disable encryption check --- .../io/xpipe/app/prefs/VaultCategory.java | 19 ++++++++++++++++++- lang/app/strings/translations_da.properties | 3 +++ lang/app/strings/translations_de.properties | 3 +++ lang/app/strings/translations_en.properties | 3 +++ lang/app/strings/translations_es.properties | 3 +++ lang/app/strings/translations_fr.properties | 3 +++ lang/app/strings/translations_it.properties | 3 +++ lang/app/strings/translations_ja.properties | 3 +++ lang/app/strings/translations_nl.properties | 3 +++ lang/app/strings/translations_pt.properties | 3 +++ lang/app/strings/translations_ru.properties | 3 +++ lang/app/strings/translations_tr.properties | 3 +++ lang/app/strings/translations_zh.properties | 3 +++ 13 files changed, 54 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java b/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java index cba1d617..c95a1052 100644 --- a/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java @@ -2,14 +2,17 @@ package io.xpipe.app.prefs; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.core.window.AppWindowHelper; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.util.LockChangeAlert; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.util.Validator; import io.xpipe.core.util.XPipeInstallation; +import javafx.application.Platform; import javafx.beans.binding.Bindings; +import javafx.beans.property.SimpleBooleanProperty; import lombok.SneakyThrows; public class VaultCategory extends AppPrefsCategory { @@ -34,6 +37,20 @@ public class VaultCategory extends AppPrefsCategory { }); builder.addTitle("storage").sub(sub); } + + var encryptVault = new SimpleBooleanProperty(prefs.encryptAllVaultData().get()); + encryptVault.addListener((observable, oldValue, newValue) -> { + if (!newValue && !AppWindowHelper.showConfirmationAlert( + "confirmVaultUnencryptTitle", "confirmVaultUnencryptHeader", "confirmVaultUnencryptContent")) { + Platform.runLater(() -> { + encryptVault.set(true); + }); + return; + } + + prefs.encryptAllVaultData.setValue(newValue); + }); + builder.addTitle("vaultSecurity") .sub(new OptionsBuilder() .nameAndDescription("workspaceLock") @@ -57,7 +74,7 @@ public class VaultCategory extends AppPrefsCategory { .isNull() .or(prefs.getLockCrypt().isEmpty())) .nameAndDescription("encryptAllVaultData") - .addToggle(prefs.encryptAllVaultData)); + .addToggle(encryptVault)); return builder.buildComp(); } } diff --git a/lang/app/strings/translations_da.properties b/lang/app/strings/translations_da.properties index 1a009900..4e085f00 100644 --- a/lang/app/strings/translations_da.properties +++ b/lang/app/strings/translations_da.properties @@ -506,3 +506,6 @@ ttyWarning=Forbindelsen har tvangstildelt en pty/tty og giver ikke en separat st xshellSetup=Xshell-opsætning termiusSetup=Termius-opsætning tryPtbDescription=Prøv nye funktioner tidligt i XPipe-udviklernes builds +confirmVaultUnencryptTitle=Bekræft afkryptering af hvælving +confirmVaultUnencryptHeader=Vil du virkelig deaktivere avanceret vault-kryptering? +confirmVaultUnencryptContent=Dette fjerner den ekstra kryptering for lagrede data og overskriver eksisterende data. diff --git a/lang/app/strings/translations_de.properties b/lang/app/strings/translations_de.properties index 194b399b..f7d1ac82 100644 --- a/lang/app/strings/translations_de.properties +++ b/lang/app/strings/translations_de.properties @@ -500,3 +500,6 @@ ttyWarning=Die Verbindung hat zwangsweise ein pty/tty zugewiesen und stellt kein xshellSetup=Xshell-Einrichtung termiusSetup=Termius Einrichtung tryPtbDescription=Probiere neue Funktionen in XPipe-Entwickler-Builds frühzeitig aus +confirmVaultUnencryptTitle=Entschlüsselung des Tresors bestätigen +confirmVaultUnencryptHeader=Willst du die erweiterte Tresorverschlüsselung wirklich deaktivieren? +confirmVaultUnencryptContent=Dadurch wird die zusätzliche Verschlüsselung für gespeicherte Daten entfernt und die vorhandenen Daten werden überschrieben. diff --git a/lang/app/strings/translations_en.properties b/lang/app/strings/translations_en.properties index d5717645..a05bcaf2 100644 --- a/lang/app/strings/translations_en.properties +++ b/lang/app/strings/translations_en.properties @@ -504,3 +504,6 @@ ttyWarning=The connection has forcefully allocated a pty/tty and does not provid xshellSetup=Xshell setup termiusSetup=Termius setup tryPtbDescription=Try out new features early in XPipe developer builds +confirmVaultUnencryptTitle=Confirm vault unencryption +confirmVaultUnencryptHeader=Do you really want to disable advanced vault encryption? +confirmVaultUnencryptContent=This will remove the additional encryption for stored data and will overwrite existing data. diff --git a/lang/app/strings/translations_es.properties b/lang/app/strings/translations_es.properties index bcb0f083..c2f8b319 100644 --- a/lang/app/strings/translations_es.properties +++ b/lang/app/strings/translations_es.properties @@ -487,3 +487,6 @@ ttyWarning=La conexión ha asignado forzosamente un pty/tty y no proporciona un xshellSetup=Configuración de Xshell termiusSetup=Configuración de Termius tryPtbDescription=Prueba nuevas funciones antes en las versiones para desarrolladores de XPipe +confirmVaultUnencryptTitle=Confirmar la desencriptación de la bóveda +confirmVaultUnencryptHeader=¿Realmente quieres desactivar la encriptación avanzada de la bóveda? +confirmVaultUnencryptContent=Esto eliminará la encriptación adicional para los datos almacenados y sobrescribirá los datos existentes. diff --git a/lang/app/strings/translations_fr.properties b/lang/app/strings/translations_fr.properties index 805543d0..03227eac 100644 --- a/lang/app/strings/translations_fr.properties +++ b/lang/app/strings/translations_fr.properties @@ -487,3 +487,6 @@ ttyWarning=La connexion a alloué de force un pty/tty et ne fournit pas de flux xshellSetup=Configuration de Xshell termiusSetup=Installation de Termius tryPtbDescription=Essaie les nouvelles fonctions dès le début dans les versions pour développeurs de XPipe +confirmVaultUnencryptTitle=Confirmer le décryptage du coffre-fort +confirmVaultUnencryptHeader=Veux-tu vraiment désactiver le cryptage avancé de la chambre forte ? +confirmVaultUnencryptContent=Cela supprimera le cryptage supplémentaire pour les données stockées et écrasera les données existantes. diff --git a/lang/app/strings/translations_it.properties b/lang/app/strings/translations_it.properties index 16b804f2..5b011d2d 100644 --- a/lang/app/strings/translations_it.properties +++ b/lang/app/strings/translations_it.properties @@ -487,3 +487,6 @@ ttyWarning=La connessione ha allocato forzatamente una pty/tty e non fornisce un xshellSetup=Configurazione di Xshell termiusSetup=Configurazione di Termius tryPtbDescription=Prova subito le nuove funzionalità nelle build per sviluppatori di XPipe +confirmVaultUnencryptTitle=Conferma la decodifica del caveau +confirmVaultUnencryptHeader=Vuoi davvero disabilitare la crittografia avanzata del vault? +confirmVaultUnencryptContent=Questo rimuoverà la crittografia aggiuntiva per i dati memorizzati e sovrascriverà i dati esistenti. diff --git a/lang/app/strings/translations_ja.properties b/lang/app/strings/translations_ja.properties index 737d0463..0440431b 100644 --- a/lang/app/strings/translations_ja.properties +++ b/lang/app/strings/translations_ja.properties @@ -487,3 +487,6 @@ ttyWarning=接続が強制的にpty/ttyを割り当て、個別のstderrスト xshellSetup=Xshellのセットアップ termiusSetup=テルミウスのセットアップ tryPtbDescription=XPipe開発者ビルドで新機能をいち早く試す +confirmVaultUnencryptTitle=保管庫の暗号化解除を確認する +confirmVaultUnencryptHeader=本当に高度なデータ保管庫の暗号化を無効にしたいのか？ +confirmVaultUnencryptContent=これにより、保存データの暗号化が解除され、既存のデータが上書きされる。 diff --git a/lang/app/strings/translations_nl.properties b/lang/app/strings/translations_nl.properties index b507d84d..a48940f0 100644 --- a/lang/app/strings/translations_nl.properties +++ b/lang/app/strings/translations_nl.properties @@ -487,3 +487,6 @@ ttyWarning=De verbinding heeft geforceerd een pty/tty toegewezen en biedt geen a xshellSetup=Xshell installatie termiusSetup=Termius installatie tryPtbDescription=Nieuwe functies in een vroeg stadium uitproberen in XPipe developer builds +confirmVaultUnencryptTitle=Kluis ontcijfering bevestigen +confirmVaultUnencryptHeader=Wil je echt geavanceerde kluisversleuteling uitschakelen? +confirmVaultUnencryptContent=Hierdoor wordt de extra codering voor opgeslagen gegevens verwijderd en worden bestaande gegevens overschreven. diff --git a/lang/app/strings/translations_pt.properties b/lang/app/strings/translations_pt.properties index 726d066b..46aae437 100644 --- a/lang/app/strings/translations_pt.properties +++ b/lang/app/strings/translations_pt.properties @@ -487,3 +487,6 @@ ttyWarning=A ligação atribuiu à força um pty/tty e não fornece um fluxo std xshellSetup=Configuração do Xshell termiusSetup=Configuração do Termius tryPtbDescription=Experimenta as novas funcionalidades nas primeiras versões de programador do XPipe +confirmVaultUnencryptTitle=Confirma a desencriptação da abóbada +confirmVaultUnencryptHeader=Queres mesmo desativar a encriptação avançada da abóbada? +confirmVaultUnencryptContent=Isto irá remover a encriptação adicional dos dados armazenados e irá substituir os dados existentes. diff --git a/lang/app/strings/translations_ru.properties b/lang/app/strings/translations_ru.properties index a4b917d2..7dceeb33 100644 --- a/lang/app/strings/translations_ru.properties +++ b/lang/app/strings/translations_ru.properties @@ -487,3 +487,6 @@ ttyWarning=Соединение принудительно выделило pty/ xshellSetup=Настройка Xshell termiusSetup=Настройка Термиуса tryPtbDescription=Опробуй новые функции на ранней стадии в сборках разработчиков XPipe +confirmVaultUnencryptTitle=Подтверждение разблокировки хранилища +confirmVaultUnencryptHeader=Ты действительно хочешь отключить расширенное шифрование хранилища? +confirmVaultUnencryptContent=Это уберет дополнительное шифрование для сохраненных данных и перезапишет существующие. diff --git a/lang/app/strings/translations_tr.properties b/lang/app/strings/translations_tr.properties index 380a6082..7881b69d 100644 --- a/lang/app/strings/translations_tr.properties +++ b/lang/app/strings/translations_tr.properties @@ -488,3 +488,6 @@ ttyWarning=Bağlantı zorla bir pty/tty ayırmış ve ayrı bir stderr akışı xshellSetup=Xshell kurulumu termiusSetup=Termius kurulumu tryPtbDescription=XPipe geliştirici sürümlerinde yeni özellikleri erkenden deneyin +confirmVaultUnencryptTitle=Kasa şifrelemesinin kaldırılmasını onaylayın +confirmVaultUnencryptHeader=Gelişmiş kasa şifrelemesini gerçekten devre dışı bırakmak istiyor musunuz? +confirmVaultUnencryptContent=Bu, depolanan veriler için ek şifrelemeyi kaldıracak ve mevcut verilerin üzerine yazacaktır. diff --git a/lang/app/strings/translations_zh.properties b/lang/app/strings/translations_zh.properties index e1890a56..9edc9c4a 100644 --- a/lang/app/strings/translations_zh.properties +++ b/lang/app/strings/translations_zh.properties @@ -487,3 +487,6 @@ ttyWarning=连接强行分配了 pty/tty，且未提供单独的 stderr 流。\n xshellSetup=Xshell 设置 termiusSetup=Termius 设置 tryPtbDescription=在 XPipe 开发人员构建版本中提前试用新功能 +confirmVaultUnencryptTitle=确认保险库解密 +confirmVaultUnencryptHeader=您真的想禁用高级保险库加密吗？ +confirmVaultUnencryptContent=这将取消对存储数据的额外加密，并覆盖现有数据。