Commit 3dd29532 authored 3 years ago by Benoit Marty

Merge branch 'release/1.3.2' into develop

parents 52e2f5ce dc216388

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 11 additions, 0 deletions

CHANGES.md
dependencies.gradle 10 additions, 5 deletions

dependencies.gradle
gradle.properties 1 addition, 1 deletion

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

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/AndroidManifest.xml 8 additions, 3 deletions

matrix-sdk-android/src/androidTest/AndroidManifest.xml
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt 1 addition, 1 deletion

...droidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt 1 addition, 1 deletion

...org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt 5 additions, 5 deletions

...ava/org/matrix/android/sdk/account/AccountCreationTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt 5 additions, 5 deletions

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

...a/org/matrix/android/sdk/account/DeactivateAccountTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt 1 addition, 1 deletion

...va/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt 1 addition, 1 deletion

.../java/org/matrix/android/sdk/common/TestMatrixCallback.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt 1 addition, 1 deletion

...x/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt 1 addition, 1 deletion

...g/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt 3 additions, 3 deletions

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

...rg/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt 5 additions, 5 deletions

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

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

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

...id/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt

with 82 additions and 61 deletions

Please register or to comment