Commit 25e4fa92 authored 3 years ago by Benoit Marty

Merge branch 'release/1.1.13' into main

parents c61bdecf e29ebdb7

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt 1 addition, 1 deletion

...k/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt 7 additions, 6 deletions

...sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt 0 additions, 6 deletions

...rix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt 1 addition, 1 deletion

.../matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileInfo.kt 0 additions, 6 deletions

...droid/sdk/internal/crypto/model/rest/EncryptedFileInfo.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt 12 additions, 12 deletions

...ernal/crypto/secrets/DefaultSharedSecretStorageService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt 1 addition, 1 deletion

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

.../android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt 69 additions, 12 deletions

...sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt 26 additions, 17 deletions

...ndroid/sdk/internal/crypto/store/db/model/CryptoMapper.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt 1 addition, 1 deletion

...d/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt 4 additions, 4 deletions

...rnal/crypto/verification/VerificationTransportToDevice.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt 31 additions, 7 deletions

...droid/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt 1 addition, 2 deletions

...sdk/internal/database/SessionRealmConfigurationFactory.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt 7 additions, 5 deletions

...android/sdk/internal/database/mapper/AccountDataMapper.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt 41 additions, 1 deletion

.../internal/database/mapper/HomeServerCapabilitiesMapper.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt 1 addition, 0 deletions

...k/internal/database/model/HomeServerCapabilitiesEntity.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserAccountDataEntity.kt 1 addition, 1 deletion

...roid/sdk/internal/database/model/UserAccountDataEntity.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationModule.kt 2 additions, 1 deletion

...atrix/android/sdk/internal/federation/FederationModule.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt 4 additions, 5 deletions

...droid/sdk/internal/legacy/DefaultLegacySessionImporter.kt

with 238 additions and 105 deletions

Please register or to comment