ui: split servers into lists; allow to enable only tested servers (#4445)

2026-07-20 20:01:33 +00:00 · 2024-07-12 21:03:30 +04:00
parent b348979b32
commit 70204e071d
88 changed files with 320 additions and 258 deletions
@@ -3138,7 +3138,7 @@ data class ProtoServersConfig(
 data class UserProtocolServers(
  val serverProtocol: ServerProtocol,
  val protoServers: List<ServerCfg>,
-  val presetServers: List<String>,
+  val presetServers: List<ServerCfg>,
 )

@Serializable
@@ -3147,7 +3147,7 @@ data class ServerCfg(
  val server: String,
  val preset: Boolean,
  val tested: Boolean? = null,
-  val enabled: ServerEnabled
+  val enabled: Boolean
 ) {
  @Transient
  private val createdAt: Date = Date()
@@ -3161,7 +3161,7 @@ data class ServerCfg(
    get() = server.isBlank()

  companion object {
-    val empty = ServerCfg(remoteHostId = null, server = "", preset = false, tested = null, enabled = ServerEnabled.Enabled)
+    val empty = ServerCfg(remoteHostId = null, server = "", preset = false, tested = null, enabled = false)

    class SampleData(
      val preset: ServerCfg,
@@ -3175,33 +3175,26 @@ data class ServerCfg(
        server = "smp://abcd@smp8.simplex.im",
        preset = true,
        tested = true,
-        enabled = ServerEnabled.Enabled
+        enabled = true
      ),
      custom = ServerCfg(
        remoteHostId = null,
        server = "smp://abcd@smp9.simplex.im",
        preset = false,
        tested = false,
-        enabled = ServerEnabled.Disabled
+        enabled = false
      ),
      untested = ServerCfg(
        remoteHostId = null,
        server = "smp://abcd@smp10.simplex.im",
        preset = false,
        tested = null,
-        enabled = ServerEnabled.Enabled
+        enabled = true
      )
    )
  }
 }

-@Serializable
-enum class ServerEnabled {
-  @SerialName("disabled") Disabled,
-  @SerialName("enabled") Enabled,
-  @SerialName("known") Known;
-}
-
@Serializable
 enum class ProtocolTestStep {
  @SerialName("connect") Connect,
@@ -66,7 +66,7 @@ private fun LinkAMobileLayout(
        SectionView(generalGetString(MR.strings.this_device_name).uppercase()) {
          DeviceNameField(deviceName.value ?: "") { updateDeviceName(it) }
          SectionTextFooter(generalGetString(MR.strings.this_device_name_shared_with_mobile))
-          PreferenceToggle(stringResource(MR.strings.multicast_discoverable_via_local_network), remember { ChatModel.controller.appPrefs.offerRemoteMulticast.state }.value) {
+          PreferenceToggle(stringResource(MR.strings.multicast_discoverable_via_local_network), checked = remember { ChatModel.controller.appPrefs.offerRemoteMulticast.state }.value) {
            ChatModel.controller.appPrefs.offerRemoteMulticast.set(it)
          }
        }
@@ -432,14 +432,14 @@ private fun LinkedDesktopsView(remoteCtrls: SnapshotStateList<RemoteCtrlInfo>) {
    SectionDividerSpaced()

    SectionView(stringResource(MR.strings.linked_desktop_options).uppercase()) {
-      PreferenceToggle(stringResource(MR.strings.verify_connections), remember { controller.appPrefs.confirmRemoteSessions.state }.value) {
+      PreferenceToggle(stringResource(MR.strings.verify_connections), checked = remember { controller.appPrefs.confirmRemoteSessions.state }.value) {
        controller.appPrefs.confirmRemoteSessions.set(it)
      }
-      PreferenceToggle(stringResource(MR.strings.discover_on_network), remember { controller.appPrefs.connectRemoteViaMulticast.state }.value) {
+      PreferenceToggle(stringResource(MR.strings.discover_on_network), checked = remember { controller.appPrefs.connectRemoteViaMulticast.state }.value) {
        controller.appPrefs.connectRemoteViaMulticast.set(it)
      }
      if (remember { controller.appPrefs.connectRemoteViaMulticast.state }.value) {
-        PreferenceToggle(stringResource(MR.strings.multicast_connect_automatically), remember { controller.appPrefs.connectRemoteViaMulticastAuto.state }.value) {
+        PreferenceToggle(stringResource(MR.strings.multicast_connect_automatically), checked = remember { controller.appPrefs.connectRemoteViaMulticastAuto.state }.value) {
          controller.appPrefs.connectRemoteViaMulticastAuto.set(it)
        }
      }
@@ -97,7 +97,7 @@ fun ConnectMobileLayout(
    SectionView(generalGetString(MR.strings.this_device_name).uppercase()) {
      DeviceNameField(deviceName.value ?: "") { updateDeviceName(it) }
      SectionTextFooter(generalGetString(MR.strings.this_device_name_shared_with_mobile))
-      PreferenceToggle(stringResource(MR.strings.multicast_discoverable_via_local_network), remember { controller.appPrefs.offerRemoteMulticast.state }.value) {
+      PreferenceToggle(stringResource(MR.strings.multicast_discoverable_via_local_network), checked = remember { controller.appPrefs.offerRemoteMulticast.state }.value) {
        controller.appPrefs.offerRemoteMulticast.set(it)
      }
      SectionDividerSpaced(maxBottomPadding = false)
@@ -175,10 +175,16 @@ private fun UseServerSection(
      Text(stringResource(MR.strings.smp_servers_test_server), color = if (valid && !testing) MaterialTheme.colors.onBackground else MaterialTheme.colors.secondary)
      ShowTestStatus(server)
    }
-    val enabled = rememberUpdatedState(server.enabled == ServerEnabled.Enabled)
-    PreferenceToggle(stringResource(MR.strings.smp_servers_use_server_for_new_conn), enabled.value) { enable ->
-      onUpdate(server.copy(enabled = if (enable) ServerEnabled.Enabled else ServerEnabled.Disabled))
+
+    val enabled = rememberUpdatedState(server.enabled)
+    PreferenceToggle(
+      stringResource(MR.strings.smp_servers_use_server_for_new_conn),
+      disabled = server.tested != true && !server.preset,
+      checked = enabled.value
+    ) {
+      onUpdate(server.copy(enabled = it))
    }
+    
    SectionItemView(onDelete, disabled = testing) {
      Text(stringResource(MR.strings.smp_servers_delete_server), color = if (testing) MaterialTheme.colors.secondary else MaterialTheme.colors.error)
    }
@@ -28,13 +28,13 @@ import chat.simplex.res.MR

@Composable
 fun ModalData.ProtocolServersView(m: ChatModel, rhId: Long?, serverProtocol: ServerProtocol, close: () -> Unit) {
-  var presetServers by remember(rhId) { mutableStateOf(emptyList<String>()) }
+  var presetServers by remember(rhId) { mutableStateOf(emptyList<ServerCfg>()) }
  var servers by remember { stateGetOrPut("servers") { emptyList<ServerCfg>() } }
  var serversAlreadyLoaded by remember { stateGetOrPut("serversAlreadyLoaded") { false } }
  val currServers = remember(rhId) { mutableStateOf(servers) }
  val testing = rememberSaveable(rhId) { mutableStateOf(false) }
  val serversUnchanged = remember(servers) { derivedStateOf { servers == currServers.value || testing.value } }
-  val allServersDisabled = remember { derivedStateOf { servers.none { it.enabled == ServerEnabled.Enabled } } }
+  val allServersDisabled = remember { derivedStateOf { servers.none { it.enabled } } }
  val saveDisabled = remember(servers) {
    derivedStateOf {
      servers.isEmpty() ||
@@ -198,12 +198,42 @@ private fun ProtocolServersLayout(
  ) {
    AppBarTitle(stringResource(if (serverProtocol == ServerProtocol.SMP) MR.strings.your_SMP_servers else MR.strings.your_XFTP_servers))

-    SectionView(stringResource(if (serverProtocol == ServerProtocol.SMP) MR.strings.smp_servers else MR.strings.xftp_servers).uppercase()) {
-      for (srv in servers) {
-        SectionItemView({ showServer(srv) }, disabled = testing) {
-          ProtocolServerView(serverProtocol, srv, servers, testing)
+    val configuredServers = servers.filter { it.preset || it.enabled }
+    val otherServers = servers.filter { !(it.preset || it.enabled) }
+
+    if (configuredServers.isNotEmpty()) {
+      SectionView(stringResource(if (serverProtocol == ServerProtocol.SMP) MR.strings.smp_servers_configured else MR.strings.xftp_servers_configured).uppercase()) {
+        for (srv in configuredServers) {
+          SectionItemView({ showServer(srv) }, disabled = testing) {
+            ProtocolServerView(serverProtocol, srv, servers, testing)
+          }
        }
      }
+      SectionTextFooter(
+        remember(currentUser?.displayName) {
+          buildAnnotatedString {
+            append(generalGetString(MR.strings.smp_servers_per_user) + " ")
+            withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
+              append(currentUser?.displayName ?: "")
+            }
+            append(".")
+          }
+        }
+      )
+      SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
+    }
+
+    if (otherServers.isNotEmpty()) {
+      SectionView(stringResource(if (serverProtocol == ServerProtocol.SMP) MR.strings.smp_servers_other else MR.strings.xftp_servers_other).uppercase()) {
+        for (srv in otherServers.filter { !(it.preset || it.enabled) }) {
+          SectionItemView({ showServer(srv) }, disabled = testing) {
+            ProtocolServerView(serverProtocol, srv, servers, testing)
+          }
+        }
+      }
+    }
+
+    SectionView {
      SettingsActionItem(
        painterResource(MR.images.ic_add),
        stringResource(MR.strings.smp_servers_add),
@@ -212,19 +242,9 @@ private fun ProtocolServersLayout(
        textColor = if (testing) MaterialTheme.colors.secondary else MaterialTheme.colors.primary,
        iconColor = if (testing) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
      )
+      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = false)
    }
-    SectionTextFooter(
-      remember(currentUser?.displayName) {
-        buildAnnotatedString {
-          append(generalGetString(MR.strings.smp_servers_per_user) + " ")
-          withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
-            append(currentUser?.displayName ?: "")
-          }
-          append(".")
-        }
-      }
-    )
-    SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
+
    SectionView {
      SectionItemView(resetServers, disabled = serversUnchanged) {
        Text(stringResource(MR.strings.reset_verb), color = if (!serversUnchanged) MaterialTheme.colors.onBackground else MaterialTheme.colors.secondary)
@@ -250,12 +270,12 @@ private fun ProtocolServerView(serverProtocol: ServerProtocol, srv: ServerCfg, s
  val address = parseServerAddress(srv.server)
  when {
    address == null || !address.valid || address.serverProtocol != serverProtocol || !uniqueAddress(srv, address, servers) -> InvalidServer()
-    srv.enabled != ServerEnabled.Enabled -> Icon(painterResource(MR.images.ic_do_not_disturb_on), null, tint = MaterialTheme.colors.secondary)
+    !srv.enabled -> Icon(painterResource(MR.images.ic_do_not_disturb_on), null, tint = MaterialTheme.colors.secondary)
    else -> ShowTestStatus(srv)
  }
  Spacer(Modifier.padding(horizontal = 4.dp))
  val text = address?.hostnames?.firstOrNull() ?: srv.server
-  if (srv.enabled == ServerEnabled.Enabled) {
+  if (srv.enabled) {
    Text(text, color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.onBackground, maxLines = 1)
  } else {
    Text(text, maxLines = 1, color = MaterialTheme.colors.secondary)
@@ -285,21 +305,21 @@ private fun uniqueAddress(s: ServerCfg, address: ServerAddress, servers: List<Se
  }
 }

-private fun hasAllPresets(presetServers: List<String>, servers: List<ServerCfg>, m: ChatModel): Boolean =
+private fun hasAllPresets(presetServers: List<ServerCfg>, servers: List<ServerCfg>, m: ChatModel): Boolean =
  presetServers.all { hasPreset(it, servers) } ?: true

-private fun addAllPresets(rhId: Long?, presetServers: List<String>, servers: List<ServerCfg>, m: ChatModel): List<ServerCfg> {
+private fun addAllPresets(rhId: Long?, presetServers: List<ServerCfg>, servers: List<ServerCfg>, m: ChatModel): List<ServerCfg> {
  val toAdd = ArrayList<ServerCfg>()
  for (srv in presetServers) {
    if (!hasPreset(srv, servers)) {
-      toAdd.add(ServerCfg(remoteHostId = rhId, srv, preset = true, tested = null, enabled = ServerEnabled.Enabled))
+      toAdd.add(srv)
    }
  }
  return toAdd
 }

-private fun hasPreset(srv: String, servers: List<ServerCfg>): Boolean =
-  servers.any { it.server == srv }
+private fun hasPreset(srv: ServerCfg, servers: List<ServerCfg>): Boolean =
+  servers.any { it.server == srv.server }

 private suspend fun testServers(testing: MutableState<Boolean>, servers: List<ServerCfg>, m: ChatModel, onUpdated: (List<ServerCfg>) -> Unit) {
  val resetStatus = resetTestStatus(servers)
@@ -319,7 +339,7 @@ private suspend fun testServers(testing: MutableState<Boolean>, servers: List<Se
 private fun resetTestStatus(servers: List<ServerCfg>): List<ServerCfg> {
  val copy = ArrayList(servers)
  for ((index, server) in servers.withIndex()) {
-    if (server.enabled == ServerEnabled.Enabled) {
+    if (server.enabled) {
      copy.removeAt(index)
      copy.add(index, server.copy(tested = null))
    }
@@ -331,7 +351,7 @@ private suspend fun runServersTest(servers: List<ServerCfg>, m: ChatModel, onUpd
  val fs: MutableMap<String, ProtocolTestFailure> = mutableMapOf()
  val updatedServers = ArrayList<ServerCfg>(servers)
  for ((index, server) in servers.withIndex()) {
-    if (server.enabled == ServerEnabled.Enabled) {
+    if (server.enabled) {
      interruptIfCancelled()
      val (updatedServer, f) = testServerConnection(server, m)
      updatedServers.removeAt(index)
@@ -7,7 +7,6 @@ import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.ServerAddress.Companion.parseServerAddress
 import chat.simplex.common.model.ServerCfg
-import chat.simplex.common.model.ServerEnabled
 import chat.simplex.common.ui.theme.DEFAULT_PADDING
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.newchat.QRCodeScanner
@@ -26,7 +25,7 @@ fun ScanProtocolServerLayout(rhId: Long?, onNext: (ServerCfg) -> Unit) {
    QRCodeScanner { text ->
      val res = parseServerAddress(text)
      if (res != null) {
-        onNext(ServerCfg(remoteHostId = rhId, text, false, null, ServerEnabled.Enabled))
+        onNext(ServerCfg(remoteHostId = rhId, text, false, null, false))
      } else {
        AlertManager.shared.showAlertMsg(
          title = generalGetString(MR.strings.smp_servers_invalid_address),
@@ -416,13 +416,15 @@ fun SettingsPreferenceItem(
@Composable
 fun PreferenceToggle(
  text: String,
+  disabled: Boolean = false,
  checked: Boolean,
  onChange: (Boolean) -> Unit = {},
 ) {
-  SettingsActionItemWithContent(null, text, extraPadding = true,) {
+  SettingsActionItemWithContent(null, text, disabled = disabled, extraPadding = true,) {
    DefaultSwitch(
      checked = checked,
      onCheckedChange = onChange,
+      enabled = !disabled
    )
  }
 }
@@ -31,7 +31,7 @@
    <string name="smp_servers_add_to_another_device">أضِف إلى جهاز آخر</string>
    <string name="users_delete_all_chats_deleted">سيتم حذف جميع الدردشات والرسائل - لا يمكن التراجع عن هذا!</string>
    <string name="network_enable_socks_info">الوصول إلى الخوادم عبر بروكسي SOCKS على المنفذ %d؟ يجب بدء تشغيل الوكيل قبل تمكين هذا الخيار.</string>
-    <string name="smp_servers_add">أضِف خادم…</string>
+    <string name="smp_servers_add">أضِف خادم</string>
    <string name="network_settings">إعدادات الشبكة المتقدمة</string>
    <string name="all_group_members_will_remain_connected">سيبقى جميع أعضاء المجموعة على اتصال.</string>
    <string name="allow_disappearing_messages_only_if">السماح باختفاء الرسائل فقط إذا سمحت جهة اتصالك بذلك.</string>
@@ -673,9 +673,11 @@
  <string name="chat_lock">SimpleX Lock</string>
  <string name="chat_console">Chat console</string>
  <string name="smp_servers">SMP servers</string>
+  <string name="smp_servers_configured">Configured SMP servers</string>
+  <string name="smp_servers_other">Other SMP servers</string>
  <string name="smp_servers_preset_address">Preset server address</string>
  <string name="smp_servers_preset_add">Add preset servers</string>
-  <string name="smp_servers_add">Add server…</string>
+  <string name="smp_servers_add">Add server</string>
  <string name="smp_servers_test_server">Test server</string>
  <string name="smp_servers_test_servers">Test servers</string>
  <string name="smp_servers_save">Save servers</string>
@@ -695,6 +697,8 @@
  <string name="smp_servers_per_user">The servers for new connections of your current chat profile</string>
  <string name="smp_save_servers_question">Save servers?</string>
  <string name="xftp_servers">XFTP servers</string>
+  <string name="xftp_servers_configured">Configured XFTP servers</string>
+  <string name="xftp_servers_other">Other XFTP servers</string>
  <string name="subscription_percentage">Subscription percentage</string>
  <string name="install_simplex_chat_for_terminal">Install SimpleX Chat for terminal</string>
  <string name="star_on_github">Star on GitHub</string>
@@ -4,7 +4,7 @@
    <string name="contact_wants_to_connect_via_call">%1$s иска да се свърже с вас чрез</string>
    <string name="send_disappearing_message_1_minute">1 минута</string>
    <string name="v4_3_improved_server_configuration_desc">Добави сървъри чрез сканиране на QR кодове.</string>
-    <string name="smp_servers_add">Добави сървър…</string>
+    <string name="smp_servers_add">Добави сървър</string>
    <string name="group_member_role_admin">админ</string>
    <string name="button_add_welcome_message">Добави съобщение при посрещане</string>
    <string name="v5_1_self_destruct_passcode_descr">Всички данни се изтриват при въвеждане.</string>
@@ -28,7 +28,7 @@
    <string name="color_secondary_variant">আনুষঙ্গিক রং</string>
    <string name="v4_2_group_links_desc">অ্যাডমিনরা গ্রুপে যোগদানের সংযোগ-সূত্র তৈরি করতে পারবেন।</string>
    <string name="v4_3_improved_server_configuration_desc">QR কোড স্ক্যান করে সার্ভার যুক্ত করুন।</string>
-    <string name="smp_servers_add">সার্ভার যুক্ত করুন…</string>
+    <string name="smp_servers_add">সার্ভার যুক্ত করুন</string>
    <string name="address_section_title">ঠিকানা</string>
    <string name="abort_switch_receiving_address_desc">ঠিকানা পরিবর্তন বাতিল করা হবে। বার্তা গ্রহণের পুরনো ঠিকানা ব্যবহার করা হবে।</string>
    <string name="all_app_data_will_be_cleared">অ্যাপের সকল তথ্য মুছে ফেলা হয়েছে।</string>
@@ -8,7 +8,7 @@
    <string name="smp_servers_preset_add">Přidat přednastavené servery</string>
    <string name="network_settings">Pokročilá nastavení sítě</string>
    <string name="accept">Přijmout</string>
-    <string name="smp_servers_add">Přidat server…</string>
+    <string name="smp_servers_add">Přidat server</string>
    <string name="network_enable_socks_info">Přistupovat k serverům přes SOCKS proxy na portu %d\? Před povolením této možnosti musí být spuštěna proxy.</string>
    <string name="accept_feature">Přijmout</string>
    <string name="allow_your_contacts_to_send_disappearing_messages">Povolit svým kontaktům odesílat mizící zprávy.</string>
@@ -355,7 +355,7 @@
    <string name="smp_servers">SMP-Server</string>
    <string name="smp_servers_preset_address">Voreingestellte Serveradresse</string>
    <string name="smp_servers_preset_add">Füge voreingestellte Server hinzu</string>
-    <string name="smp_servers_add">Füge Server hinzu…</string>
+    <string name="smp_servers_add">Füge Server hinzu</string>
    <string name="smp_servers_test_server">Teste Server</string>
    <string name="smp_servers_test_servers">Teste alle Server</string>
    <string name="smp_servers_save">Alle Server speichern</string>
@@ -42,7 +42,7 @@
    <string name="accept_connection_request__question">Αποδοχή αιτήματος σύνδεσης;</string>
    <string name="callstatus_accepted">αποδεκτή κλήση</string>
    <string name="network_enable_socks_info">Πρόσβαση στους διακομιστές μέσω SOCKS proxy στην πόρτα %d; Ο διακομιστής μεσολάβησης (proxy server) πρέπει να είναι ενεργός πριν ενεργοποιηθεί αυτή η ρύθμιση.</string>
-    <string name="smp_servers_add">Προσθήκη διακομιστή…</string>
+    <string name="smp_servers_add">Προσθήκη διακομιστή</string>
    <string name="network_settings">Προχωρημένες ρυθμίσεις δικτύου</string>
    <string name="v4_3_improved_server_configuration_desc">Προσθήκη διακομιστών μέσω σάρωσης QR κωδικών.</string>
    <string name="v4_2_group_links_desc">Οι διαχειριστές μπορούν να δημιουργήσουν τους συνδέσμους συμμετοχής σε ομάδες.</string>
@@ -30,7 +30,7 @@
    <string name="accept_connection_request__question">¿Aceptar solicitud de conexión\?</string>
    <string name="accept_contact_incognito_button">Aceptar incógnito</string>
    <string name="clear_chat_warning">Se eliminarán todos los mensajes SOLO para tí. ¡No podrá deshacerse!</string>
-    <string name="smp_servers_add">Añadir servidor…</string>
+    <string name="smp_servers_add">Añadir servidor</string>
    <string name="network_enable_socks_info">¿Acceder a los servidores a través del proxy SOCKS en el puerto %d\? El proxy debe iniciarse antes de activar esta opción.</string>
    <string name="all_your_contacts_will_remain_connected">Todos tus contactos permanecerán conectados.</string>
    <string name="appearance_settings">Apariencia</string>
@@ -539,7 +539,7 @@
    <string name="chat_with_the_founder">ایده‌ها و سوالات را ارسال کنید</string>
    <string name="send_us_an_email">به ما ایمیل بفرستید</string>
    <string name="chat_lock">قفل SimpleX</string>
-    <string name="smp_servers_add">افزودن سرور…</string>
+    <string name="smp_servers_add">افزودن سرور</string>
    <string name="smp_servers_test_servers">آزمایش سرورها</string>
    <string name="smp_servers_save">ذخیره سرورها</string>
    <string name="smp_servers_test_failed">عدم موفقیت آزمایش سرور!</string>
@@ -16,7 +16,7 @@
    <string name="send_disappearing_message_30_seconds">30 sekuntia</string>
    <string name="send_disappearing_message_5_minutes">5 minuuttia</string>
    <string name="allow_disappearing_messages_only_if">Salli katoavat viestit vain, jos kontaktisi sallii ne.</string>
-    <string name="smp_servers_add">Lisää palvelin…</string>
+    <string name="smp_servers_add">Lisää palvelin</string>
    <string name="button_add_welcome_message">Lisää tervetuloviesti</string>
    <string name="allow_to_send_voice">Salli ääniviestien lähettäminen.</string>
    <string name="one_time_link_short">Kertakäyttölinkki</string>
@@ -313,7 +313,7 @@
    <string name="scan_code_from_contacts_app">Scannez le code de sécurité depuis l\'application de votre contact.</string>
    <string name="to_verify_compare">Pour vérifier le chiffrement de bout en bout avec votre contact, comparez (ou scannez) le code sur vos appareils.</string>
    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link"><![CDATA[Si vous ne pouvez pas vous rencontrer en personne, vous pouvez <b>scanner un code QR lors d\'un appel vidéo</b>, ou votre contact peut partager un lien d\'invitation.]]></string>
-    <string name="smp_servers_add">Ajouter un serveur…</string>
+    <string name="smp_servers_add">Ajouter un serveur</string>
    <string name="markdown_in_messages">Markdown dans les messages</string>
    <string name="smp_servers_preset_add">Ajouter des serveurs prédéfinis</string>
    <string name="use_simplex_chat_servers__question">Utiliser les serveurs SimpleX Chat \?</string>
@@ -36,7 +36,7 @@
    <string name="accept_contact_incognito_button">गुप्त स्वीकार करें</string>
    <string name="smp_servers_preset_add">पूर्वनिर्धारित सर्वर जोड़ें</string>
    <string name="users_add">प्रोफ़ाइल जोड़ें</string>
-    <string name="smp_servers_add">सर्वर जोड़े…</string>
+    <string name="smp_servers_add">सर्वर जोड़े</string>
    <string name="notifications_mode_service">हमेशा बने रहें</string>
    <string name="attach">संलग्न करना</string>
    <string name="network_settings">उन्नत संजाल समायोजन</string>
@@ -165,7 +165,7 @@
    <string name="block_member_desc">Minden %s által írt új üzenet elrejtésre kerül!</string>
    <string name="app_version_name">Alkalmazás verzió: v%s</string>
    <string name="allow_calls_only_if">A hívások kezdeményezése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</string>
-    <string name="smp_servers_add">Kiszolgáló hozzáadása…</string>
+    <string name="smp_servers_add">Kiszolgáló hozzáadása</string>
    <string name="icon_descr_audio_on">Hang bekapcsolva</string>
    <string name="audio_call_no_encryption">hanghívás (nem e2e titkosított)</string>
    <string name="blocked_item_description">letiltva</string>
@@ -249,7 +249,7 @@
    <string name="accept_contact_incognito_button">Accetta in incognito</string>
    <string name="clear_chat_warning">Tutti i messaggi verranno eliminati, non è reversibile! I messaggi verranno eliminati SOLO per te.</string>
    <string name="smp_servers_preset_add">Aggiungi server preimpostati</string>
-    <string name="smp_servers_add">Aggiungi server…</string>
+    <string name="smp_servers_add">Aggiungi server</string>
    <string name="network_settings">Impostazioni di rete avanzate</string>
    <string name="about_simplex">Riguardo SimpleX</string>
    <string name="callstatus_accepted">chiamata accettata</string>
@@ -18,7 +18,7 @@
    <string name="clear_chat_warning">כל ההודעות יימחקו – לא ניתן לבטל זאת! ההודעות יימחקו רק עבורך.</string>
    <string name="accept_contact_incognito_button">אשר זהות נסתרת</string>
    <string name="smp_servers_preset_add">הוסף שרתים מוגדרים מראש</string>
-    <string name="smp_servers_add">הוסף שרת…</string>
+    <string name="smp_servers_add">הוסף שרת</string>
    <string name="network_enable_socks_info">לגשת לשרתים דרך פרוקסי SOCKS בפורט %d\? הפרוקסי חייב לפעול לפני הפעלת אפשרות זו.</string>
    <string name="network_settings">הגדרות רשת מתקדמות</string>
    <string name="appearance_settings">מראה</string>
@@ -21,7 +21,7 @@
    <string name="v4_3_improved_server_configuration_desc">QRコードでサーバを追加</string>
    <string name="smp_servers_add_to_another_device">別の端末に追加</string>
    <string name="users_add">プロフィールを追加</string>
-    <string name="smp_servers_add">サーバを追加…</string>
+    <string name="smp_servers_add">サーバを追加</string>
    <string name="network_enable_socks_info">SOCKSプロキシ(ポート%d)経由で接続しますか？(※設定する前にプロキシ起動が必要※)</string>
    <string name="users_delete_all_chats_deleted">全チャットとメッセージが削除されます(※元に戻せません※)！</string>
    <string name="allow_your_contacts_to_send_voice_messages">送信相手からの音声メッセージを許可する。</string>
@@ -43,7 +43,7 @@
    <string name="connection_request_sent">연결 요청이 전송되었습니다!</string>
    <string name="connect_via_link">링크로 연결</string>
    <string name="smp_servers_preset_add">프리셋 서버 추가</string>
-    <string name="smp_servers_add">서버 추가…</string>
+    <string name="smp_servers_add">서버 추가</string>
    <string name="chat_console">채팅 콘솔</string>
    <string name="smp_servers_check_address">서버 주소를 확인 후 다시 시도해 주세요.</string>
    <string name="configure_ICE_servers">ICE 서버 설정</string>
@@ -6,7 +6,7 @@
    <string name="chat_item_ttl_day">1 diena</string>
    <string name="a_plus_b">a + b</string>
    <string name="about_simplex">Apie SimpleX</string>
-    <string name="smp_servers_add">Pridėti serverį…</string>
+    <string name="smp_servers_add">Pridėti serverį</string>
    <string name="v4_3_improved_server_configuration_desc">Pridėti serverius nuskanuojant QR kodus.</string>
    <string name="appearance_settings">Išvaizda</string>
    <string name="app_version_title">Programėlės versija</string>
@@ -109,7 +109,7 @@
    <string name="back">തിരികെ</string>
    <string name="mute_chat">നിശബ്ദമാക്കുക</string>
    <string name="icon_descr_help">സഹായം</string>
-    <string name="smp_servers_add">സെർവർ ചേർക്കുക…</string>
+    <string name="smp_servers_add">സെർവർ ചേർക്കുക</string>
    <string name="smp_servers_add_to_another_device">മറ്റൊരു ഉപകരണത്തിലേക്ക് ചേർക്കുക</string>
    <string name="auto_accept_contact">സ്വയമേവ സ്വീകരിക്കുക</string>
    <string name="callstate_waiting_for_confirmation">സ്ഥിരീകരണത്തിനായി കാത്തിരിക്കുന്നു…</string>
@@ -39,7 +39,7 @@
    <string name="accept_contact_incognito_button">Accepteer incognito</string>
    <string name="smp_servers_preset_add">Vooraf ingestelde servers toevoegen</string>
    <string name="users_add">Profiel toevoegen</string>
-    <string name="smp_servers_add">Server toevoegen…</string>
+    <string name="smp_servers_add">Server toevoegen</string>
    <string name="smp_servers_add_to_another_device">Toevoegen aan een ander apparaat</string>
    <string name="v4_2_group_links_desc">Beheerders kunnen de uitnodiging links naar groepen aanmaken.</string>
    <string name="v4_3_improved_server_configuration_desc">Servers toevoegen door QR-codes te scannen.</string>
@@ -290,7 +290,7 @@
    <string name="you_will_be_connected_when_group_host_device_is_online">Zostaniesz połączony do grupy, gdy urządzenie gospodarza grupy będzie online, proszę czekać lub sprawdzić później!</string>
    <string name="you_will_be_connected_when_your_contacts_device_is_online">Zostaniesz połączony, gdy urządzenie Twojego kontaktu będzie online, proszę czekać lub sprawdzić później!</string>
    <string name="smp_servers_preset_add">Dodaj gotowe serwery</string>
-    <string name="smp_servers_add">Dodaj serwer…</string>
+    <string name="smp_servers_add">Dodaj serwer</string>
    <string name="smp_servers_add_to_another_device">Dodaj do innego urządzenia</string>
    <string name="chat_console">Konsola czatu</string>
    <string name="smp_servers_check_address">Sprawdź adres serwera i spróbuj ponownie.</string>
@@ -110,7 +110,7 @@
    <string name="connect_via_link_or_qr">Conectar via link/QR code</string>
    <string name="clear_chat_warning">Todas as mensagens serão excluídas - isso não pode ser desfeito! As mensagens serão excluídas APENAS para você.</string>
    <string name="smp_servers_preset_add">Adicionar servidores pré-definidos</string>
-    <string name="smp_servers_add">Adicionar servidor…</string>
+    <string name="smp_servers_add">Adicionar servidor</string>
    <string name="create_your_profile">Crie seu perfil</string>
    <string name="icon_descr_context">Ícone de contexto</string>
    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Contato e todas as mensagens serão excluídas - isso não pode ser desfeito!</string>
@@ -122,7 +122,7 @@
    <string name="chat_item_ttl_week">1 semana</string>
    <string name="accept_contact_button">Aceitar</string>
    <string name="callstatus_accepted">aceitar chamada</string>
-    <string name="smp_servers_add">Adicionar servidor…</string>
+    <string name="smp_servers_add">Adicionar servidor</string>
    <string name="accept">Aceitar</string>
    <string name="accept_connection_request__question">Aceitar pedido de ligação\?</string>
    <string name="accept_contact_incognito_button">Aceitar modo anónimo</string>
@@ -5,7 +5,7 @@
    <string name="send_disappearing_message_30_seconds">30 secunde</string>
    <string name="accept_contact_button">Acceptă</string>
    <string name="accept_contact_incognito_button">Acceptă incognito</string>
-    <string name="smp_servers_add">Adaugă server…</string>
+    <string name="smp_servers_add">Adaugă server</string>
    <string name="network_settings">Setări de rețea avansate</string>
    <string name="contact_wants_to_connect_via_call">%1$s dorește să se conecteze cu tine prin</string>
    <string name="accept_call_on_lock_screen">Acceptă</string>
@@ -354,7 +354,7 @@
    <string name="smp_servers">SMP серверы</string>
    <string name="smp_servers_preset_address">Адрес сервера по умолчанию</string>
    <string name="smp_servers_preset_add">Добавить серверы по умолчанию</string>
-    <string name="smp_servers_add">Добавить сервер…</string>
+    <string name="smp_servers_add">Добавить сервер</string>
    <string name="smp_servers_test_server">Тестировать сервер</string>
    <string name="smp_servers_test_servers">Тестировать серверы</string>
    <string name="smp_servers_save">Сохранить серверы</string>
@@ -46,7 +46,7 @@
    <string name="icon_descr_asked_to_receive">ขอรับภาพ</string>
    <string name="icon_descr_video_asked_to_receive">ขอรับวิดีโอ</string>
    <string name="clear_chat_warning">ข้อความทั้งหมดจะถูกลบ - การดำเนินการนี้ไม่สามารถยกเลิกได้! ข้อความจะถูกลบสำหรับคุณเท่านั้น</string>
-    <string name="smp_servers_add">เพิ่มเซิร์ฟเวอร์…</string>
+    <string name="smp_servers_add">เพิ่มเซิร์ฟเวอร์</string>
    <string name="app_version_title">เวอร์ชันแอป</string>
    <string name="app_version_name">เวอร์ชันแอป: v%s</string>
    <string name="all_your_contacts_will_remain_connected">ผู้ติดต่อทั้งหมดของคุณจะยังคงเชื่อมต่ออยู่.</string>
@@ -38,7 +38,7 @@
    <string name="abort_switch_receiving_address_desc">Adres değişikliği iptal edilecek. Eski alıcı adresi kullanılacaktır.</string>
    <string name="send_disappearing_message_1_minute">1 dakika</string>
    <string name="clear_chat_warning">Tüm mesajlar silinecektir. Bu, geri alınamaz! Mesajlar, YALNIZCA senin için silinecektir.</string>
-    <string name="smp_servers_add">Sunucu ekle…</string>
+    <string name="smp_servers_add">Sunucu ekle</string>
    <string name="database_passphrase_and_export">Veri tabanı ayarları</string>
    <string name="one_time_link_short">tek kullanımlık bağlantı</string>
    <string name="network_settings">Gelişmiş ağ ayarları</string>
@@ -55,7 +55,7 @@
    <string name="keychain_allows_to_receive_ntfs">Після перезапуску додатка або зміни ключової фрази буде використано сховище ключів Android для безпечного збереження ключової фрази - це дозволить отримувати сповіщення.</string>
    <string name="allow_your_contacts_to_send_voice_messages">Дозвольте вашим контактам надсилати голосові повідомлення.</string>
    <string name="accept_contact_incognito_button">Прийняти інкогніто</string>
-    <string name="smp_servers_add">Додати сервер…</string>
+    <string name="smp_servers_add">Додати сервер</string>
    <string name="group_member_role_admin">адміністратор</string>
    <string name="button_add_welcome_message">Додати привітання</string>
    <string name="all_group_members_will_remain_connected">Всі члени групи залишаться підключеними.</string>
@@ -10,7 +10,7 @@
    <string name="one_time_link_short">liên kết dùng một lần</string>
    <string name="add_contact_tab">Thêm liên hệ</string>
    <string name="about_simplex_chat">Thông tin về SimpleX Chat</string>
-    <string name="smp_servers_add">Thêm máy chủ…</string>
+    <string name="smp_servers_add">Thêm máy chủ</string>
    <string name="about_simplex">Thông tin về SimpleX</string>
    <string name="group_member_role_admin">quản trị viên</string>
    <string name="button_add_welcome_message">Thêm lời chào</string>
@@ -15,7 +15,7 @@
    <string name="callstatus_accepted">已接受通话</string>
    <string name="accept">接受</string>
    <string name="network_enable_socks_info">通过在 %d 端口的 SOCKS 代理访问服务器？启用该选项前必须先启动代理。</string>
-    <string name="smp_servers_add">添加服务器……</string>
+    <string name="smp_servers_add">添加服务器</string>
    <string name="smp_servers_add_to_another_device">添加另一设备</string>
    <string name="group_member_role_admin">管理员</string>
    <string name="v4_3_improved_server_configuration_desc">扫描二维码来添加服务器。</string>
@@ -15,7 +15,7 @@
    <string name="group_member_role_admin">管理員</string>
    <string name="above_then_preposition_continuation">然後，選按：</string>
    <string name="smp_servers_preset_add">新增預設伺服器</string>
-    <string name="smp_servers_add">新增伺服器…</string>
+    <string name="smp_servers_add">新增伺服器</string>
    <string name="accept">接受</string>
    <string name="auth_unavailable">認證無效</string>
    <string name="allow_verb">允許</string>