Commit a4a039b0 authored 4 years ago by Benoit Marty

Merge branch 'release/1.1.1' into develop

parents bf90d76c f91bebea

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

build.gradle 4 additions, 7 deletions

build.gradle
matrix-sdk-android/build.gradle 15 additions, 21 deletions

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt 19 additions, 20 deletions

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

...st/java/org/matrix/android/sdk/common/CommonTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt 40 additions, 0 deletions

...android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt 103 additions, 0 deletions

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

...ix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt 1 addition, 2 deletions

...g/matrix/android/sdk/session/search/SearchMessagesTest.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt 9 additions, 1 deletion

...in/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt 26 additions, 0 deletions

...matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt 13 additions, 18 deletions

.../org/matrix/android/sdk/api/auth/AuthenticationService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt 8 additions, 12 deletions

...java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt 9 additions, 12 deletions

...x/android/sdk/api/auth/registration/RegistrationWizard.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/VerificationState.kt 29 additions, 0 deletions

...va/org/matrix/android/sdk/api/crypto/VerificationState.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt 11 additions, 9 deletions

...ain/java/org/matrix/android/sdk/api/failure/Extensions.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/federation/FederationService.kt 24 additions, 0 deletions

...rg/matrix/android/sdk/api/federation/FederationService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/federation/FederationVersion.kt 31 additions, 0 deletions

...rg/matrix/android/sdk/api/federation/FederationVersion.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt 13 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/account/AccountService.kt 5 additions, 3 deletions

.../matrix/android/sdk/api/session/account/AccountService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallListener.kt 22 additions, 1 deletion

...a/org/matrix/android/sdk/api/session/call/CallListener.kt

with 423 additions and 146 deletions

Please register or to comment