Merge commit 'a8c505c2f9175ae0bece1f62708e6fc31e587897' into feature/3746_merge_element_1.9.10

# Conflicts:
#	Config/AppConfiguration.swift
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/AppCoordinator.swift
#	Riot/Modules/Common/Avatar/AvatarView.swift
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/Settings/Security/SecurityViewController.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	Riot/target.yml
#	fastlane/Fastfile
#	project.yml

Riot/Modules/KeyVerification/Device/Incoming/DeviceVerificationIncomingCoordinator.swift

@@ -38,7 +38,7 @@ final class DeviceVerificationIncomingCoordinator: DeviceVerificationIncomingCoo
     
     // MARK: - Setup
     
-    init(session: MXSession, otherUser: MXUser, transaction: MXIncomingSASTransaction) {
+    init(session: MXSession, otherUser: MXUser, transaction: MXSASTransaction) {
         self.session = session
         
         let deviceVerificationIncomingViewModel = DeviceVerificationIncomingViewModel(session: self.session, otherUser: otherUser, transaction: transaction)

Riot/Modules/KeyVerification/Device/Incoming/DeviceVerificationIncomingViewModel.swift

@@ -25,7 +25,7 @@ final class DeviceVerificationIncomingViewModel: DeviceVerificationIncomingViewM
     // MARK: Private
 
     private let session: MXSession
-    private let transaction: MXIncomingSASTransaction
+    private let transaction: MXSASTransaction
     
     // MARK: Public
 
@@ -41,7 +41,7 @@ final class DeviceVerificationIncomingViewModel: DeviceVerificationIncomingViewM
     
     // MARK: - Setup
     
-    init(session: MXSession, otherUser: MXUser, transaction: MXIncomingSASTransaction) {
+    init(session: MXSession, otherUser: MXUser, transaction: MXSASTransaction) {
         self.session = session
         self.transaction = transaction
         self.userId = otherUser.userId
@@ -83,7 +83,7 @@ final class DeviceVerificationIncomingViewModel: DeviceVerificationIncomingViewM
 
     // MARK: - MXKeyVerificationTransactionDidChange
 
-    private func registerTransactionDidStateChangeNotification(transaction: MXIncomingSASTransaction) {
+    private func registerTransactionDidStateChangeNotification(transaction: MXSASTransaction) {
         NotificationCenter.default.addObserver(self, selector: #selector(transactionDidStateChange(notification:)), name: NSNotification.Name.MXKeyVerificationTransactionDidChange, object: transaction)
     }
     
@@ -92,7 +92,7 @@ final class DeviceVerificationIncomingViewModel: DeviceVerificationIncomingViewM
     }
 
     @objc private func transactionDidStateChange(notification: Notification) {
-        guard let transaction = notification.object as? MXIncomingSASTransaction else {
+        guard let transaction = notification.object as? MXSASTransaction, transaction.isIncoming else {
             return
         }
 

Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitCoordinator.swift

@@ -69,7 +69,7 @@ extension KeyVerificationSelfVerifyWaitCoordinator: KeyVerificationSelfVerifyWai
         self.delegate?.keyVerificationSelfVerifyWaitCoordinator(self, didAcceptKeyVerificationRequest: keyVerificationRequest)
     }
     
-    func keyVerificationSelfVerifyWaitViewModel(_ viewModel: KeyVerificationSelfVerifyWaitViewModelType, didAcceptIncomingSASTransaction incomingSASTransaction: MXIncomingSASTransaction) {
+    func keyVerificationSelfVerifyWaitViewModel(_ viewModel: KeyVerificationSelfVerifyWaitViewModelType, didAcceptIncomingSASTransaction incomingSASTransaction: MXSASTransaction) {
         self.delegate?.keyVerificationSelfVerifyWaitCoordinator(self, didAcceptIncomingSASTransaction: incomingSASTransaction)
     }
     

Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitCoordinatorType.swift

@@ -20,7 +20,7 @@ import Foundation
 
 protocol KeyVerificationSelfVerifyWaitCoordinatorDelegate: AnyObject {
     func keyVerificationSelfVerifyWaitCoordinator(_ coordinator: KeyVerificationSelfVerifyWaitCoordinatorType, didAcceptKeyVerificationRequest keyVerificationRequest: MXKeyVerificationRequest)
-    func keyVerificationSelfVerifyWaitCoordinator(_ coordinator: KeyVerificationSelfVerifyWaitCoordinatorType, didAcceptIncomingSASTransaction incomingSASTransaction: MXIncomingSASTransaction)
+    func keyVerificationSelfVerifyWaitCoordinator(_ coordinator: KeyVerificationSelfVerifyWaitCoordinatorType, didAcceptIncomingSASTransaction incomingSASTransaction: MXSASTransaction)
     func keyVerificationSelfVerifyWaitCoordinatorDidCancel(_ coordinator: KeyVerificationSelfVerifyWaitCoordinatorType)
     func keyVerificationSelfVerifyWaitCoordinator(_ coordinator: KeyVerificationSelfVerifyWaitCoordinatorType, wantsToRecoverSecretsWith secretsRecoveryMode: SecretsRecoveryMode)
 }

Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewModel.swift

@@ -92,21 +92,29 @@ final class KeyVerificationSelfVerifyWaitViewModel: KeyVerificationSelfVerifyWai
             //  be sure that session has completed its first sync
             if session.state >= .running {
                 
-                // Always send request instead of waiting for an incoming one as per recent EW changes
-                MXLog.debug("[KeyVerificationSelfVerifyWaitViewModel] loadData: Send a verification request to all devices instead of waiting")
-                
-                let keyVerificationService = KeyVerificationService()
-                self.verificationManager.requestVerificationByToDevice(withUserId: self.session.myUserId, deviceIds: nil, methods: keyVerificationService.supportedKeyVerificationMethods(), success: { [weak self] (keyVerificationRequest) in
-                    guard let self = self else {
-                        return
-                    }
+                if let existingRequest = verificationManager.pendingRequests.first(where: { $0.isFromMyUser && !$0.isFromMyDevice && $0.state == MXKeyVerificationRequestStatePending }) {
+                    MXLog.debug("[KeyVerificationSelfVerifyWaitViewModel] loadData: Accepting an existing self-verification request instead of starting a new one")
                     
-                    self.keyVerificationRequest = keyVerificationRequest
+                    registerTransactionDidStateChangeNotification()
+                    acceptKeyVerificationRequest(existingRequest)
+                } else {
                     
-                }, failure: { [weak self] error in
-                    self?.update(viewState: .error(error))
-                })
-                continueLoadData()
+                    // Always send request instead of waiting for an incoming one as per recent EW changes
+                    MXLog.debug("[KeyVerificationSelfVerifyWaitViewModel] loadData: Send a verification request to all devices instead of waiting")
+                    
+                    let keyVerificationService = KeyVerificationService()
+                    self.verificationManager.requestVerificationByToDevice(withUserId: self.session.myUserId, deviceIds: nil, methods: keyVerificationService.supportedKeyVerificationMethods(), success: { [weak self] (keyVerificationRequest) in
+                        guard let self = self else {
+                            return
+                        }
+                        
+                        self.keyVerificationRequest = keyVerificationRequest
+                        
+                    }, failure: { [weak self] error in
+                        self?.update(viewState: .error(error))
+                    })
+                    continueLoadData()
+                }
             } else {
                 //  show loader
                 self.update(viewState: .secretsRecoveryCheckingAvailability(VectorL10n.deviceVerificationSelfVerifyWaitRecoverSecretsCheckingAvailability))
@@ -181,7 +189,7 @@ final class KeyVerificationSelfVerifyWaitViewModel: KeyVerificationSelfVerifyWai
     
     @objc private func keyVerificationManagerNewRequestNotification(notification: Notification) {
         
-        guard let userInfo = notification.userInfo, let keyVerificationRequest = userInfo[MXKeyVerificationManagerNotificationRequestKey] as? MXKeyVerificationByToDeviceRequest else {
+        guard let userInfo = notification.userInfo, let keyVerificationRequest = userInfo[MXKeyVerificationManagerNotificationRequestKey] as? MXKeyVerificationRequest, keyVerificationRequest.transport == .toDevice else {
             return
         }
         
@@ -242,14 +250,14 @@ final class KeyVerificationSelfVerifyWaitViewModel: KeyVerificationSelfVerifyWai
     }
 
     @objc private func transactionDidStateChange(notification: Notification) {
-        guard let sasTransaction = notification.object as? MXIncomingSASTransaction,
-            sasTransaction.otherUserId == self.session.myUserId else {
+        guard let sasTransaction = notification.object as? MXSASTransaction,
+            sasTransaction.isIncoming, sasTransaction.otherUserId == self.session.myUserId else {
             return
         }
         self.sasTransactionDidStateChange(sasTransaction)
     }
 
-    private func sasTransactionDidStateChange(_ transaction: MXIncomingSASTransaction) {
+    private func sasTransactionDidStateChange(_ transaction: MXSASTransaction) {
         switch transaction.state {
         case MXSASTransactionStateIncomingShowAccept:
             transaction.accept()

Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewModelType.swift

@@ -24,7 +24,7 @@ protocol KeyVerificationSelfVerifyWaitViewModelViewDelegate: AnyObject {
 
 protocol KeyVerificationSelfVerifyWaitViewModelCoordinatorDelegate: AnyObject {
     func keyVerificationSelfVerifyWaitViewModel(_ viewModel: KeyVerificationSelfVerifyWaitViewModelType, didAcceptKeyVerificationRequest keyVerificationRequest: MXKeyVerificationRequest)
-    func keyVerificationSelfVerifyWaitViewModel(_ viewModel: KeyVerificationSelfVerifyWaitViewModelType, didAcceptIncomingSASTransaction incomingSASTransaction: MXIncomingSASTransaction)
+    func keyVerificationSelfVerifyWaitViewModel(_ viewModel: KeyVerificationSelfVerifyWaitViewModelType, didAcceptIncomingSASTransaction incomingSASTransaction: MXSASTransaction)
     func keyVerificationSelfVerifyWaitViewModelDidCancel(_ viewModel: KeyVerificationSelfVerifyWaitViewModelType)
     func keyVerificationSelfVerifyWaitViewModel(_ viewModel: KeyVerificationSelfVerifyWaitViewModelType, wantsToRecoverSecretsWith secretsRecoveryMode: SecretsRecoveryMode)
 }

Riot/Modules/KeyVerification/Device/Start/DeviceVerificationStartCoordinator.swift

@@ -63,13 +63,9 @@ extension DeviceVerificationStartCoordinator: DeviceVerificationStartViewModelCo
     func deviceVerificationStartViewModelDidUseLegacyVerification(_ viewModel: DeviceVerificationStartViewModelType) {
         self.delegate?.deviceVerificationStartCoordinatorDidCancel(self) 
     }
-
-    func deviceVerificationStartViewModel(_ viewModel: DeviceVerificationStartViewModelType, didCompleteWithOutgoingTransaction transaction: MXSASTransaction) {
-        self.delegate?.deviceVerificationStartCoordinator(self, didCompleteWithOutgoingTransaction: transaction)
-    }
-
-    func deviceVerificationStartViewModel(_ viewModel: DeviceVerificationStartViewModelType, didTransactionCancelled transaction: MXSASTransaction) {
-        self.delegate?.deviceVerificationStartCoordinator(self, didTransactionCancelled: transaction)
+    
+    func deviceVerificationStartViewModel(_ viewModel: DeviceVerificationStartViewModelType, otherDidAcceptRequest request: MXKeyVerificationRequest) {
+        self.delegate?.deviceVerificationStartCoordinator(self, otherDidAcceptRequest: request)
     }
     
     func deviceVerificationStartViewModelDidCancel(_ viewModel: DeviceVerificationStartViewModelType) {

Riot/Modules/KeyVerification/Device/Start/DeviceVerificationStartCoordinatorType.swift

@@ -19,8 +19,7 @@
 import Foundation
 
 protocol DeviceVerificationStartCoordinatorDelegate: AnyObject {
-    func deviceVerificationStartCoordinator(_ coordinator: DeviceVerificationStartCoordinatorType, didCompleteWithOutgoingTransaction transaction: MXSASTransaction)
-    func deviceVerificationStartCoordinator(_ coordinator: DeviceVerificationStartCoordinatorType, didTransactionCancelled transaction: MXSASTransaction)
+    func deviceVerificationStartCoordinator(_ coordinator: DeviceVerificationStartCoordinatorType, otherDidAcceptRequest request: MXKeyVerificationRequest)
 
     func deviceVerificationStartCoordinatorDidCancel(_ coordinator: DeviceVerificationStartCoordinatorType)
 }

Riot/Modules/KeyVerification/Device/Start/DeviceVerificationStartViewModel.swift

@@ -29,7 +29,7 @@ final class DeviceVerificationStartViewModel: DeviceVerificationStartViewModelTy
     private let otherUser: MXUser
     private let otherDevice: MXDeviceInfo
 
-    private var transaction: MXSASTransaction!
+    private var request: MXKeyVerificationRequest?
     
     // MARK: Public
 
@@ -52,12 +52,12 @@ final class DeviceVerificationStartViewModel: DeviceVerificationStartViewModelTy
         case .beginVerifying:
             self.beginVerifying()
         case .verifyUsingLegacy:
-           self.cancelTransaction()
+           self.cancelRequest()
            self.update(viewState: .verifyUsingLegacy(self.session, self.otherDevice))
         case .verifiedUsingLegacy:
             self.coordinatorDelegate?.deviceVerificationStartViewModelDidUseLegacyVerification(self)
         case .cancel:
-            self.cancelTransaction()
+            self.cancelRequest()
             self.coordinatorDelegate?.deviceVerificationStartViewModelDidCancel(self)
         }
     }
@@ -67,30 +67,22 @@ final class DeviceVerificationStartViewModel: DeviceVerificationStartViewModelTy
     private func beginVerifying() {
         self.update(viewState: .loading)
 
-        self.verificationManager.beginKeyVerification(withUserId: self.otherUser.userId, andDeviceId: self.otherDevice.deviceId, method: MXKeyVerificationMethodSAS, success: { [weak self] (transaction) in
-
-            guard let sself = self else {
-                return
-            }
-            guard let sasTransaction: MXOutgoingSASTransaction = transaction as? MXOutgoingSASTransaction  else {
+        self.verificationManager.requestVerificationByToDevice(withUserId: otherUser.userId, deviceIds: [otherDevice.deviceId], methods: [MXKeyVerificationMethodSAS], success: { [weak self] request in
+            guard let self = self else {
                 return
             }
 
-            sself.transaction = sasTransaction
+            self.request = request
 
-            sself.update(viewState: .loaded)
-            sself.registerTransactionDidStateChangeNotification(transaction: sasTransaction)
+            self.update(viewState: .loaded)
+            self.registerKeyVerificationRequestDidChangeNotification(for: request)
         }, failure: {[weak self]  error in
             self?.update(viewState: .error(error))
         })
     }
 
-    private func cancelTransaction() {
-        guard let transaction = self.transaction  else {
-            return
-        }
-
-        transaction.cancel(with: MXTransactionCancelCode.user())
+    private func cancelRequest() {
+        request?.cancel(with: MXTransactionCancelCode.user(), success: nil)
     }
     
     private func update(viewState: DeviceVerificationStartViewState) {
@@ -98,37 +90,41 @@ final class DeviceVerificationStartViewModel: DeviceVerificationStartViewModelTy
     }
 
 
-    // MARK: - MXKeyVerificationTransactionDidChange
+    // MARK: - MXKeyVerificationRequestDidChange
 
-    private func registerTransactionDidStateChangeNotification(transaction: MXOutgoingSASTransaction) {
-        NotificationCenter.default.addObserver(self, selector: #selector(transactionDidStateChange(notification:)), name: NSNotification.Name.MXKeyVerificationTransactionDidChange, object: transaction)
+    private func registerKeyVerificationRequestDidChangeNotification(for request: MXKeyVerificationRequest) {
+        NotificationCenter.default.addObserver(self, selector: #selector(requestDidStateChange(notification:)), name: .MXKeyVerificationRequestDidChange, object: request)
     }
     
-    private func unregisterTransactionDidStateChangeNotification() {
-        NotificationCenter.default.removeObserver(self, name: .MXKeyVerificationTransactionDidChange, object: nil)
+    private func unregisterKeyVerificationRequestDidChangeNotification() {
+        NotificationCenter.default.removeObserver(self, name: .MXKeyVerificationRequestDidChange, object: nil)
     }
-
-    @objc private func transactionDidStateChange(notification: Notification) {
-        guard let transaction = notification.object as? MXOutgoingSASTransaction else {
+    
+    @objc private func requestDidStateChange(notification: Notification) {
+        guard let request = notification.object as? MXKeyVerificationRequest, request.requestId == self.request?.requestId else {
             return
         }
 
-        switch transaction.state {
-        case MXSASTransactionStateShowSAS:
-            self.unregisterTransactionDidStateChangeNotification()
-            self.coordinatorDelegate?.deviceVerificationStartViewModel(self, didCompleteWithOutgoingTransaction: transaction)
-        case MXSASTransactionStateCancelled:
-            guard let reason = transaction.reasonCancelCode else {
+        switch request.state {
+        case MXKeyVerificationRequestStateAccepted, MXKeyVerificationRequestStateReady:
+            self.unregisterKeyVerificationRequestDidChangeNotification()
+            self.coordinatorDelegate?.deviceVerificationStartViewModel(self, otherDidAcceptRequest: request)
+            
+        case MXKeyVerificationRequestStateCancelled:
+            guard let reason = request.reasonCancelCode else {
                 return
             }
-            self.unregisterTransactionDidStateChangeNotification()
+            self.unregisterKeyVerificationRequestDidChangeNotification()
             self.update(viewState: .cancelled(reason))
-        case MXSASTransactionStateCancelledByMe:
-            guard let reason = transaction.reasonCancelCode else {
+        case MXKeyVerificationRequestStateCancelledByMe:
+            guard let reason = request.reasonCancelCode else {
                 return
             }
-            self.unregisterTransactionDidStateChangeNotification()
+            self.unregisterKeyVerificationRequestDidChangeNotification()
             self.update(viewState: .cancelledByMe(reason))
+        case MXKeyVerificationRequestStateExpired:
+            self.unregisterKeyVerificationRequestDidChangeNotification()
+            self.update(viewState: .error(UserVerificationStartViewModelError.keyVerificationRequestExpired))
         default:
             break
         }

Riot/Modules/KeyVerification/Device/Start/DeviceVerificationStartViewModelType.swift

@@ -25,8 +25,7 @@ protocol DeviceVerificationStartViewModelViewDelegate: AnyObject {
 protocol DeviceVerificationStartViewModelCoordinatorDelegate: AnyObject {
     func deviceVerificationStartViewModelDidUseLegacyVerification(_ viewModel: DeviceVerificationStartViewModelType)
 
-    func deviceVerificationStartViewModel(_ viewModel: DeviceVerificationStartViewModelType, didCompleteWithOutgoingTransaction transaction: MXSASTransaction)
-    func deviceVerificationStartViewModel(_ viewModel: DeviceVerificationStartViewModelType, didTransactionCancelled transaction: MXSASTransaction)
+    func deviceVerificationStartViewModel(_ viewModel: DeviceVerificationStartViewModelType, otherDidAcceptRequest request: MXKeyVerificationRequest)
 
     func deviceVerificationStartViewModelDidCancel(_ viewModel: DeviceVerificationStartViewModelType)
 }