This commit is contained in:
David Langley 2021-07-27 20:38:13 +01:00
parent 60b351cddd
commit 7405d501f6
2 changed files with 0 additions and 3 deletions

View file

@ -39,7 +39,6 @@ val PushRule.notificationIndex: NotificationIndex? get() =
ruleMatches(this, targetRule) ruleMatches(this, targetRule)
} }
private fun ruleMatches(rule: PushRule, targetRule: PushRule): Boolean { private fun ruleMatches(rule: PushRule, targetRule: PushRule): Boolean {
// Rules match if both are disabled, or if both are enabled and their highlight/sound/notify actions match up. // Rules match if both are disabled, or if both are enabled and their highlight/sound/notify actions match up.
return (!rule.enabled && !targetRule.enabled) return (!rule.enabled && !targetRule.enabled)

View file

@ -17,8 +17,6 @@
package im.vector.app.features.settings.notifications package im.vector.app.features.settings.notifications
import org.matrix.android.sdk.api.pushrules.RuleIds import org.matrix.android.sdk.api.pushrules.RuleIds
import org.matrix.android.sdk.api.pushrules.rest.PushRule
import org.matrix.android.sdk.api.pushrules.toJson
fun getStandardAction(ruleId: String, index: NotificationIndex): StandardActions? { fun getStandardAction(ruleId: String, index: NotificationIndex): StandardActions? {
return when (ruleId) { return when (ruleId) {