From b1a3fb393dfced4c52ecd1877f3a8b311b5f8676 Mon Sep 17 00:00:00 2001 From: valere Date: Mon, 30 Jan 2023 15:25:27 +0100 Subject: [PATCH] Fix flavor compilation --- .../android/sdk/internal/session/MigrateEAtoEROperation.kt | 2 +- .../android/sdk/internal/crypto/RustEncryptionConfiguration.kt | 0 .../store/db/migration/rust/ExtractMigrationDataUseCase.kt | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) rename matrix-sdk-android/src/{rustCrypto => main}/java/org/matrix/android/sdk/internal/crypto/RustEncryptionConfiguration.kt (100%) diff --git a/matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/session/MigrateEAtoEROperation.kt b/matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/session/MigrateEAtoEROperation.kt index c17f2e8dca..86ede50798 100644 --- a/matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/session/MigrateEAtoEROperation.kt +++ b/matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/session/MigrateEAtoEROperation.kt @@ -22,7 +22,7 @@ import java.io.File class MigrateEAtoEROperation { - fun execute(cryptoRealm: RealmConfiguration, sessionFilesDir: File): File { + fun execute(cryptoRealm: RealmConfiguration, sessionFilesDir: File, passphrase: String?): File { Timber.v("Not used in kotlin crypto $cryptoRealm") // no op in kotlinCrypto return sessionFilesDir diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustEncryptionConfiguration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RustEncryptionConfiguration.kt similarity index 100% rename from matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustEncryptionConfiguration.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RustEncryptionConfiguration.kt diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/store/db/migration/rust/ExtractMigrationDataUseCase.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/store/db/migration/rust/ExtractMigrationDataUseCase.kt index 2403cfb803..96f3fda2f4 100644 --- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/store/db/migration/rust/ExtractMigrationDataUseCase.kt +++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/store/db/migration/rust/ExtractMigrationDataUseCase.kt @@ -29,7 +29,6 @@ import org.matrix.olm.OlmSession import org.matrix.olm.OlmUtility import org.matrix.rustcomponents.sdk.crypto.CrossSigningKeyExport import org.matrix.rustcomponents.sdk.crypto.MigrationData -import org.matrix.rustcomponents.sdk.crypto.MigrationException import org.matrix.rustcomponents.sdk.crypto.PickledAccount import org.matrix.rustcomponents.sdk.crypto.PickledInboundGroupSession import org.matrix.rustcomponents.sdk.crypto.PickledSession