Merge pull request #3576 from frebib/frebib/dupe-room-crash

bmarty · web-flow · commit ee7e5b8a46ce · 2024-10-02T13:54:19.000+02:00
Prevent crash with duplicate room suggestion
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt
@@ -60,7 +60,7 @@ fun SuggestionsPickerView(
                 when (suggestion) {
                     is ResolvedSuggestion.AtRoom -> "@room"
                     is ResolvedSuggestion.Member -> suggestion.roomMember.userId.value
-                    is ResolvedSuggestion.Alias -> suggestion.roomAlias.value
+                    is ResolvedSuggestion.Alias -> suggestion.roomSummary.roomId.value
                 }
             }
         ) {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ fun SuggestionsPickerView(`
`60`	`60`	`when (suggestion) {`
`61`	`61`	`is ResolvedSuggestion.AtRoom -> "@room"`
`62`	`62`	`is ResolvedSuggestion.Member -> suggestion.roomMember.userId.value`
`63`		`- is ResolvedSuggestion.Alias -> suggestion.roomAlias.value`
	`63`	`+ is ResolvedSuggestion.Alias -> suggestion.roomSummary.roomId.value`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`) {`