Commit 0fd24442 authored 2 years ago by Benoit Marty

Merge branch 'release/1.5.2' into develop

parents 77df720a 90119df9

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 15 additions, 0 deletions

CHANGES.md
dependencies.gradle 21 additions, 16 deletions

dependencies.gradle
dependencies_groups.gradle 15 additions, 2 deletions

dependencies_groups.gradle
gradle.properties 1 addition, 1 deletion

gradle.properties
matrix-sdk-android/build.gradle 2 additions, 0 deletions

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt 1 addition, 3 deletions

...java/org/matrix/android/sdk/account/ChangePasswordTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt 25 additions, 31 deletions

...a/org/matrix/android/sdk/account/DeactivateAccountTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt 141 additions, 218 deletions

...st/java/org/matrix/android/sdk/common/CommonTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt 1 addition, 1 deletion

...Test/java/org/matrix/android/sdk/common/CryptoTestData.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt 160 additions, 291 deletions

...st/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestExtensions.kt 67 additions, 0 deletions

...Test/java/org/matrix/android/sdk/common/TestExtensions.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/DecryptRedactedEventTest.kt 16 additions, 20 deletions

...x/android/sdk/internal/crypto/DecryptRedactedEventTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2EShareKeysConfigTest.kt 29 additions, 49 deletions

...rix/android/sdk/internal/crypto/E2EShareKeysConfigTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeConfigTest.kt 132 additions, 0 deletions

.../org/matrix/android/sdk/internal/crypto/E2eeConfigTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt 307 additions, 259 deletions

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

...x/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt 6 additions, 10 deletions

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

...a/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt 112 additions, 13 deletions

.../android/sdk/internal/crypto/crosssigning/XSigningTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt 36 additions, 39 deletions

.../android/sdk/internal/crypto/encryption/EncryptionTest.kt

with 1201 additions and 1133 deletions

Please register or to comment