Commit 35ed5865 authored 2 years ago by Taras

Merge branch 'develop' into main

parents be974163 77df720a

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 11 additions, 0 deletions

CHANGES.md
dependencies.gradle 3 additions, 3 deletions

dependencies.gradle
dependencies_groups.gradle 0 additions, 2 deletions

dependencies_groups.gradle
gradle.properties 1 addition, 1 deletion

gradle.properties
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt 8 additions, 4 deletions

...st/java/org/matrix/android/sdk/common/CommonTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt 2 additions, 1 deletion

...st/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt 39 additions, 34 deletions

...org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt 10 additions, 4 deletions

...x/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt 5 additions, 1 deletion

...a/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt 57 additions, 25 deletions

...ix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt 9 additions, 2 deletions

...ix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt 3 additions, 2 deletions

.../java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt 5 additions, 0 deletions

...java/org/matrix/android/sdk/api/query/QueryStringValue.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/SessionExtensions.kt 8 additions, 0 deletions

...a/org/matrix/android/sdk/api/session/SessionExtensions.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/MXEventDecryptionResult.kt 3 additions, 1 deletion

...d/sdk/api/session/crypto/model/MXEventDecryptionResult.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/OlmDecryptionResult.kt 6 additions, 1 deletion

...droid/sdk/api/session/crypto/model/OlmDecryptionResult.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt 16 additions, 2 deletions

.../org/matrix/android/sdk/api/session/events/model/Event.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt 12 additions, 0 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/RoomService.kt 7 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 8 additions, 0 deletions

...ix/android/sdk/api/session/room/RoomSummaryQueryParams.kt

with 213 additions and 83 deletions

Please register or to comment