Commit 3adfe4d0 authored 2 years ago by Benoit Marty

Merge branch 'release/1.4.13' into develop

parents adcc7be0 154aa423

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 15 additions, 0 deletions

CHANGES.md
build.gradle 1 addition, 0 deletions

build.gradle
dependencies_groups.gradle 6 additions, 1 deletion

dependencies_groups.gradle
gradle.properties 1 addition, 1 deletion

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

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt 4 additions, 4 deletions

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

...java/org/matrix/android/sdk/common/TestMatrixComponent.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt 3 additions, 3 deletions

...x/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt 6 additions, 6 deletions

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

...rg/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt 1 addition, 1 deletion

...a/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/ExtensionsKtTest.kt 1 addition, 0 deletions

...roid/sdk/internal/crypto/crosssigning/ExtensionsKtTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt 4 additions, 2 deletions

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

.../android/sdk/internal/crypto/encryption/EncryptionTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt 9 additions, 9 deletions

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

...ix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt 6 additions, 4 deletions

.../sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt 16 additions, 15 deletions

.../android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt 3 additions, 3 deletions

...id/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt 1 addition, 1 deletion

...internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt

with 91 additions and 57 deletions

Please register or to comment