dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-07-10 01:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

save server fixes

Browse Source
This commit is contained in:
Diogo
2024-11-20 11:10:57 +00:00
parent 09e326500c
commit 58b5058ea2
2 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
+21 -20
View File
@@ -26,7 +26,6 @@ import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import chat.simplex.common.model.*
import chat.simplex.common.model.ChatController.acceptConditions
import chat.simplex.common.model.ChatController.appPrefs
import chat.simplex.common.model.ChatController.getUserServers
import chat.simplex.common.model.ChatController.setUserServers
@@ -39,14 +38,14 @@ import chat.simplex.res.MR
import kotlinx.coroutines.launch
@Composable
fun NetworkAndServersView(close: () -> Unit) {
fun ModalData.NetworkAndServersView(close: () -> Unit) {
val currentRemoteHost by remember { chatModel.currentRemoteHost }
// It's not a state, just a one-time value. Shouldn't be used in any state-related situations
val netCfg = remember { chatModel.controller.getNetCfg() }
val networkUseSocksProxy: MutableState<Boolean> = remember { mutableStateOf(netCfg.useSocksProxy) }
val currUserServers = remember { mutableStateOf(emptyList<UserOperatorServers>()) }
val userServers = remember { mutableStateOf(emptyList<UserOperatorServers>()) }
val serverErrors = remember { mutableStateOf(emptyList<UserServersError>()) }
val currUserServers = remember { stateGetOrPut("currUserServers") { emptyList<UserOperatorServers>() } }
val userServers = remember { stateGetOrPut("userServers") { emptyList<UserOperatorServers>() } }
val serverErrors = remember { stateGetOrPut("serverErrors") { emptyList<UserServersError>() } }
val scope = rememberCoroutineScope()
@@ -146,6 +145,9 @@ fun NetworkAndServersView(close: () -> Unit) {
val scope = rememberCoroutineScope()
LaunchedEffect(Unit) {
if (currUserServers.value.isNotEmpty() || userServers.value.isNotEmpty()) {
return@LaunchedEffect
}
try {
val servers = getUserServers(rh = currentRemoteHost?.remoteHostId)
if (servers != null) {
@@ -230,19 +232,6 @@ fun NetworkAndServersView(close: () -> Unit) {
SettingsActionItem(painterResource(MR.images.ic_electrical_services), stringResource(MR.strings.webrtc_ice_servers), { ModalManager.start.showModal { RTCServersView(m) } })
}
// val footerText = when (val c = operator.conditionsAcceptance) {
// is ConditionsAcceptance.Accepted -> if (c.acceptedAt != null) {
// String.format(generalGetString(MR.strings.operator_conditions_accepted), localTimestamp(c.acceptedAt))
// } else null
// is ConditionsAcceptance.Required -> if (operator.enabled && c.deadline != null) {
// String.format(generalGetString(MR.strings.operator_conditions_accepted_after), localTimestamp(c.deadline))
// } else null
// }
// if (footerText != null) {
// SectionTextFooter(footerText)
// }
if (appPlatform.isAndroid) {
SectionDividerSpaced()
SectionView(generalGetString(MR.strings.settings_section_title_network_connection).uppercase()) {
@@ -619,7 +608,19 @@ private fun ServerOperatorRow(
serverErrors: MutableState<List<UserServersError>>,
rhId: Long?
) {
SectionItemView({ ModalManager.start.showModalCloseable { _ -> OperatorView(currUserServers, userServers, serverErrors, index, rhId) } }) {
SectionItemView(
{
ModalManager.start.showModalCloseable { close ->
OperatorView(
currUserServers,
userServers,
serverErrors,
index,
rhId
)
}
}
) {
Image(
painterResource(MR.images.decentralized),
operator.tradeName,
@@ -782,7 +783,7 @@ private suspend fun saveServers(
currUserServers: MutableState<List<UserOperatorServers>>,
userServers: MutableState<List<UserOperatorServers>>
) {
val userServersToSave = currUserServers.value
val userServersToSave = userServers.value
try {
val set = setUserServers(rhId, userServersToSave)
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/OperatorView.kt
+29 -7
View File
@@ -79,6 +79,18 @@ fun OperatorViewLayout(
}
UseOperatorToggle(currUserServers = currUserServers, userServers = userServers, serverErrors = serverErrors, operatorIndex = operatorIndex, rhId = rhId)
}
val footerText = when (val c = operator.conditionsAcceptance) {
is ConditionsAcceptance.Accepted -> if (c.acceptedAt != null) {
String.format(generalGetString(MR.strings.operator_conditions_accepted_on), localTimestamp(c.acceptedAt))
} else null
is ConditionsAcceptance.Required -> if (operator.enabled && c.deadline != null) {
String.format(generalGetString(MR.strings.operator_conditions_accepted_after), localTimestamp(c.deadline))
} else null
}
if (footerText != null) {
SectionTextFooter(footerText)
}
if (operator.enabled) {
if (userServers.value[operatorIndex].smpServers.filter { !it.deleted }.isNotEmpty()) {
@@ -116,7 +128,6 @@ private fun UseOperatorToggle(
operatorIndex: Int,
rhId: Long?
) {
val operator = remember { userServers.value[operatorIndex].operator_ }
SectionItemView {
Text(
stringResource(MR.strings.operator_use_operator_toggle_description),
@@ -125,12 +136,13 @@ private fun UseOperatorToggle(
)
Spacer(Modifier.fillMaxWidth().weight(1f))
DefaultSwitch(
checked = operator.enabled,
checked = userServers.value[operatorIndex].operator?.enabled ?: false,
onCheckedChange = { enabled ->
val operator = userServers.value[operatorIndex].operator
if (enabled) {
when (val conditionsAcceptance = operator.conditionsAcceptance) {
when (val conditionsAcceptance = operator?.conditionsAcceptance) {
is ConditionsAcceptance.Accepted -> {
userServers.value[operatorIndex].operator_.enabled = true
changeOperatorEnabled(userServers, operatorIndex, true)
}
is ConditionsAcceptance.Required -> {
@@ -146,12 +158,14 @@ private fun UseOperatorToggle(
)
}
} else {
userServers.value[operatorIndex].operator_.enabled = true
changeOperatorEnabled(userServers, operatorIndex, true)
}
}
else -> {}
}
} else {
userServers.value[operatorIndex].operator_.enabled = false
changeOperatorEnabled(userServers, operatorIndex, false)
}
},
)
@@ -179,7 +193,7 @@ private fun SingleOperatorUsageConditionsView(
chatModel.conditions.value = r
updateOperatorsConditionsAcceptance(currUserServers, r.serverOperators)
updateOperatorsConditionsAcceptance(userServers, r.serverOperators)
userServers.value.getOrNull(operatorIndexToEnable)?.operator?.enabled = true
changeOperatorEnabled(userServers, operatorIndex, true)
validateServers(rhId, userServers, serverErrors)
close()
} catch (ex: Exception) {
@@ -377,3 +391,11 @@ private fun ConditionsAppliedToOtherOperatorsText(userServers: List<UserOperator
}
}
}
private fun changeOperatorEnabled(userServers: MutableState<List<UserOperatorServers>>, operatorIndex: Int, enabled: Boolean) {
userServers.value = userServers.value.toMutableList().apply {
this[operatorIndex] = this[operatorIndex].copy(
operator = this[operatorIndex].operator?.copy(enabled = enabled)
)
}
}