From a0d6ae15ab10b711b596ca3d5052e3950aee43c3 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Fri, 17 May 2024 16:36:25 +0400 Subject: [PATCH] ui: comment smp proxy ui (#4204) --- .../UserSettings/NetworkAndServers.swift | 46 +++++++++---------- .../views/usersettings/NetworkAndServers.kt | 22 ++++----- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift index 6d849479e5..54a4ef1489 100644 --- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift +++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift @@ -82,29 +82,29 @@ struct NetworkAndServers: View { Text("Using .onion hosts requires compatible VPN provider.") } - Section { - Picker("Private routing", selection: $proxyMode) { - ForEach(SMPProxyMode.values, id: \.self) { Text($0.text) } - } - .frame(height: 36) - - Picker("Allow downgrade", selection: $proxyFallback) { - ForEach(SMPProxyFallback.values, id: \.self) { Text($0.text) } - } - .disabled(proxyMode == .never) - .frame(height: 36) - - Toggle("Show message status", isOn: $showSentViaProxy) - } header: { - Text("Private message routing") - } footer: { - VStack(alignment: .leading) { - Text("To protect your IP address, private routing uses your SMP servers to deliver messages.") - if showSentViaProxy { - Text("Show → on messages sent via private routing.") - } - } - } +// Section { +// Picker("Private routing", selection: $proxyMode) { +// ForEach(SMPProxyMode.values, id: \.self) { Text($0.text) } +// } +// .frame(height: 36) +// +// Picker("Allow downgrade", selection: $proxyFallback) { +// ForEach(SMPProxyFallback.values, id: \.self) { Text($0.text) } +// } +// .disabled(proxyMode == .never) +// .frame(height: 36) +// +// Toggle("Show message status", isOn: $showSentViaProxy) +// } header: { +// Text("Private message routing") +// } footer: { +// VStack(alignment: .leading) { +// Text("To protect your IP address, private routing uses your SMP servers to deliver messages.") +// if showSentViaProxy { +// Text("Show → on messages sent via private routing.") +// } +// } +// } Section("Calls") { NavigationLink { 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 d07fad8623..b2124df988 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 @@ -250,17 +250,17 @@ 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)) - } +// 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) } })