Prepare flavors

flavor.gradle

@@ -0,0 +1,20 @@
+android {
+
+    flavorDimensions "crypto"
+
+    productFlavors {
+        kotlinCrypto {
+            dimension "crypto"
+            isDefault = true
+            // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
+//            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"JC\""
+//            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"KotlinCrypto\""
+        }
+        rustCrypto {
+            dimension "crypto"
+//            // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
+//            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"RC\""
+//            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"RustCrypto\""
+        }
+    }
+}

matrix-sdk-android-flow/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
 }
+apply from: '../flavor.gradle'
 
 android {
     compileSdk versions.compileSdk
@@ -28,11 +29,23 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+
+//    publishNonDefault true
 }
 
+//configurations {
+//    kotlinCryptoDebugImplementation
+//    kotlinCryptoReleaseImplementation
+//    rustCryptoDebugImplementation
+//    rustCryptoReleaseImplementation
+//}
+
 dependencies {
     implementation project(":matrix-sdk-android")
-
+//    kotlinCryptoDebugImplementation project(path: ":matrix-sdk-android", configuration :"kotlinCryptoDebug")
+//    kotlinCryptoReleaseImplementation project(path: ":matrix-sdk-android", configuration :"kotlinCryptoRelease")
+//    rustCryptoDebugImplementation project(path: ":matrix-sdk-android", configuration :"rustCryptoDebug")
+//    rustCryptoReleaseImplementation project(path: ":matrix-sdk-android", configuration :"rustCryptoDebug")
     implementation libs.jetbrains.coroutinesCore
     implementation libs.jetbrains.coroutinesAndroid
     implementation libs.androidx.lifecycleLivedata

matrix-sdk-android/build.gradle

@@ -41,6 +41,7 @@ dokkaHtml {
         }
     }
 }
+apply from: '../flavor.gradle'
 
 android {
     testOptions.unitTests.includeAndroidResources = true
@@ -122,6 +123,26 @@ android {
             java.srcDirs += "src/sharedTest/java"
         }
     }
+//
+//    flavorDimensions "crypto"
+//
+//    productFlavors {
+//        kotlinCrypto {
+//            dimension "crypto"
+//            isDefault = true
+//            // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
+//            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"JC\""
+//            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"KotlinCrypto\""
+//        }
+//        rustCrypto {
+//            dimension "crypto"
+//            // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
+//            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"RC\""
+//            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"RustCrypto\""
+//        }
+//    }
+//    publishNonDefault true
+
 }
 
 static def gitRevision() {
@@ -201,6 +222,8 @@ dependencies {
 
     implementation libs.google.phonenumber
 
+    rustCryptoImplementation 'org.matrix.rustcomponents:crypto-android:0.2.1-SNAPSHOT'
+
     testImplementation libs.tests.junit
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
     testImplementation libs.mockk.mockk

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt

@@ -38,8 +38,8 @@ import org.matrix.android.sdk.api.session.crypto.keysbackup.MegolmBackupAuthData
 import org.matrix.android.sdk.api.session.crypto.keysbackup.MegolmBackupCreationInfo
 import org.matrix.android.sdk.api.session.crypto.keysbackup.extractCurveKeyFromRecoveryKey
 import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
-import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
-import org.matrix.android.sdk.api.session.crypto.verification.OutgoingSasVerificationTransaction
+import org.matrix.android.sdk.internal.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.internal.crypto.verification.OutgoingSasVerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
 import org.matrix.android.sdk.api.session.events.model.EventType

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt

@@ -45,8 +45,8 @@ import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysVersionResult
 import org.matrix.android.sdk.api.session.crypto.keysbackup.MegolmBackupCreationInfo
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.ImportRoomKeysResult
-import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
-import org.matrix.android.sdk.api.session.crypto.verification.OutgoingSasVerificationTransaction
+import org.matrix.android.sdk.internal.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.internal.crypto.verification.OutgoingSasVerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.PendingVerificationRequest
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
@@ -726,7 +726,7 @@ class E2eeSanityTests : InstrumentedTest {
                                 // we can release this latch?
                                 continuation.resume(oldCode!!)
                             }
-                            else -> Unit
+                            else                                                -> Unit
                         }
                     }
                 }
@@ -761,18 +761,18 @@ class E2eeSanityTests : InstrumentedTest {
                             IncomingSasVerificationTransaction.UxState.SHOW_ACCEPT -> {
                                 // no need to accept as there was a request first it will auto accept
                             }
-                            IncomingSasVerificationTransaction.UxState.SHOW_SAS -> {
+                            IncomingSasVerificationTransaction.UxState.SHOW_SAS    -> {
                                 if (matchOnce) {
                                     sasTx.userHasVerifiedShortCode()
                                     newCode = sasTx.getDecimalCodeRepresentation()
                                     matchOnce = false
                                 }
                             }
-                            IncomingSasVerificationTransaction.UxState.VERIFIED -> {
+                            IncomingSasVerificationTransaction.UxState.VERIFIED    -> {
                                 removeListener(this)
                                 continuation.resume(newCode!!)
                             }
-                            else -> Unit
+                            else                                                   -> Unit
                         }
                     }
                 }

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt

@@ -34,8 +34,6 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
-import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
-import org.matrix.android.sdk.api.session.crypto.verification.OutgoingSasVerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.SasMode
 import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
@@ -415,7 +413,7 @@ class SASTest : InstrumentedTest {
                     OutgoingSasVerificationTransaction.UxState.SHOW_SAS -> {
                         aliceSASLatch.countDown()
                     }
-                    else -> Unit
+                    else                                                -> Unit
                 }
             }
         }
@@ -429,7 +427,7 @@ class SASTest : InstrumentedTest {
                     IncomingSasVerificationTransaction.UxState.SHOW_ACCEPT -> {
                         tx.performAccept()
                     }
-                    else -> Unit
+                    else                                                   -> Unit
                 }
                 if (uxState === IncomingSasVerificationTransaction.UxState.SHOW_SAS) {
                     bobSASLatch.countDown()
@@ -479,7 +477,7 @@ class SASTest : InstrumentedTest {
                             aliceSASLatch.countDown()
                         }
                     }
-                    else -> Unit
+                    else                                                -> Unit
                 }
             }
         }
@@ -499,16 +497,16 @@ class SASTest : InstrumentedTest {
                             tx.performAccept()
                         }
                     }
-                    IncomingSasVerificationTransaction.UxState.SHOW_SAS -> {
+                    IncomingSasVerificationTransaction.UxState.SHOW_SAS    -> {
                         if (matchOnce) {
                             matchOnce = false
                             tx.userHasVerifiedShortCode()
                         }
                     }
-                    IncomingSasVerificationTransaction.UxState.VERIFIED -> {
+                    IncomingSasVerificationTransaction.UxState.VERIFIED    -> {
                         bobSASLatch.countDown()
                     }
-                    else -> Unit
+                    else                                                   -> Unit
                 }
             }
         }

matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/api/session/crypto/verification/IncomingSasVerificationTransaction.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt

@@ -24,6 +24,7 @@ import java.net.Proxy
 data class MatrixConfiguration(
         val applicationFlavor: String = "Default-application-flavor",
         val cryptoConfig: MXCryptoConfig = MXCryptoConfig(),
+        val cryptoFlavor: String = "Default-crypto-flavor",
         val integrationUIUrl: String = "https://scalar.vector.im/",
         val integrationRestUrl: String = "https://scalar.vector.im/api",
         val integrationWidgetUrls: List<String> = listOf(

vector-app/build.gradle

@@ -124,6 +124,8 @@ ext.abiVersionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4].
 
 def buildNumber = System.env.BUILDKITE_BUILD_NUMBER as Integer ?: 0
 
+apply from: '../flavor.gradle'
+
 android {
     // Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use
     // Ref: https://issuetracker.google.com/issues/144111441
@@ -298,7 +300,7 @@ android {
         }
     }
 
-    flavorDimensions "store"
+    flavorDimensions "store", "crypto"
 
     productFlavors {
         gplay {
@@ -320,6 +322,20 @@ android {
             buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
             buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
         }
+
+        kotlinCrypto {
+            dimension "crypto"
+            isDefault = true
+            // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
+            buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"olm-crypto\""
+//            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"KotlinCrypto\""
+        }
+        rustCrypto {
+            dimension "crypto"
+//            // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
+            buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"rust-crypto\""
+//            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"RustCrypto\""
+        }
     }
 
     lintOptions {

vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt

@@ -141,6 +141,7 @@ object VectorStaticModule {
     ): MatrixConfiguration {
         return MatrixConfiguration(
                 applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION,
+                cryptoFlavor = BuildConfig.CRYPTO_FLAVOR_DESCRIPTION,
                 roomDisplayNameFallbackProvider = vectorRoomDisplayNameFallbackProvider,
                 threadMessagesEnabledDefault = vectorPreferences.areThreadMessagesEnabled(),
                 networkInterceptors = listOfNotNull(

vector/build.gradle

@@ -103,6 +103,9 @@ android {
         viewBinding true
     }
 }
+
+apply from: '../flavor.gradle'
+
 dependencies {
     implementation project(":vector-config")
     api project(":matrix-sdk-android")

vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt

@@ -49,7 +49,7 @@ import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupLastVersio
 import org.matrix.android.sdk.api.session.crypto.keysbackup.computeRecoveryKey
 import org.matrix.android.sdk.api.session.crypto.keysbackup.toKeysVersionResult
 import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
-import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.internal.crypto.verification.IncomingSasVerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.PendingVerificationRequest
 import org.matrix.android.sdk.api.session.crypto.verification.QrCodeVerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction

vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt

@@ -103,7 +103,7 @@ import im.vector.app.features.spaces.people.SpacePeopleActivity
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.widgets.WidgetActivity
 import im.vector.app.features.widgets.WidgetArgsBuilder
-import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.internal.crypto.verification.IncomingSasVerificationTransaction
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData