User verification: Update device verification flow to support device or user verification.

Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyCoordinator.swift

@@ -38,10 +38,10 @@ final class DeviceVerificationVerifyCoordinator: DeviceVerificationVerifyCoordin
     
     // MARK: - Setup
     
-    init(session: MXSession, transaction: MXSASTransaction) {
+    init(session: MXSession, transaction: MXSASTransaction, verificationKind: KeyVerificationKind) {
         self.session = session
         
-        let deviceVerificationVerifyViewModel = DeviceVerificationVerifyViewModel(session: self.session, transaction: transaction)
+        let deviceVerificationVerifyViewModel = DeviceVerificationVerifyViewModel(session: self.session, transaction: transaction, verificationKind: verificationKind)
         let deviceVerificationVerifyViewController = DeviceVerificationVerifyViewController.instantiate(with: deviceVerificationVerifyViewModel)
         self.deviceVerificationVerifyViewModel = deviceVerificationVerifyViewModel
         self.deviceVerificationVerifyViewController = deviceVerificationVerifyViewController

Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift

@@ -59,7 +59,6 @@ final class DeviceVerificationVerifyViewController: UIViewController {
         
         // Do any additional setup after loading the view.
         
-        self.title = VectorL10n.deviceVerificationTitle
         self.vc_removeBackTitle()
         
         self.setupViews()
@@ -123,16 +122,33 @@ final class DeviceVerificationVerifyViewController: UIViewController {
         
         self.scrollView.keyboardDismissMode = .interactive
 
-        if viewModel.emojis != nil {
+        let isVerificationByEmoji = viewModel.emojis != nil
+        
+        if isVerificationByEmoji {
             self.decimalLabel.isHidden = true
-            self.titleLabel.text = VectorL10n.deviceVerificationVerifyTitleEmoji
         } else {
             self.emojisCollectionView.isHidden = true
-            self.titleLabel.text = VectorL10n.deviceVerificationVerifyTitleNumber
             self.decimalLabel.text = self.viewModel.decimal
         }
+        
+        let title: String
+        let instructionText: String
+        let adviceText: String
+        
+        switch viewModel.verificationKind {
+        case .device:
+            title = VectorL10n.deviceVerificationTitle
+            instructionText = isVerificationByEmoji ? VectorL10n.deviceVerificationVerifyTitleEmoji : VectorL10n.deviceVerificationVerifyTitleNumber
+            adviceText = VectorL10n.deviceVerificationSecurityAdvice
+        case .user:
+            title = "Verify user"
+            instructionText = isVerificationByEmoji ? "Verify this user by confirming the following unique emoji appears on their screen, in the same order." : "Verify this user by confirming the following numbers appear on their screen, in the same order."
+            adviceText = VectorL10n.deviceVerificationSecurityAdvice
+        }
 
-        self.informationLabel.text = VectorL10n.deviceVerificationSecurityAdvice
+        self.title = title
+        self.titleLabel.text = instructionText
+        self.informationLabel.text = adviceText
         self.waitingPartnerLabel.text = VectorL10n.deviceVerificationVerifyWaitPartner
 
         self.waitingPartnerLabel.isHidden = true
@@ -223,10 +239,8 @@ extension DeviceVerificationVerifyViewController: UICollectionViewDataSource {
     }
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-
-        guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "VerifyEmojiCollectionViewCell", for: indexPath) as? VerifyEmojiCollectionViewCell else {
-            return UICollectionViewCell()
-        }
+        
+        let cell = collectionView.dequeueReusableCell(for: indexPath, cellType: VerifyEmojiCollectionViewCell.self)
 
         guard let emoji = self.viewModel.emojis?[indexPath.row] else {
             return UICollectionViewCell()

Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewModel.swift

@@ -31,16 +31,19 @@ final class DeviceVerificationVerifyViewModel: DeviceVerificationVerifyViewModel
 
     weak var viewDelegate: DeviceVerificationVerifyViewModelViewDelegate?
     weak var coordinatorDelegate: DeviceVerificationVerifyViewModelCoordinatorDelegate?
-    var emojis: [MXEmojiRepresentation]?
-    var decimal: String?
+    
+    let emojis: [MXEmojiRepresentation]?
+    let decimal: String?
+    let verificationKind: KeyVerificationKind
 
     // MARK: - Setup
     
-    init(session: MXSession, transaction: MXSASTransaction) {
+    init(session: MXSession, transaction: MXSASTransaction, verificationKind: KeyVerificationKind) {
         self.session = session
         self.transaction = transaction
         self.emojis = self.transaction.sasEmoji
         self.decimal = self.transaction.sasDecimal
+        self.verificationKind = verificationKind
     }
     
     deinit {

Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewModelType.swift

@@ -35,6 +35,7 @@ protocol DeviceVerificationVerifyViewModelType {
     
     func process(viewAction: DeviceVerificationVerifyViewAction)
 
-    var emojis: [MXEmojiRepresentation]? { get set }
-    var decimal: String? { get set }
+    var emojis: [MXEmojiRepresentation]? { get }
+    var decimal: String? { get }
+    var verificationKind: KeyVerificationKind { get }
 }

Riot/Modules/DeviceVerification/Verify/Views/VerifyEmojiCollectionViewCell.swift

@@ -15,8 +15,9 @@
  */
 
 import UIKit
+import Reusable
 
-class VerifyEmojiCollectionViewCell: UICollectionViewCell, Themable {
+class VerifyEmojiCollectionViewCell: UICollectionViewCell, Reusable, Themable {
     @IBOutlet weak var emoji: UILabel!
     @IBOutlet weak var name: UILabel!