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

Fixes Changing Account Settings > Notifications > Advanced Notifications on android causes discrepancies with web #3681

Merged
merged 8 commits into from
Jul 27, 2021
Merged

Fixes Changing Account Settings > Notifications > Advanced Notifications on android causes discrepancies with web #3681

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dff8503
fix discrepancies with web
langleyd Jul 15, 2021
a29ccda
move mutable push rule logic to static declarations as on web
langleyd Jul 19, 2021
55902b5
checks
langleyd Jul 19, 2021
89ece22
Merge branch 'develop' of github.com:vector-im/element-android into f…
langleyd Jul 19, 2021
da993b5
lint
langleyd Jul 19, 2021
608a1d3
clarify sdk update and cleanup typos
langleyd Jul 20, 2021
5d092ce
simplify getHighlight logic
langleyd Jul 23, 2021
9c139b3
Merge branch 'develop' of github.com:vector-im/element-android into f…
langleyd Jul 26, 2021
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
5 changes: 3 additions & 2 deletions vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,11 @@ class PushRulePreference : VectorPreference {
}
} else {
if (NOTIFICATION_OFF_INDEX == index) {
if (safeKind == RuleSetKey.UNDERRIDE || safeRule.ruleId == RuleIds.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS) {
if (safeKind == RuleSetKey.UNDERRIDE && safeRule.ruleId != RuleIds.RULE_ID_CALL) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that it was not possible for safeRule.ruleId == RuleIds.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS to be true here. But why checking RULE_ID_CALL now?

To be honest, this code is really hard to follow, it misses some comment... :/

safeRule.setNotify(false)
} else {
safeRule.copy(enabled = false)
.removeNotificationSound()
}
} else {
val newRule = safeRule.copy(enabled = true)
Expand All @@ -142,7 +143,7 @@ class PushRulePreference : VectorPreference {
&& safeRule.ruleId != RuleIds.RULE_ID_INVITE_ME
&& NOTIFICATION_NOISY_INDEX == index)

if (NOTIFICATION_NOISY_INDEX == index) {
if (NOTIFICATION_NOISY_INDEX == index && RuleIds.RULE_ID_ROOM_NOTIF != safeRule.ruleId) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same remark, should be nice to have some comment to explain why this code is necessary.

newRule.setNotificationSound(
if (safeRule.ruleId == RuleIds.RULE_ID_CALL) {
Action.ACTION_OBJECT_VALUE_VALUE_RING
Expand Down