Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

matrix-android-sdk
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

23ed1e4d

Commit 23ed1e4d authored 1 year ago by Taras

Downloads
- Plain Diff

Merge branch 'feature/custom_crypto_sdk' into main

parents b8a21f8b 4a6f41c8

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.idea/jarRepositories.xml 5 additions, 0 deletions

.idea/jarRepositories.xml
build.gradle 1 addition, 0 deletions

build.gradle
library/rustCrypto/build.gradle 2 additions, 0 deletions

library/rustCrypto/build.gradle
library/rustCrypto/matrix-rust-sdk-crypto.aar 0 additions, 0 deletions

library/rustCrypto/matrix-rust-sdk-crypto.aar
matrix-sdk-android/build.gradle 2 additions, 2 deletions

matrix-sdk-android/build.gradle
matrix-sdk-android/gradle-publish.gradle 1 addition, 1 deletion

matrix-sdk-android/gradle-publish.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt 1 addition, 8 deletions

...ernal/session/room/membership/DefaultMembershipService.kt
matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt 1 addition, 1 deletion

...java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt 16 additions, 6 deletions

...g/matrix/android/sdk/internal/crypto/RustCryptoService.kt
matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/store/db/migration/rust/ExtractUtils.kt 2 additions, 2 deletions

...k/internal/crypto/store/db/migration/rust/ExtractUtils.kt

with 31 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment