revert '813f9ad6302d421864736a6be596093c23cf35d7' 4889_deactivate_rust_for_prod

Config/CommonConfiguration.swift

@@ -91,8 +91,7 @@ class CommonConfiguration: NSObject, Configurable {
 
         sdkOptions.enableNewClientInformationFeature = RiotSettings.shared.enableClientInformationFeature
         
-        // Configure Crypto SDK feature deciding which crypto module to use
-        sdkOptions.cryptoSDKFeature = CryptoSDKFeature.shared
+        sdkOptions.cryptoMigrationDelegate = self
     }
     
     private func makeASCIIUserAgent() -> String? {
@@ -168,14 +167,16 @@ class CommonConfiguration: NSObject, Configurable {
         if RiotSettings.shared.allowStunServerFallback, let stunServerFallback = BWIBuildSettings.shared.stunServerFallbackUrlString {
             callManager.fallbackSTUNServer = stunServerFallback
         }
-    }
-    
-    
-    // MARK: - Per loaded matrix session settings
-    
-    func setupSettingsWhenLoaded(for matrixSession: MXSession) {
-        // Do not warn for unknown devices. We have cross-signing now
-        (matrixSession.crypto as? MXLegacyCrypto)?.warnOnUnknowDevices = false
-    }
-    
+    }    
+}
+
+extension CommonConfiguration: MXCryptoV2MigrationDelegate {
+    var needsVerificationUpgrade: Bool {
+        get {
+            RiotSettings.shared.showVerificationUpgradeAlert
+        }
+        set {
+            RiotSettings.shared.showVerificationUpgradeAlert = newValue
+        }
+    }
 }

Config/Configurable.swift

@@ -24,7 +24,4 @@ import MatrixSDK
     
     // MARK: - Per matrix session settings
     func setupSettings(for matrixSession: MXSession)
-    
-    // MARK: - Per loaded matrix session settings
-    func setupSettingsWhenLoaded(for matrixSession: MXSession)
 }