diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index ff0f1edbc..04982b222 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -1992,7 +1992,7 @@ 4A2B5274C1D3D2999D643786 /* EncryptionResetPasswordScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionResetPasswordScreenViewModelProtocol.swift; sourceTree = ""; }; 4A5B4CD611DE7E94F5BA87B2 /* AppLockTimerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockTimerTests.swift; sourceTree = ""; }; 4AB29A2D95D3469B5F016655 /* SecureBackupControllerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupControllerMock.swift; sourceTree = ""; }; - 4B1F71AC585827E6C416C15A /* AppIcon.icon */ = {isa = PBXFileReference; path = AppIcon.icon; sourceTree = ""; }; + 4B1F71AC585827E6C416C15A /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = wrapper.icon; path = AppIcon.icon; sourceTree = ""; }; 4B2B564CA6570E1487A7C7CC /* SpaceRoomListProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceRoomListProxy.swift; sourceTree = ""; }; 4B2D4EEBE8C098BBADD10939 /* SecureBackupKeyBackupScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupKeyBackupScreenCoordinator.swift; sourceTree = ""; }; 4B41FABA2B0AEF4389986495 /* LoginMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginMode.swift; sourceTree = ""; }; @@ -7215,7 +7215,6 @@ }; }; buildConfigurationList = 7AE41FCCF9D1352E2770D1F9 /* Build configuration list for PBXProject "ElementX" */; - compatibilityVersion = "Xcode 14.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -7291,6 +7290,7 @@ C89CF7729E028671C5DC461E /* XCLocalSwiftPackageReference "compound-ios" */, ); preferredProjectObjectVersion = 77; + productRefGroup = 681566846AF307E9BA4C72C6 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( @@ -9903,7 +9903,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 26.03.10; + version = 26.03.18; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index bbad0bf29..fe34c28df 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "90ff17a924d5f3b110bd4a178ebe9a8ab0500930275f80318a65e0110bec8b29", + "originHash" : "55c4668e5e1412e51f88dd423b2448d5da169f348da89c24f6fcdad0b0704c6e", "pins" : [ { "identity" : "compound-design-tokens", @@ -159,8 +159,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "5f6444d7c6c90d35fe3cef44167944b414187436", - "version" : "26.3.10" + "revision" : "4d92f5cbf8982302bac652cb6ce65e19da21e540", + "version" : "26.3.18" } }, { diff --git a/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings b/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings index 0fd121c0e..b1023cc18 100644 --- a/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings @@ -154,14 +154,15 @@ "action_share_live_location" = "Share live location"; "action_show" = "Show"; "action_sign_in_again" = "Sign in again"; -"action_signout" = "Sign out"; -"action_signout_anyway" = "Sign out anyway"; +"action_signout" = "Remove this device"; +"action_signout_anyway" = "Remove this device anyway"; "action_skip" = "Skip"; "action_start" = "Start"; "action_start_chat" = "Start chat"; "action_start_over" = "Start over"; "action_start_verification" = "Start verification"; "action_static_map_load" = "Tap to load map"; +"action_stop" = "Stop"; "action_take_photo" = "Take photo"; "action_tap_for_options" = "Tap for options"; "action_translate" = "Translate"; @@ -190,6 +191,7 @@ "common_advanced_settings" = "Advanced settings"; "common_an_image" = "an image"; "common_analytics" = "Analytics"; +"common_android_fetching_notifications_title" = "Syncing notifications..."; "common_android_shortcuts_remove_reason_session_logged_out" = "You were logged out of the session"; "common_appearance" = "Appearance"; "common_audio" = "Audio"; @@ -224,6 +226,7 @@ "common_empty_file" = "Empty file"; "common_encryption" = "Encryption"; "common_encryption_enabled" = "Encryption enabled"; +"common_ends_in_time_ios" = "Ends %1$@"; "common_enter_your_pin" = "Enter your PIN"; "common_error" = "Error"; "common_everyone" = "Everyone"; @@ -246,6 +249,8 @@ "common_line_copied_to_clipboard" = "Line copied to clipboard"; "common_link_copied_to_clipboard" = "Link copied to clipboard"; "common_link_new_device" = "Link new device"; +"common_live_location" = "Live location"; +"common_live_location_ended" = "Live location ended"; "common_loading" = "Loading…"; "common_loading_more" = "Loading more…"; "common_message" = "Message"; @@ -319,9 +324,10 @@ "common_settings" = "Settings"; "common_share_space" = "Share space"; "common_shared_history" = "New members see history"; +"common_shared_live_location" = "Shared live location"; "common_shared_location" = "Shared location"; "common_shared_space" = "Shared space"; -"common_signing_out" = "Signing out"; +"common_signing_out" = "Removing device"; "common_something_went_wrong" = "Something went wrong"; "common_something_went_wrong_message" = "We encountered an issue. Please try again."; "common_space" = "Space"; @@ -366,6 +372,7 @@ "common_voice_message" = "Voice message"; "common_waiting" = "Waiting…"; "common_waiting_for_decryption_key" = "Waiting for this message"; +"common_waiting_live_location" = "Waiting for live location…"; "common_world_readable_history" = "Anyone can see history"; "common_you" = "You"; "common_unable_to_decrypt_insecure_device" = "Sent from an insecure device"; @@ -826,7 +833,7 @@ "screen_app_lock_setup_pin_mismatch_dialog_content" = "Please enter the same PIN twice"; "screen_app_lock_setup_pin_mismatch_dialog_title" = "PINs don't match"; "screen_app_lock_signout_alert_message" = "You’ll need to re-login and create a new PIN to proceed"; -"screen_app_lock_signout_alert_title" = "You are being signed out"; +"screen_app_lock_signout_alert_title" = "This device is being removed"; "screen_blocked_users_empty" = "You have no blocked users"; "screen_blocked_users_unblocking" = "Unblocking…"; "screen_bug_report_attach_screenshot" = "Attach screenshot"; @@ -872,7 +879,7 @@ "screen_chat_backup_recovery_action_change" = "Change recovery key"; "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."; "screen_chat_backup_recovery_action_confirm_description" = "Your key storage is currently out of sync."; -"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."; +"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."; "screen_create_new_recovery_key_list_item_1" = "Open %1$@ in a desktop device"; "screen_create_new_recovery_key_list_item_2" = "Sign into your account again"; "screen_create_new_recovery_key_list_item_3" = "When asked to verify your device, select %1$@"; @@ -947,9 +954,9 @@ "screen_join_room_subtitle_no_preview" = "You must be a member of this room to view the message history."; "screen_join_room_title_knock" = "Want to join this room?"; "screen_join_room_title_no_preview" = "Preview is not available"; -"screen_key_backup_disable_confirmation_action_turn_off" = "Turn off"; -"screen_key_backup_disable_confirmation_description" = "You will lose your encrypted messages if you are signed out of all devices."; -"screen_key_backup_disable_confirmation_title" = "Are you sure you want to turn off backup?"; +"screen_key_backup_disable_confirmation_action_turn_off" = "Delete"; +"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."; +"screen_key_backup_disable_confirmation_title" = "Are you sure you want to delete key storage?"; "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:"; "screen_key_backup_disable_description_point_1" = "You will not have encrypted message history on new devices"; "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 @@ "screen_signed_out_reason_3" = "Your server’s administrator has invalidated your access"; "screen_signed_out_subtitle" = "You might have been signed out for one of the reasons listed below. Please sign in again to continue using %@."; "screen_signed_out_title" = "You’re signed out"; -"screen_signout_confirmation_dialog_content" = "Are you sure you want to sign out?"; -"screen_signout_in_progress_dialog_content" = "Signing out…"; -"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."; -"screen_signout_key_backup_disabled_title" = "You have turned off backup"; -"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."; -"screen_signout_key_backup_ongoing_subtitle" = "Please wait for this to complete before signing out."; +"screen_signout_confirmation_dialog_content" = "Are you sure you want to remove this device?"; +"screen_signout_in_progress_dialog_content" = "Removing device…"; +"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."; +"screen_signout_key_backup_disabled_title" = "You’re about to lose access to your encrypted chats"; +"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."; +"screen_signout_key_backup_ongoing_subtitle" = "Please wait for this to complete before removing this device."; "screen_signout_key_backup_ongoing_title" = "Your keys are still being backed up"; -"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."; -"screen_signout_recovery_disabled_title" = "Recovery not set up"; -"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."; +"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."; +"screen_signout_recovery_disabled_title" = "You’re about to lose access to your encrypted chats"; +"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."; +"screen_signout_save_recovery_key_title" = "Make sure you have access to your recovery key before removing this device"; "screen_start_chat_error_starting_chat" = "An error occurred when trying to start a chat"; "screen_view_location_title" = "Location"; "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 @@ "screen_session_verification_request_success_subtitle" = "Now you can read or send messages securely on your other device."; "screen_session_verification_request_success_title" = "Device verified"; "screen_session_verification_waiting_other_device_title" = "Start verification on the other device"; -"screen_signout_confirmation_dialog_submit" = "Sign out"; -"screen_signout_confirmation_dialog_title" = "Sign out"; +"screen_signout_confirmation_dialog_submit" = "Remove this device"; +"screen_signout_confirmation_dialog_title" = "Remove this device"; "screen_signout_key_backup_offline_title" = "Your keys are still being backed up"; -"screen_signout_preference_item" = "Sign out"; -"screen_signout_save_recovery_key_title" = "Have you saved your recovery key?"; +"screen_signout_preference_item" = "Remove this device"; "timeline_decryption_failure_historical_event_user_not_joined" = "You don't have access to this message"; "troubleshoot_notifications_test_blocked_users_title" = "Blocked users"; "troubleshoot_notifications_entry_point_push_history_title" = "Push history"; diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings index 3e5f0c6d9..e4f0136df 100644 --- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings @@ -154,14 +154,15 @@ "action_share_live_location" = "Share live location"; "action_show" = "Show"; "action_sign_in_again" = "Sign in again"; -"action_signout" = "Sign out"; -"action_signout_anyway" = "Sign out anyway"; +"action_signout" = "Remove this device"; +"action_signout_anyway" = "Remove this device anyway"; "action_skip" = "Skip"; "action_start" = "Start"; "action_start_chat" = "Start chat"; "action_start_over" = "Start over"; "action_start_verification" = "Start verification"; "action_static_map_load" = "Tap to load map"; +"action_stop" = "Stop"; "action_take_photo" = "Take photo"; "action_tap_for_options" = "Tap for options"; "action_translate" = "Translate"; @@ -190,6 +191,7 @@ "common_advanced_settings" = "Advanced settings"; "common_an_image" = "an image"; "common_analytics" = "Analytics"; +"common_android_fetching_notifications_title" = "Syncing notifications..."; "common_android_shortcuts_remove_reason_session_logged_out" = "You were logged out of the session"; "common_appearance" = "Appearance"; "common_audio" = "Audio"; @@ -224,6 +226,7 @@ "common_empty_file" = "Empty file"; "common_encryption" = "Encryption"; "common_encryption_enabled" = "Encryption enabled"; +"common_ends_in_time_ios" = "Ends %1$@"; "common_enter_your_pin" = "Enter your PIN"; "common_error" = "Error"; "common_everyone" = "Everyone"; @@ -246,6 +249,8 @@ "common_line_copied_to_clipboard" = "Line copied to clipboard"; "common_link_copied_to_clipboard" = "Link copied to clipboard"; "common_link_new_device" = "Link new device"; +"common_live_location" = "Live location"; +"common_live_location_ended" = "Live location ended"; "common_loading" = "Loading…"; "common_loading_more" = "Loading more…"; "common_message" = "Message"; @@ -319,9 +324,10 @@ "common_settings" = "Settings"; "common_share_space" = "Share space"; "common_shared_history" = "New members see history"; +"common_shared_live_location" = "Shared live location"; "common_shared_location" = "Shared location"; "common_shared_space" = "Shared space"; -"common_signing_out" = "Signing out"; +"common_signing_out" = "Removing device"; "common_something_went_wrong" = "Something went wrong"; "common_something_went_wrong_message" = "We encountered an issue. Please try again."; "common_space" = "Space"; @@ -366,6 +372,7 @@ "common_voice_message" = "Voice message"; "common_waiting" = "Waiting…"; "common_waiting_for_decryption_key" = "Waiting for this message"; +"common_waiting_live_location" = "Waiting for live location…"; "common_world_readable_history" = "Anyone can see history"; "common_you" = "You"; "common_unable_to_decrypt_insecure_device" = "Sent from an insecure device"; @@ -826,7 +833,7 @@ "screen_app_lock_setup_pin_mismatch_dialog_content" = "Please enter the same PIN twice"; "screen_app_lock_setup_pin_mismatch_dialog_title" = "PINs don't match"; "screen_app_lock_signout_alert_message" = "You’ll need to re-login and create a new PIN to proceed"; -"screen_app_lock_signout_alert_title" = "You are being signed out"; +"screen_app_lock_signout_alert_title" = "This device is being removed"; "screen_blocked_users_empty" = "You have no blocked users"; "screen_blocked_users_unblocking" = "Unblocking…"; "screen_bug_report_attach_screenshot" = "Attach screenshot"; @@ -872,7 +879,7 @@ "screen_chat_backup_recovery_action_change" = "Change recovery key"; "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."; "screen_chat_backup_recovery_action_confirm_description" = "Your key storage is currently out of sync."; -"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."; +"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."; "screen_create_new_recovery_key_list_item_1" = "Open %1$@ in a desktop device"; "screen_create_new_recovery_key_list_item_2" = "Sign into your account again"; "screen_create_new_recovery_key_list_item_3" = "When asked to verify your device, select %1$@"; @@ -947,9 +954,9 @@ "screen_join_room_subtitle_no_preview" = "You must be a member of this room to view the message history."; "screen_join_room_title_knock" = "Want to join this room?"; "screen_join_room_title_no_preview" = "Preview is not available"; -"screen_key_backup_disable_confirmation_action_turn_off" = "Turn off"; -"screen_key_backup_disable_confirmation_description" = "You will lose your encrypted messages if you are signed out of all devices."; -"screen_key_backup_disable_confirmation_title" = "Are you sure you want to turn off backup?"; +"screen_key_backup_disable_confirmation_action_turn_off" = "Delete"; +"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."; +"screen_key_backup_disable_confirmation_title" = "Are you sure you want to delete key storage?"; "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:"; "screen_key_backup_disable_description_point_1" = "You will not have encrypted message history on new devices"; "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 @@ "screen_signed_out_reason_3" = "Your server’s administrator has invalidated your access"; "screen_signed_out_subtitle" = "You might have been signed out for one of the reasons listed below. Please sign in again to continue using %@."; "screen_signed_out_title" = "You’re signed out"; -"screen_signout_confirmation_dialog_content" = "Are you sure you want to sign out?"; -"screen_signout_in_progress_dialog_content" = "Signing out…"; -"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."; -"screen_signout_key_backup_disabled_title" = "You have turned off backup"; -"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."; -"screen_signout_key_backup_ongoing_subtitle" = "Please wait for this to complete before signing out."; +"screen_signout_confirmation_dialog_content" = "Are you sure you want to remove this device?"; +"screen_signout_in_progress_dialog_content" = "Removing device…"; +"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."; +"screen_signout_key_backup_disabled_title" = "You’re about to lose access to your encrypted chats"; +"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."; +"screen_signout_key_backup_ongoing_subtitle" = "Please wait for this to complete before removing this device."; "screen_signout_key_backup_ongoing_title" = "Your keys are still being backed up"; -"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."; -"screen_signout_recovery_disabled_title" = "Recovery not set up"; -"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."; +"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."; +"screen_signout_recovery_disabled_title" = "You’re about to lose access to your encrypted chats"; +"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."; +"screen_signout_save_recovery_key_title" = "Make sure you have access to your recovery key before removing this device"; "screen_start_chat_error_starting_chat" = "An error occurred when trying to start a chat"; "screen_view_location_title" = "Location"; "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 @@ "screen_session_verification_request_success_subtitle" = "Now you can read or send messages securely on your other device."; "screen_session_verification_request_success_title" = "Device verified"; "screen_session_verification_waiting_other_device_title" = "Start verification on the other device"; -"screen_signout_confirmation_dialog_submit" = "Sign out"; -"screen_signout_confirmation_dialog_title" = "Sign out"; +"screen_signout_confirmation_dialog_submit" = "Remove this device"; +"screen_signout_confirmation_dialog_title" = "Remove this device"; "screen_signout_key_backup_offline_title" = "Your keys are still being backed up"; -"screen_signout_preference_item" = "Sign out"; -"screen_signout_save_recovery_key_title" = "Have you saved your recovery key?"; +"screen_signout_preference_item" = "Remove this device"; "timeline_decryption_failure_historical_event_user_not_joined" = "You don't have access to this message"; "troubleshoot_notifications_test_blocked_users_title" = "Blocked users"; "troubleshoot_notifications_entry_point_push_history_title" = "Push history"; diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift index f71564d22..20a1f3221 100644 --- a/ElementX/Sources/Generated/Strings.swift +++ b/ElementX/Sources/Generated/Strings.swift @@ -346,9 +346,9 @@ internal enum L10n { internal static var actionShow: String { return L10n.tr("Localizable", "action_show") } /// Sign in again internal static var actionSignInAgain: String { return L10n.tr("Localizable", "action_sign_in_again") } - /// Sign out + /// Remove this device internal static var actionSignout: String { return L10n.tr("Localizable", "action_signout") } - /// Sign out anyway + /// Remove this device anyway internal static var actionSignoutAnyway: String { return L10n.tr("Localizable", "action_signout_anyway") } /// Skip internal static var actionSkip: String { return L10n.tr("Localizable", "action_skip") } @@ -362,6 +362,8 @@ internal enum L10n { internal static var actionStartVerification: String { return L10n.tr("Localizable", "action_start_verification") } /// Tap to load map internal static var actionStaticMapLoad: String { return L10n.tr("Localizable", "action_static_map_load") } + /// Stop + internal static var actionStop: String { return L10n.tr("Localizable", "action_stop") } /// Take photo internal static var actionTakePhoto: String { return L10n.tr("Localizable", "action_take_photo") } /// Tap for options @@ -422,6 +424,8 @@ internal enum L10n { internal static var commonAnImage: String { return L10n.tr("Localizable", "common_an_image") } /// Analytics internal static var commonAnalytics: String { return L10n.tr("Localizable", "common_analytics") } + /// Syncing notifications... + internal static var commonAndroidFetchingNotificationsTitle: String { return L10n.tr("Localizable", "common_android_fetching_notifications_title") } /// You left the room internal static var commonAndroidShortcutsRemoveReasonLeftRoom: String { return L10n.tr("Localizable", "common_android_shortcuts_remove_reason_left_room") } /// You were logged out of the session @@ -496,6 +500,10 @@ internal enum L10n { internal static var commonEncryption: String { return L10n.tr("Localizable", "common_encryption") } /// Encryption enabled internal static var commonEncryptionEnabled: String { return L10n.tr("Localizable", "common_encryption_enabled") } + /// Ends %1$@ + internal static func commonEndsInTimeIos(_ p1: Any) -> String { + return L10n.tr("Localizable", "common_ends_in_time_ios", String(describing: p1)) + } /// Enter your PIN internal static var commonEnterYourPin: String { return L10n.tr("Localizable", "common_enter_your_pin") } /// Error @@ -542,6 +550,10 @@ internal enum L10n { internal static var commonLinkCopiedToClipboard: String { return L10n.tr("Localizable", "common_link_copied_to_clipboard") } /// Link new device internal static var commonLinkNewDevice: String { return L10n.tr("Localizable", "common_link_new_device") } + /// Live location + internal static var commonLiveLocation: String { return L10n.tr("Localizable", "common_live_location") } + /// Live location ended + internal static var commonLiveLocationEnded: String { return L10n.tr("Localizable", "common_live_location_ended") } /// Loading… internal static var commonLoading: String { return L10n.tr("Localizable", "common_loading") } /// Loading more… @@ -720,11 +732,13 @@ internal enum L10n { internal static var commonShareSpace: String { return L10n.tr("Localizable", "common_share_space") } /// New members see history internal static var commonSharedHistory: String { return L10n.tr("Localizable", "common_shared_history") } + /// Shared live location + internal static var commonSharedLiveLocation: String { return L10n.tr("Localizable", "common_shared_live_location") } /// Shared location internal static var commonSharedLocation: String { return L10n.tr("Localizable", "common_shared_location") } /// Shared space internal static var commonSharedSpace: String { return L10n.tr("Localizable", "common_shared_space") } - /// Signing out + /// Removing device internal static var commonSigningOut: String { return L10n.tr("Localizable", "common_signing_out") } /// Something went wrong internal static var commonSomethingWentWrong: String { return L10n.tr("Localizable", "common_something_went_wrong") } @@ -822,6 +836,8 @@ internal enum L10n { internal static var commonWaiting: String { return L10n.tr("Localizable", "common_waiting") } /// Waiting for this message internal static var commonWaitingForDecryptionKey: String { return L10n.tr("Localizable", "common_waiting_for_decryption_key") } + /// Waiting for live location… + internal static var commonWaitingLiveLocation: String { return L10n.tr("Localizable", "common_waiting_live_location") } /// Anyone can see history internal static var commonWorldReadableHistory: String { return L10n.tr("Localizable", "common_world_readable_history") } /// You @@ -1390,7 +1406,7 @@ internal enum L10n { internal static var screenAppLockSetupPinMismatchDialogTitle: String { return L10n.tr("Localizable", "screen_app_lock_setup_pin_mismatch_dialog_title") } /// You’ll need to re-login and create a new PIN to proceed internal static var screenAppLockSignoutAlertMessage: String { return L10n.tr("Localizable", "screen_app_lock_signout_alert_message") } - /// You are being signed out + /// This device is being removed internal static var screenAppLockSignoutAlertTitle: String { return L10n.tr("Localizable", "screen_app_lock_signout_alert_title") } /// Plural format key: "%#@COUNT@" internal static func screenAppLockSubtitle(_ p1: Int) -> String { @@ -1573,10 +1589,8 @@ internal enum L10n { internal static var screenChatBackupRecoveryActionConfirmDescription: String { return L10n.tr("Localizable", "screen_chat_backup_recovery_action_confirm_description") } /// Get recovery key internal static var screenChatBackupRecoveryActionSetup: String { return L10n.tr("Localizable", "screen_chat_backup_recovery_action_setup") } - /// Get access to your encrypted messages if you lose all your devices or are signed out of %1$@ everywhere. - internal static func screenChatBackupRecoveryActionSetupDescription(_ p1: Any) -> String { - return L10n.tr("Localizable", "screen_chat_backup_recovery_action_setup_description", String(describing: p1)) - } + /// 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. + internal static var screenChatBackupRecoveryActionSetupDescription: String { return L10n.tr("Localizable", "screen_chat_backup_recovery_action_setup_description") } /// Create account internal static var screenCreateAccountTitle: String { return L10n.tr("Localizable", "screen_create_account_title") } /// Open %1$@ in a desktop device @@ -1902,11 +1916,11 @@ internal enum L10n { internal static var screenJoinRoomTitleKnock: String { return L10n.tr("Localizable", "screen_join_room_title_knock") } /// Preview is not available internal static var screenJoinRoomTitleNoPreview: String { return L10n.tr("Localizable", "screen_join_room_title_no_preview") } - /// Turn off + /// Delete internal static var screenKeyBackupDisableConfirmationActionTurnOff: String { return L10n.tr("Localizable", "screen_key_backup_disable_confirmation_action_turn_off") } - /// You will lose your encrypted messages if you are signed out of all devices. + /// You will lose your encrypted chat history and need to reset your digital identity if you remove all your devices. internal static var screenKeyBackupDisableConfirmationDescription: String { return L10n.tr("Localizable", "screen_key_backup_disable_confirmation_description") } - /// Are you sure you want to turn off backup? + /// Are you sure you want to delete key storage? internal static var screenKeyBackupDisableConfirmationTitle: String { return L10n.tr("Localizable", "screen_key_backup_disable_confirmation_title") } /// Deleting key storage will remove your digital identity and message keys from the server and turn off the following security features: internal static var screenKeyBackupDisableDescription: String { return L10n.tr("Localizable", "screen_key_backup_disable_description") } @@ -3187,35 +3201,35 @@ internal enum L10n { } /// You’re signed out internal static var screenSignedOutTitle: String { return L10n.tr("Localizable", "screen_signed_out_title") } - /// Are you sure you want to sign out? + /// Are you sure you want to remove this device? internal static var screenSignoutConfirmationDialogContent: String { return L10n.tr("Localizable", "screen_signout_confirmation_dialog_content") } - /// Sign out + /// Remove this device internal static var screenSignoutConfirmationDialogSubmit: String { return L10n.tr("Localizable", "screen_signout_confirmation_dialog_submit") } - /// Sign out + /// Remove this device internal static var screenSignoutConfirmationDialogTitle: String { return L10n.tr("Localizable", "screen_signout_confirmation_dialog_title") } - /// Signing out… + /// Removing device… internal static var screenSignoutInProgressDialogContent: String { return L10n.tr("Localizable", "screen_signout_in_progress_dialog_content") } - /// You are about to sign out of your last session. If you sign out now, you will lose access to your encrypted messages. + /// 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. internal static var screenSignoutKeyBackupDisabledSubtitle: String { return L10n.tr("Localizable", "screen_signout_key_backup_disabled_subtitle") } - /// You have turned off backup + /// You’re about to lose access to your encrypted chats internal static var screenSignoutKeyBackupDisabledTitle: String { return L10n.tr("Localizable", "screen_signout_key_backup_disabled_title") } - /// Your keys were still being backed up when you went offline. Reconnect so that your keys can be backed up before signing out. + /// 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. internal static var screenSignoutKeyBackupOfflineSubtitle: String { return L10n.tr("Localizable", "screen_signout_key_backup_offline_subtitle") } /// Your keys are still being backed up internal static var screenSignoutKeyBackupOfflineTitle: String { return L10n.tr("Localizable", "screen_signout_key_backup_offline_title") } - /// Please wait for this to complete before signing out. + /// Please wait for this to complete before removing this device. internal static var screenSignoutKeyBackupOngoingSubtitle: String { return L10n.tr("Localizable", "screen_signout_key_backup_ongoing_subtitle") } /// Your keys are still being backed up internal static var screenSignoutKeyBackupOngoingTitle: String { return L10n.tr("Localizable", "screen_signout_key_backup_ongoing_title") } - /// Sign out + /// Remove this device internal static var screenSignoutPreferenceItem: String { return L10n.tr("Localizable", "screen_signout_preference_item") } - /// You are about to sign out of your last session. If you sign out now, you'll lose access to your encrypted messages. + /// 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. internal static var screenSignoutRecoveryDisabledSubtitle: String { return L10n.tr("Localizable", "screen_signout_recovery_disabled_subtitle") } - /// Recovery not set up + /// You’re about to lose access to your encrypted chats internal static var screenSignoutRecoveryDisabledTitle: String { return L10n.tr("Localizable", "screen_signout_recovery_disabled_title") } - /// You are about to sign out of your last session. If you sign out now, you might lose access to your encrypted messages. + /// 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. internal static var screenSignoutSaveRecoveryKeySubtitle: String { return L10n.tr("Localizable", "screen_signout_save_recovery_key_subtitle") } - /// Have you saved your recovery key? + /// Make sure you have access to your recovery key before removing this device internal static var screenSignoutSaveRecoveryKeyTitle: String { return L10n.tr("Localizable", "screen_signout_save_recovery_key_title") } /// Room internal static var screenSpaceAddRoomAction: String { return L10n.tr("Localizable", "screen_space_add_room_action") } diff --git a/ElementX/Sources/Other/Extensions/ProcessInfo.swift b/ElementX/Sources/Other/Extensions/ProcessInfo.swift index 458edfadb..bdedc2a20 100644 --- a/ElementX/Sources/Other/Extensions/ProcessInfo.swift +++ b/ElementX/Sources/Other/Extensions/ProcessInfo.swift @@ -85,4 +85,14 @@ extension ProcessInfo { false #endif } + + var platform: String { + if #available(iOS 26.1, *), ProcessInfo.processInfo.isiOSAppOnVision { + "visionOS" + } else if ProcessInfo.processInfo.isiOSAppOnMac { + "macOS" + } else { + "iOS" + } + } } diff --git a/ElementX/Sources/Other/Logging/Tracing.swift b/ElementX/Sources/Other/Logging/Tracing.swift index 3bdc6f86a..93d6c0f15 100644 --- a/ElementX/Sources/Other/Logging/Tracing.swift +++ b/ElementX/Sources/Other/Logging/Tracing.swift @@ -37,6 +37,11 @@ enum Tracing { // Log everything on integration tests to check whether // the logs contain any sensitive data. See `integration-tests.yml` let level: LogLevel = ProcessInfo.isRunningIntegrationTests ? .trace : logLevel + let sentryConfig = sentryURL.map { url in + SentryConfig(dsn: url.absoluteString, + appVersion: InfoPlistReader.app.bundleShortVersionString, + appPlatform: ProcessInfo.processInfo.platform) + } return .init(logLevel: level.rustLogLevel, traceLogPacks: traceLogPacks.map(\.rustLogPack), @@ -48,7 +53,7 @@ enum Tracing { // Total compressed size needs to be under CloudFlare's max request size of 50Mb maxTotalSizeBytes: 100 * 1024 * 1024, // 100Mb maxAgeSeconds: 7 * 24 * 60 * 60), // One week - sentryDsn: sentryURL?.absoluteString) + sentryConfig: sentryConfig) } /// A list of all log file URLs, sorted chronologically. diff --git a/ElementX/Sources/Services/Authentication/AuthenticationService.swift b/ElementX/Sources/Services/Authentication/AuthenticationService.swift index 0a0927e15..e80e78435 100644 --- a/ElementX/Sources/Services/Authentication/AuthenticationService.swift +++ b/ElementX/Sources/Services/Authentication/AuthenticationService.swift @@ -281,6 +281,8 @@ private extension HumanQrLoginError { .qrCodeError(.slidingSyncNotAvailable) case .OtherDeviceNotSignedIn: .qrCodeError(.deviceNotSignedIn) + case .UnsupportedQrCodeType: + .qrCodeError(.invalidQRCode) case .Unknown, .OidcMetadataInvalid, .CheckCodeAlreadySent, .CheckCodeCannotBeSent: .qrCodeError(.unknown) } diff --git a/ElementX/Sources/Services/Authentication/LinkNewDeviceService.swift b/ElementX/Sources/Services/Authentication/LinkNewDeviceService.swift index 0f53f8b15..b8f8af515 100644 --- a/ElementX/Sources/Services/Authentication/LinkNewDeviceService.swift +++ b/ElementX/Sources/Services/Authentication/LinkNewDeviceService.swift @@ -201,6 +201,8 @@ private extension QRCodeLoginError { .cancelled case .OtherDeviceAlreadySignedIn: .deviceAlreadySignedIn + case .UnsupportedQrCodeType: + .invalidQRCode case .Unknown, .MissingSecretsBackup, .DeviceIdAlreadyInUse: .unknown } diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift index c869229bf..866aee84a 100644 --- a/ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift +++ b/ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift @@ -62,6 +62,9 @@ struct RoomEventStringBuilder { return prefix(errorMessage, with: displayName, isOutgoing: isOutgoing) case .other: return nil // We shouldn't receive these without asking for custom event types. + case .liveLocation: + // TODO: Implement + return nil } case .failedToParseMessageLike, .failedToParseState: return prefix(L10n.commonUnsupportedEvent, with: displayName, isOutgoing: isOutgoing) @@ -86,9 +89,6 @@ struct RoomEventStringBuilder { return prefix(L10n.commonUnsupportedCall, with: displayName, isOutgoing: isOutgoing) case .rtcNotification: return prefix(L10n.commonCallStarted, with: displayName, isOutgoing: isOutgoing) - case .liveLocation: - // TODO: Implement - return nil } } diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift index 82c56803b..9e53719f3 100644 --- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift +++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift @@ -90,12 +90,11 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { self.roomList = roomList do { - listUpdatesSubscriptionResult = roomList.entriesWithDynamicAdaptersWith(pageSize: UInt32(roomListPageSize), - enableLatestEventSorter: true, - listener: SDKListener { [weak self] updates in - guard let self else { return } - diffsPublisher.send(updates) - }) + listUpdatesSubscriptionResult = roomList.entriesWithDynamicAdapters(pageSize: UInt32(roomListPageSize), + listener: SDKListener { [weak self] updates in + guard let self else { return } + diffsPublisher.send(updates) + }) // Forces the listener above to be called with the current state setFilter(.all(filters: [])) diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift index 6779c02c4..310cb3c9c 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift @@ -43,6 +43,9 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { return buildEncryptedTimelineItem(eventItemProxy, messageLikeContent, encryptedMessage, isOutgoing) case .other: return nil // We shouldn't receive these without asking for custom event types. + case .liveLocation: + // TODO: Implement + return nil } case .failedToParseMessageLike(let eventType, let error): return buildUnsupportedTimelineItem(eventItemProxy, eventType, error, isOutgoing) @@ -69,9 +72,6 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { return buildCallInviteTimelineItem(for: eventItemProxy) case .rtcNotification: return buildCallNotificationTimelineItem(for: eventItemProxy) - case .liveLocation: - // TODO: Implement - return nil } } diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPad-en-GB.png index d5a6da965..0538caf9b 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34837de9a5b4ff07c491f308673959a13268f08beacff64bfe812a9d7e573cc5 -size 116204 +oid sha256:67c6a4f543907db6083e0b00ae5d3b0d8c884dc8e9af1f7d5004229d4cb475a6 +size 118038 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPad-pseudo.png index 89acaa964..5d5af0b14 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13e5eff1a43dbba254c9b16838b1d4626a517bf53c1ce4f41e808b1f75cb33e2 -size 133292 +oid sha256:5ede92fd1a8ba6277000cbf355c1dcd8e13d2c93c1c5c0290b2e26e4fe74c8fa +size 135516 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPhone-en-GB.png index 935dbfe1b..fecdfd360 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03197767b985d17bb66c8bd9d5a0c70540c3a1fe7afc177cfec7a619654310f5 -size 70491 +oid sha256:982c64278485f72ce7dd2a4a0c91bf96837c049e1f9db3a00e543606ceb07b73 +size 72039 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPhone-pseudo.png index e1223aecc..d79f33242 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Actions-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d68e8fd41ca6d0674818f02c251d8aa244a0c3c1b2d244a14ec5518177f0d661 -size 91533 +oid sha256:4bec098f8b71154ffc2c5272d35aa9369904c959030296945bec69d85cda55bc +size 93501 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Loading-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Loading-iPad-en-GB.png index fde439004..e9536f234 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Loading-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Loading-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63ca90065774109cd375725a4ffb7762d3f532aae8fd20f5ec396b3663a44637 -size 97923 +oid sha256:8aeff9fe298bb0f757979c7e56b8b60354a2406b2cb60c960bc7c05bb3e0c4ff +size 99757 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Loading-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Loading-iPad-pseudo.png index 370090eb1..15612fb86 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Loading-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/identityConfirmationScreen.Loading-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2409735740fad18b43cb9333799a50de81993187069cc1fc6c9385267bdcdd0f -size 109950 +oid sha256:6ff8872ae747ab23a3bcdd93b28a1c6cd4bacf2a08d5e8e05963a051caf536c0 +size 112174 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPad-en-GB.png index a271c4f2c..6303065ad 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be846f35c81b0e669a0abfceb4478432ce51de76c8e28d516b860ab1a01c95b6 -size 108174 +oid sha256:045777718fe2fcbf99cf713b4a47c9f8a4bea86de0b8a2f3c18a8291330ebbd7 +size 124985 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPad-pseudo.png index 85e1c4ccf..630684560 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2bd867776e5f04a4600594c7cde59b24a5c19fd2c438947cedb739af76ab773 -size 130436 +oid sha256:3ce148759ddeb667002666194bbbcffe6c12ddf99c24e71bf44d1c34916930d9 +size 160923 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPhone-en-GB.png index 46b40942d..d2b02f763 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8686933e90fa2faaacd6a3d46422fd0f88a8a3242c0fb161c6b51e2c666ed041 -size 66592 +oid sha256:dffbf9f5f5a63949274da0932f7b1c581a8aeaefa0c90e3dcf9170963a73a6ab +size 83739 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPhone-pseudo.png index 24edde9f3..ac1caaa29 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Confirmation-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62196b7cfd63e8ffe1fa49137c447328ad38142b54c30df619c9f94fed52b3eb -size 89512 +oid sha256:a761c49e561137955eec3baf0b995a03972a94dd5dc5dd51106aaf07964d3eec +size 128316 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPad-en-GB.png index b5eac34df..48b212e70 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d290d373ca3ba746d8d5bfe78a85baef9b18441278abf0d27f0f1e1f3654bd31 -size 107544 +oid sha256:e6aecd8d0b9ed2bcdc093c820f749ed73ae166986ea7a362f9e8a187985b6264 +size 110409 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPad-pseudo.png index 529f484e5..93336b816 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ab50369f2dd33fcbe06b33fe88866cf39ad5e6ae4f9ab8627b23917c8ad0ed8 -size 129797 +oid sha256:469984d04f9da108dabc4fc507d21ed3d8b463affe4c8388c81069dde1906fe9 +size 136314 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPhone-en-GB.png index 96d49faf8..94d2e89da 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00f0c361c289c1f3db74ddd66b849fbc3ea27c4527e4e66a8aa2de20389e6586 -size 67703 +oid sha256:e5b19178efddc0e8653810074d274fedcb82cf55576d8ac37175f795106420ca +size 70489 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPhone-pseudo.png index cf62a48ee..4cf9ac0e1 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Offline-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0096e108c859640a13dc5d92fbdfd54d192395ce2f009c2a6b41b98043fc3214 -size 95785 +oid sha256:ab026de4f2474f8742157a5f6924b80252868fe570cdb41c2d1cadabc9eb56a4 +size 102199 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPad-en-GB.png index 251ee136a..39033fb93 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bc1a797f8ae60ccfbe66d92f271ebb3c7d6fb12f8c1d2297986ed2661f92966 -size 96889 +oid sha256:a61ba0958e7d1ca3fe3a37d78aedfe5e64a54ebff886b0c4b9e0171d1f6a2079 +size 99801 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPad-pseudo.png index 88e4d383f..97d7edace 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4549e3d1bf67b7705d9f3b0aa84d6282d94d6fabbe7d0de292348be2d987ee4e -size 111476 +oid sha256:a42d4b26424a6a717ea70374e6a5c4dbf900613b911aeacf89aa8bbd02e583e5 +size 118254 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPhone-en-GB.png index f9b2ad529..4e7e45af9 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ae1eab357ed0a9fde64ab43281da31510fc9d9ff3e4ed9946050bdaf7a9d367 -size 57003 +oid sha256:b325edd1631682098d2ea8da98e3f330f9bff8b68380a5bb3cd2af5754c59901 +size 61096 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPhone-pseudo.png index c695963e3..dce06f050 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Ongoing-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8c7f406961535eae36c06932003954a21fbb643990fcb5650445c59b6c62ced -size 74038 +oid sha256:0f06166cea0767ab7a4ca21ed36a74744e765fc3c384a186afdd32d8bb75d032 +size 82682 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPad-en-GB.png index 13e088194..36425b72a 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9faa1750d5d4162e9e43c99b63247f90f79f620af5296c8fe505831ce0dac9f1 -size 102638 +oid sha256:9329b3d29db8f60190e581d7a01487d8213f6c3410191cd8d898c9fe19bb639a +size 105533 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPad-pseudo.png index adf79923e..5925bca26 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02d7a62de6c8a5f2400fe7f480d17281b00fee657bb18b0621bb3003c3d7e382 -size 119736 +oid sha256:2c21f4c822aead3cb93414129afdc3f8e15949858d909c712287966e3f2f7bcb +size 126468 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPhone-en-GB.png index cfde0c6e0..9f8b4b734 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42fe354cc53a55d57c7d820045e941e467b42168d0361d8a5b7e37e3bcbdec9c -size 62130 +oid sha256:78df23c9f5aeb9a2ac316e29018ece90e14a40aeb5ec1027bf7f9bbdc539a7d6 +size 66094 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPhone-pseudo.png index 47438a348..59a18ba54 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Stalled-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2544c50f4877731a3708df496a27cb26c19fd60e018b498d71c47c56e928ea99 -size 85013 +oid sha256:4b1b741c021a64ffced165010d5b804edd4c13e35d93ad6a3343b505dfcf3199 +size 93400 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPad-en-GB.png index e9611ec4e..d966240bf 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc1c1b94ab08863b813fac3bc516a5a116116a4dec474637d87d06b644b8a945 -size 97077 +oid sha256:3102d5afe63a43477b21a6773312aaa9110e739cc8801a119a3357d99cc08cdb +size 99977 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPad-pseudo.png index 22f06438c..d4a98b65a 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d57130b33d762616b51a579566b7632616204d97086b40e03282f3b85a84cd7 -size 111516 +oid sha256:d87644bf0ed3308f42b2aeeb868ccf4c0fdfd8dbc3cd6200cacb11fa03b519f9 +size 118311 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPhone-en-GB.png index 3e8465698..7bdd78bb4 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a73ce1efd59a3f28a96d0e51b90ebe7c7b66563e15fdf3e14b2fba0feeba7e8 -size 57290 +oid sha256:3070a8ac49e1ee4f6773b0840a948aa2d672ea2e6d130b3f12e3b579edb55a62 +size 61385 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPhone-pseudo.png index edb3442b9..a61e5be1f 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupLogoutConfirmationScreen.Waiting-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93617dc0d217bd410fc67343a0268ff18e221bbd828dda08dc2036378034d21e -size 74854 +oid sha256:ff33ef9d83bccb4b9e7fe9dbc035991680d79b8f95cc53e20f16855b243a222f +size 83424 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-en-GB.png index 90792d30f..3a3910d14 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f6783a5f0b6f923fc5dccd9900b5c15797eb30be2cd5896fdc443ca62661a71 -size 94171 +oid sha256:af428096543259ba33aeaa6e2da59ffcc58c6a564dd54567e998563c9fa58940 +size 94197 diff --git a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift index cc1912f70..f96c29ff1 100644 --- a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift +++ b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift @@ -15207,81 +15207,6 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable { try await leaveClosure?() } - //MARK: - listThreads - - open var listThreadsOptsThrowableError: Error? - open var listThreadsOptsUnderlyingCallsCount = 0 - open var listThreadsOptsCallsCount: Int { - get { - if Thread.isMainThread { - return listThreadsOptsUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = listThreadsOptsUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - listThreadsOptsUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - listThreadsOptsUnderlyingCallsCount = newValue - } - } - } - } - open var listThreadsOptsCalled: Bool { - return listThreadsOptsCallsCount > 0 - } - open var listThreadsOptsReceivedOpts: ListThreadsOptions? - open var listThreadsOptsReceivedInvocations: [ListThreadsOptions] = [] - - open var listThreadsOptsUnderlyingReturnValue: ThreadRoots! - open var listThreadsOptsReturnValue: ThreadRoots! { - get { - if Thread.isMainThread { - return listThreadsOptsUnderlyingReturnValue - } else { - var returnValue: ThreadRoots? = nil - DispatchQueue.main.sync { - returnValue = listThreadsOptsUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - listThreadsOptsUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - listThreadsOptsUnderlyingReturnValue = newValue - } - } - } - } - open var listThreadsOptsClosure: ((ListThreadsOptions) async throws -> ThreadRoots)? - - open override func listThreads(opts: ListThreadsOptions) async throws -> ThreadRoots { - if let error = listThreadsOptsThrowableError { - throw error - } - listThreadsOptsCallsCount += 1 - listThreadsOptsReceivedOpts = opts - DispatchQueue.main.async { - self.listThreadsOptsReceivedInvocations.append(opts) - } - if let listThreadsOptsClosure = listThreadsOptsClosure { - return try await listThreadsOptsClosure(opts) - } else { - return listThreadsOptsReturnValue - } - } - //MARK: - loadComposerDraft open var loadComposerDraftThreadRootThrowableError: Error? @@ -15432,6 +15357,81 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable { } } + //MARK: - loadThreadList + + open var loadThreadListOptsThrowableError: Error? + open var loadThreadListOptsUnderlyingCallsCount = 0 + open var loadThreadListOptsCallsCount: Int { + get { + if Thread.isMainThread { + return loadThreadListOptsUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = loadThreadListOptsUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + loadThreadListOptsUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + loadThreadListOptsUnderlyingCallsCount = newValue + } + } + } + } + open var loadThreadListOptsCalled: Bool { + return loadThreadListOptsCallsCount > 0 + } + open var loadThreadListOptsReceivedOpts: ListThreadsOptions? + open var loadThreadListOptsReceivedInvocations: [ListThreadsOptions] = [] + + open var loadThreadListOptsUnderlyingReturnValue: ThreadList! + open var loadThreadListOptsReturnValue: ThreadList! { + get { + if Thread.isMainThread { + return loadThreadListOptsUnderlyingReturnValue + } else { + var returnValue: ThreadList? = nil + DispatchQueue.main.sync { + returnValue = loadThreadListOptsUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + loadThreadListOptsUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + loadThreadListOptsUnderlyingReturnValue = newValue + } + } + } + } + open var loadThreadListOptsClosure: ((ListThreadsOptions) async throws -> ThreadList)? + + open override func loadThreadList(opts: ListThreadsOptions) async throws -> ThreadList { + if let error = loadThreadListOptsThrowableError { + throw error + } + loadThreadListOptsCallsCount += 1 + loadThreadListOptsReceivedOpts = opts + DispatchQueue.main.async { + self.loadThreadListOptsReceivedInvocations.append(opts) + } + if let loadThreadListOptsClosure = loadThreadListOptsClosure { + return try await loadThreadListOptsClosure(opts) + } else { + return loadThreadListOptsReturnValue + } + } + //MARK: - markAsFullyReadUnchecked open var markAsFullyReadUncheckedEventIdThrowableError: Error? @@ -19194,77 +19194,6 @@ open class RoomListSDKMock: MatrixRustSDK.RoomList, @unchecked Sendable { } } - //MARK: - entriesWithDynamicAdaptersWith - - open var entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerUnderlyingCallsCount = 0 - open var entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerCallsCount: Int { - get { - if Thread.isMainThread { - return entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerUnderlyingCallsCount = newValue - } - } - } - } - open var entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerCalled: Bool { - return entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerCallsCount > 0 - } - open var entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerReceivedArguments: (pageSize: UInt32, enableLatestEventSorter: Bool, listener: RoomListEntriesListener)? - open var entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerReceivedInvocations: [(pageSize: UInt32, enableLatestEventSorter: Bool, listener: RoomListEntriesListener)] = [] - - open var entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerUnderlyingReturnValue: RoomListEntriesWithDynamicAdaptersResult! - open var entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerReturnValue: RoomListEntriesWithDynamicAdaptersResult! { - get { - if Thread.isMainThread { - return entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerUnderlyingReturnValue - } else { - var returnValue: RoomListEntriesWithDynamicAdaptersResult? = nil - DispatchQueue.main.sync { - returnValue = entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerUnderlyingReturnValue = newValue - } - } - } - } - open var entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerClosure: ((UInt32, Bool, RoomListEntriesListener) -> RoomListEntriesWithDynamicAdaptersResult)? - - open override func entriesWithDynamicAdaptersWith(pageSize: UInt32, enableLatestEventSorter: Bool, listener: RoomListEntriesListener) -> RoomListEntriesWithDynamicAdaptersResult { - entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerCallsCount += 1 - entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerReceivedArguments = (pageSize: pageSize, enableLatestEventSorter: enableLatestEventSorter, listener: listener) - DispatchQueue.main.async { - self.entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerReceivedInvocations.append((pageSize: pageSize, enableLatestEventSorter: enableLatestEventSorter, listener: listener)) - } - if let entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerClosure = entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerClosure { - return entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerClosure(pageSize, enableLatestEventSorter, listener) - } else { - return entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerReturnValue - } - } - //MARK: - loadingState open var loadingStateListenerThrowableError: Error? @@ -25397,21 +25326,6 @@ open class TaskHandleSDKMock: MatrixRustSDK.TaskHandle, @unchecked Sendable { } } } -open class ThreadRootsSDKMock: MatrixRustSDK.ThreadRoots, @unchecked Sendable { - public init() { - super.init(noHandle: .init()) - } - - public required init(unsafeFromHandle handle: UInt64) { - fatalError("init(unsafeFromHandle:) has not been implemented") - } - - fileprivate var handle: UInt64 { - get { return underlyingHandle } - set(value) { underlyingHandle = value } - } - fileprivate var underlyingHandle: UInt64! -} open class ThreadSummarySDKMock: MatrixRustSDK.ThreadSummary, @unchecked Sendable { public init() { super.init(noHandle: .init()) diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-en-GB-3.png index a7b050fc7..db3ccfd60 100644 --- a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-en-GB-3.png +++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-en-GB-3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd643c89be9efcd31780d5b00e60664f6b7adaac16e84bc29bf9767c7730441e -size 201772 +oid sha256:060f786305b154bc55dad20a605f634d736258d912eb8c3e6394cc1b513d9b93 +size 202055 diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-en-GB-4.png index 278605be1..66d547c5c 100644 --- a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-en-GB-4.png +++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-en-GB-4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14bb0af19bc7cb397959d5e42e79cfe77c1e7e4c4d55eaef5f2e05787104f73b -size 117964 +oid sha256:c73defd8f7474c7e6bee6a037b0f181c66b4c2a3e5fd18aca5609bd2ecb8ff38 +size 118136 diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-en-GB-3.png index 6640fbcca..c3744f8c6 100644 --- a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-en-GB-3.png +++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-en-GB-3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:027e304feb25788f7af65f69f240f411434a10cf515c57236c2ffa088cf86463 -size 278951 +oid sha256:332bf11295bcc81de2e4e5214f066a6cff694df83431e4f8cdf47cbdbc7b60b5 +size 279728 diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-en-GB-4.png index e5af2167d..f7d949531 100644 --- a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-en-GB-4.png +++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-en-GB-4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6a34d175cda50bf40353aa645a9c695a0fc68d274cf9ee31b4d203ca9582d9d -size 136298 +oid sha256:a3a0e6526bccbbb6b82510b80994f9ac3b325d1f0afee0cf3161059fab00c125 +size 138106 diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-en-GB-3.png index 35097a0e2..33d0db9ab 100644 --- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-en-GB-3.png +++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-en-GB-3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc50dad804ed55bf0856ba7811cea03743320808093230c0e1e5737569e94257 -size 93769 +oid sha256:281b22cdedce700a922b23e3f89177eee394107b65218f912e6092ebb576cba3 +size 93905 diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testMultipleProvidersLoginWithPassword-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testMultipleProvidersLoginWithPassword-iPad-en-GB.png index f04f06a90..03e9acffa 100644 --- a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testMultipleProvidersLoginWithPassword-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testMultipleProvidersLoginWithPassword-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa2744e954f2443873e29f587136f6a0f146b8b34873b5469f46ff4037ef87f5 -size 1332793 +oid sha256:568ebbafab1727b4d95d6777bb3cd4accf4a540c358bdb077de128069e8b15ca +size 1334488 diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testMultipleProvidersLoginWithPassword-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testMultipleProvidersLoginWithPassword-iPhone-en-GB.png index 7cb6d4270..798ca8a36 100644 --- a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testMultipleProvidersLoginWithPassword-iPhone-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testMultipleProvidersLoginWithPassword-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a60162c9c4320d161d200f472ab79da425c17f29b8b3cbc86bc6188b22b6de7 -size 1229448 +oid sha256:47c5d7027b40bd3e3304304c34e951558c60011d1212e9542c432ad52a6985c0 +size 1235697 diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testProvisionedLoginWithPassword-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testProvisionedLoginWithPassword-iPad-en-GB.png index 2d298b03f..f98b795d9 100644 --- a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testProvisionedLoginWithPassword-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testProvisionedLoginWithPassword-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76285108a4deddb21423115f05d3052b21ea05f014a10387e2566842007d4541 -size 1369391 +oid sha256:7485f9a08a17104b5b0cfe3a696c830bebe3b235be04ec33a9feea514d8fbf1a +size 1372724 diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testProvisionedLoginWithPassword-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testProvisionedLoginWithPassword-iPhone-en-GB.png index fda55b912..536486704 100644 --- a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testProvisionedLoginWithPassword-iPhone-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testProvisionedLoginWithPassword-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcc50b99f2ba9b5f8cf2e49d8822f5d08dae0603eec09d473ca52b3cbd713436 -size 1230992 +oid sha256:41cdbe770168764d4414bcc151aa817d7570af301b1fcaacfb6c6acd73092798 +size 1233166 diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testSingleProviderLoginWithPassword-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testSingleProviderLoginWithPassword-iPad-en-GB.png index 4b39120f0..b4621256e 100644 --- a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testSingleProviderLoginWithPassword-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testSingleProviderLoginWithPassword-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:070c7fd006608f55ab8de0d3689095ef888528a972b52fdbb2db6adff988cc71 -size 1334186 +oid sha256:4a6817ccb92f4f593f02898ae224cc9705c8634fe8ca057af24d0b653b4abbbd +size 1335924 diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testSingleProviderLoginWithPassword-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testSingleProviderLoginWithPassword-iPhone-en-GB.png index ecf0a9878..255fa01ba 100644 --- a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testSingleProviderLoginWithPassword-iPhone-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testSingleProviderLoginWithPassword-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67d9a1aae0614b698a0ef7a5f579746492b2dd428edaeef2fec90c94bbeeb791 -size 1231382 +oid sha256:4dfe5d37fc9993dab7c1f0660b99e7a814bf11d89cc6b1b76c40a77432f0b96a +size 1237931 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-0.png index 48bf779d5..2fa7a0fe8 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-0.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b19c7edb36015db561932ae129a450c63486db5be4d4741543da4a3d733e5a06 -size 135691 +oid sha256:ccbbe95e4a9f403e4cf61bceb81efd3d398409b9dee7e94cfd4b7700898a619c +size 138319 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-1.png index 3a3fc72e4..9715a7316 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-1.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21f4c963577b922b167045450aa299ecdc2418c8dea74b5b70b3d2a61949e428 -size 95035 +oid sha256:24ce09f07911e0367f976f205569f035b63af573aca5934c1f681db7a7a0c9ec +size 95561 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-2.png index ffc0fe4a9..d5fdcbec3 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-2.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-en-GB-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:522e34c3e39a596ad7d403de95251b5a1d14817deb883ecd076e9df2730549ab -size 143688 +oid sha256:21ffe24f29e27109288c8d431bbad8efc224557f34e728c2d8c0006a2aa807a6 +size 147050 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-0.png index d242ff4d5..a0cb20bca 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-0.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41d5311c78ee8e73eab7acf6be1e4e96e907d51d7bd506908df07c38ae3cc196 -size 171185 +oid sha256:c6313775d8eac4f7e13489dfce37fd403fcee37d1d621fd2a41d2b4f75c6b8cf +size 174882 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-1.png index 0ccfe98b6..f479fba09 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-1.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51a392db967bc5c5a469a4ce3ab7a705da5afdebbd99de7f6fbd8018392e4f96 -size 104990 +oid sha256:94b5d408f18451158f43b08290615ebca788be309df76ae1a250698f12c3c870 +size 107937 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-2.png index 8be7dafca..c5e674c57 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-2.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-en-GB-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f46f8c4f12798fbb155415ba0c4ddf93279312f957f5b65eaaf4a44afed6930 -size 181762 +oid sha256:5d6d2413c71413c45dd706afa29d67a9f3a3ded4d3eb63e5c90ca152fb1f7165 +size 185098 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-0.png index a2844020e..8657498fa 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-0.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8c917d0e118fbd2b0bc40b82879136bcce591b0d14f613ab90fdb882f7c3088 -size 125026 +oid sha256:9676389f348335b66c259dccdc652560dabccd647e2e3eb65f221a11792e4c43 +size 127048 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-1.png index 913843460..8981f57ba 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-1.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77fb3b0f26b7c6add9ea93a487a4aec681064e0a1f732c251ec34ae466e8faf4 -size 245652 +oid sha256:3e288c11e61b341876d10b1705145485b1a34c5b77ff52b0e746f9251236a08b +size 240477 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-2.png index 8b311fc8f..34f93e923 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-2.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a18a680b76d07edfd36d90884bbc61f22aac79483c1ca750a922a1029ffad2d3 -size 107662 +oid sha256:3cc82782cbfe78df5192b6a6ebd345688487098363880f35581511b663da3f18 +size 105070 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-3.png index 2f1611236..a87e33e49 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-3.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1eca34d60a550924486ad5da65a0119d31c4d0075b8063f62a7d0f7e73e3c5c -size 224092 +oid sha256:fd881f3f905fcdb717c61884319f4aef1d48d83e6e3362e47614ca7a9c88e38c +size 220176 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-4.png index 84c47afa9..a5124c018 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-4.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-en-GB-4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39782fa34b2695285b190a608b3c05d7288ff9b39048ff4c338564977edc5cff -size 222930 +oid sha256:ea2d2ca9efa72124f9c1492479eda890033886b696e5fd041bbfe0557ad2327e +size 218506 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-0.png index 203e0d397..216754627 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-0.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6b0c782e92ef1f73795bd9b255bb895309cc2159015ddcd147ef79f6cfce7a3 -size 149728 +oid sha256:d5f17300866d4fbaed10e2edc4af07eca937e743f7f077fe73d62f58cfe04f45 +size 160116 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-1.png index fff7893d2..7b4fe752c 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-1.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94fed8ac22d7bd510b3242a21660ea5fe3b4b399d0657bdc947c75238a9e92ae -size 169432 +oid sha256:7819a76cd923a84884a06cbeb72969d5addfcac1121f63e75c3b086179274777 +size 168363 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-2.png index 66b836f07..e86551450 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-2.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8e8aaf2fa46a29360ae8e455a0afccea2d34c2c419b1b6ad25dd7c7634acb57 -size 124934 +oid sha256:02cb1db89189ff0e1c1dd61aebf46427996257842ca3a787a034ccba0129e690 +size 121833 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-3.png index e07179b51..6dcec3fdd 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-3.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:606bcfd26a46d5d21fadc062f422fc2fe3e79923ae8c7a00b9a1175a088a2241 -size 135297 +oid sha256:7fb2a3305523bf81736cd73250c51502d15afa3cb6f7dc95502439f09991751c +size 135134 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-en-GB-0.png index a2844020e..8657498fa 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-en-GB-0.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-en-GB-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8c917d0e118fbd2b0bc40b82879136bcce591b0d14f613ab90fdb882f7c3088 -size 125026 +oid sha256:9676389f348335b66c259dccdc652560dabccd647e2e3eb65f221a11792e4c43 +size 127048 diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-en-GB-0.png index 0d41e2e19..216754627 100644 --- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-en-GB-0.png +++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-en-GB-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a61707f2865351f59ed09b46f7019ab26a5ef1ee978b1211379a231976544e3e -size 149757 +oid sha256:d5f17300866d4fbaed10e2edc4af07eca937e743f7f077fe73d62f58cfe04f45 +size 160116 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-en-GB.png index 41657b66d..95b6c0752 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8436c792f285852535a2e7deea8245108e86538b089dde2a0e77440b9169a1a -size 289877 +oid sha256:555c48e145a2671e06247c4d98f0922c2d7208519c8661b8eab93c9488f1f2e7 +size 289536 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-en-GB.png index fcc5e5d46..77a22bc89 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:171da6b4a43eaacb7e3591ea7913bf1ae654bd766413fddc4035a2eb1bc52850 -size 319591 +oid sha256:3aa30810255bf4f12ead614dcc0a43b8f401a5393b9cbef47d546363bdce054f +size 319543 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-en-GB.png index 809ff540c..99b74d0dc 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:841049046150623da9c46b7581e57bb2a7a362ebcd65773c5961795d9434d4b2 -size 108781 +oid sha256:e0845b649b5f1781be4e7bb1b7a9b56bf78a6878176486823babdb3150c2b87f +size 106464 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-en-GB.png index 5a8f461fe..e9e8290ce 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfe2e708cffe3c4134b554558ac3c34cb41ab77ac2310d73b8be070f2822edfc -size 129281 +oid sha256:818656e2cfcdbc93a0ba7b72817787a22b8703b5d0c3e166d6257618b14d79bd +size 128998 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPad-en-GB.png index cf761c570..6a8bdf208 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3378b33cf6a6e7616e0f6d269ab8ea238b1a3552bf723285f1a56fda251ed2df -size 316979 +oid sha256:b94961cf9ad380174c8949fce98b24881c13b2d0b2ded39f6fc832b2a5ef1e4f +size 316848 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPad-en-GB.png index 6d2af5f25..5249a3640 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0cc0e8cf4662ace2c3a961caa753de6afb1d1f055e1259f8cb66a3cef55dbad -size 176347 +oid sha256:c9ed9f93ab6114e425cb76ee575dc365744d8e5d22404365009e67435ac78d4d +size 175922 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-en-GB-0.png index f2f5cc208..f42fbe7a5 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-en-GB-0.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-en-GB-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:727cc0d0c1e108dde23530b3349b0fb2ed8baac4e0601932aa234d78429a98dd -size 309280 +oid sha256:d761c50bac7be1ddcc9eac6bc2278b48fce60809e5c793bd40153e9b9a0da3cb +size 308829 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-en-GB-1.png index 227ea7f15..5d8da76ab 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-en-GB-1.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-en-GB-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53567aa58a78d5a869d4bf91b3fef3f905b6d1d8b5e9b42d96efc0476fceb8b5 -size 314624 +oid sha256:f83e44b07ec70021852a637edebe6b4f41b108c7250a7a36ba918549b2c69a8f +size 313961 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-1.png index 5a48adeab..d6d49de6f 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-1.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f68f6372172a8fe470121cb4a48879d42d88f68fa59f672a91b869f0f669dd21 -size 256648 +oid sha256:29ed277987c1e2f0fd581727370617b9e7f9f799ebcc5c265152e28a588512ca +size 259324 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-en-GB.png index 82d9a7cf5..aa0029522 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:827844cfe025b345c1433e6866b4021903b48a9dd4de6fe20761c858489380bb -size 312932 +oid sha256:569524d778a6005493d14355ed04693e887359420be8ee3c86e841e79004e495 +size 312476 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPad-en-GB.png index 86ed77b07..4a2cd5b2d 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e7fe505415d366dbbe27c3e30c089c3f075c0f15b7d6eb6695a834eb5381d3f -size 218904 +oid sha256:2f37b3390f9632d4cc3139c8eb027f893b7f379a0654577386fc85a338d8f464 +size 218369 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPad-en-GB.png index c4b6a49f5..0064fb526 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a8fdc95d6da5b15e21574970378f3339ab6dec46c435a79f352700dc8e4e64b -size 141063 +oid sha256:d1bc1e73180c1ec9c0f9fa91e294dff1147da75f2abe9f1503e09b7e7caddaa5 +size 140597 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-en-GB.png index adb15b139..64af0ede8 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b76cac22b1117e08d30e0d40088713380c87c6686b6cc7e75437b3f5bb26e2eb -size 129774 +oid sha256:9674dc10ef3a2532c1b069f8c99ddceb3e16e6ccf47df95a641a62c36085018a +size 127457 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-en-GB.png index 9fd27bdb6..972302a37 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3591eee911fd416b8328ec696ba2287752ec08881c6ddb0e58e4d7bd79cd54b8 -size 167215 +oid sha256:d1bbf865caf4226d653586cbc5a526dc448a6ff737f6c52f08b657a93708a7b7 +size 167080 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPad-en-GB.png index b6bfd2be8..188dd4c2f 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64577ff14a1701214c3ace472ba2b6c02d9914ebc46a44699f8a9e5c03a2e402 -size 173087 +oid sha256:dfad29ba94850203764f0e7b147658f83ff267789c05b0183bad22adbaadc218 +size 172662 diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-en-GB.png index d446b7e02..e0878dab7 100644 --- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:452a2bcaa06f8e61d0921eaa6cdcf9a0f469758bb57c7730206513505aadc129 -size 234406 +oid sha256:f72b436d4a042883bd7c583657af08090b8c2db8dc6ff8c7af9450711b2bfe05 +size 234425 diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-en-GB.png index 91ab7e9dc..a592cd48c 100644 --- a/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0cdd93f6982b645d7a6c7893036f05d1550315a0d248d4b9ac2cba0ddb875f4 -size 166072 +oid sha256:c2849f409b014460e1c164820a3db2ee364b6a61d2a1aac5c004f614f25483da +size 166133 diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-en-GB.png index a570d9c7b..4085e8abe 100644 --- a/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:755b3a2c8be2d4e6b496c05308a8d52cd09e6e9a6bacafe2ae9ecc392da69877 -size 168927 +oid sha256:50c9f12d709219acfd5d1cfcf62041af9537b669a653f92f3ccf453da70f383e +size 169106 diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-en-GB-1.png index 2245afe8b..72d05612b 100644 --- a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-en-GB-1.png +++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-en-GB-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6cd3dee6a121b6ca50ba5e66f3cbccaf67a9cf75c9714568f12867df34ae1a6 -size 90187 +oid sha256:630120434bb5f01e95a7fb0199f2125a8729db88923a810ca498fe1457817ad5 +size 90166 diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-en-GB-1.png index 63cdc2dec..b5dfcd3ad 100644 --- a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-en-GB-1.png +++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-en-GB-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23304de779aafa6bc7043203b79783954da3259bc848551ec2f19164437b1e13 -size 95791 +oid sha256:9181d42db80f8867582bc317fe40755b7432ac92b1e147dbe722aae2663f80c8 +size 95856 diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-en-GB-1.png index 9906e426d..d695f1be6 100644 --- a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-en-GB-1.png +++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-en-GB-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f2e7cbd6ee0008628c88d6ec9f41267dd2d5cd72d7e5284b602f87a9ac35e99 -size 90182 +oid sha256:295d23fea4463acf99d8f678435d5b08612ac444d6b573811a194c6c8c9123d1 +size 90210 diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-en-GB-1.png index b5dfcd3ad..63cdc2dec 100644 --- a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-en-GB-1.png +++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-en-GB-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9181d42db80f8867582bc317fe40755b7432ac92b1e147dbe722aae2663f80c8 -size 95856 +oid sha256:23304de779aafa6bc7043203b79783954da3259bc848551ec2f19164437b1e13 +size 95791 diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-en-GB-1.png index b5dfcd3ad..63cdc2dec 100644 --- a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-en-GB-1.png +++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-en-GB-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9181d42db80f8867582bc317fe40755b7432ac92b1e147dbe722aae2663f80c8 -size 95856 +oid sha256:23304de779aafa6bc7043203b79783954da3259bc848551ec2f19164437b1e13 +size 95791 diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testAcceptSpaceInvite-iPhone-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testAcceptSpaceInvite-iPhone-en-GB-4.png index 985774d2b..750eeb13d 100644 --- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testAcceptSpaceInvite-iPhone-en-GB-4.png +++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testAcceptSpaceInvite-iPhone-en-GB-4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:349576491d41190794e374a16fb6d0582f2b3bef294a34eee1b310f0de2610ea -size 695376 +oid sha256:df75a76a44aa0a7f8b231fb76a0c5b75b8591026398c051338cf58d99ad8a495 +size 695373 diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPad-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPad-en-GB-4.png index f71d81511..acd821460 100644 --- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPad-en-GB-4.png +++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPad-en-GB-4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec8ec1f6a6ecd0b7869fdb2b0c7538662caaa48d1de4892e2ab1345ad82d253f -size 507280 +oid sha256:f2aaffe97acf1b29708609ffc119c1fe67b8b286de87ab2f66305dfefd226739 +size 507367 diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPad-en-GB-8.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPad-en-GB-8.png index 7f8cb79ea..772601050 100644 --- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPad-en-GB-8.png +++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPad-en-GB-8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbd576d7e6ddcf3c1f92f4812726c144fa325c2842040638a0b1018ba0d5d42b -size 440131 +oid sha256:1c812198021cd1967d1b15c4fbc19958bfff60c13195696e106bed9db649b1d9 +size 439831 diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-10.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-10.png index 866cd76b9..e29cad211 100644 --- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-10.png +++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6361faefaeff3d18121fe975c6c472a5f33b08cd4818c6e6192dcf5c940ffeae -size 171619 +oid sha256:0edf9c50527b8fd1d7267b39eb5d0079b17f26e9405887a224ded50b5c8526bb +size 171498 diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-5.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-5.png index b000b16ea..27821babc 100644 --- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-5.png +++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:266fb18755b3679986bc69c1c0fb9b4e9ac2b700b8119364ab3cb129b4d95ca8 -size 371539 +oid sha256:94e839271660f13c5a77e97460f72a642fa87f2858331716dffe86d2ba2fcbaf +size 370661 diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-7.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-7.png index 9aa639c84..df25a965c 100644 --- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-7.png +++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4d71b23d7c6c49f194c8e6ad03f381be466eb790bd432e0b44e7f56c0226c77 -size 140779 +oid sha256:5a70e7391975c2d5d8069261ce80bfad87f708b780b78520adc79af7f72837de +size 140699 diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-en-GB-2.png index 46c110b2b..c0439ab37 100644 --- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-en-GB-2.png +++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-en-GB-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc97b460e6e5d8c094e1c922f91f0f5f7a05d02d63f6f9ac381974fd6852fd51 -size 515344 +oid sha256:7b1043ac482ac77e1f702dd836e5ec7c9b9651a81b1fb1fa4bcbab5f6ecd1625 +size 514882 diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-en-GB-3.png index d06ff30ea..a1b8dfbe1 100644 --- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-en-GB-3.png +++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-en-GB-3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7cbbb2d3660d0299a5f3fc59376f645d97c66bdb7225afb78ac90f9724c6587 -size 586533 +oid sha256:e1693d994bf5ef2e5a8b44d4a35a597c3488fa2615888d2a66e568051a2484a9 +size 587384 diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-3.png index d978bc222..665b0543f 100644 --- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-3.png +++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2bd268f7474dd09384a646e24f74a1f529f30d4717df5260208b2f4f1a07ea3 -size 443867 +oid sha256:50674d74da9708bbfbd962f0770f4eda886312ae42468bff801e3ac0581056fd +size 445996 diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-en-GB.png index 4cb625052..34a2001cf 100644 --- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b7b3fc6be9714c75eebed4124b829b65d9e058fbaebb46d5c17790b44d8f09b -size 530613 +oid sha256:cebda75f9478e418a8c5f7cbce234efba0bf3a1720a86e1551b55bd20cc359bb +size 531722 diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-en-GB.png index 8214a6311..807d3213d 100644 --- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-en-GB.png +++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c41560089930954c50895d3b8fcbfe8ff2beb037c1ac87fa51ffea79aa2982c7 -size 272629 +oid sha256:bc053cb55c7a82f453a881ea5f19fcbeb37ac5b9bc99445c93d4e0c0a3d8e7be +size 273017 diff --git a/UnitTests/Sources/RoomSummaryProviderTests.swift b/UnitTests/Sources/RoomSummaryProviderTests.swift index 630128f81..79262401c 100644 --- a/UnitTests/Sources/RoomSummaryProviderTests.swift +++ b/UnitTests/Sources/RoomSummaryProviderTests.swift @@ -117,7 +117,7 @@ final class RoomSummaryProviderTests { let dynamicAdaptersResult = RoomListEntriesWithDynamicAdaptersResultSDKMock() dynamicAdaptersResult.controllerReturnValue = dynamicEntriesController roomList = RoomListSDKMock() - roomList.entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerReturnValue = dynamicAdaptersResult + roomList.entriesWithDynamicAdaptersPageSizeListenerReturnValue = dynamicAdaptersResult roomList.loadingStateListenerReturnValue = .some(.init(state: .notLoaded, stateStream: .init(noHandle: .init()))) roomSummaryProvider.setRoomList(roomList) } diff --git a/project.yml b/project.yml index 2e1c78b71..2e71bcc6a 100644 --- a/project.yml +++ b/project.yml @@ -74,7 +74,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 26.03.10 + exactVersion: 26.03.18 # path: ../matrix-rust-sdk Compound: path: compound-ios