MESSENGER-2762 Initial Merge

Riot/Modules/Secrets/Setup/RecoveryPassphrase/SecretsSetupRecoveryPassphraseViewController.swift

@@ -2,6 +2,7 @@
 // $ createScreen.sh Test SecretsSetupRecoveryPassphrase
 /*
  Copyright 2020 New Vector Ltd
+ Copyright (c) 2021 BWI GmbH
  
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -18,7 +19,7 @@
 
 import UIKit
 
-final class SecretsSetupRecoveryPassphraseViewController: UIViewController {
+final class SecretsSetupRecoveryPassphraseViewController: UIViewController, UITextFieldDelegate {
     
     // MARK: - Constants
     
@@ -82,6 +83,7 @@ final class SecretsSetupRecoveryPassphraseViewController: UIViewController {
         self.keyboardAvoider = KeyboardAvoider(scrollViewContainerView: self.view, scrollView: self.scrollView)
         self.activityPresenter = ActivityIndicatorPresenter()
         self.errorPresenter = MXKErrorAlertPresentation()
+        self.passphraseTextField.delegate = self
         
         self.registerThemeServiceDidChangeThemeNotification()
         self.update(theme: self.theme)
@@ -119,12 +121,16 @@ final class SecretsSetupRecoveryPassphraseViewController: UIViewController {
     // MARK: - Private
     
     private func setupViews() {
-        let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
-            self?.cancelButtonAction()
+        if let session = AppDelegate.theDelegate().mxSessions.first as? MXSession {
+            if !session.homeserverWellknown.backupRequired() {
+                let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
+                    self?.cancelButtonAction()
+                }
+                
+                self.navigationItem.rightBarButtonItem = cancelBarButtonItem
+            }
         }
-        
-        self.navigationItem.rightBarButtonItem = cancelBarButtonItem
-        
+                        
         self.vc_removeBackTitle()
         
         self.title = VectorL10n.secretsSetupRecoveryPassphraseTitle
@@ -165,16 +171,17 @@ final class SecretsSetupRecoveryPassphraseViewController: UIViewController {
             
         if let viewData = self.currentViewData, case .confimPassphrase = viewData.mode {
             passphraseTitle = VectorL10n.secretsSetupRecoveryPassphraseConfirmPassphrasePlaceholder
+            self.additionalInformationLabel.isHidden = true
         } else {
             passphraseTitle = VectorL10n.keyBackupSetupPassphrasePassphrasePlaceholder
+            self.additionalInformationLabel.isHidden = false
         }
-        
+
         self.passphraseTextField.attributedPlaceholder = NSAttributedString(string: passphraseTitle,
                                                                             attributes: [.foregroundColor: theme.placeholderTextColor])
         self.passphraseVisibilityButton.tintColor = theme.tintColor
         
         self.additionalInformationLabel.textColor = theme.textSecondaryColor
-
         self.validateButton.update(theme: theme)
     }
     
@@ -312,6 +319,13 @@ final class SecretsSetupRecoveryPassphraseViewController: UIViewController {
     private func cancelButtonAction() {
         self.viewModel.process(viewAction: .cancel)
     }
+    
+    
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        self.passphraseTextField.resignFirstResponder()
+        self.viewModel.process(viewAction: .validate)
+        return true
+    }
 }
 
 // MARK: - SecretsSetupRecoveryPassphraseViewModelViewDelegate