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/session/room/RoomService.kt 6 additions, 0 deletions

...va/org/matrix/android/sdk/api/session/room/RoomService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt 1 addition, 8 deletions

...ix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataEvent.kt 29 additions, 0 deletions

.../sdk/api/session/room/accountdata/RoomAccountDataEvent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataService.kt 7 additions, 7 deletions

...dk/api/session/room/accountdata/RoomAccountDataService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.kt 1 addition, 0 deletions

.../sdk/api/session/room/accountdata/RoomAccountDataTypes.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAssertedIdentityContent.kt 57 additions, 0 deletions

...pi/session/room/model/call/CallAssertedIdentityContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt 2 additions, 26 deletions

...roid/sdk/api/session/room/model/call/CallHangupContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallRejectContent.kt 6 additions, 1 deletion

...roid/sdk/api/session/room/model/call/CallRejectContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/EndCallReason.kt 50 additions, 0 deletions

.../android/sdk/api/session/room/model/call/EndCallReason.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt 8 additions, 3 deletions

...oid/sdk/api/session/room/model/create/CreateRoomParams.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomStateEvent.kt 36 additions, 0 deletions

...sdk/api/session/room/model/create/CreateRoomStateEvent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomFeaturePreset.kt 56 additions, 0 deletions

...id/sdk/api/session/room/model/create/RoomFeaturePreset.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioInfo.kt 3 additions, 3 deletions

...x/android/sdk/api/session/room/model/message/AudioInfo.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioWaveformInfo.kt 36 additions, 0 deletions

...d/sdk/api/session/room/model/message/AudioWaveformInfo.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt 13 additions, 2 deletions

...sdk/api/session/room/model/message/MessageAudioContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFileContent.kt 1 addition, 2 deletions

.../sdk/api/session/room/model/message/MessageFileContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt 1 addition, 2 deletions

...sdk/api/session/room/model/message/MessageImageContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt 1 addition, 1 deletion

...k/api/session/room/model/message/MessageStickerContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt 1 addition, 1 deletion

...sdk/api/session/room/model/message/MessageVideoContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt 6 additions, 1 deletion

...matrix/android/sdk/api/session/room/state/StateService.kt

with 321 additions and 57 deletions

Please register or to comment