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

revert breaking field name change

Browse Source
This commit is contained in:
Evgeny Poberezkin
2026-07-01 17:35:51 +01:00
parent fbb171019f
commit c86bf5b3b4
8 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
+1 -1
View File
@@ -2334,7 +2334,7 @@ data class SimplexNameClaim(
data class PublicGroupAccess(
val groupWebPage: String? = null,
val simplexName: SimplexNameClaim? = null,
val simplexNameWebPage: Boolean = false,
val domainWebPage: Boolean = false,
val allowEmbedding: Boolean = false
)
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/ChannelWebPageView.kt
+1 -1
View File
@@ -50,7 +50,7 @@ fun ChannelWebPageView(
val newAccess = PublicGroupAccess(
groupWebPage = trimmedPage.ifEmpty { null },
simplexName = access?.simplexName,
simplexNameWebPage = access?.simplexNameWebPage ?: false,
domainWebPage = access?.domainWebPage ?: false,
allowEmbedding = allowEmbedding.value
)
val gp = groupInfo.groupProfile.copy(
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
+9 -6
View File
@@ -268,13 +268,16 @@ fun ModalData.NetworkAndServersView(closeNetworkAndServers: () -> Unit) {
if (currentRemoteHost == null && networkUseSocksProxy.value) {
SectionTextFooter(annotatedStringResource(MR.strings.socks_proxy_setting_limitations))
}
val saveDisabled = !serversCanBeSaved(currUserServers.value, userServers.value, serverErrors.value)
SectionItemView(
{ scope.launch { saveServers(rhId = currentRemoteHost?.remoteHostId, currUserServers, userServers) } },
disabled = saveDisabled,
) {
Text(stringResource(MR.strings.smp_servers_save), color = if (!saveDisabled) MaterialTheme.colors.onBackground else MaterialTheme.colors.secondary)
SectionDividerSpaced()
SectionView {
val saveDisabled = !serversCanBeSaved(currUserServers.value, userServers.value, serverErrors.value)
SectionItemView(
{ scope.launch { saveServers(rhId = currentRemoteHost?.remoteHostId, currUserServers, userServers) } },
disabled = saveDisabled,
) {
Text(stringResource(MR.strings.smp_servers_save), color = if (!saveDisabled) MaterialTheme.colors.onBackground else MaterialTheme.colors.secondary)
}
}
val serversErrs = globalServersErrors(serverErrors.value)
if (serversErrs.isNotEmpty()) {