Commit 971e0571 authored 2 years ago by Taras

Merge branch 'develop' into main

parents 256d29d1 5b1154c0

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 22 additions, 0 deletions

CHANGES.md
dependencies.gradle 13 additions, 17 deletions

dependencies.gradle
dependencies_groups.gradle 4 additions, 1 deletion

dependencies_groups.gradle
gradle.properties 1 addition, 1 deletion

gradle.properties
matrix-sdk-android/build.gradle 2 additions, 0 deletions

matrix-sdk-android/build.gradle
matrix-sdk-android/src/main/AndroidManifest.xml 1 addition, 2 deletions

matrix-sdk-android/src/main/AndroidManifest.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/account/LocalNotificationSettingsContent.kt 25 additions, 0 deletions

...droid/sdk/api/account/LocalNotificationSettingsContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt 20 additions, 0 deletions

.../org/matrix/android/sdk/api/auth/AuthenticationService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt 3 additions, 1 deletion

...rc/main/java/org/matrix/android/sdk/api/auth/LoginType.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt 1 addition, 0 deletions

...droid/sdk/api/session/accountdata/UserAccountDataTypes.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt 5 additions, 0 deletions

.../org/matrix/android/sdk/api/session/events/model/Event.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt 6 additions, 1 deletion

...roid/sdk/api/session/homeserver/HomeServerCapabilities.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/HttpPusher.kt 10 additions, 0 deletions

.../org/matrix/android/sdk/api/session/pushers/HttpPusher.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt 3 additions, 2 deletions

...java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt 8 additions, 0 deletions

.../matrix/android/sdk/api/session/pushers/PushersService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioEvent.kt 47 additions, 0 deletions

...d/sdk/api/session/room/model/message/MessageAudioEvent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt 3 additions, 0 deletions

...android/sdk/api/session/room/model/message/MessageType.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt 8 additions, 2 deletions

...id/sdk/api/session/room/model/relation/RelationService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt 42 additions, 10 deletions

...g/matrix/android/sdk/api/session/room/send/SendService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt 8 additions, 2 deletions

...ix/android/sdk/api/session/room/timeline/TimelineEvent.kt

with 232 additions and 39 deletions

Please register or to comment