From 2625e115082b172241e338ba591e10871183f2f6 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 26 Jun 2019 10:09:45 +0200 Subject: [PATCH] rename method --- .../android/api/pushrules/PushRuleService.kt | 3 +-- .../matrix/android/api/pushrules/RuleIds.kt | 20 +++++++++++++++++++ .../internal/session/DefaultSession.kt | 4 ++-- .../session/notification/BingRuleWatcher.kt | 2 +- .../notification/DefaultPushRuleService.kt | 2 +- .../settings/push/PushRulesViewModel.kt | 2 +- 6 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleIds.kt diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt index fc71d16d..222d0da9 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt @@ -20,14 +20,13 @@ import im.vector.matrix.android.api.session.events.model.Event interface PushRuleService { - /** * Fetch the push rules from the server */ fun fetchPushRules(scope: String = "global") //TODO get push rule set - fun getPushrules(scope: String = "global"): List + fun getPushRules(scope: String = "global"): List //TODO update rule diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleIds.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleIds.kt new file mode 100644 index 00000000..c3a64490 --- /dev/null +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleIds.kt @@ -0,0 +1,20 @@ +/* + * Copyright 2019 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.matrix.android.api.pushrules + +enum class RuleIds { +} \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt index bdc365f4..c6aef848 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt @@ -503,8 +503,8 @@ internal class DefaultSession(override val sessionParams: SessionParams) : Sessi return pushersService.livePushers() } - override fun getPushrules(scope: String): List { - return pushRuleService.getPushrules(scope) + override fun getPushRules(scope: String): List { + return pushRuleService.getPushRules(scope) } override fun fetchPushRules(scope: String) { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/BingRuleWatcher.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/BingRuleWatcher.kt index b584fd8e..2e6a1a9a 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/BingRuleWatcher.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/BingRuleWatcher.kt @@ -42,7 +42,7 @@ internal class BingRuleWatcher(monarchy: Monarchy, } override fun processChanges(inserted: List, updated: List, deleted: List) { - val rules = defaultPushRuleService.getPushrules("global") + val rules = defaultPushRuleService.getPushRules("global") inserted.map { it.asDomain() } .filter { it.senderId != sessionParams.credentials.userId } .let { events -> diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt index afaab486..c5c1e18e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt @@ -103,7 +103,7 @@ internal class DefaultPushRuleService( .executeBy(taskExecutor) } - override fun getPushrules(scope: String): List { + override fun getPushRules(scope: String): List { var contentRules: List = emptyList() var overrideRules: List = emptyList() diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesViewModel.kt index f950d0ef..03a2e600 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesViewModel.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesViewModel.kt @@ -34,7 +34,7 @@ class PushRulesViewModel(initialState: PushRulesViewState) : VectorViewModel() - val rules = session.getPushrules() + val rules = session.getPushRules() return PushRulesViewState(rules) }