Commit 25e4fa92 authored 3 years ago by Benoit Marty

Merge branch 'release/1.1.13' into main

parents c61bdecf e29ebdb7

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt 8 additions, 0 deletions

...ava/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt 3 additions, 1 deletion

...rc/main/java/org/matrix/android/sdk/api/raw/RawService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt 3 additions, 3 deletions

...c/main/java/org/matrix/android/sdk/api/session/Session.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/SessionAccountDataService.kt 66 additions, 0 deletions

.../sdk/api/session/accountdata/SessionAccountDataService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataEvent.kt 2 additions, 2 deletions

...droid/sdk/api/session/accountdata/UserAccountDataEvent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallListener.kt 6 additions, 0 deletions

...a/org/matrix/android/sdk/api/session/call/CallListener.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt 4 additions, 2 deletions

...java/org/matrix/android/sdk/api/session/call/CallState.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt 2 additions, 2 deletions

...in/java/org/matrix/android/sdk/api/session/call/MxCall.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt 2 additions, 1 deletion

.../android/sdk/api/session/content/ContentAttachmentData.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt 4 additions, 3 deletions

...rg/matrix/android/sdk/api/session/crypto/CryptoService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt 1 addition, 1 deletion

...id/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt 1 addition, 1 deletion

...roid/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt 1 addition, 1 deletion

.../org/matrix/android/sdk/api/session/events/model/Event.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt 2 additions, 0 deletions

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

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

...ix/android/sdk/api/session/homeserver/RoomVersionModel.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt 1 addition, 1 deletion

...atrix/android/sdk/api/session/identity/IdentityService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/AliasAvailabilityResult.kt 24 additions, 0 deletions

...x/android/sdk/api/session/room/AliasAvailabilityResult.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt 4 additions, 2 deletions

...main/java/org/matrix/android/sdk/api/session/room/Room.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt 2 additions, 0 deletions

...trix/android/sdk/api/session/room/RoomDirectoryService.kt

with 238 additions and 21 deletions

Please register or to comment