Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Mar 16, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3c3cbd
Fix wrong mode displayed when mention only is selected on the web app…
Claire1817 Mar 15, 2022
c7ac7c4
add changelog file
Claire1817 Mar 15, 2022
d53de39
fix PR comment
Claire1817 Mar 16, 2022
b073724
small fix
Claire1817 Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5547.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[Notification mode] Wrong mode is displayed when the mention only is selected on the web client
12 changes: 7 additions & 5 deletions ...ava/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,16 @@ data class RoomNotificationSettingsViewState(
*/
val RoomNotificationSettingsViewState.notificationStateMapped: Async<RoomNotificationState>
get() {
if ((roomSummary()?.isEncrypted == true && notificationState() == RoomNotificationState.MENTIONS_ONLY) ||
notificationState() == RoomNotificationState.ALL_MESSAGES) {
fedrunov marked this conversation as resolved.
Show resolved Hide resolved
/** if in an encrypted room, mentions notifications are not supported so show "All Messages" as selected.
return when {
/**
* 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
*/
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
}

/**
Expand Down