Commit 4f911d91 authored 3 years ago by Benoit Marty

Merge branch 'release/1.1.9' into develop

parents 1bf40714 d5dc4f5b

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 6 additions, 0 deletions

CHANGES.md
matrix-sdk-android/build.gradle 5 additions, 5 deletions

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt 12 additions, 12 deletions

...org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/SsoIdentityProvider.kt 6 additions, 6 deletions

...g/matrix/android/sdk/api/auth/data/SsoIdentityProvider.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt 11 additions, 2 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/AccountDataEvent.kt 1 addition, 1 deletion

...x/android/sdk/api/session/accountdata/AccountDataEvent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt 7 additions, 4 deletions

...android/sdk/api/session/accountdata/AccountDataService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallIdGenerator.kt 23 additions, 0 deletions

...rg/matrix/android/sdk/api/session/call/CallIdGenerator.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt 0 additions, 2 deletions

...trix/android/sdk/api/session/call/CallSignalingService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt 10 additions, 8 deletions

...in/java/org/matrix/android/sdk/api/session/call/MxCall.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/PSTNProtocolChecker.kt 0 additions, 98 deletions

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

.../matrix/android/sdk/api/session/events/model/EventType.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt 1 addition, 1 deletion

...ix/android/sdk/api/session/permalinks/PermalinkService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt 9 additions, 7 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/accountdata/RoomAccountDataTypes.kt 23 additions, 0 deletions

.../sdk/api/session/room/accountdata/RoomAccountDataTypes.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt 3 additions, 1 deletion

...trix/android/sdk/api/session/room/model/SpaceChildInfo.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt 1 addition, 1 deletion

...roid/sdk/api/session/room/model/call/CallAnswerContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt 1 addition, 1 deletion

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

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

...roid/sdk/api/session/room/model/call/CallInviteContent.kt

with 124 additions and 153 deletions

Please register or to comment