Commit a818e574 authored 4 years ago by Benoit Marty

Merge branch 'release/1.0.10' into develop

parents 235d432d 97030883

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.buildkite/pipeline.yml 1 addition, 1 deletion

.buildkite/pipeline.yml
.idea/inspectionProfiles/Project_Default.xml 6 additions, 0 deletions

.idea/inspectionProfiles/Project_Default.xml
CHANGES.md 5 additions, 0 deletions

CHANGES.md
matrix-sdk-android/build.gradle 1 addition, 1 deletion

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt 9 additions, 5 deletions

...st/java/org/matrix/android/sdk/common/CommonTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt 9 additions, 49 deletions

...st/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt 4 additions, 5 deletions

.../android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt 16 additions, 10 deletions

...roid/sdk/internal/session/room/send/MarkdownParserTest.kt
matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/database/RealmDebugTools.kt 0 additions, 68 deletions

...g/matrix/android/sdk/internal/database/RealmDebugTools.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt 5 additions, 0 deletions

...c/main/java/org/matrix/android/sdk/api/session/Session.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt 8 additions, 1 deletion

...rg/matrix/android/sdk/api/session/crypto/CryptoService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt 28 additions, 1 deletion

...va/org/matrix/android/sdk/api/session/room/RoomService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt 6 additions, 1 deletion

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

...oid/sdk/api/session/room/model/create/CreateRoomParams.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionInfo.kt 1 addition, 1 deletion

...droid/sdk/api/session/room/model/relation/ReactionInfo.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt 0 additions, 5 deletions

...g/matrix/android/sdk/api/session/room/send/SendService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt 5 additions, 0 deletions

...matrix/android/sdk/api/session/room/state/StateService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt 61 additions, 0 deletions

.../android/sdk/internal/crypto/CryptoSessionInfoProvider.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt 79 additions, 133 deletions

...atrix/android/sdk/internal/crypto/DefaultCryptoService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt 1 addition, 1 deletion

...g/matrix/android/sdk/internal/crypto/DeviceListManager.kt

with 251 additions and 282 deletions

Please register or to comment