Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

feat(security&privacy) : update the save address algorithm

Browse source
This commit is contained in:
ganfra 2025-01-22 17:07:11 +01:00
parent 755ddcbf47
commit 8a90770072
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenter.kt
View file

@ -107,15 +107,24 @@ class EditRoomAddressPresenter @AssistedInject constructor(
if (savedAliasFromHomeserver != null) { if (savedAliasFromHomeserver != null) {
room.removeRoomAliasFromRoomDirectory(savedAliasFromHomeserver).getOrThrow() room.removeRoomAliasFromRoomDirectory(savedAliasFromHomeserver).getOrThrow()
} }
// Finally update the canonical alias state..
// Finally update the canonical alias state
when { when {
// Allow to update the canonical alias only if the saved canonical alias matches the homeserver or if there is no canonical alias // Allow to update the canonical alias only if the saved canonical alias matches the homeserver or if there is no canonical alias
savedCanonicalAlias == null || savedCanonicalAlias.matchesServer(serverName) -> { savedCanonicalAlias == null || savedCanonicalAlias.matchesServer(serverName) -> {
room.updateCanonicalAlias(newRoomAlias, room.alternativeAliases).getOrThrow() val newAlternativeAliases = room.alternativeAliases.filter { it != savedAliasFromHomeserver }
room.updateCanonicalAlias(newRoomAlias, newAlternativeAliases).getOrThrow()
} }
// Otherwise, update the alternative aliases and keep the current canonical alias // Otherwise, only update the alternative aliases and keep the current canonical alias
else -> { else -> {
val newAlternativeAliases = listOf(newRoomAlias) + room.alternativeAliases val newAlternativeAliases = buildList {
add(newRoomAlias)
for (alias in room.alternativeAliases) {
if (alias != savedAliasFromHomeserver) {
add(alias)
}
}
}
room.updateCanonicalAlias(savedCanonicalAlias, newAlternativeAliases).getOrThrow() room.updateCanonicalAlias(savedCanonicalAlias, newAlternativeAliases).getOrThrow()
} }
} }