Commit 2aedd5e8 authored 4 years ago by Benoit Marty

Merge branch 'release/1.0.12' into develop

parents e0059c15 eec88e93

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 14 additions, 0 deletions

CHANGES.md
matrix-sdk-android/build.gradle 4 additions, 5 deletions

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt 4 additions, 0 deletions

...src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt 9 additions, 8 deletions

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

.../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
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/media/UrlsExtractorTest.kt 108 additions, 0 deletions

...x/android/sdk/internal/session/media/UrlsExtractorTest.kt
matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt 19 additions, 23 deletions

.../internal/network/interceptors/FormattedJsonHttpLogger.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt 4 additions, 0 deletions

...ndroid/src/main/java/org/matrix/android/sdk/api/Matrix.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt 1 addition, 1 deletion

...rc/main/java/org/matrix/android/sdk/api/auth/Constants.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/HomeServerHistoryService.kt 29 additions, 0 deletions

...g/matrix/android/sdk/api/auth/HomeServerHistoryService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt 1 addition, 0 deletions

...a/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/SsoIdentityProvider.kt 52 additions, 0 deletions

...g/matrix/android/sdk/api/auth/data/SsoIdentityProvider.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/cache/CacheStrategy.kt 5 additions, 5 deletions

...in/java/org/matrix/android/sdk/api/cache/CacheStrategy.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt 3 additions, 1 deletion

...rc/main/java/org/matrix/android/sdk/api/raw/RawService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt 6 additions, 0 deletions

...c/main/java/org/matrix/android/sdk/api/session/Session.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt 1 addition, 1 deletion

...java/org/matrix/android/sdk/api/session/call/CallState.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt 2 additions, 1 deletion

.../android/sdk/api/session/content/ContentAttachmentData.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt 6 additions, 0 deletions

.../matrix/android/sdk/api/session/events/model/EventType.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt 61 additions, 29 deletions

...va/org/matrix/android/sdk/api/session/file/FileService.kt

with 331 additions and 76 deletions

Please register or to comment