diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/OperatorView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/OperatorView.kt index bd54e6f92e..4cf92d7c3a 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/OperatorView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/OperatorView.kt @@ -9,23 +9,17 @@ import SectionView import TextIconSpaced import androidx.compose.foundation.* import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha -import androidx.compose.ui.draw.clip -import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.* import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.text.* import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import chat.simplex.common.model.* import chat.simplex.common.model.ChatController.getUsageConditions import chat.simplex.common.platform.* @@ -247,7 +241,7 @@ fun OperatorViewLayout( userServers.value[operatorIndex].smpServers.forEachIndexed { i, server -> if (!server.preset) return@forEachIndexed SectionItemView({ navigateToProtocolView(i, server, ServerProtocol.SMP) }) { - ProtocolServerView( + ProtocolServerViewLink( srv = server, serverProtocol = ServerProtocol.SMP, duplicateHosts = duplicateHosts @@ -281,7 +275,7 @@ fun OperatorViewLayout( userServers.value[operatorIndex].smpServers.forEachIndexed { i, server -> if (server.deleted || server.preset) return@forEachIndexed SectionItemView({ navigateToProtocolView(i, server, ServerProtocol.SMP) }) { - ProtocolServerView( + ProtocolServerViewLink( srv = server, serverProtocol = ServerProtocol.SMP, duplicateHosts = duplicateHosts @@ -333,7 +327,7 @@ fun OperatorViewLayout( userServers.value[operatorIndex].xftpServers.forEachIndexed { i, server -> if (!server.preset) return@forEachIndexed SectionItemView({ navigateToProtocolView(i, server, ServerProtocol.XFTP) }) { - ProtocolServerView( + ProtocolServerViewLink( srv = server, serverProtocol = ServerProtocol.XFTP, duplicateHosts = duplicateHosts @@ -367,7 +361,7 @@ fun OperatorViewLayout( userServers.value[operatorIndex].xftpServers.forEachIndexed { i, server -> if (server.deleted || server.preset) return@forEachIndexed SectionItemView({ navigateToProtocolView(i, server, ServerProtocol.XFTP) }) { - ProtocolServerView( + ProtocolServerViewLink( srv = server, serverProtocol = ServerProtocol.XFTP, duplicateHosts = duplicateHosts diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ProtocolServersView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ProtocolServersView.kt index 4f6e32a722..45bc92ae2e 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ProtocolServersView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ProtocolServersView.kt @@ -79,7 +79,7 @@ fun YourServersViewLayout( userServers.value[operatorIndex].smpServers.forEachIndexed { i, server -> if (server.deleted) return@forEachIndexed SectionItemView({ navigateToProtocolView(i, server, ServerProtocol.SMP) }) { - ProtocolServerView( + ProtocolServerViewLink( srv = server, serverProtocol = ServerProtocol.SMP, duplicateHosts = duplicateHosts @@ -113,7 +113,7 @@ fun YourServersViewLayout( userServers.value[operatorIndex].xftpServers.forEachIndexed { i, server -> if (server.deleted) return@forEachIndexed SectionItemView({ navigateToProtocolView(i, server, ServerProtocol.XFTP) }) { - ProtocolServerView( + ProtocolServerViewLink( srv = server, serverProtocol = ServerProtocol.XFTP, duplicateHosts = duplicateHosts @@ -259,7 +259,7 @@ fun showAddServerDialog( } @Composable -fun ProtocolServerView(serverProtocol: ServerProtocol, srv: UserServer, duplicateHosts: Set) { +fun ProtocolServerViewLink(serverProtocol: ServerProtocol, srv: UserServer, duplicateHosts: Set) { val address = parseServerAddress(srv.server) when { address == null || !address.valid || address.serverProtocol != serverProtocol || address.hostnames.any { it in duplicateHosts } -> InvalidServer()