rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Notification mode] Wrong mode is displayed when the mention only is selected on the web client

Browse Source
This commit is contained in:
ClaireG 2022-03-16 14:51:10 +01:00 committed by GitHub
parent 99b43fd771
commit d1bca78083
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5547.bugfix Normal file
View File

@ -0,0 +1 @@
[Notification mode] Wrong mode is displayed when the mention only is selected on the web client

12
vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
View File

@ -40,14 +40,16 @@ data class RoomNotificationSettingsViewState(
*/ */
val RoomNotificationSettingsViewState.notificationStateMapped: Async<RoomNotificationState> val RoomNotificationSettingsViewState.notificationStateMapped: Async<RoomNotificationState>
get() { get() {
if ((roomSummary()?.isEncrypted == true && notificationState() == RoomNotificationState.MENTIONS_ONLY) || return when {
notificationState() == RoomNotificationState.ALL_MESSAGES) { /**
/** if in an encrypted room, mentions notifications are not supported so show "All Messages" as selected. * if in an encrypted room, mentions notifications are not supported so show "None" as selected.
* Also in the new settings there is no notion of notifications without sound so it maps to noisy also * Also in the new settings there is no notion of notifications without sound so it maps to noisy also
*/ */
return Success(RoomNotificationState.ALL_MESSAGES_NOISY) (roomSummary()?.isEncrypted == true && notificationState() == RoomNotificationState.MENTIONS_ONLY)
-> Success(RoomNotificationState.MUTE)
notificationState() == RoomNotificationState.ALL_MESSAGES -> Success(RoomNotificationState.ALL_MESSAGES_NOISY)
else -> notificationState
} }
return notificationState
} }
/** /**