diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index 24b07b68a..ddd76f9b7 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -1548,9 +1548,8 @@ Tap the + to start adding people."; "key_verification_self_verify_current_session_alert_validate_action" = "Verify"; // Unverified sessions - -"key_verification_self_verify_unverified_sessions_alert_title" = "Review where you're logged in"; -"key_verification_self_verify_unverified_sessions_alert_message" = "Verify all your sessions to ensure your account & messages are safe."; +"key_verification_alert_title" = "You have unverified sessions"; +"key_verification_alert_body" = "Review to ensure your account is safe."; "key_verification_self_verify_unverified_sessions_alert_validate_action" = "Review"; // MARK: Self verification wait diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index 00519d061..eca6e67b4 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -2923,6 +2923,14 @@ public class VectorL10n: NSObject { public static var keyBackupSetupTitle: String { return VectorL10n.tr("Vector", "key_backup_setup_title") } + /// Review to ensure your account is safe. + public static var keyVerificationAlertBody: String { + return VectorL10n.tr("Vector", "key_verification_alert_body") + } + /// You have unverified sessions + public static var keyVerificationAlertTitle: String { + return VectorL10n.tr("Vector", "key_verification_alert_title") + } /// You need to bootstrap cross-signing first. public static var keyVerificationBootstrapNotSetupMessage: String { return VectorL10n.tr("Vector", "key_verification_bootstrap_not_setup_message") @@ -3007,14 +3015,6 @@ public class VectorL10n: NSObject { public static var keyVerificationSelfVerifyCurrentSessionAlertValidateAction: String { return VectorL10n.tr("Vector", "key_verification_self_verify_current_session_alert_validate_action") } - /// Verify all your sessions to ensure your account & messages are safe. - public static var keyVerificationSelfVerifyUnverifiedSessionsAlertMessage: String { - return VectorL10n.tr("Vector", "key_verification_self_verify_unverified_sessions_alert_message") - } - /// Review where you're logged in - public static var keyVerificationSelfVerifyUnverifiedSessionsAlertTitle: String { - return VectorL10n.tr("Vector", "key_verification_self_verify_unverified_sessions_alert_title") - } /// Review public static var keyVerificationSelfVerifyUnverifiedSessionsAlertValidateAction: String { return VectorL10n.tr("Vector", "key_verification_self_verify_unverified_sessions_alert_validate_action") diff --git a/Riot/Modules/Home/AllChats/AllChatsViewController.swift b/Riot/Modules/Home/AllChats/AllChatsViewController.swift index de7504084..a8e4e39cb 100644 --- a/Riot/Modules/Home/AllChats/AllChatsViewController.swift +++ b/Riot/Modules/Home/AllChats/AllChatsViewController.swift @@ -997,8 +997,8 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol { currentAlert?.dismiss(animated: true, completion: nil) - let alert = UIAlertController(title: VectorL10n.keyVerificationSelfVerifyUnverifiedSessionsAlertTitle, - message: VectorL10n.keyVerificationSelfVerifyUnverifiedSessionsAlertMessage, + let alert = UIAlertController(title: VectorL10n.keyVerificationAlertTitle, + message: VectorL10n.keyVerificationAlertBody, preferredStyle: .alert) alert.addAction(UIAlertAction(title: VectorL10n.keyVerificationSelfVerifyUnverifiedSessionsAlertValidateAction, diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index bf949d27b..c58f663e1 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -6760,8 +6760,8 @@ static CGSize kThreadListBarButtonItemImageSize; [currentAlert dismissViewControllerAnimated:NO completion:nil]; - UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertTitle] - message:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertMessage] + UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n keyVerificationAlertTitle] + message:[VectorL10n keyVerificationAlertBody] preferredStyle:UIAlertControllerStyleAlert]; [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertValidateAction] diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m index 4bdab4abd..0c1f67e5d 100644 --- a/Riot/Modules/TabBar/MasterTabBarController.m +++ b/Riot/Modules/TabBar/MasterTabBarController.m @@ -934,8 +934,8 @@ [currentAlert dismissViewControllerAnimated:NO completion:nil]; - UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertTitle] - message:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertMessage] + UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n keyVerificationAlertTitle] + message:[VectorL10n keyVerificationAlertBody] preferredStyle:UIAlertControllerStyleAlert]; [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertValidateAction]