diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index 0ce59a41b..b0458f718 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -919,7 +919,7 @@ "rerequest_keys_alert_title" = "Request Sent"; "rerequest_keys_alert_message" = "Please launch Riot on another device that can decrypt the message so it can send the keys to this session."; -// MARK: Secure Key backup setup +// MARK: Secure backup setup // Intro @@ -937,6 +937,11 @@ "secure_key_backup_setup_cancel_alert_title" = "Are your sure?"; "secure_key_backup_setup_cancel_alert_message" = "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.\n\nYou can also set up Secure Backup & manage your keys in Settings."; +// Banner + +"secure_backup_setup_banner_title" = "Secure Backup"; +"secure_backup_setup_banner_subtitle" = "Safeguard against losing access to encrypted messages & data"; + // MARK: Key backup setup @@ -1023,20 +1028,6 @@ "key_backup_recover_success_info" = "Backup Restored!"; "key_backup_recover_done_action" = "Done"; -// MARK: Secure backup banners - -// Setup - -"secure_backup_setup_banner_title" = "Secure Backup"; -"secure_backup_setup_banner_subtitle" = "Safeguard against losing access to encrypted messages & data"; - -// MARK: Key backup banners - -// Recover - -"key_backup_recover_banner_title" = "Never lose encrypted messages"; -"key_backup_recover_connent_banner_subtitle" = "Connect this session to Key Backup"; - // MARK: Sign out warning "sign_out_existing_key_backup_alert_title" = "Are you sure you want to sign out?"; diff --git a/Riot/Categories/MXSession+Riot.h b/Riot/Categories/MXSession+Riot.h index 9661620cc..f756a2ede 100644 --- a/Riot/Categories/MXSession+Riot.h +++ b/Riot/Categories/MXSession+Riot.h @@ -46,6 +46,6 @@ /** Indicate YES if secure key backup can be setup */ -- (BOOL)vc_canSetupSecureKeyBackup; +- (BOOL)vc_canSetupSecureBackup; @end diff --git a/Riot/Categories/MXSession+Riot.m b/Riot/Categories/MXSession+Riot.m index 67f50f3a8..eeb03de68 100644 --- a/Riot/Categories/MXSession+Riot.m +++ b/Riot/Categories/MXSession+Riot.m @@ -78,7 +78,7 @@ } } -- (BOOL)vc_canSetupSecureKeyBackup +- (BOOL)vc_canSetupSecureBackup { MXRecoveryService *recoveryService = self.crypto.recoveryService; diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index 812209514..f43fdcea6 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -1306,14 +1306,6 @@ internal enum VectorL10n { internal static var join: String { return VectorL10n.tr("Vector", "join") } - /// Never lose encrypted messages - internal static var keyBackupRecoverBannerTitle: String { - return VectorL10n.tr("Vector", "key_backup_recover_banner_title") - } - /// Connect this session to Key Backup - internal static var keyBackupRecoverConnentBannerSubtitle: String { - return VectorL10n.tr("Vector", "key_backup_recover_connent_banner_subtitle") - } /// Done internal static var keyBackupRecoverDoneAction: String { return VectorL10n.tr("Vector", "key_backup_recover_done_action") diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m index 6105687a5..a31fc3869 100644 --- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m +++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m @@ -183,7 +183,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou { SecureBackupBannerPreferences *secureBackupBannersPreferences = SecureBackupBannerPreferences.shared; - if (!secureBackupBannersPreferences.hideSetupBanner && [self.mxSession vc_canSetupSecureKeyBackup]) + if (!secureBackupBannersPreferences.hideSetupBanner && [self.mxSession vc_canSetupSecureBackup]) { secureBackupBanner = SecureBackupBannerDisplaySetup; } @@ -196,11 +196,11 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou return updated; } -- (void)hideKeyBackupBannerWithDisplay:(SecureBackupBannerDisplay)secureKeyBackupBannerDisplay +- (void)hideKeyBackupBannerWithDisplay:(SecureBackupBannerDisplay)secureBackupBannerDisplay { SecureBackupBannerPreferences *keyBackupBannersPreferences = SecureBackupBannerPreferences.shared; - switch (secureKeyBackupBannerDisplay) { + switch (secureBackupBannerDisplay) { case SecureBackupBannerDisplaySetup: keyBackupBannersPreferences.hideSetupBanner = YES; break; diff --git a/Riot/Modules/Home/HomeViewController.m b/Riot/Modules/Home/HomeViewController.m index d332f8fbd..5cd7c8d5d 100644 --- a/Riot/Modules/Home/HomeViewController.m +++ b/Riot/Modules/Home/HomeViewController.m @@ -677,7 +677,7 @@ [self leaveEditedRoom]; } -#pragma mark - SecureKeyBackupSetupCoordinatorBridgePresenterDelegate +#pragma mark - SecureBackupSetupCoordinatorBridgePresenterDelegate - (void)secureBackupSetupCoordinatorBridgePresenterDelegateDidComplete:(SecureBackupSetupCoordinatorBridgePresenter *)coordinatorBridgePresenter { diff --git a/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift b/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift index 39ee8438d..bdf462b09 100644 --- a/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift +++ b/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift @@ -55,8 +55,8 @@ final class SecureBackupSetupCoordinator: SecureBackupSetupCoordinatorType { // MARK: - Private methods - private func createIntro() -> SecureKeyBackupSetupIntroViewController { - let introViewController = SecureKeyBackupSetupIntroViewController.instantiate() + private func createIntro() -> SecureBackupSetupIntroViewController { + let introViewController = SecureBackupSetupIntroViewController.instantiate() introViewController.delegate = self return introViewController } @@ -122,18 +122,18 @@ final class SecureBackupSetupCoordinator: SecureBackupSetupCoordinatorType { } } -// MARK: - SecureKeyBackupSetupIntroViewControllerDelegate -extension SecureBackupSetupCoordinator: SecureKeyBackupSetupIntroViewControllerDelegate { +// MARK: - SecureBackupSetupIntroViewControllerDelegate +extension SecureBackupSetupCoordinator: SecureBackupSetupIntroViewControllerDelegate { - func secureKeyBackupSetupIntroViewControllerDidTapUseKey(_ secureKeyBackupSetupIntroViewController: SecureKeyBackupSetupIntroViewController) { + func secureBackupSetupIntroViewControllerDidTapUseKey(_ secureBackupSetupIntroViewController: SecureBackupSetupIntroViewController) { self.showSetupKey() } - func secureKeyBackupSetupIntroViewControllerDidTapUsePassphrase(_ secureKeyBackupSetupIntroViewController: SecureKeyBackupSetupIntroViewController) { + func secureBackupSetupIntroViewControllerDidTapUsePassphrase(_ secureBackupSetupIntroViewController: SecureBackupSetupIntroViewController) { self.showSetupPassphrase() } - func secureKeyBackupSetupIntroViewControllerDidCancel(_ secureKeyBackupSetupIntroViewController: SecureKeyBackupSetupIntroViewController) { + func secureBackupSetupIntroViewControllerDidCancel(_ secureBackupSetupIntroViewController: SecureBackupSetupIntroViewController) { self.didCancel() } } diff --git a/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinatorBridgePresenter.swift b/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinatorBridgePresenter.swift index ca6ef2106..9748dbc51 100644 --- a/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinatorBridgePresenter.swift +++ b/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinatorBridgePresenter.swift @@ -20,10 +20,10 @@ import Foundation @objc protocol SecureBackupSetupCoordinatorBridgePresenterDelegate { func secureBackupSetupCoordinatorBridgePresenterDelegateDidComplete(_ coordinatorBridgePresenter: SecureBackupSetupCoordinatorBridgePresenter) - func secureKeyBackupSetupCoordinatorBridgePresenterDelegateDidCancel(_ coordinatorBridgePresenter: SecureBackupSetupCoordinatorBridgePresenter) + func secureBackupSetupCoordinatorBridgePresenterDelegateDidCancel(_ coordinatorBridgePresenter: SecureBackupSetupCoordinatorBridgePresenter) } -/// SecureKeyBackupSetupCoordinatorBridgePresenter enables to start SecureKeyBackupSetupCoordinator from a view controller. +/// SecureBackupSetupCoordinatorBridgePresenter enables to start SecureBackupSetupCoordinator from a view controller. /// This bridge is used while waiting for global usage of coordinator pattern. @objcMembers final class SecureBackupSetupCoordinatorBridgePresenter: NSObject { @@ -54,12 +54,12 @@ final class SecureBackupSetupCoordinatorBridgePresenter: NSObject { // } func present(from viewController: UIViewController, animated: Bool) { - let secureKeyBackupSetupCoordinator = SecureBackupSetupCoordinator(session: self.session) - secureKeyBackupSetupCoordinator.delegate = self - viewController.present(secureKeyBackupSetupCoordinator.toPresentable(), animated: animated, completion: nil) - secureKeyBackupSetupCoordinator.start() + let secureBackupSetupCoordinator = SecureBackupSetupCoordinator(session: self.session) + secureBackupSetupCoordinator.delegate = self + viewController.present(secureBackupSetupCoordinator.toPresentable(), animated: animated, completion: nil) + secureBackupSetupCoordinator.start() - self.coordinator = secureKeyBackupSetupCoordinator + self.coordinator = secureBackupSetupCoordinator } func dismiss(animated: Bool, completion: (() -> Void)?) { @@ -76,13 +76,13 @@ final class SecureBackupSetupCoordinatorBridgePresenter: NSObject { } } -// MARK: - SecureKeyBackupSetupCoordinatorDelegate +// MARK: - SecureBackupSetupCoordinatorDelegate extension SecureBackupSetupCoordinatorBridgePresenter: SecureBackupSetupCoordinatorDelegate { func secureBackupSetupCoordinatorDidComplete(_ coordinator: SecureBackupSetupCoordinatorType) { self.delegate?.secureBackupSetupCoordinatorBridgePresenterDelegateDidComplete(self) } func secureBackupSetupCoordinatorDidCancel(_ coordinator: SecureBackupSetupCoordinatorType) { - self.delegate?.secureKeyBackupSetupCoordinatorBridgePresenterDelegateDidCancel(self) + self.delegate?.secureBackupSetupCoordinatorBridgePresenterDelegateDidCancel(self) } }