From 6285b3c1b991fd2619e1f388777f12ccc8b76285 Mon Sep 17 00:00:00 2001 From: Arnfried Griesert Date: Wed, 11 Jan 2023 13:11:20 +0000 Subject: [PATCH] MESSENGER-3418 text changes chrosssigning --- Config/BWIBuildSettings.swift | 2 +- Podfile.lock | 43 +++++++++++++------ Riot/Assets/de.lproj/Bwi.strings | 20 ++++++--- Riot/Assets/en.lproj/Bwi.strings | 16 ++++++- Riot/Modules/Application/LegacyAppDelegate.m | 6 +-- ...erificationDataLoadingViewController.swift | 2 +- ...nScanConfirmationViewController.storyboard | 35 +++++++-------- ...cationScanConfirmationViewController.swift | 2 +- ...erificationVerifyBySASViewController.swift | 4 +- ...cationVerifyByScanningViewController.swift | 10 ++--- ...ceVerificationIncomingViewController.swift | 2 +- ...icationSelfVerifyStartViewController.swift | 2 +- ...ionSelfVerifyWaitViewController.storyboard | 40 +++++++++++------ ...ficationSelfVerifyWaitViewController.swift | 6 +-- ...eviceVerificationStartViewController.swift | 2 +- .../UserVerificationStartViewController.swift | 2 +- .../Security/SecurityViewController.m | 17 ++++---- 17 files changed, 126 insertions(+), 85 deletions(-) diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift index c373570bd..bc03c4dd4 100644 --- a/Config/BWIBuildSettings.swift +++ b/Config/BWIBuildSettings.swift @@ -403,7 +403,7 @@ class BWIBuildSettings: NSObject { var authScreenShowSocialLoginSection = false // MARK: - Cross-signing (bwi=true) - var disableSelfUserVerification = true + var disableSelfUserVerification = false // MARK: - Antivirus scan (bwi=true) diff --git a/Podfile.lock b/Podfile.lock index 5244de7b2..8b16f0e83 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -38,6 +38,7 @@ PODS: - DTFoundation/Core - DTFoundation/UIKit (1.7.18): - DTFoundation/Core + - DTTJailbreakDetection (0.4.0) - FLEX (4.5.0) - FlowCommoniOS (1.12.2) - GBDeviceInfo (7.1.0): @@ -55,9 +56,12 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) - - MatrixSDK (0.24.5): - - MatrixSDK/Core (= 0.24.5) - - MatrixSDK/Core (0.24.5): + - MatomoTracker (7.4.1): + - MatomoTracker/Core (= 7.4.1) + - MatomoTracker/Core (7.4.1) + - MatrixSDK (0.24.6): + - MatrixSDK/Core (= 0.24.6) + - MatrixSDK/Core (0.24.6): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) @@ -65,12 +69,12 @@ PODS: - OLMKit (~> 3.2.5) - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/CryptoSDK (0.24.5): - - MatrixSDKCrypto (= 0.1.5) - - MatrixSDK/JingleCallStack (0.24.5): + - MatrixSDK/CryptoSDK (0.24.6): + - MatrixSDKCrypto (= 0.1.6) + - MatrixSDK/JingleCallStack (0.24.6): - JitsiMeetSDK (= 5.0.2) - MatrixSDK/Core - - MatrixSDKCrypto (0.1.5) + - MatrixSDKCrypto (0.1.6) - OLMKit (3.2.12): - OLMKit/olmc (= 3.2.12) - OLMKit/olmcpp (= 3.2.12) @@ -115,6 +119,7 @@ DEPENDENCIES: - DSBottomSheet (~> 0.3) - DSWaveformImage (~> 6.1.1) - DTCoreText (~> 1.6.25) + - DTTJailbreakDetection (~> 0.4.0) - FLEX (~> 4.5.0) - FlowCommoniOS (~> 1.12.0) - GBDeviceInfo (~> 7.1.0) @@ -122,8 +127,9 @@ DEPENDENCIES: - KeychainAccess (~> 4.2.2) - KTCenterFlowLayout (~> 1.3.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.24.5) - - MatrixSDK/JingleCallStack (= 0.24.5) + - MatomoTracker (~> 7.4.1) + - MatrixSDK (from `https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk`, tag `v0.24.6_bwi_beta`) + - MatrixSDK/JingleCallStack (from `https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk`, tag `v0.24.6_bwi_beta`) - OLMKit - PostHog (~> 1.4.4) - ReadMoreTextView (~> 3.0.1) @@ -152,6 +158,7 @@ SPEC REPOS: - DSWaveformImage - DTCoreText - DTFoundation + - DTTJailbreakDetection - FLEX - FlowCommoniOS - GBDeviceInfo @@ -165,7 +172,7 @@ SPEC REPOS: - libPhoneNumber-iOS - LoggerAPI - Logging - - MatrixSDK + - MatomoTracker - MatrixSDKCrypto - OLMKit - PostHog @@ -190,11 +197,17 @@ EXTERNAL SOURCES: AnalyticsEvents: :branch: release/swift :git: https://github.com/matrix-org/matrix-analytics-events.git + MatrixSDK: + :git: https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk + :tag: v0.24.6_bwi_beta CHECKOUT OPTIONS: AnalyticsEvents: :commit: 53ad46ba1ea1ee8f21139dda3c351890846a202f :git: https://github.com/matrix-org/matrix-analytics-events.git + MatrixSDK: + :git: https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk + :tag: v0.24.6_bwi_beta SPEC CHECKSUMS: AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce @@ -207,6 +220,7 @@ SPEC CHECKSUMS: DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536 + DTTJailbreakDetection: 5e356c5badc17995f65a83ed9483f787a0057b71 FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2 GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376 @@ -220,8 +234,9 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b - MatrixSDK: 1557b3ed0a211db43a865cfdad93f07c2be92c9e - MatrixSDKCrypto: dcab554bc7157cad31c01fc1137cf5acb01959a4 + MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb + MatrixSDK: 2bd63890d709683741452de2f215cfcda840fe64 + MatrixSDKCrypto: b9e9bced53510f063bb203ccbec919f08d8f2641 OLMKit: da115f16582e47626616874e20f7bb92222c7a51 PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d @@ -241,6 +256,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: c93b326deaf9de3916d42a49d39d737612ab1d94 +PODFILE CHECKSUM: 2046a454e97a09b21239c91eeeabb97af1089baf -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 diff --git a/Riot/Assets/de.lproj/Bwi.strings b/Riot/Assets/de.lproj/Bwi.strings index 05f4b6fec..3c2c628ca 100644 --- a/Riot/Assets/de.lproj/Bwi.strings +++ b/Riot/Assets/de.lproj/Bwi.strings @@ -263,15 +263,17 @@ "device_verification_verified_got_it_button" = "Fertig"; "device_verification_verified_title" = "Geschafft!"; +"device_verification_cancelled" = "Verifizierung abgebrochen. Du kannst sie erneut starten."; "image_picker_action_remove_photo" = "Foto entfernen"; "room_participants_security_information_room_not_encrypted_for_dm" = "Die Nachrichten hier sind nicht Ende-zu-Ende verschlüsselt."; "room_participants_security_information_room_encrypted" = "Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt.\n\nDeine Nachrichten sind mit digitalen Schlüsseln gesichert, nur du und der/die Empfänger!n haben die einzigen Schlüssel, um jene zu entschlüsseln."; "security_settings_crypto_sessions_description" = "Vertraue Sitzungen, um Zugriff auf Ende-zu-Ende verschlüsselte Nachrichten zu gewähren. Wenn du eine Sitzung nicht kennst, ändere dein Passwort und setze dein Nachrichtenpasswort für die Nachrichtensicherung zurück."; "room_participants_security_information_room_encrypted_for_dm" = "Nachrichten hier sind Ende-zu-Ende verschlüsselt.\n\nDeine Nachrichten sind mit digitalen Schlüsseln gesichert, nur du und der/die Empfänger!n haben die einzigen Schlüssel, um jene zu entsperren."; "room_widget_permission_avatar_url_permission" = "Deine Profilbild-URL"; -"device_verification_self_verify_wait_title" = "Verifiziere dieses Gerät"; -"device_verification_self_verify_wait_information" = "Verfiziere dieses Gerät von einer Deiner anderen Sitzungen, um Zugriff auf die verschlüsselten Nachrichten zu erhalten."; -"device_verification_self_verify_wait_information_more" = "Benutze die neuste Messenger-Sitzung auf deinem anderen Gerät:"; +"device_verification_self_verify_wait_title" = "Diese Anmeldung verifizieren"; +"device_verification_self_verify_wait_information" = "Verifiziere diese Anmeldung mit einem Gerät, auf dem du bereits angemeldet bist, um Zugriff auf die verschlüsselten Nachrichten zu erhalten."; +"device_verification_self_verify_wait_information_more" = ""; +"device_verification_self_verify_alert_message" = "Bestätige die neue Anmeldung auf Deinem Gerät: %@"; "client_desktop_name" = "BundesMessenger Desktop"; "client_web_name" = "BundesMessenger Web"; @@ -289,12 +291,16 @@ "secure_key_backup_setup_intro_info" = "Damit du deine Nachrichten bei einem erneuten Login auf diesem Gerät entschlüsseln kannst, richte einen Wiederherstellungsschlüssel ein."; "secure_key_backup_setup_intro_use_security_passphrase_title" = "Wiederherstellungsschlüssel"; "secure_key_backup_setup_intro_use_security_passphrase_info" = "Nutze deinen Wiederherstellungsschlüssel, um alle deine Nachrichten zu entschlüsseln."; -"key_verification_this_session_title" = "Wiederherstellungsschlüssel"; -"device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Verschlüsselungskennwort verwenden"; -"device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Verschlüsselungskennwort verwenden"; -"device_verification_self_verify_wait_recover_secrets_additional_information" = "Nutze Dein Wiederherstellungsschlüssel um alle Deine Nachrichten zu entschlüsseln"; +"key_verification_verify_qr_code_title" = "Diese Anmeldung verifizieren"; +"key_verification_verify_qr_code_information_other_device" = "Scanne den Code mit einem anderen Gerät oder umgekehrt."; +"key_verification_verify_qr_code_cannot_scan_action" = "Stattdessen mit Emojis vergleichen"; +"key_verification_this_session_title" = "Diese Anmeldung verifizieren"; +"device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Alternative Wiederherstellung"; +"device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Alternative Wiederherstellung"; +"device_verification_self_verify_wait_recover_secrets_additional_information" = "Nutze Deinen Wiederherstellungsschlüssel, um alle Deine Nachrichten zu entschlüsseln."; "key_verification_verified_new_session_information" = "Du kannst nun sichere Nachrichten auf deinem neuen Gerät lesen. Andere Benutzer wissen, dass sie es vertrauen können."; "key_verification_verified_this_session_information" = "Deine Chats wurden erfolgreich wiederhergestellt."; +"key_verification_tile_request_alert_title" = "Verifizierung angefragt"; // MARK: - Secrets Recovery diff --git a/Riot/Assets/en.lproj/Bwi.strings b/Riot/Assets/en.lproj/Bwi.strings index 3be69cd9b..e414192fa 100644 --- a/Riot/Assets/en.lproj/Bwi.strings +++ b/Riot/Assets/en.lproj/Bwi.strings @@ -184,11 +184,23 @@ // MARK: - Device Verification -"key_verification_this_session_title" = "Recovery Key"; -"device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Use recovery key"; +"key_verification_verify_qr_code_title" = "Verify this session"; +"key_verification_this_session_title" = "Verify this session"; +"device_verification_self_verify_wait_title" = "Verify this session"; +"device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Other recovery method"; +"device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Other recovery method"; +"device_verification_self_verify_wait_recover_secrets_additional_information" = "Use your recovery key to decrypt all your messages."; +"device_verification_self_verify_wait_information" = "Verify your login with a device you are already logged in with to access your encrypted messages."; +"device_verification_self_verify_wait_information_more" = ""; + "device_verification_verified_title" = "Completed!"; "device_verification_verified_got_it_button" = "Finish"; +"device_verification_cancelled" = "Verification process cancelled. You can restart it again."; +"device_verification_self_verify_alert_message" = "Confirm new login on your device: %@"; "key_verification_verified_this_session_information" = "Your chats have been successfully decrypted."; +"key_verification_verify_qr_code_information_other_device" = "Scan code either with this device or another."; +"key_verification_verify_qr_code_cannot_scan_action" = "Compare with emojis instead"; +"key_verification_tile_request_alert_title" = "Verification requested"; // MARK: - Secrets Recovery diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m index 38d76b15c..958165428 100644 --- a/Riot/Modules/Application/LegacyAppDelegate.m +++ b/Riot/Modules/Application/LegacyAppDelegate.m @@ -4124,7 +4124,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni if (senderName) { - senderInfo = [NSString stringWithFormat:@"%@ (%@)", senderName, senderId]; + senderInfo = [NSString stringWithFormat:@"%@", senderName]; // bwi: show only the name } else { @@ -4141,7 +4141,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni } }; - UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[VectorL10n keyVerificationTileRequestIncomingTitle] + UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[BWIL10n keyVerificationTileRequestAlertTitle] message:senderInfo preferredStyle:UIAlertControllerStyleAlert]; @@ -4253,7 +4253,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni deviceInfo = device.deviceId; } - NSString *alertMessage = [VectorL10n deviceVerificationSelfVerifyAlertMessage:deviceInfo]; + NSString *alertMessage = [BWIL10n deviceVerificationSelfVerifyAlertMessage:deviceInfo]; UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n deviceVerificationSelfVerifyAlertTitle] message:alertMessage diff --git a/Riot/Modules/KeyVerification/Common/Loading/KeyVerificationDataLoadingViewController.swift b/Riot/Modules/KeyVerification/Common/Loading/KeyVerificationDataLoadingViewController.swift index 2536cd1f4..d9e80c154 100644 --- a/Riot/Modules/KeyVerification/Common/Loading/KeyVerificationDataLoadingViewController.swift +++ b/Riot/Modules/KeyVerification/Common/Loading/KeyVerificationDataLoadingViewController.swift @@ -133,7 +133,7 @@ final class KeyVerificationDataLoadingViewController: UIViewController { switch error { case KeyVerificationDataLoadingViewModelError.transactionCancelled: - message = VectorL10n.deviceVerificationCancelled + message = BWIL10n.deviceVerificationCancelled case KeyVerificationDataLoadingViewModelError.transactionCancelledByMe(reason: let reason): if reason.value != MXTransactionCancelCode.user().value { message = VectorL10n.deviceVerificationCancelledByMe(reason.humanReadable) diff --git a/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard b/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard index b6b9edafa..def928604 100644 --- a/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard +++ b/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard @@ -1,11 +1,9 @@ - - - - + + - + @@ -13,7 +11,7 @@ - + @@ -33,18 +31,18 @@ - + - - + + - +