Skip to content

Commit b36955f

Browse files
bmartybmarty
authored
Merge pull request #5812 from vector-im/feature/bma/dokka_3
Feature/bma/dokka 3
2 parents e3198e5 + 8874f23 commit b36955f

File tree

61 files changed

+132
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+132
-131
lines changed

‎changelog.d/5812.sdk

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move package `org.matrix.android.sdk.api.pushrules` to `org.matrix.android.sdk.api.session.pushrules`

‎dependencies_groups.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ ext.groups = [
164164
'org.codehaus.woodstox',
165165
'org.eclipse.ee4j',
166166
'org.ec4j.core',
167+
'org.freemarker',
167168
'org.glassfish.jaxb',
168169
'org.hamcrest',
169170
'org.jacoco',

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
2424
import org.matrix.android.sdk.api.auth.data.SessionParams
2525
import org.matrix.android.sdk.api.failure.GlobalError
2626
import org.matrix.android.sdk.api.federation.FederationService
27-
import org.matrix.android.sdk.api.pushrules.PushRuleService
2827
import org.matrix.android.sdk.api.session.account.AccountService
2928
import org.matrix.android.sdk.api.session.accountdata.SessionAccountDataService
3029
import org.matrix.android.sdk.api.session.cache.CacheService
@@ -47,6 +46,7 @@ import org.matrix.android.sdk.api.session.permalinks.PermalinkService
4746
import org.matrix.android.sdk.api.session.presence.PresenceService
4847
import org.matrix.android.sdk.api.session.profile.ProfileService
4948
import org.matrix.android.sdk.api.session.pushers.PushersService
49+
import org.matrix.android.sdk.api.session.pushrules.PushRuleService
5050
import org.matrix.android.sdk.api.session.room.RoomDirectoryService
5151
import org.matrix.android.sdk.api.session.room.RoomService
5252
import org.matrix.android.sdk.api.session.search.SearchService

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Action.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules
16+
package org.matrix.android.sdk.api.session.pushrules
1717

18-
import org.matrix.android.sdk.api.pushrules.rest.PushRule
18+
import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
1919
import timber.log.Timber
2020

2121
sealed class Action {

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Condition.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules
16+
package org.matrix.android.sdk.api.session.pushrules
1717

1818
import org.matrix.android.sdk.api.session.events.model.Event
1919

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ConditionResolver.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ConditionResolver.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules
16+
package org.matrix.android.sdk.api.session.pushrules
1717

1818
import org.matrix.android.sdk.api.session.events.model.Event
1919

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ContainsDisplayNameCondition.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules
16+
package org.matrix.android.sdk.api.session.pushrules
1717

1818
import org.matrix.android.sdk.api.session.events.model.Event
1919
import org.matrix.android.sdk.api.session.events.model.EventType

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/EventMatchCondition.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules
16+
package org.matrix.android.sdk.api.session.pushrules
1717

1818
import org.matrix.android.sdk.api.session.events.model.Event
1919
import org.matrix.android.sdk.internal.di.MoshiProvider

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Kind.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.matrix.android.sdk.api.pushrules
17+
package org.matrix.android.sdk.api.session.pushrules
1818

1919
enum class Kind(val value: String) {
2020
EventMatch("event_match"),

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushEvents.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushEvents.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules
16+
package org.matrix.android.sdk.api.session.pushrules
1717

18-
import org.matrix.android.sdk.api.pushrules.rest.PushRule
1918
import org.matrix.android.sdk.api.session.events.model.Event
19+
import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
2020

2121
data class PushEvents(
2222
val matchedEvents: List<Pair<Event, PushRule>>,

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushRuleService.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules
16+
package org.matrix.android.sdk.api.session.pushrules
1717

1818
import androidx.lifecycle.LiveData
19-
import org.matrix.android.sdk.api.pushrules.rest.PushRule
20-
import org.matrix.android.sdk.api.pushrules.rest.RuleSet
2119
import org.matrix.android.sdk.api.session.events.model.Event
20+
import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
21+
import org.matrix.android.sdk.api.session.pushrules.rest.RuleSet
2222

2323
interface PushRuleService {
2424
/**

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RoomMemberCountCondition.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules
16+
package org.matrix.android.sdk.api.session.pushrules
1717

1818
import org.matrix.android.sdk.api.session.events.model.Event
1919
import org.matrix.android.sdk.internal.session.room.RoomGetter

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleIds.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.matrix.android.sdk.api.pushrules
17+
package org.matrix.android.sdk.api.session.pushrules
1818

1919
/**
2020
* Known rule ids

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleScope.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleScope.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules
16+
package org.matrix.android.sdk.api.session.pushrules
1717

1818
object RuleScope {
1919
const val GLOBAL = "global"

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleSetKey.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleSetKey.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.matrix.android.sdk.api.pushrules
17+
package org.matrix.android.sdk.api.session.pushrules
1818

1919
/**
2020
* Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushrules

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/SenderNotificationPermissionCondition.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules
16+
package org.matrix.android.sdk.api.session.pushrules
1717

1818
import org.matrix.android.sdk.api.session.events.model.Event
1919
import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/PushCondition.kt

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules.rest
16+
package org.matrix.android.sdk.api.session.pushrules.rest
1717

1818
import com.squareup.moshi.Json
1919
import com.squareup.moshi.JsonClass
20-
import org.matrix.android.sdk.api.pushrules.Condition
21-
import org.matrix.android.sdk.api.pushrules.ContainsDisplayNameCondition
22-
import org.matrix.android.sdk.api.pushrules.EventMatchCondition
23-
import org.matrix.android.sdk.api.pushrules.Kind
24-
import org.matrix.android.sdk.api.pushrules.RoomMemberCountCondition
25-
import org.matrix.android.sdk.api.pushrules.RuleIds
26-
import org.matrix.android.sdk.api.pushrules.SenderNotificationPermissionCondition
20+
import org.matrix.android.sdk.api.session.pushrules.Condition
21+
import org.matrix.android.sdk.api.session.pushrules.ContainsDisplayNameCondition
22+
import org.matrix.android.sdk.api.session.pushrules.EventMatchCondition
23+
import org.matrix.android.sdk.api.session.pushrules.Kind
24+
import org.matrix.android.sdk.api.session.pushrules.RoomMemberCountCondition
25+
import org.matrix.android.sdk.api.session.pushrules.RuleIds
26+
import org.matrix.android.sdk.api.session.pushrules.SenderNotificationPermissionCondition
2727
import timber.log.Timber
2828

2929
/**

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/PushRule.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.matrix.android.sdk.api.pushrules.rest
17+
package org.matrix.android.sdk.api.session.pushrules.rest
1818

1919
import com.squareup.moshi.Json
2020
import com.squareup.moshi.JsonClass
2121
import org.matrix.android.sdk.api.extensions.orFalse
22-
import org.matrix.android.sdk.api.pushrules.Action
23-
import org.matrix.android.sdk.api.pushrules.getActions
24-
import org.matrix.android.sdk.api.pushrules.toJson
22+
import org.matrix.android.sdk.api.session.pushrules.Action
23+
import org.matrix.android.sdk.api.session.pushrules.getActions
24+
import org.matrix.android.sdk.api.session.pushrules.toJson
2525

2626
/**
2727
* Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushrules

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/RuleSet.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules.rest
16+
package org.matrix.android.sdk.api.session.pushrules.rest
1717

1818
import com.squareup.moshi.Json
1919
import com.squareup.moshi.JsonClass
20-
import org.matrix.android.sdk.api.pushrules.RuleIds
21-
import org.matrix.android.sdk.api.pushrules.RuleSetKey
20+
import org.matrix.android.sdk.api.session.pushrules.RuleIds
21+
import org.matrix.android.sdk.api.session.pushrules.RuleSetKey
2222

2323
/**
2424
* Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushrules

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.matrix.android.sdk.internal.database.mapper
1818

19-
import org.matrix.android.sdk.api.pushrules.rest.PushCondition
19+
import org.matrix.android.sdk.api.session.pushrules.rest.PushCondition
2020
import org.matrix.android.sdk.internal.database.model.PushConditionEntity
2121

2222
internal object PushConditionMapper {

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ package org.matrix.android.sdk.internal.database.mapper
1717

1818
import com.squareup.moshi.Types
1919
import io.realm.RealmList
20-
import org.matrix.android.sdk.api.pushrules.Kind
21-
import org.matrix.android.sdk.api.pushrules.rest.PushCondition
22-
import org.matrix.android.sdk.api.pushrules.rest.PushRule
20+
import org.matrix.android.sdk.api.session.pushrules.Kind
21+
import org.matrix.android.sdk.api.session.pushrules.rest.PushCondition
22+
import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
2323
import org.matrix.android.sdk.internal.database.model.PushRuleEntity
2424
import org.matrix.android.sdk.internal.di.MoshiProvider
2525
import timber.log.Timber

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package org.matrix.android.sdk.internal.database.model
1717

1818
import io.realm.RealmList
1919
import io.realm.RealmObject
20-
import org.matrix.android.sdk.api.pushrules.RuleKind
20+
import org.matrix.android.sdk.api.session.pushrules.RuleKind
2121
import org.matrix.android.sdk.internal.extensions.clearWith
2222

2323
internal open class PushRulesEntity(

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.matrix.android.sdk.internal.database.query
1818
import io.realm.Realm
1919
import io.realm.RealmQuery
2020
import io.realm.kotlin.where
21-
import org.matrix.android.sdk.api.pushrules.RuleKind
21+
import org.matrix.android.sdk.api.session.pushrules.RuleKind
2222
import org.matrix.android.sdk.internal.database.model.PushRuleEntity
2323
import org.matrix.android.sdk.internal.database.model.PushRuleEntityFields
2424
import org.matrix.android.sdk.internal.database.model.PushRulesEntity

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
2626
import org.matrix.android.sdk.api.auth.data.SessionParams
2727
import org.matrix.android.sdk.api.failure.GlobalError
2828
import org.matrix.android.sdk.api.federation.FederationService
29-
import org.matrix.android.sdk.api.pushrules.PushRuleService
3029
import org.matrix.android.sdk.api.session.EventStreamService
3130
import org.matrix.android.sdk.api.session.Session
3231
import org.matrix.android.sdk.api.session.SessionLifecycleObserver
@@ -53,6 +52,7 @@ import org.matrix.android.sdk.api.session.permalinks.PermalinkService
5352
import org.matrix.android.sdk.api.session.presence.PresenceService
5453
import org.matrix.android.sdk.api.session.profile.ProfileService
5554
import org.matrix.android.sdk.api.session.pushers.PushersService
55+
import org.matrix.android.sdk.api.session.pushrules.PushRuleService
5656
import org.matrix.android.sdk.api.session.room.RoomDirectoryService
5757
import org.matrix.android.sdk.api.session.room.RoomService
5858
import org.matrix.android.sdk.api.session.search.SearchService

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.matrix.android.sdk.internal.session.pushers
1717

18-
import org.matrix.android.sdk.api.pushrules.RuleKind
19-
import org.matrix.android.sdk.api.pushrules.rest.PushRule
18+
import org.matrix.android.sdk.api.session.pushrules.RuleKind
19+
import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
2020
import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
2121
import org.matrix.android.sdk.internal.network.executeRequest
2222
import org.matrix.android.sdk.internal.task.Task

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616
package org.matrix.android.sdk.internal.session.pushers
1717

18-
import org.matrix.android.sdk.api.pushrules.ConditionResolver
19-
import org.matrix.android.sdk.api.pushrules.ContainsDisplayNameCondition
20-
import org.matrix.android.sdk.api.pushrules.EventMatchCondition
21-
import org.matrix.android.sdk.api.pushrules.RoomMemberCountCondition
22-
import org.matrix.android.sdk.api.pushrules.SenderNotificationPermissionCondition
2318
import org.matrix.android.sdk.api.session.events.model.Event
2419
import org.matrix.android.sdk.api.session.events.model.EventType
2520
import org.matrix.android.sdk.api.session.events.model.toModel
21+
import org.matrix.android.sdk.api.session.pushrules.ConditionResolver
22+
import org.matrix.android.sdk.api.session.pushrules.ContainsDisplayNameCondition
23+
import org.matrix.android.sdk.api.session.pushrules.EventMatchCondition
24+
import org.matrix.android.sdk.api.session.pushrules.RoomMemberCountCondition
25+
import org.matrix.android.sdk.api.session.pushrules.SenderNotificationPermissionCondition
2626
import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
2727
import org.matrix.android.sdk.internal.di.UserId
2828
import org.matrix.android.sdk.internal.session.room.RoomGetter

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/GetPushRulesResponse.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesResponse.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.matrix.android.sdk.api.pushrules.rest
16+
package org.matrix.android.sdk.internal.session.pushers
1717

1818
import com.squareup.moshi.Json
1919
import com.squareup.moshi.JsonClass
20+
import org.matrix.android.sdk.api.session.pushrules.rest.RuleSet
2021

2122
/**
2223
* All push rulesets for a user.

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
*/
1616
package org.matrix.android.sdk.internal.session.pushers
1717

18-
import org.matrix.android.sdk.api.pushrules.rest.GetPushRulesResponse
19-
import org.matrix.android.sdk.api.pushrules.rest.PushRule
18+
import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
2019
import org.matrix.android.sdk.internal.network.NetworkConstants
2120
import retrofit2.http.Body
2221
import retrofit2.http.DELETE

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ package org.matrix.android.sdk.internal.session.pushers
1919
import dagger.Binds
2020
import dagger.Module
2121
import dagger.Provides
22-
import org.matrix.android.sdk.api.pushrules.ConditionResolver
23-
import org.matrix.android.sdk.api.pushrules.PushRuleService
2422
import org.matrix.android.sdk.api.session.pushers.PushersService
25-
import org.matrix.android.sdk.internal.session.notification.DefaultProcessEventForPushTask
26-
import org.matrix.android.sdk.internal.session.notification.DefaultPushRuleService
27-
import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask
23+
import org.matrix.android.sdk.api.session.pushrules.ConditionResolver
24+
import org.matrix.android.sdk.api.session.pushrules.PushRuleService
2825
import org.matrix.android.sdk.internal.session.pushers.gateway.DefaultPushGatewayNotifyTask
2926
import org.matrix.android.sdk.internal.session.pushers.gateway.PushGatewayNotifyTask
27+
import org.matrix.android.sdk.internal.session.pushrules.DefaultProcessEventForPushTask
28+
import org.matrix.android.sdk.internal.session.pushrules.DefaultPushRuleService
29+
import org.matrix.android.sdk.internal.session.pushrules.ProcessEventForPushTask
3030
import org.matrix.android.sdk.internal.session.room.notification.DefaultSetRoomNotificationStateTask
3131
import org.matrix.android.sdk.internal.session.room.notification.SetRoomNotificationStateTask
3232
import retrofit2.Retrofit

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.matrix.android.sdk.internal.session.pushers
1717

18-
import org.matrix.android.sdk.api.pushrules.RuleKind
18+
import org.matrix.android.sdk.api.session.pushrules.RuleKind
1919
import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
2020
import org.matrix.android.sdk.internal.network.executeRequest
2121
import org.matrix.android.sdk.internal.task.Task

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
package org.matrix.android.sdk.internal.session.pushers
1717

1818
import com.zhuinden.monarchy.Monarchy
19-
import org.matrix.android.sdk.api.pushrules.RuleScope
20-
import org.matrix.android.sdk.api.pushrules.RuleSetKey
21-
import org.matrix.android.sdk.api.pushrules.rest.GetPushRulesResponse
19+
import org.matrix.android.sdk.api.session.pushrules.RuleScope
20+
import org.matrix.android.sdk.api.session.pushrules.RuleSetKey
2221
import org.matrix.android.sdk.internal.database.mapper.PushRulesMapper
2322
import org.matrix.android.sdk.internal.database.model.PushRulesEntity
2423
import org.matrix.android.sdk.internal.database.model.deleteOnCascade

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package org.matrix.android.sdk.internal.session.pushers
1717

18-
import org.matrix.android.sdk.api.pushrules.Action
19-
import org.matrix.android.sdk.api.pushrules.RuleKind
20-
import org.matrix.android.sdk.api.pushrules.toJson
18+
import org.matrix.android.sdk.api.session.pushrules.Action
19+
import org.matrix.android.sdk.api.session.pushrules.RuleKind
20+
import org.matrix.android.sdk.api.session.pushrules.toJson
2121
import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
2222
import org.matrix.android.sdk.internal.network.executeRequest
2323
import org.matrix.android.sdk.internal.task.Task

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.matrix.android.sdk.internal.session.pushers
1717

18-
import org.matrix.android.sdk.api.pushrules.RuleKind
19-
import org.matrix.android.sdk.api.pushrules.rest.PushRule
18+
import org.matrix.android.sdk.api.session.pushrules.RuleKind
19+
import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
2020
import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
2121
import org.matrix.android.sdk.internal.network.executeRequest
2222
import org.matrix.android.sdk.internal.task.Task

0 commit comments

Comments
 (0)