Commit 2d57927b authored 4 years ago by Benoit Marty

Merge branch 'release/1.1.4' into develop

parents a4a039b0 d31a24ee

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 10 additions, 0 deletions

CHANGES.md
build.gradle 2 additions, 2 deletions

build.gradle
matrix-sdk-android/build.gradle 8 additions, 9 deletions

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt 0 additions, 5 deletions

...droidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt 12 additions, 0 deletions

...src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt 58 additions, 0 deletions

.../org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt 6 additions, 7 deletions

...st/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt 9 additions, 6 deletions

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

...ix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt 42 additions, 65 deletions

...org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt 2 additions, 4 deletions

...atrix/android/sdk/internal/crypto/verification/SASTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt 55 additions, 100 deletions

...g/matrix/android/sdk/session/search/SearchMessagesTest.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt 12 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/RoomDisplayNameFallbackProvider.kt 6 additions, 5 deletions

...matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt 7 additions, 7 deletions

...oid/sdk/api/auth/registration/RegistrationAvailability.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt 2 additions, 0 deletions

...x/android/sdk/api/auth/registration/RegistrationWizard.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt 25 additions, 2 deletions

...ain/java/org/matrix/android/sdk/api/failure/Extensions.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptorListener.kt 21 additions, 0 deletions

.../matrix/android/sdk/api/network/ApiInterceptorListener.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiPath.kt 183 additions, 0 deletions

...c/main/java/org/matrix/android/sdk/api/network/ApiPath.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt 2 additions, 0 deletions

...a/org/matrix/android/sdk/api/pushrules/PushRuleService.kt

with 464 additions and 214 deletions

Please register or to comment