Merge pull request #7852 from element-hq/mauroromito/libolm_deprecated_removal

Libolm removal

Podfile

@@ -37,7 +37,6 @@ abstract_target 'RiotPods' do
 
   pod 'Sentry', '~> 7.15.0'
 
-  pod 'OLMKit'
   pod 'zxcvbn-ios'
 
   # Tools

Podfile.lock

@@ -46,18 +46,12 @@ PODS:
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - MatrixSDKCrypto (= 0.4.3)
-    - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
   - MatrixSDK/JingleCallStack (0.27.13):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.4.3)
-  - OLMKit (3.2.12):
-    - OLMKit/olmc (= 3.2.12)
-    - OLMKit/olmcpp (= 3.2.12)
-  - OLMKit/olmc (3.2.12)
-  - OLMKit/olmcpp (3.2.12)
   - ReadMoreTextView (3.0.1)
   - Realm (10.27.0):
     - Realm/Headers (= 10.27.0)
@@ -103,7 +97,6 @@ DEPENDENCIES:
   - libPhoneNumber-iOS (~> 0.9.13)
   - MatrixSDK (from `matrix-ios-sdk/MatrixSDK.podspec`)
   - MatrixSDK/JingleCallStack (from `matrix-ios-sdk/MatrixSDK.podspec`)
-  - OLMKit
   - ReadMoreTextView (~> 3.0.1)
   - Reusable (~> 4.1)
   - Sentry (~> 7.15.0)
@@ -143,7 +136,6 @@ SPEC REPOS:
     - LoggerAPI
     - Logging
     - MatrixSDKCrypto
-    - OLMKit
     - ReadMoreTextView
     - Realm
     - Reusable
@@ -187,9 +179,8 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 1dae186c839eb145974fc1fc127ec903de60a297
+  MatrixSDK: b5756a518af19296b94e3ad9b6f16648f9eb17c3
   MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e
-  OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
   Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
@@ -207,6 +198,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-PODFILE CHECKSUM: fb3e1c62f9e35a9bdbafce743664bf4f620af028
+PODFILE CHECKSUM: 484a1cdf04951cc82156f29de196efd76d3ad893
 
 COCOAPODS: 1.15.2

Riot/Modules/Authentication/AuthenticationCoordinator.swift

@@ -298,8 +298,8 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc
         let store = MXFileStore(credentials: credentials)
         let userDisplayName = await store.displayName(ofUserWithId: userId) ?? ""
 
