Commit adcc7be0 authored 2 years ago by Benoit Marty

Merge branch 'release/1.4.11' into develop

parents b1b9e52e 73407cb9

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 9 additions, 0 deletions

CHANGES.md
dependencies.gradle 5 additions, 4 deletions

dependencies.gradle
dependencies_groups.gradle 5 additions, 0 deletions

dependencies_groups.gradle
gradle.properties 1 addition, 1 deletion

gradle.properties
gradle/wrapper/gradle-wrapper.properties 2 additions, 2 deletions

gradle/wrapper/gradle-wrapper.properties
matrix-sdk-android/build.gradle 4 additions, 5 deletions

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt 1 addition, 1 deletion

...dTest/java/org/matrix/android/sdk/common/TestConstants.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt 649 additions, 0 deletions

...org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt 1 addition, 3 deletions

...rg/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt 6 additions, 7 deletions

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

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

...ix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt 2 additions, 0 deletions

...k/internal/crypto/verification/qrcode/VerificationTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt 3 additions, 1 deletion

...roid/sdk/internal/session/room/send/MarkdownParserTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/TestPermalinkService.kt 51 additions, 0 deletions

...id/sdk/internal/session/room/send/TestPermalinkService.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt 20 additions, 4 deletions

...trix/android/sdk/session/room/timeline/ChunkEntityTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt 233 additions, 0 deletions

.../android/sdk/session/room/timeline/PollAggregationTest.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt 9 additions, 1 deletion

...in/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt 26 additions, 2 deletions

...ain/java/org/matrix/android/sdk/api/failure/Extensions.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt 1 addition, 2 deletions

...rg/matrix/android/sdk/api/session/crypto/CryptoService.kt

with 1062 additions and 43 deletions

Please register or to comment