filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure we push only clean m.room.canonical_alias event

This commit is contained in:
Benoit Marty 2020-11-24 06:08:39 +01:00 committed by Benoit Marty
parent 0a9b234272
commit 82b23d9a13
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
View File

@ -111,7 +111,13 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
eventType = EventType.STATE_ROOM_CANONICAL_ALIAS, eventType = EventType.STATE_ROOM_CANONICAL_ALIAS,
body = RoomCanonicalAliasContent( body = RoomCanonicalAliasContent(
canonicalAlias = alias, canonicalAlias = alias,
alternativeAliases = altAliases.distinct() alternativeAliases = altAliases
// Ensure there is no duplicate
.distinct()
// Ensure the canonical alias is not also included in the alt alias
.minus(listOfNotNull(alias))
// Sort for the cleanup
.sorted()
).toContent(), ).toContent(),
callback = callback, callback = callback,
stateKey = null stateKey = null