From 1f4c098d8b6836209bae170c1c7f88d7b5bc364a Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Mon, 13 Feb 2023 18:39:35 +0100 Subject: [PATCH] Synchronize polls and message push rules after creation --- .../sdk/api/session/pushrules/RuleIds.kt | 46 ++++++++++------ .../app/core/notification/PushRulesUpdater.kt | 54 ++++++++++++++++++ .../ConfigureAndStartSessionUseCase.kt | 3 + ...orSettingsPushRuleNotificationViewModel.kt | 1 + .../usecase/UpdatePushRulesIfNeededUseCase.kt | 55 +++++++++++++++++++ .../ConfigureAndStartSessionUseCaseTest.kt | 1 + 6 files changed, 144 insertions(+), 16 deletions(-) create mode 100644 vector/src/main/java/im/vector/app/core/notification/PushRulesUpdater.kt create mode 100644 vector/src/main/java/im/vector/app/features/settings/notifications/usecase/UpdatePushRulesIfNeededUseCase.kt diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleIds.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleIds.kt index a3755f85b7..484344e6ea 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleIds.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleIds.kt @@ -61,22 +61,36 @@ object RuleIds { const val RULE_ID_FALLBACK = ".m.rule.fallback" const val RULE_ID_REACTION = ".m.rule.reaction" +} - fun getSyncedRules(ruleId: String): List { - return when (ruleId) { - RULE_ID_ONE_TO_ONE_ROOM -> listOf( - RULE_ID_POLL_START_ONE_TO_ONE, - RULE_ID_POLL_START_ONE_TO_ONE_UNSTABLE, - RULE_ID_POLL_END_ONE_TO_ONE, - RULE_ID_POLL_END_ONE_TO_ONE_UNSTABLE, - ) - RULE_ID_ALL_OTHER_MESSAGES_ROOMS -> listOf( - RULE_ID_POLL_START, - RULE_ID_POLL_START_UNSTABLE, - RULE_ID_POLL_END, - RULE_ID_POLL_END_UNSTABLE, - ) - else -> emptyList() - } +fun RuleIds.getSyncedRules(ruleId: String): List { + return when (ruleId) { + RULE_ID_ONE_TO_ONE_ROOM -> listOf( + RULE_ID_POLL_START_ONE_TO_ONE, + RULE_ID_POLL_START_ONE_TO_ONE_UNSTABLE, + RULE_ID_POLL_END_ONE_TO_ONE, + RULE_ID_POLL_END_ONE_TO_ONE_UNSTABLE, + ) + RULE_ID_ALL_OTHER_MESSAGES_ROOMS -> listOf( + RULE_ID_POLL_START, + RULE_ID_POLL_START_UNSTABLE, + RULE_ID_POLL_END, + RULE_ID_POLL_END_UNSTABLE, + ) + else -> emptyList() + } +} + +fun RuleIds.getParentRule(ruleId: String): String? { + return when (ruleId) { + RULE_ID_POLL_START_ONE_TO_ONE, + RULE_ID_POLL_START_ONE_TO_ONE_UNSTABLE, + RULE_ID_POLL_END_ONE_TO_ONE, + RULE_ID_POLL_END_ONE_TO_ONE_UNSTABLE -> RULE_ID_ONE_TO_ONE_ROOM + RULE_ID_POLL_START, + RULE_ID_POLL_START_UNSTABLE, + RULE_ID_POLL_END, + RULE_ID_POLL_END_UNSTABLE -> RULE_ID_ALL_OTHER_MESSAGES_ROOMS + else -> null } } diff --git a/vector/src/main/java/im/vector/app/core/notification/PushRulesUpdater.kt b/vector/src/main/java/im/vector/app/core/notification/PushRulesUpdater.kt new file mode 100644 index 0000000000..4925941f92 --- /dev/null +++ b/vector/src/main/java/im/vector/app/core/notification/PushRulesUpdater.kt @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * 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 im.vector.app.core.notification + +import im.vector.app.features.session.coroutineScope +import im.vector.app.features.settings.notifications.usecase.UpdatePushRulesIfNeededUseCase +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.launch +import org.matrix.android.sdk.api.session.Session +import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes +import org.matrix.android.sdk.flow.flow +import javax.inject.Inject +import javax.inject.Singleton + +/** + * Listen changes in Account Data to update the push rules if needed. + */ +@Singleton +class PushRulesUpdater @Inject constructor( + private val updatePushRulesIfNeededUseCase: UpdatePushRulesIfNeededUseCase, +) { + + private var job: Job? = null + + fun onSessionStarted(session: Session) { + updatePushRulesOnChange(session) + } + + private fun updatePushRulesOnChange(session: Session) { + job?.cancel() + job = session.coroutineScope.launch { + session.flow() + .liveUserAccountData(UserAccountDataTypes.TYPE_PUSH_RULES) + .onEach { updatePushRulesIfNeededUseCase.execute(session) } + .collect() + } + } +} diff --git a/vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.kt b/vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.kt index c6a2635e6c..b9573e9292 100644 --- a/vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.kt +++ b/vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.kt @@ -20,6 +20,7 @@ import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext import im.vector.app.core.extensions.startSyncing import im.vector.app.core.notification.NotificationsSettingUpdater +import im.vector.app.core.notification.PushRulesUpdater import im.vector.app.core.session.clientinfo.UpdateMatrixClientInfoUseCase import im.vector.app.features.call.webrtc.WebRtcCallManager import im.vector.app.features.session.coroutineScope @@ -37,6 +38,7 @@ class ConfigureAndStartSessionUseCase @Inject constructor( private val vectorPreferences: VectorPreferences, private val notificationsSettingUpdater: NotificationsSettingUpdater, private val updateNotificationSettingsAccountDataUseCase: UpdateNotificationSettingsAccountDataUseCase, + private val pushRulesUpdater: PushRulesUpdater, ) { fun execute(session: Session, startSyncing: Boolean = true) { @@ -50,6 +52,7 @@ class ConfigureAndStartSessionUseCase @Inject constructor( updateMatrixClientInfoIfNeeded(session) createNotificationSettingsAccountDataIfNeeded(session) notificationsSettingUpdater.onSessionStarted(session) + pushRulesUpdater.onSessionStarted(session) } private fun updateMatrixClientInfoIfNeeded(session: Session) { diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationViewModel.kt index 39969ec13e..daf9c044d1 100644 --- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationViewModel.kt @@ -32,6 +32,7 @@ import org.matrix.android.sdk.api.failure.MatrixError 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.RuleKind +import org.matrix.android.sdk.api.session.pushrules.getSyncedRules import org.matrix.android.sdk.api.session.pushrules.rest.PushRuleAndKind private typealias ViewModel = VectorSettingsPushRuleNotificationViewModel diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/usecase/UpdatePushRulesIfNeededUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/usecase/UpdatePushRulesIfNeededUseCase.kt new file mode 100644 index 0000000000..9397c9e74c --- /dev/null +++ b/vector/src/main/java/im/vector/app/features/settings/notifications/usecase/UpdatePushRulesIfNeededUseCase.kt @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * 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 im.vector.app.features.settings.notifications.usecase + +import org.matrix.android.sdk.api.session.Session +import org.matrix.android.sdk.api.session.pushrules.RuleIds +import org.matrix.android.sdk.api.session.pushrules.getActions +import org.matrix.android.sdk.api.session.pushrules.getParentRule +import org.matrix.android.sdk.api.session.pushrules.rest.PushRule +import org.matrix.android.sdk.api.session.pushrules.rest.PushRuleAndKind +import javax.inject.Inject + +class UpdatePushRulesIfNeededUseCase @Inject constructor() { + + suspend fun execute(session: Session) { + val ruleSet = session.pushRuleService().getPushRules() + val pushRules = ruleSet.getAllRules() + val rulesToUpdate = pushRules.mapNotNull { rule -> + val parent = RuleIds.getParentRule(rule.ruleId)?.let { ruleId -> ruleSet.findDefaultRule(ruleId) } + if (parent != null && (rule.enabled != parent.pushRule.enabled || rule.actions != parent.pushRule.actions)) { + PushRuleWithParent(rule, parent) + } else { + null + } + } + + rulesToUpdate.forEach { + session.pushRuleService().updatePushRuleActions( + kind = it.parent.kind, + ruleId = it.rule.ruleId, + enable = it.parent.pushRule.enabled, + actions = it.parent.pushRule.getActions(), + ) + } + } + + private data class PushRuleWithParent( + val rule: PushRule, + val parent: PushRuleAndKind, + ) +} diff --git a/vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt index d72500b520..786b200ef5 100644 --- a/vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt +++ b/vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt @@ -56,6 +56,7 @@ class ConfigureAndStartSessionUseCaseTest { vectorPreferences = fakeVectorPreferences.instance, notificationsSettingUpdater = fakeNotificationsSettingUpdater.instance, updateNotificationSettingsAccountDataUseCase = fakeUpdateNotificationSettingsAccountDataUseCase, + pushRulesUpdater = mockk(), ) @Before