From 55954a004bcfd2d196d505176a0e7c15e3e4cacc Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Sun, 10 Sep 2023 18:53:34 +0100
Subject: [PATCH] android, desktop: notices about SOCKS proxy limitations
(#3044)
---
.../common/views/usersettings/NetworkAndServers.kt | 8 +++++++-
.../common/src/commonMain/resources/MR/base/strings.xml | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt
index 447b65eff..f2fee926a 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt
@@ -180,7 +180,13 @@ fun NetworkAndServersView(
SettingsActionItem(painterResource(MR.images.ic_cable), stringResource(MR.strings.network_settings), showSettingsModal { AdvancedNetworkSettingsView(it) })
}
if (networkUseSocksProxy.value) {
- SectionCustomFooter { Text(annotatedStringResource(MR.strings.disable_onion_hosts_when_not_supported)) }
+ SectionCustomFooter {
+ Column {
+ Text(annotatedStringResource(MR.strings.disable_onion_hosts_when_not_supported))
+ Spacer(Modifier.height(DEFAULT_PADDING_HALF))
+ Text(annotatedStringResource(MR.strings.socks_proxy_setting_limitations))
+ }
+ }
Divider(Modifier.padding(start = DEFAULT_PADDING_HALF, top = 32.dp, end = DEFAULT_PADDING_HALF, bottom = 30.dp))
} else {
Divider(Modifier.padding(start = DEFAULT_PADDING_HALF, top = 24.dp, end = DEFAULT_PADDING_HALF, bottom = 30.dp))
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
index ae55ad7e5..43c237f97 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@@ -615,7 +615,7 @@
Required
Onion hosts will be used when available.
Onion hosts will not be used.
- Onion hosts will be required for connection.
+ Onion hosts will be required for connection.\nPlease note: you will not be able to connect to the servers without .onion address.
Onion hosts will be used when available.
Onion hosts will not be used.
Onion hosts will be required for connection.
@@ -626,6 +626,7 @@
for each contact and group member.\nPlease note: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail.]]>
Update transport isolation mode?
Use .onion hosts to No if SOCKS proxy does not support them.]]>
+ Please note: message and file relays are connected via SOCKS proxy. Calls and link previews use direct network connection.]]>
Appearance
Customize theme
THEME COLORS