-        let cryptoStore = MXRealmCryptoStore(credentials: credentials)
-        let keyBackupNeeded = (cryptoStore?.inboundGroupSessions(toBackup: 1) ?? []).count > 0
+        // The backup is now handled by Rust
+        let keyBackupNeeded = false
 
         let softLogoutCredentials = SoftLogoutCredentials(userId: userId,
                                                           homeserverName: credentials.homeServerName() ?? "",

Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m

@@ -1033,10 +1033,8 @@ Please see LICENSE in the repository root for full details.
 
 - (void)displaySoftLogoutMessage
 {
-    // Take some shortcuts and make some assumptions (Riot uses MXFileStore and MXRealmCryptoStore) to
-    // retrieve data to display as quick as possible
-    MXRealmCryptoStore *cryptoStore = [[MXRealmCryptoStore alloc] initWithCredentials:self.softLogoutCredentials];
-    BOOL keyBackupNeeded = [cryptoStore inboundGroupSessionsToBackup:1].count > 0;
+    // Backup is now handled by Rust
+    BOOL keyBackupNeeded = NO;
 
     MXFileStore *fileStore = [[MXFileStore alloc] initWithCredentials:softLogoutCredentials];
     [fileStore asyncUsersWithUserIds:@[softLogoutCredentials.userId] success:^(NSArray<MXUser *> * _Nonnull users) {

Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift

@@ -172,14 +172,6 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
             
                 // Remove pending QR code transaction, as we are going to use SAS verification
                 self.removePendingQRCodeTransaction()
-
-                // Check due to legacy implementation of key verification which could pass incorrect type of transaction
-                if keyVerificationTransaction is MXIncomingSASTransaction {
-                    MXLog.debug("[KeyVerificationVerifyByScanningViewModel] SAS transaction should be outgoing")
-                    self.unregisterDidStateChangeNotification()
-                    self.update(viewState: .error(KeyVerificationVerifyByScanningViewModelError.unknown))
-                }
-            
             }, failure: { [weak self] (error) in
                 guard let self = self else {
                     return

Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m

@@ -7,8 +7,6 @@ Please see LICENSE in the repository root for full details.
 
 #import "ManageSessionViewController.h"
 
-#import <OLMKit/OLMKit.h>
-
 #import "AvatarGenerator.h"
 
 #import "ThemeService.h"

Riot/Modules/Settings/Security/SecurityViewController.m

@@ -9,8 +9,6 @@ Please see LICENSE in the repository root for full details.
 
 #import "ManageSessionViewController.h"
 
-#import <OLMKit/OLMKit.h>
-
 #import "AvatarGenerator.h"
 
 #import "ThemeService.h"

Riot/Modules/Settings/SettingsViewController.m

@@ -9,8 +9,6 @@ Please see LICENSE in the repository root for full details.
 
 #import "SettingsViewController.h"
 
-#import <OLMKit/OLMKit.h>
-
 #import "AvatarGenerator.h"
 
 #import "BugReportViewController.h"

RiotTests/UserSessionsDataProviderTests.swift

@@ -10,22 +10,6 @@ import XCTest
 @testable import Element
 
 class UserSessionCardViewDataTests: XCTestCase {
-    func testOtherSessionsWithCrossSigning() {
-        // Given a data provider for a session that can cross sign.
-        let mxSession = MockSession(canCrossSign: true)
-        let dataProvider = UserSessionsDataProvider(session: mxSession)
-        
-        // When the verification state of other sessions is requested.
-        let deviceA = MockDeviceInfo(deviceID: .otherDeviceA, verified: true)
-        let deviceB = MockDeviceInfo(deviceID: .otherDeviceB, verified: false)
-        let verificationStateA = dataProvider.verificationState(for: deviceA)
-        let verificationStateB = dataProvider.verificationState(for: deviceB)
-        
-        // Then they should match the verification state from the device info.
-        XCTAssertEqual(verificationStateA, .verified)
-        XCTAssertEqual(verificationStateB, .unverified)
-    }
-    
     func testOtherSessionsWithoutCrossSigning() {
         // Given a data provider for a session that can't cross sign.
         let mxSession = MockSession(canCrossSign: false)
@@ -42,38 +26,6 @@ class UserSessionCardViewDataTests: XCTestCase {
         XCTAssertEqual(verificationStateB, .unknown)
     }
     
-    func testCurrentDeviceWithCrossSigning() {
-        // Given a data provider for a session that can cross sign.
-        let mxSession = MockSession(canCrossSign: true)
-        let dataProvider = UserSessionsDataProvider(session: mxSession)
-        
-        // When the verification state of the same session is requested.
-        let currentDeviceVerified = MockDeviceInfo(deviceID: .currentDevice, verified: true)
-        let currentDeviceUnverified = MockDeviceInfo(deviceID: .currentDevice, verified: false)
-        let verificationStateVerified = dataProvider.verificationState(for: currentDeviceVerified)
-        let verificationStateUnverified = dataProvider.verificationState(for: currentDeviceUnverified)
-        
-        // Then the verification state should be unknown.
-        XCTAssertEqual(verificationStateVerified, .verified)
-        XCTAssertEqual(verificationStateUnverified, .unverified)
-    }
-    
-    func testCurrentDeviceWithoutCrossSigning() {
-        // Given a data provider for a session that can't cross sign.
-        let mxSession = MockSession(canCrossSign: false)
-        let dataProvider = UserSessionsDataProvider(session: mxSession)
-        
-        // When the verification state of the same session is requested.
-        let currentDeviceVerified = MockDeviceInfo(deviceID: .currentDevice, verified: true)
-        let currentDeviceUnverified = MockDeviceInfo(deviceID: .currentDevice, verified: false)
-        let verificationStateVerified = dataProvider.verificationState(for: currentDeviceVerified)
-        let verificationStateUnverified = dataProvider.verificationState(for: currentDeviceUnverified)
-        
-        // Then the verification state should be unknown.
-        XCTAssertEqual(verificationStateVerified, .unverified)
-        XCTAssertEqual(verificationStateUnverified, .unverified)
-    }
-    
     func testDeviceNotHavingCryptoSupportOnVerifiedDevice() {
         let mxSession = MockSession(canCrossSign: true)
         let dataProvider = UserSessionsDataProvider(session: mxSession)
@@ -166,11 +118,6 @@ private class MockSession: MXSession {
     let canCrossSign: Bool
     override var myDeviceId: String! { .currentDevice }
     
-    override var crypto: MXCrypto! {
-        get { MockCrypto(canCrossSign: canCrossSign) }
-        set { }
-    }
-    
     init(canCrossSign: Bool) {
         self.canCrossSign = canCrossSign
         super.init()
@@ -178,33 +125,6 @@ private class MockSession: MXSession {
     
 }
 
-/// A mock `MXCrypto` that can override the `canCrossSign` state.
-private class MockCrypto: MXLegacyCrypto {
-    let canCrossSign: Bool
-    override var crossSigning: MXCrossSigning { MockCrossSigning(canCrossSign: canCrossSign) }
-    
-    init(canCrossSign: Bool) {
-        self.canCrossSign = canCrossSign
-        super.init()
-    }
-    
-}
-
-/// A mock `MXCrossSigning` with an overridden `canCrossSign` property.
-private class MockCrossSigning: MXLegacyCrossSigning {
-    let canCrossSignMock: Bool
-    override var canCrossSign: Bool { canCrossSignMock }
-    
-    init(canCrossSign: Bool) {
-        self.canCrossSignMock = canCrossSign
-        super.init()
-    }
-    
-    override var state: MXCrossSigningState {
-        .crossSigningExists
-    }
-}
-
 /// A mock `MXDeviceInfo` that can override the `isVerified` state.
 private class MockDeviceInfo: MXDeviceInfo {
     private let verified: Bool