mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-21 17:05:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8945 from element-hq/feature/bma/elementCallNotification

Browse source 
Ensure m.call.notify event is not filtered out by push rules.
This commit is contained in:
Benoit Marty 2024-11-18 14:56:53 +01:00 committed by GitHub
commit 367fcfa8f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 72 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleIds.kt
View file

@ -57,6 +57,9 @@ object RuleIds {
const val RULE_ID_POLL_END = ".m.rule.poll_end"
const val RULE_ID_POLL_END_UNSTABLE = ".org.matrix.msc3930.rule.poll_end"
const val RULE_ID_ELEMENT_CALL_NOTIFY = ".m.call.notify"
const val RULE_ID_ELEMENT_CALL_NOTIFY_UNSTABLE = ".org.matrix.msc4075.call.notify"
// Not documented
const val RULE_ID_FALLBACK = ".m.rule.fallback"

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/DefaultPushRuleService.kt
View file

@ -103,7 +103,7 @@ internal class DefaultPushRuleService @Inject constructor(
}
return RuleSet(
content = contentRules,
content = contentRules.withElementCallPushRules(),
override = overrideRules,
room = roomRules,
sender = senderRules,

68
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/LocalElementCallPushRule.kt Normal file
View file

@ -0,0 +1,68 @@
/*
* Copyright (c) 2024 The Matrix.org Foundation C.I.C.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.matrix.android.sdk.internal.session.pushrules
import org.matrix.android.sdk.api.session.pushrules.Action
import org.matrix.android.sdk.api.session.pushrules.RuleIds
import org.matrix.android.sdk.api.session.pushrules.rest.PushCondition
import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
private val localElementCallPushRule = PushRule(
ruleId = RuleIds.RULE_ID_ELEMENT_CALL_NOTIFY,
conditions = listOf(
PushCondition(
kind = "event_match",
key = "type",
pattern = "m.call.notify",
)
),
actions = listOf(
Action.ACTION_NOTIFY,
),
enabled = true,
)
private val localElementCallPushRuleUnstable = PushRule(
ruleId = RuleIds.RULE_ID_ELEMENT_CALL_NOTIFY_UNSTABLE,
conditions = listOf(
PushCondition(
kind = "event_match",
key = "type",
pattern = "org.matrix.msc4075.call.notify",
)
),
actions = listOf(
Action.ACTION_NOTIFY,
),
enabled = true,
)
/**
* Ensure that the element call push rules are present.
*/
fun List<PushRule>.withElementCallPushRules(): List<PushRule> {
val ruleIds = map { it.ruleId }
return buildList {
addAll(this@withElementCallPushRules)
if (!ruleIds.contains(localElementCallPushRule.ruleId)) {
add(localElementCallPushRule)
}
if (!ruleIds.contains(localElementCallPushRuleUnstable.ruleId)) {
add(localElementCallPushRuleUnstable)
}
}
}