multiplatform: SMP proxy configuration buttons (#4188)

* multiplatform: SMP proxy configuration buttons * fix * icons * icon * icon
2026-03-30 20:45:49 +00:00 · 2024-05-15 23:09:51 +04:00
parent 98a67fa2e4
commit 96ce59f330
4 changed files with 180 additions and 4 deletions
--- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift
+++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift
@@ -261,9 +261,9 @@ struct NetworkAndServers: View {

    private func proxyFallbackInfo(_ proxyFallback: SMPProxyFallback) -> LocalizedStringKey {
        switch proxyFallback {
-        case .allow: return "Send messages directly when your or destination server does not support 2-hop onion routing."
-        case .allowProtected: return "Send messages directly when IP address is protected and your or destination server does not support 2-hop onion routing."
-        case .prohibit: return "Do NOT send messages directly, even if your or destination server does not support 2-hop onion routing."
+        case .allow: return "Send messages directly when your or destination server does not support private routing."
+        case .allowProtected: return "Send messages directly when IP address is protected and your or destination server does not support private routing."
+        case .prohibit: return "Do NOT send messages directly, even if your or destination server does not support private routing."
        }
    }
 }
--- 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
@@ -43,6 +43,8 @@ fun NetworkAndServersView() {
  val developerTools = chatModel.controller.appPrefs.developerTools.get()
  val onionHosts = remember { mutableStateOf(netCfg.onionHosts) }
  val sessionMode = remember { mutableStateOf(netCfg.sessionMode) }
+  val smpProxyMode = remember { mutableStateOf(netCfg.smpProxyMode) }
+  val smpProxyFallback = remember { mutableStateOf(netCfg.smpProxyFallback) }

  val proxyPort = remember { derivedStateOf { chatModel.controller.appPrefs.networkProxyHostPort.state.value?.split(":")?.lastOrNull()?.toIntOrNull() ?: 9050 } }
  NetworkAndServersLayout(
@@ -51,6 +53,8 @@ fun NetworkAndServersView() {
    networkUseSocksProxy = networkUseSocksProxy,
    onionHosts = onionHosts,
    sessionMode = sessionMode,
+    smpProxyMode = smpProxyMode,
+    smpProxyFallback = smpProxyFallback,
    proxyPort = proxyPort,
    toggleSocksProxy = { enable ->
      if (enable) {
@@ -137,6 +141,59 @@ fun NetworkAndServersView() {
          }
        }
      }
+    },
+    updateSMPProxyMode = {
+      if (smpProxyMode.value == it) return@NetworkAndServersLayout
+      val prevValue = smpProxyMode.value
+      smpProxyMode.value = it
+      val startsWith = when (it) {
+        SMPProxyMode.Always -> generalGetString(MR.strings.network_smp_proxy_mode_always_description)
+        SMPProxyMode.Unknown -> generalGetString(MR.strings.network_smp_proxy_mode_unknown_description)
+        SMPProxyMode.Unprotected -> generalGetString(MR.strings.network_smp_proxy_mode_unprotected_description)
+        SMPProxyMode.Never -> generalGetString(MR.strings.network_smp_proxy_mode_never_description)
+      }
+      showUpdateNetworkSettingsDialog(
+        title = generalGetString(MR.strings.update_network_smp_proxy_mode_question),
+        startsWith,
+        onDismiss = { smpProxyMode.value = prevValue }
+      ) {
+        withBGApi {
+          val newCfg = chatModel.controller.getNetCfg().copy(smpProxyMode = it)
+          val res = chatModel.controller.apiSetNetworkConfig(newCfg)
+          if (res) {
+            chatModel.controller.setNetCfg(newCfg)
+            smpProxyMode.value = it
+          } else {
+            smpProxyMode.value = prevValue
+          }
+        }
+      }
+    },
+    updateSMPProxyFallback = {
+      if (smpProxyFallback.value == it) return@NetworkAndServersLayout
+      val prevValue = smpProxyFallback.value
+      smpProxyFallback.value = it
+      val startsWith = when (it) {
+        SMPProxyFallback.Allow -> generalGetString(MR.strings.network_smp_proxy_fallback_allow_description)
+        SMPProxyFallback.AllowProtected -> generalGetString(MR.strings.network_smp_proxy_fallback_allow_protected_description)
+        SMPProxyFallback.Prohibit -> generalGetString(MR.strings.network_smp_proxy_fallback_prohibit_description)
+      }
+      showUpdateNetworkSettingsDialog(
+        title = generalGetString(MR.strings.update_network_smp_proxy_fallback_question),
+        startsWith,
+        onDismiss = { smpProxyFallback.value = prevValue }
+      ) {
+        withBGApi {
+          val newCfg = chatModel.controller.getNetCfg().copy(smpProxyFallback = it)
+          val res = chatModel.controller.apiSetNetworkConfig(newCfg)
+          if (res) {
+            chatModel.controller.setNetCfg(newCfg)
+            smpProxyFallback.value = it
+          } else {
+            smpProxyFallback.value = prevValue
+          }
+        }
+      }
    }
  )
 }
@@ -147,16 +204,22 @@ fun NetworkAndServersView() {
  networkUseSocksProxy: MutableState<Boolean>,
  onionHosts: MutableState<OnionHosts>,
  sessionMode: MutableState<TransportSessionMode>,
+  smpProxyMode: MutableState<SMPProxyMode>,
+  smpProxyFallback: MutableState<SMPProxyFallback>,
  proxyPort: State<Int>,
  toggleSocksProxy: (Boolean) -> Unit,
  useOnion: (OnionHosts) -> Unit,
  updateSessionMode: (TransportSessionMode) -> Unit,
+  updateSMPProxyMode: (SMPProxyMode) -> Unit,
+  updateSMPProxyFallback: (SMPProxyFallback) -> Unit,
 ) {
  val m = chatModel
  ColumnWithScrollBar(
    Modifier.fillMaxWidth(),
    verticalArrangement = Arrangement.spacedBy(8.dp)
  ) {
+    val showModal = { it: @Composable ModalData.() -> Unit ->  ModalManager.start.showModal(content = it) }
+
    AppBarTitle(stringResource(MR.strings.network_and_servers))
    if (!chatModel.desktopNoUserNoRemote) {
      SectionView(generalGetString(MR.strings.settings_section_title_messages)) {
@@ -165,7 +228,6 @@ fun NetworkAndServersView() {
        SettingsActionItem(painterResource(MR.images.ic_dns), stringResource(MR.strings.xftp_servers), { ModalManager.start.showCustomModal { close -> ProtocolServersView(m, m.remoteHostId, ServerProtocol.XFTP, close) } })

        if (currentRemoteHost == null) {
-          val showModal = { it: @Composable ModalData.() -> Unit ->  ModalManager.start.showModal(content = it) }
          UseSocksProxySwitch(networkUseSocksProxy, proxyPort, toggleSocksProxy, showModal, chatModel.controller.appPrefs.networkProxyHostPort, false)
          UseOnionHosts(onionHosts, networkUseSocksProxy, showModal, useOnion)
          if (developerTools) {
@@ -188,6 +250,18 @@ fun NetworkAndServersView() {
      Divider(Modifier.padding(start = DEFAULT_PADDING_HALF, top = 24.dp, end = DEFAULT_PADDING_HALF, bottom = 30.dp))
    }

+    if (currentRemoteHost == null) {
+      SectionView(generalGetString(MR.strings.settings_section_title_private_message_routing)) {
+        SMPProxyModePicker(smpProxyMode, showModal, updateSMPProxyMode)
+        SMPProxyFallbackPicker(smpProxyFallback, showModal, updateSMPProxyFallback, enabled = remember { mutableStateOf(smpProxyMode.value != SMPProxyMode.Never) })
+        SettingsPreferenceItem(painterResource(MR.images.ic_arrow_forward), stringResource(MR.strings.private_routing_show_message_status), chatModel.controller.appPrefs.showSentViaProxy)
+      }
+      SectionCustomFooter {
+        Text(stringResource(MR.strings.private_routing_explanation))
+      }
+      Divider(Modifier.padding(start = DEFAULT_PADDING_HALF, top = 32.dp, end = DEFAULT_PADDING_HALF, bottom = 30.dp))
+    }
+
    SectionView(generalGetString(MR.strings.settings_section_title_calls)) {
      SettingsActionItem(painterResource(MR.images.ic_electrical_services), stringResource(MR.strings.webrtc_ice_servers), { ModalManager.start.showModal { RTCServersView(m) } })
    }
@@ -452,6 +526,79 @@ private fun SessionModePicker(
  )
 }

+@Composable
+private fun SMPProxyModePicker(
+  smpProxyMode: MutableState<SMPProxyMode>,
+  showModal: (@Composable ModalData.() -> Unit) -> Unit,
+  updateSMPProxyMode: (SMPProxyMode) -> Unit,
+) {
+  val density = LocalDensity.current
+  val values = remember {
+    SMPProxyMode.values().map {
+      when (it) {
+        SMPProxyMode.Always -> ValueTitleDesc(SMPProxyMode.Always, generalGetString(MR.strings.network_smp_proxy_mode_always), escapedHtmlToAnnotatedString(generalGetString(MR.strings.network_smp_proxy_mode_always_description), density))
+        SMPProxyMode.Unknown -> ValueTitleDesc(SMPProxyMode.Unknown, generalGetString(MR.strings.network_smp_proxy_mode_unknown), escapedHtmlToAnnotatedString(generalGetString(MR.strings.network_smp_proxy_mode_unknown_description), density))
+        SMPProxyMode.Unprotected -> ValueTitleDesc(SMPProxyMode.Unprotected, generalGetString(MR.strings.network_smp_proxy_mode_unprotected), escapedHtmlToAnnotatedString(generalGetString(MR.strings.network_smp_proxy_mode_unprotected_description), density))
+        SMPProxyMode.Never -> ValueTitleDesc(SMPProxyMode.Never, generalGetString(MR.strings.network_smp_proxy_mode_never), escapedHtmlToAnnotatedString(generalGetString(MR.strings.network_smp_proxy_mode_never_description), density))
+      }
+    }
+  }
+
+  SectionItemWithValue(
+    generalGetString(MR.strings.network_smp_proxy_mode_private_routing),
+    smpProxyMode,
+    values,
+    icon = painterResource(MR.images.ic_settings_ethernet),
+    onSelected = {
+      showModal {
+        ColumnWithScrollBar(
+          Modifier.fillMaxWidth(),
+        ) {
+          AppBarTitle(stringResource(MR.strings.network_smp_proxy_mode_private_routing))
+          SectionViewSelectable(null, smpProxyMode, values, updateSMPProxyMode)
+        }
+      }
+    }
+  )
+}
+
+@Composable
+private fun SMPProxyFallbackPicker(
+  smpProxyFallback: MutableState<SMPProxyFallback>,
+  showModal: (@Composable ModalData.() -> Unit) -> Unit,
+  updateSMPProxyFallback: (SMPProxyFallback) -> Unit,
+  enabled: State<Boolean>,
+) {
+  val density = LocalDensity.current
+  val values = remember {
+    SMPProxyFallback.values().map {
+      when (it) {
+        SMPProxyFallback.Allow -> ValueTitleDesc(SMPProxyFallback.Allow, generalGetString(MR.strings.network_smp_proxy_fallback_allow), escapedHtmlToAnnotatedString(generalGetString(MR.strings.network_smp_proxy_fallback_allow_description), density))
+        SMPProxyFallback.AllowProtected -> ValueTitleDesc(SMPProxyFallback.AllowProtected, generalGetString(MR.strings.network_smp_proxy_fallback_allow_protected), escapedHtmlToAnnotatedString(generalGetString(MR.strings.network_smp_proxy_fallback_allow_protected_description), density))
+        SMPProxyFallback.Prohibit -> ValueTitleDesc(SMPProxyFallback.Prohibit, generalGetString(MR.strings.network_smp_proxy_fallback_prohibit), escapedHtmlToAnnotatedString(generalGetString(MR.strings.network_smp_proxy_fallback_prohibit_description), density))
+      }
+    }
+  }
+
+  SectionItemWithValue(
+    generalGetString(MR.strings.network_smp_proxy_fallback_allow_downgrade),
+    smpProxyFallback,
+    values,
+    icon = painterResource(MR.images.ic_arrows_left_right),
+    enabled = enabled,
+    onSelected = {
+      showModal {
+        ColumnWithScrollBar(
+          Modifier.fillMaxWidth(),
+        ) {
+          AppBarTitle(stringResource(MR.strings.network_smp_proxy_fallback_allow_downgrade))
+          SectionViewSelectable(null, smpProxyFallback, values, updateSMPProxyFallback)
+        }
+      }
+    }
+  )
+}
+
@Composable
 private fun NetworkSectionFooter(revert: () -> Unit, save: () -> Unit, revertDisabled: Boolean, saveDisabled: Boolean) {
  Row(
@@ -506,8 +653,12 @@ fun PreviewNetworkAndServersLayout() {
      toggleSocksProxy = {},
      onionHosts = remember { mutableStateOf(OnionHosts.PREFER) },
      sessionMode = remember { mutableStateOf(TransportSessionMode.User) },
+      smpProxyMode = remember { mutableStateOf(SMPProxyMode.Never) },
+      smpProxyFallback = remember { mutableStateOf(SMPProxyFallback.Allow) },
      useOnion = {},
      updateSessionMode = {},
+      updateSMPProxyMode = {},
+      updateSMPProxyFallback = {},
    )
  }
 }
--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@@ -722,6 +722,26 @@
  <string name="update_network_session_mode_question">Update transport isolation mode?</string>
  <string name="disable_onion_hosts_when_not_supported"><![CDATA[Set <i>Use .onion hosts</i> to No if SOCKS proxy does not support them.]]></string>
  <string name="socks_proxy_setting_limitations"><![CDATA[<b>Please note</b>: message and file relays are connected via SOCKS proxy. Calls and sending link previews use direct connection.]]></string>
+  <string name="network_smp_proxy_mode_private_routing">Private routing</string>
+  <string name="network_smp_proxy_mode_always">Always</string>
+  <string name="network_smp_proxy_mode_unknown">Unknown relays</string>
+  <string name="network_smp_proxy_mode_unprotected">Unprotected</string>
+  <string name="network_smp_proxy_mode_never">Never</string>
+  <string name="network_smp_proxy_mode_always_description">Always use private routing.</string>
+  <string name="network_smp_proxy_mode_unknown_description">Use private routing with unknown servers.</string>
+  <string name="network_smp_proxy_mode_unprotected_description">Use private routing with unknown servers when IP address is not protected.</string>
+  <string name="network_smp_proxy_mode_never_description">Do NOT use private routing.</string>
+  <string name="update_network_smp_proxy_mode_question">Message routing mode</string>
+  <string name="network_smp_proxy_fallback_allow_downgrade">Allow downgrade</string>
+  <string name="network_smp_proxy_fallback_allow">Yes</string>
+  <string name="network_smp_proxy_fallback_allow_protected">When IP hidden</string>
+  <string name="network_smp_proxy_fallback_prohibit">No</string>
+  <string name="network_smp_proxy_fallback_allow_description">Send messages directly when your or destination server does not support private routing.</string>
+  <string name="network_smp_proxy_fallback_allow_protected_description">Send messages directly when IP address is protected and your or destination server does not support private routing.</string>
+  <string name="network_smp_proxy_fallback_prohibit_description">Do NOT send messages directly, even if your or destination server does not support private routing.</string>
+  <string name="update_network_smp_proxy_fallback_question">Message routing fallback</string>
+  <string name="private_routing_show_message_status">Show message status</string>
+  <string name="private_routing_explanation">To protect your IP address, private routing uses your SMP servers to deliver messages.</string>
  <string name="appearance_settings">Appearance</string>
  <string name="customize_theme_title">Customize theme</string>
  <string name="theme_colors_section_title">THEME COLORS</string>
@@ -1047,6 +1067,7 @@
  <string name="settings_section_title_themes">THEMES</string>
  <string name="settings_section_title_profile_images">Profile images</string>
  <string name="settings_section_title_messages">MESSAGES AND FILES</string>
+  <string name="settings_section_title_private_message_routing">PRIVATE MESSAGE ROUTING</string>
  <string name="settings_section_title_calls">CALLS</string>
  <string name="settings_section_title_network_connection">Network connection</string>
  <string name="settings_section_title_incognito">Incognito mode</string>
--- a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_arrows_left_right.svg
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_arrows_left_right.svg
@@ -0,0 +1,4 @@
+<svg height="24" viewBox="0 -960 960 960" width="24" fill="#000000" xmlns="http://www.w3.org/2000/svg">
+  <path d="M 831.5 -480 L 657 -656.5 C 651.667 -662.167 648.917 -668.833 648.75 -676.5 C 648.583 -684.167 651.333 -690.833 657 -696.5 C 662.667 -702.5 669.333 -705.5 677 -705.5 C 684.667 -705.5 691.5 -702.667 697.5 -697 L 894 -500.5 C 897 -497.167 899.25 -493.917 900.75 -490.75 C 902.25 -487.583 903 -484 903 -480 C 903 -476 902.25 -472.417 900.75 -469.25 C 899.25 -466.083 897 -463 894 -460 L 697.5 -263.5 C 691.5 -257.5 684.667 -254.583 677 -254.75 C 669.333 -254.917 662.667 -257.833 657 -263.5 C 651 -269.5 648.167 -276.25 648.5 -283.75 C 648.833 -291.25 651.667 -297.833 657 -303.5 L 831.5 -480 Z M 128.5 -480 L 303 -303.5 C 308.333 -297.833 311.083 -291.167 311.25 -283.5 C 311.417 -275.833 308.667 -269.167 303 -263.5 C 297.333 -257.5 290.667 -254.5 283 -254.5 C 275.333 -254.5 268.667 -257.5 263 -263.5 L 66.5 -460 C 63.167 -463 60.833 -466.083 59.5 -469.25 C 58.167 -472.417 57.5 -476 57.5 -480 C 57.5 -484 58.167 -487.583 59.5 -490.75 C 60.833 -493.917 63.167 -497.167 66.5 -500.5 L 263 -697 C 268.667 -702.667 275.333 -705.417 283 -705.25 C 290.667 -705.083 297.5 -702.167 303.5 -696.5 C 309.167 -690.5 311.833 -683.75 311.5 -676.25 C 311.167 -668.75 308.333 -662.167 303 -656.5 L 128.5 -480 Z" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, 0)"/>
+  <rect x="123" y="-514" width="711.266" height="68" style="stroke: rgb(0, 0, 0);" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, 0)"/>
+</svg>