From added6105b75275856e64dea260b652f44d97fb2 Mon Sep 17 00:00:00 2001 From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com> Date: Mon, 20 Mar 2023 20:12:15 +0300 Subject: [PATCH] android: relay server footer (#2035) --- .../app/views/usersettings/CallSettings.kt | 16 ++++++++++++---- .../app/src/main/res/values-cs/strings.xml | 4 +++- .../app/src/main/res/values-de/strings.xml | 4 +++- .../app/src/main/res/values-es/strings.xml | 2 +- .../app/src/main/res/values-fr/strings.xml | 4 +++- .../app/src/main/res/values-it/strings.xml | 4 +++- .../app/src/main/res/values-ja/strings.xml | 2 +- .../app/src/main/res/values-nl/strings.xml | 4 +++- .../app/src/main/res/values-pt-rBR/strings.xml | 2 +- .../app/src/main/res/values-ru/strings.xml | 4 +++- .../app/src/main/res/values-zh-rCN/strings.xml | 4 +++- .../app/src/main/res/values-zh-rTW/strings.xml | 2 +- apps/android/app/src/main/res/values/strings.xml | 4 +++- 13 files changed, 40 insertions(+), 16 deletions(-) diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/CallSettings.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/CallSettings.kt index d5873f35b2..c1fa4a04bc 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/CallSettings.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/CallSettings.kt @@ -2,6 +2,7 @@ package chat.simplex.app.views.usersettings import SectionDivider import SectionItemView +import SectionTextFooter import SectionView import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* @@ -43,16 +44,23 @@ fun CallSettingsLayout( AppBarTitle(stringResource(R.string.your_calls)) val lockCallState = remember { mutableStateOf(callOnLockScreen.get()) } SectionView(stringResource(R.string.settings_section_title_settings)) { - SectionItemView() { - SharedPreferenceToggle(stringResource(R.string.connect_calls_via_relay), webrtcPolicyRelay) - } + SectionItemView(editIceServers) { Text(stringResource(R.string.webrtc_ice_servers)) } SectionDivider() val enabled = remember { mutableStateOf(true) } SectionItemView { LockscreenOpts(lockCallState, enabled, onSelected = { callOnLockScreen.set(it); lockCallState.value = it }) } SectionDivider() - SectionItemView(editIceServers) { Text(stringResource(R.string.webrtc_ice_servers)) } + SectionItemView() { + SharedPreferenceToggle(stringResource(R.string.always_use_relay), webrtcPolicyRelay) + } } + SectionTextFooter( + if (remember { webrtcPolicyRelay.state }.value) { + generalGetString(R.string.relay_server_protects_ip) + } else { + generalGetString(R.string.relay_server_if_necessary) + } + ) } } diff --git a/apps/android/app/src/main/res/values-cs/strings.xml b/apps/android/app/src/main/res/values-cs/strings.xml index 8a8a7aa54c..a4d9dbb77c 100644 --- a/apps/android/app/src/main/res/values-cs/strings.xml +++ b/apps/android/app/src/main/res/values-cs/strings.xml @@ -709,11 +709,13 @@ zvukový hovor (nešifrováno e2e) Odmítnout Vaše hovory - Spojení přes relé + Spojení přes relé Zobrazit Zakázat Vaše servery ICE WebRTC servery ICE + Přenosový server chrání vaši IP adresu, ale může sledovat dobu trvání hovoru. + Přenosový server se používá pouze v případě potřeby. Jiná strana může sledovat vaši IP adresu. bez šifrování e2e Druhý foťák Čekající hovor diff --git a/apps/android/app/src/main/res/values-de/strings.xml b/apps/android/app/src/main/res/values-de/strings.xml index 7a0a213a0f..3d80ffdbca 100644 --- a/apps/android/app/src/main/res/values-de/strings.xml +++ b/apps/android/app/src/main/res/values-de/strings.xml @@ -513,13 +513,15 @@ Audio- & Videoanrufe Ihre Anrufe - Über ein Relais verbinden + Über ein Relais verbinden Anrufe auf Sperrbildschirm: Akzeptieren Anzeigen Deaktivieren Ihre ICE-Server WebRTC ICE-Server + Relais-Server schützen Ihre IP-Adresse, aber sie können die Anrufdauer erfassen. + Relais-Server werden nur genutzt, wenn sie benötigt werden. Ihre IP-Adresse kann von Anderen erfasst werden. Öffnen Sie SimpleX Chat, um den Anruf anzunehmen. Aktivieren Sie Anrufe vom Sperrbildschirm über die Einstellungen. diff --git a/apps/android/app/src/main/res/values-es/strings.xml b/apps/android/app/src/main/res/values-es/strings.xml index 1d1854a113..33fce7acff 100644 --- a/apps/android/app/src/main/res/values-es/strings.xml +++ b/apps/android/app/src/main/res/values-es/strings.xml @@ -152,7 +152,7 @@ Nombre del contacto Copiar Crear tu perfil - Conectar mediante relay + Conectar mediante relay La base de datos está cifrada con una contraseña aleatoria. Cámbiala antes de exportar. %d archivo(s) con tamaño total de %s Activar eliminación automática de mensajes\? diff --git a/apps/android/app/src/main/res/values-fr/strings.xml b/apps/android/app/src/main/res/values-fr/strings.xml index 7f07335904..b4df047cce 100644 --- a/apps/android/app/src/main/res/values-fr/strings.xml +++ b/apps/android/app/src/main/res/values-fr/strings.xml @@ -598,12 +598,14 @@ Appel audio entrant %1$s veut se connecter à vous via Vos appels - Se connecter via relais + Se connecter via relais Appels en écran verrouillé : Montrer Désactiver Vos serveurs ICE Serveurs WebRTC ICE + Le serveur relais protège votre adresse IP, mais il peut observer la durée de l\'appel. + Le serveur relais n\'est utilisé que si nécessaire. Un tiers peut observer votre adresse IP. Ouvrez SimpleX Chat pour décrocher sans chiffrement de bout en bout Ce contact a le chiffrement de bout en bout diff --git a/apps/android/app/src/main/res/values-it/strings.xml b/apps/android/app/src/main/res/values-it/strings.xml index 1eaf4120fa..4d58edda6f 100644 --- a/apps/android/app/src/main/res/values-it/strings.xml +++ b/apps/android/app/src/main/res/values-it/strings.xml @@ -378,7 +378,7 @@ Chiamata in corso Chiamate sulla schermata di blocco: Connessione chiamata - Connetti via relay + Connetti via relay il contatto ha la crittografia e2e il contatto non ha la crittografia e2e Disattiva @@ -718,6 +718,8 @@ Video off Video on Server WebRTC ICE + Il server relay protegge il tuo indirizzo IP, ma può osservare la durata della chiamata. + Il server relay viene usato solo se necessario. Un altro utente può osservare il tuo indirizzo IP. %1$d messaggio/i saltato/i Le tue chiamate I tuoi server ICE diff --git a/apps/android/app/src/main/res/values-ja/strings.xml b/apps/android/app/src/main/res/values-ja/strings.xml index 62b89baa54..0530ae4ec6 100644 --- a/apps/android/app/src/main/res/values-ja/strings.xml +++ b/apps/android/app/src/main/res/values-ja/strings.xml @@ -459,7 +459,7 @@ コアのバージョン: v%s 画像を編集 不在着信 - リレー経由で繋がる。 + リレー経由で繋がる。 エンドツーエンド暗号化済み チャットのデータベースが削除されました。 次の期間が経ったら、メッセージを削除: diff --git a/apps/android/app/src/main/res/values-nl/strings.xml b/apps/android/app/src/main/res/values-nl/strings.xml index 0942e464fa..8d764bf385 100644 --- a/apps/android/app/src/main/res/values-nl/strings.xml +++ b/apps/android/app/src/main/res/values-nl/strings.xml @@ -215,7 +215,7 @@ Maak Maak een profiel aan Adres verwijderen - Verbinden via relais + Verbinden via relais contact heeft e2e-codering contact heeft geen e2e versleuteling De database is versleuteld met een willekeurige wachtwoord. Wijzig dit voordat u exporteert. @@ -752,6 +752,8 @@ Uw oproepen Toon WebRTC ICE-servers + Relay server beschermt uw IP-adres, maar kan de duur van het gesprek observeren. + Relay server wordt alleen gebruikt als dat nodig is. Een andere partij kan uw IP-adres zien. Uw ICE-servers Overgeslagen berichten via relais diff --git a/apps/android/app/src/main/res/values-pt-rBR/strings.xml b/apps/android/app/src/main/res/values-pt-rBR/strings.xml index eead81a839..3d7227189a 100644 --- a/apps/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/apps/android/app/src/main/res/values-pt-rBR/strings.xml @@ -134,7 +134,7 @@ Adicione servidores digitalizando QR code. Permitir enviar mensagens de voz. Criar grupo secreto - Conectar via relay + Conectar via relay Adicionar perfil Conectar via link Criar perfil diff --git a/apps/android/app/src/main/res/values-ru/strings.xml b/apps/android/app/src/main/res/values-ru/strings.xml index d139eb97f9..c61e70b493 100644 --- a/apps/android/app/src/main/res/values-ru/strings.xml +++ b/apps/android/app/src/main/res/values-ru/strings.xml @@ -514,13 +514,15 @@ Аудио- и видеозвонки Ваши звонки - Соединяться через сервер (relay) + Всегда соединяться через relay Звонки на экране блокировки: Принимать Показывать Выключить Ваши ICE серверы WebRTC ICE серверы + Relay сервер защищает ваш IP адрес, но может отслеживать продолжительность звонка. + Relay сервер используется только при необходимости. Другая сторона может видеть ваш IP адрес. Откройте SimpleX Chat\nчтобы принять звонок Вы можете разрешить принимать звонки на экране блокировки через Настройки. diff --git a/apps/android/app/src/main/res/values-zh-rCN/strings.xml b/apps/android/app/src/main/res/values-zh-rCN/strings.xml index 2a6b6b656c..8cf13e4ec0 100644 --- a/apps/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/apps/android/app/src/main/res/values-zh-rCN/strings.xml @@ -67,7 +67,7 @@ 通过联系人链接连接? 通过群组链接连接? 通过群组链接/二维码连接 - 通过中继连接 + 通过中继连接 允许您的联系人不可撤回地删除已发送消息。 联系人允许 仅有您的联系人许可后才允许语音消息。 @@ -924,6 +924,8 @@ 使用 SimpleX Chat 服务器? 我们不会在服务器上存储您的任何联系人或消息(一旦发送)。 WebRTC ICE 服务器 + 中继服务器保护您的 IP 地址,但它可以观察通话的持续时间。 + 中继服务器仅在必要时使用。其他人可能会观察到您的IP地址。 您的 ICE 服务器 视频关闭 您可以通过应用设置/数据库或重启应用开始聊天。 diff --git a/apps/android/app/src/main/res/values-zh-rTW/strings.xml b/apps/android/app/src/main/res/values-zh-rTW/strings.xml index e58d5b938f..66de2e31d1 100644 --- a/apps/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/apps/android/app/src/main/res/values-zh-rTW/strings.xml @@ -941,7 +941,7 @@ 待確認通話 你的私隱 你的通話 - 經由分程傳遞連接 + 經由分程傳遞連接 在上鎖畫面顯示來電通知: %1$d 你錯過了多個訊息 錯誤訊息雜湊值 diff --git a/apps/android/app/src/main/res/values/strings.xml b/apps/android/app/src/main/res/values/strings.xml index 158dbc0a1a..8820b19c6d 100644 --- a/apps/android/app/src/main/res/values/strings.xml +++ b/apps/android/app/src/main/res/values/strings.xml @@ -631,13 +631,15 @@ Audio & video calls Your calls - Connect via relay + Always use relay Calls on lock screen: Accept Show Disable Your ICE servers WebRTC ICE servers + Relay server protects your IP address, but it can observe the duration of the call. + Relay server is only used if necessary. Another party can observe your IP address. Open SimpleX Chat to accept call