From f2ed385630341449858b4b97abd6c265bdb6097b Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 14 Feb 2019 17:28:29 +0100 Subject: [PATCH] Key recovery: Trust on decrypt Fixed Steve's comments --- ...eyBackupRecoverFromPassphraseViewModel.swift | 13 ++----------- ...yBackupRecoverFromRecoveryKeyViewModel.swift | 17 ++++------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModel.swift b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModel.swift index 92b76e96e..264db3063 100644 --- a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModel.swift +++ b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModel.swift @@ -16,9 +16,6 @@ import Foundation -enum KeyBackupRecoverFromPassphraseViewModelError: Error { -} - final class KeyBackupRecoverFromPassphraseViewModel: KeyBackupRecoverFromPassphraseViewModelType { // MARK: - Properties @@ -88,17 +85,11 @@ final class KeyBackupRecoverFromPassphraseViewModel: KeyBackupRecoverFromPassphr ssself.coordinatorDelegate?.keyBackupRecoverFromPassphraseViewModelDidRecover(ssself) }, failure: { [weak sself] error in - guard let ssself = sself else { - return - } - ssself.update(viewState: .error(error)) + sself?.update(viewState: .error(error)) }) }, failure: { [weak self] error in - guard let sself = self else { - return - } - sself.update(viewState: .error(error)) + self?.update(viewState: .error(error)) }) } diff --git a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModel.swift b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModel.swift index 0bdd512e4..4ad042002 100644 --- a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModel.swift +++ b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModel.swift @@ -16,9 +16,6 @@ import Foundation -enum KeyBackupRecoverFromRecoveryKeyViewModelError: Error { -} - final class KeyBackupRecoverFromRecoveryKeyViewModel: KeyBackupRecoverFromRecoveryKeyViewModelType { // MARK: - Properties @@ -87,18 +84,12 @@ final class KeyBackupRecoverFromRecoveryKeyViewModel: KeyBackupRecoverFromRecove ssself.update(viewState: .loaded) ssself.coordinatorDelegate?.keyBackupRecoverFromRecoveryKeyViewModelDidRecover(ssself) - }, failure: { [weak sself] error in - guard let ssself = sself else { - return - } - ssself.update(viewState: .error(error)) + }, failure: {[weak sself] error in + sself?.update(viewState: .error(error)) }) - }, failure: { [weak self] error in - guard let sself = self else { - return - } - sself.update(viewState: .error(error)) + }, failure: {[weak self] error in + self?.update(viewState: .error(error)) }) }