merged element 1.8.10

This commit is contained in:
Arnfried Griesert
2022-05-03 12:48:01 +02:00
1235 changed files with 50869 additions and 23132 deletions
@@ -118,7 +118,7 @@ final class UserVerificationCoordinator: NSObject, UserVerificationCoordinatorTy
private func presentDeviceVerification(for deviceId: String) {
let keyVerificationCoordinator = KeyVerificationCoordinator(session: self.session, flow: .verifyDevice(userId: self.userId, deviceId: deviceId), navigationRouter: self.navigationRouter)
let keyVerificationCoordinator = KeyVerificationCoordinator(session: self.session, flow: .verifyDevice(userId: self.userId, deviceId: deviceId), navigationRouter: self.navigationRouter, cancellable: true)
keyVerificationCoordinator.delegate = self
keyVerificationCoordinator.start()
@@ -134,7 +134,7 @@ final class UserVerificationCoordinator: NSObject, UserVerificationCoordinatorTy
message: VectorL10n.keyVerificationBootstrapNotSetupMessage,
preferredStyle: .alert)
let cancelAction = UIAlertAction(title: MatrixKitL10n.ok, style: .cancel)
let cancelAction = UIAlertAction(title: VectorL10n.ok, style: .cancel)
alert.addAction(cancelAction)
self.presenter.toPresentable().present(alert, animated: true, completion: nil)