Skip to content

Commit dfee18e

Browse files
authored
Rename Sign Out to Remove Device + Update SDK 26.03.18 (#5280)
* update the sdk * updated preview tests # Conflicts: # ElementX/Sources/Screens/Timeline/View/Style/TimelineItemSendInfoLabel.swift # ElementX/Sources/Screens/Timeline/View/TimelineItemViews/LiveLocationRoomTimelineView.swift * update sdk to 26.03.18 + regenerated preview tests after sign out copy change * updated UI tests * pr suggestions
1 parent 860a7de commit dfee18e

File tree

104 files changed

+386
-426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+386
-426
lines changed

ElementX.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,7 @@
19921992
4A2B5274C1D3D2999D643786 /* EncryptionResetPasswordScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionResetPasswordScreenViewModelProtocol.swift; sourceTree = "<group>"; };
19931993
4A5B4CD611DE7E94F5BA87B2 /* AppLockTimerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockTimerTests.swift; sourceTree = "<group>"; };
19941994
4AB29A2D95D3469B5F016655 /* SecureBackupControllerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupControllerMock.swift; sourceTree = "<group>"; };
1995-
4B1F71AC585827E6C416C15A /* AppIcon.icon */ = {isa = PBXFileReference; path = AppIcon.icon; sourceTree = "<group>"; };
1995+
4B1F71AC585827E6C416C15A /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = wrapper.icon; path = AppIcon.icon; sourceTree = "<group>"; };
19961996
4B2B564CA6570E1487A7C7CC /* SpaceRoomListProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceRoomListProxy.swift; sourceTree = "<group>"; };
19971997
4B2D4EEBE8C098BBADD10939 /* SecureBackupKeyBackupScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupKeyBackupScreenCoordinator.swift; sourceTree = "<group>"; };
19981998
4B41FABA2B0AEF4389986495 /* LoginMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginMode.swift; sourceTree = "<group>"; };
@@ -7215,7 +7215,6 @@
72157215
};
72167216
};
72177217
buildConfigurationList = 7AE41FCCF9D1352E2770D1F9 /* Build configuration list for PBXProject "ElementX" */;
7218-
compatibilityVersion = "Xcode 14.0";
72197218
developmentRegion = en;
72207219
hasScannedForEncodings = 0;
72217220
knownRegions = (
@@ -7291,6 +7290,7 @@
72917290
C89CF7729E028671C5DC461E /* XCLocalSwiftPackageReference "compound-ios" */,
72927291
);
72937292
preferredProjectObjectVersion = 77;
7293+
productRefGroup = 681566846AF307E9BA4C72C6 /* Products */;
72947294
projectDirPath = "";
72957295
projectRoot = "";
72967296
targets = (
@@ -9903,7 +9903,7 @@
99039903
repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
99049904
requirement = {
99059905
kind = exactVersion;
9906-
version = 26.03.10;
9906+
version = 26.03.18;
99079907
};
99089908
};
99099909
701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {

ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElementX/Resources/Localizations/en-US.lproj/Localizable.strings

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,15 @@
154154
"action_share_live_location" = "Share live location";
155155
"action_show" = "Show";
156156
"action_sign_in_again" = "Sign in again";
157-
"action_signout" = "Sign out";
158-
"action_signout_anyway" = "Sign out anyway";
157+
"action_signout" = "Remove this device";
158+
"action_signout_anyway" = "Remove this device anyway";
159159
"action_skip" = "Skip";
160160
"action_start" = "Start";
161161
"action_start_chat" = "Start chat";
162162
"action_start_over" = "Start over";
163163
"action_start_verification" = "Start verification";
164164
"action_static_map_load" = "Tap to load map";
165+
"action_stop" = "Stop";
165166
"action_take_photo" = "Take photo";
166167
"action_tap_for_options" = "Tap for options";
167168
"action_translate" = "Translate";
@@ -190,6 +191,7 @@
190191
"common_advanced_settings" = "Advanced settings";
191192
"common_an_image" = "an image";
192193
"common_analytics" = "Analytics";
194+
"common_android_fetching_notifications_title" = "Syncing notifications...";
193195
"common_android_shortcuts_remove_reason_session_logged_out" = "You were logged out of the session";
194196
"common_appearance" = "Appearance";
195197
"common_audio" = "Audio";
@@ -224,6 +226,7 @@
224226
"common_empty_file" = "Empty file";
225227
"common_encryption" = "Encryption";
226228
"common_encryption_enabled" = "Encryption enabled";
229+
"common_ends_in_time_ios" = "Ends %1$@";
227230
"common_enter_your_pin" = "Enter your PIN";
228231
"common_error" = "Error";
229232
"common_everyone" = "Everyone";
@@ -246,6 +249,8 @@
246249
"common_line_copied_to_clipboard" = "Line copied to clipboard";
247250
"common_link_copied_to_clipboard" = "Link copied to clipboard";
248251
"common_link_new_device" = "Link new device";
252+
"common_live_location" = "Live location";
253+
"common_live_location_ended" = "Live location ended";
249254
"common_loading" = "Loading…";
250255
"common_loading_more" = "Loading more…";
251256
"common_message" = "Message";
@@ -319,9 +324,10 @@
319324
"common_settings" = "Settings";
320325
"common_share_space" = "Share space";
321326
"common_shared_history" = "New members see history";
327+
"common_shared_live_location" = "Shared live location";
322328
"common_shared_location" = "Shared location";
323329
"common_shared_space" = "Shared space";
324-
"common_signing_out" = "Signing out";
330+
"common_signing_out" = "Removing device";
325331
"common_something_went_wrong" = "Something went wrong";
326332
"common_something_went_wrong_message" = "We encountered an issue. Please try again.";
327333
"common_space" = "Space";
@@ -366,6 +372,7 @@
366372
"common_voice_message" = "Voice message";
367373
"common_waiting" = "Waiting…";
368374
"common_waiting_for_decryption_key" = "Waiting for this message";
375+
"common_waiting_live_location" = "Waiting for live location…";
369376
"common_world_readable_history" = "Anyone can see history";
370377
"common_you" = "You";
371378
"common_unable_to_decrypt_insecure_device" = "Sent from an insecure device";
@@ -826,7 +833,7 @@
826833
"screen_app_lock_setup_pin_mismatch_dialog_content" = "Please enter the same PIN twice";
827834
"screen_app_lock_setup_pin_mismatch_dialog_title" = "PINs don't match";
828835
"screen_app_lock_signout_alert_message" = "You’ll need to re-login and create a new PIN to proceed";
829-
"screen_app_lock_signout_alert_title" = "You are being signed out";
836+
"screen_app_lock_signout_alert_title" = "This device is being removed";
830837
"screen_blocked_users_empty" = "You have no blocked users";
831838
"screen_blocked_users_unblocking" = "Unblocking…";
832839
"screen_bug_report_attach_screenshot" = "Attach screenshot";
@@ -872,7 +879,7 @@
872879
"screen_chat_backup_recovery_action_change" = "Change recovery key";
873880
"screen_chat_backup_recovery_action_change_description" = "Your chats are automatically backed up with end-to-end encryption. To restore this backup and retain your digital identity when you lose access to all your devices, you will need your recovery key.";
874881
"screen_chat_backup_recovery_action_confirm_description" = "Your key storage is currently out of sync.";
875-
"screen_chat_backup_recovery_action_setup_description" = "Get access to your encrypted messages if you lose all your devices or are signed out of %1$@ everywhere.";
882+
"screen_chat_backup_recovery_action_setup_description" = "Your chats are automatically backed up with end-to-end encryption. To restore this backup and retain your digital identity when you lose access to all your devices, you will need your recovery key.";
876883
"screen_create_new_recovery_key_list_item_1" = "Open %1$@ in a desktop device";
877884
"screen_create_new_recovery_key_list_item_2" = "Sign into your account again";
878885
"screen_create_new_recovery_key_list_item_3" = "When asked to verify your device, select %1$@";
@@ -947,9 +954,9 @@
947954
"screen_join_room_subtitle_no_preview" = "You must be a member of this room to view the message history.";
948955
"screen_join_room_title_knock" = "Want to join this room?";
949956
"screen_join_room_title_no_preview" = "Preview is not available";
950-
"screen_key_backup_disable_confirmation_action_turn_off" = "Turn off";
951-
"screen_key_backup_disable_confirmation_description" = "You will lose your encrypted messages if you are signed out of all devices.";
952-
"screen_key_backup_disable_confirmation_title" = "Are you sure you want to turn off backup?";
957+
"screen_key_backup_disable_confirmation_action_turn_off" = "Delete";
958+
"screen_key_backup_disable_confirmation_description" = "You will lose your encrypted chat history and need to reset your digital identity if you remove all your devices.";
959+
"screen_key_backup_disable_confirmation_title" = "Are you sure you want to delete key storage?";
953960
"screen_key_backup_disable_description" = "Deleting key storage will remove your digital identity and message keys from the server and turn off the following security features:";
954961
"screen_key_backup_disable_description_point_1" = "You will not have encrypted message history on new devices";
955962
"screen_key_backup_disable_description_point_2" = "You will lose access to your encrypted messages if you are signed out of %1$@ everywhere";
@@ -1282,16 +1289,17 @@
12821289
"screen_signed_out_reason_3" = "Your server’s administrator has invalidated your access";
12831290
"screen_signed_out_subtitle" = "You might have been signed out for one of the reasons listed below. Please sign in again to continue using %@.";
12841291
"screen_signed_out_title" = "You’re signed out";
1285-
"screen_signout_confirmation_dialog_content" = "Are you sure you want to sign out?";
1286-
"screen_signout_in_progress_dialog_content" = "Signing out…";
1287-
"screen_signout_key_backup_disabled_subtitle" = "You are about to sign out of your last session. If you sign out now, you will lose access to your encrypted messages.";
1288-
"screen_signout_key_backup_disabled_title" = "You have turned off backup";
1289-
"screen_signout_key_backup_offline_subtitle" = "Your keys were still being backed up when you went offline. Reconnect so that your keys can be backed up before signing out.";
1290-
"screen_signout_key_backup_ongoing_subtitle" = "Please wait for this to complete before signing out.";
1292+
"screen_signout_confirmation_dialog_content" = "Are you sure you want to remove this device?";
1293+
"screen_signout_in_progress_dialog_content" = "Removing device…";
1294+
"screen_signout_key_backup_disabled_subtitle" = "This is your only device. If you remove it you’ll need a recovery key in order to confirm your digital identity and restore your encrypted chats the next time you sign in.";
1295+
"screen_signout_key_backup_disabled_title" = "You’re about to lose access to your encrypted chats";
1296+
"screen_signout_key_backup_offline_subtitle" = "Your keys were still being backed up when you went offline. Reconnect so that your keys can be backed up before you remove this device.";
1297+
"screen_signout_key_backup_ongoing_subtitle" = "Please wait for this to complete before removing this device.";
12911298
"screen_signout_key_backup_ongoing_title" = "Your keys are still being backed up";
1292-
"screen_signout_recovery_disabled_subtitle" = "You are about to sign out of your last session. If you sign out now, you'll lose access to your encrypted messages.";
1293-
"screen_signout_recovery_disabled_title" = "Recovery not set up";
1294-
"screen_signout_save_recovery_key_subtitle" = "You are about to sign out of your last session. If you sign out now, you might lose access to your encrypted messages.";
1299+
"screen_signout_recovery_disabled_subtitle" = "This is your only device. If you remove it you’ll need a recovery key in order to confirm your digital identity and restore your encrypted chats the next time you sign in.";
1300+
"screen_signout_recovery_disabled_title" = "You’re about to lose access to your encrypted chats";
1301+
"screen_signout_save_recovery_key_subtitle" = "This is your only device. If you remove it you’ll need a recovery key in order to confirm your digital identity and restore your encrypted chats the next time you sign in.";
1302+
"screen_signout_save_recovery_key_title" = "Make sure you have access to your recovery key before removing this device";
12951303
"screen_start_chat_error_starting_chat" = "An error occurred when trying to start a chat";
12961304
"screen_view_location_title" = "Location";
12971305
"session_verification_banner_message" = "Looks like you’re using a new device. Verify with another device to access your encrypted messages.";
@@ -1551,11 +1559,10 @@
15511559
"screen_session_verification_request_success_subtitle" = "Now you can read or send messages securely on your other device.";
15521560
"screen_session_verification_request_success_title" = "Device verified";
15531561
"screen_session_verification_waiting_other_device_title" = "Start verification on the other device";
1554-
"screen_signout_confirmation_dialog_submit" = "Sign out";
1555-
"screen_signout_confirmation_dialog_title" = "Sign out";
1562+
"screen_signout_confirmation_dialog_submit" = "Remove this device";
1563+
"screen_signout_confirmation_dialog_title" = "Remove this device";
15561564
"screen_signout_key_backup_offline_title" = "Your keys are still being backed up";
1557-
"screen_signout_preference_item" = "Sign out";
1558-
"screen_signout_save_recovery_key_title" = "Have you saved your recovery key?";
1565+
"screen_signout_preference_item" = "Remove this device";
15591566
"timeline_decryption_failure_historical_event_user_not_joined" = "You don't have access to this message";
15601567
"troubleshoot_notifications_test_blocked_users_title" = "Blocked users";
15611568
"troubleshoot_notifications_entry_point_push_history_title" = "Push history";

0 commit comments

Comments
 (0)