Merge branch 'release/1.1.8' into develop

parents 2ae30a42 5021ad66

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

.idea/compiler.xml 1 addition, 1 deletion

.idea/compiler.xml
.idea/misc.xml 1 addition, 1 deletion

.idea/misc.xml
.idea/runConfigurations.xml 1 addition, 0 deletions

.idea/runConfigurations.xml
build.gradle 3 additions, 3 deletions

build.gradle
gradle/wrapper/gradle-wrapper.properties 2 additions, 2 deletions

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

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt 11 additions, 11 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/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/KeyShareTests.kt 6 additions, 8 deletions

...ix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt 6 additions, 6 deletions

...oid/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtilsTest.kt 184 additions, 0 deletions

.../internal/session/securestorage/SecretStoringUtilsTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/securestorage/TestBuildVersionSdkIntProvider.kt 25 additions, 0 deletions

...l/session/securestorage/TestBuildVersionSdkIntProvider.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt 2 additions, 1 deletion

.../sdk/session/room/timeline/TimelineWithManyMembersTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt 222 additions, 0 deletions

...org/matrix/android/sdk/session/space/SpaceCreationTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt 472 additions, 0 deletions

...rg/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt 4 additions, 0 deletions

.../org/matrix/android/sdk/api/auth/AuthenticationService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt 7 additions, 9 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 22 additions, 1 deletion

...g/matrix/android/sdk/api/auth/data/SsoIdentityProvider.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginProfileInfo.kt 23 additions, 0 deletions

...org/matrix/android/sdk/api/auth/login/LoginProfileInfo.kt

with 1010 additions and 59 deletions

Please register or to comment