Commit 0a90529e authored 2 years ago by Taras

Merge branch 'develop' into main

parents ec849690 711ff70c

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 13 additions, 3 deletions

CHANGES.md
dependencies.gradle 4 additions, 1 deletion

dependencies.gradle
gradle.properties 1 addition, 1 deletion

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

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt 2 additions, 0 deletions

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

...org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt 1 addition, 1 deletion

.../android/sdk/internal/crypto/crosssigning/XSigningTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt 2 additions, 2 deletions

...atrix/android/sdk/internal/crypto/verification/SASTest.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt 16 additions, 11 deletions

...rg/matrix/android/sdk/api/session/crypto/CryptoService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt 3 additions, 0 deletions

.../matrix/android/sdk/api/session/events/model/EventType.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt 4 additions, 0 deletions

...a/org/matrix/android/sdk/api/session/identity/ThreePid.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt 19 additions, 8 deletions

...oid/sdk/api/session/room/model/create/CreateRoomParams.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomStateEvent.kt 2 additions, 0 deletions

...sdk/api/session/room/model/create/CreateRoomStateEvent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt 20 additions, 11 deletions

...atrix/android/sdk/internal/crypto/DefaultCryptoService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt 5 additions, 0 deletions

...nternal/crypto/crosssigning/DefaultCrossSigningService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt 2 additions, 0 deletions

...oid/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt 4 additions, 0 deletions

...atrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt 24 additions, 8 deletions

.../android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/MyDeviceLastSeenInfoEntityMapper.kt 33 additions, 0 deletions

...rypto/store/db/mapper/MyDeviceLastSeenInfoEntityMapper.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt 16 additions, 0 deletions

...matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt

with 175 additions and 50 deletions

Please register or to comment