From 5167ed8fb6a0cbb64e8e8da5be6cc2e452c1f22b Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 28 May 2025 11:39:51 +0200 Subject: [PATCH 1/5] update to support 16.3 --- Gemfile.lock | 31 ++++++++++++++------------- Podfile | 2 +- Podfile.lock | 12 +++++------ RiotTests/PushRulesUpdaterTests.swift | 2 +- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 82538d2eb..c858250c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,17 +32,18 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.2) - aws-partitions (1.1063.0) - aws-sdk-core (3.220.1) + aws-partitions (1.1107.0) + aws-sdk-core (3.224.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.99.0) + logger + aws-sdk-kms (1.101.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.182.0) + aws-sdk-s3 (1.186.1) aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -96,13 +97,13 @@ GEM commander (4.6.0) highline (~> 2.0.0) concurrent-ruby (1.3.5) - connection_pool (2.5.0) + connection_pool (2.5.3) declarative (0.0.20) digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) dotenv (2.8.1) - drb (2.2.1) + drb (2.2.3) emoji_regex (3.2.3) escape (0.0.4) ethon (0.16.0) @@ -137,7 +138,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.226.0) + fastlane (2.227.2) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -177,17 +178,17 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.4.0) + xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-plugin-brew (0.1.1) - fastlane-plugin-sentry (1.28.0) + fastlane-plugin-sentry (1.29.0) os (~> 1.1, >= 1.1.4) fastlane-plugin-versioning (0.7.1) fastlane-plugin-xcodegen (1.1.0) fastlane-plugin-brew (~> 0.1.1) fastlane-sirp (1.0.0) sysrandom (~> 1.0) - ffi (1.17.1) + ffi (1.17.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -235,14 +236,14 @@ GEM i18n (1.14.7) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.10.1) + json (2.12.2) jwt (2.10.1) base64 - logger (1.6.6) + logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) - mini_portile2 (2.8.8) - minitest (5.25.4) + mini_portile2 (2.8.9) + minitest (5.25.5) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.4.1) @@ -313,7 +314,7 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.4.0) rexml (>= 3.3.6, < 4.0) - xcpretty (0.4.0) + xcpretty (0.4.1) rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) diff --git a/Podfile b/Podfile index 5a9048ac9..df74ba48c 100644 --- a/Podfile +++ b/Podfile @@ -34,7 +34,7 @@ abstract_target 'RiotPods' do pod 'KeychainAccess', '~> 4.2.2' pod 'WeakDictionary', '~> 2.0' - pod 'Sentry', '~> 8.35.0' + pod 'Sentry', '~> 8.46.0' pod 'zxcvbn-ios' diff --git a/Podfile.lock b/Podfile.lock index 0d2dfd08b..5fa3debb8 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -60,9 +60,9 @@ PODS: - Reusable/View (= 4.1.2) - Reusable/Storyboard (4.1.2) - Reusable/View (4.1.2) - - Sentry (8.35.1): - - Sentry/Core (= 8.35.1) - - Sentry/Core (8.35.1) + - Sentry (8.46.0): + - Sentry/Core (= 8.46.0) + - Sentry/Core (8.46.0) - SideMenu (6.5.0) - SwiftBase32 (0.9.0) - SwiftFormat/CLI (0.54.5) @@ -97,7 +97,7 @@ DEPENDENCIES: - MatrixSDK/JingleCallStack (from `matrix-ios-sdk/MatrixSDK.podspec`) - ReadMoreTextView (~> 3.0.1) - Reusable (~> 4.1) - - Sentry (~> 8.35.0) + - Sentry (~> 8.46.0) - SideMenu (~> 6.5) - SwiftBase32 (~> 0.9.0) - SwiftFormat/CLI @@ -181,7 +181,7 @@ SPEC CHECKSUMS: ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2 Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136 - Sentry: 1fe34e9c2cbba1e347623610d26db121dcb569f1 + Sentry: da60d980b197a46db0b35ea12cb8f39af48d8854 SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2 SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17 SwiftFormat: 543a7b1ab4a6ce2d88bd5616a17903446ca3dc5c @@ -195,6 +195,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 -PODFILE CHECKSUM: 24c4218f1b6fef3b8605b4af17ed3b914f373774 +PODFILE CHECKSUM: 60f4fe3695f2304b9bba734acf38d59c79678ac1 COCOAPODS: 1.16.2 diff --git a/RiotTests/PushRulesUpdaterTests.swift b/RiotTests/PushRulesUpdaterTests.swift index 7602b5982..24abcec09 100644 --- a/RiotTests/PushRulesUpdaterTests.swift +++ b/RiotTests/PushRulesUpdaterTests.swift @@ -54,7 +54,7 @@ final class PushRulesUpdaterTests: XCTestCase { } } - func testAffectedOneToOneRulesAreUpdated() async throws { + func disabled_testAffectedOneToOneRulesAreUpdated() async throws { let targetActions: NotificationActions = .init(notify: true, sound: "abc") try mockRule(ruleId: .oneToOneRoom, enabled: true, actions: targetActions) let affectedRules: [NotificationPushRuleId] = [.oneToOneRoom, .oneToOnePollStart, .msc3930oneToOnePollStart, .oneToOnePollEnd, .msc3930oneToOnePollEnd] From de546c54aade3fe88bd8e71140c999d5baa5002a Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 28 May 2025 11:44:45 +0200 Subject: [PATCH 2/5] test again --- RiotTests/PushRulesUpdaterTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RiotTests/PushRulesUpdaterTests.swift b/RiotTests/PushRulesUpdaterTests.swift index 24abcec09..7602b5982 100644 --- a/RiotTests/PushRulesUpdaterTests.swift +++ b/RiotTests/PushRulesUpdaterTests.swift @@ -54,7 +54,7 @@ final class PushRulesUpdaterTests: XCTestCase { } } - func disabled_testAffectedOneToOneRulesAreUpdated() async throws { + func testAffectedOneToOneRulesAreUpdated() async throws { let targetActions: NotificationActions = .init(notify: true, sound: "abc") try mockRule(ruleId: .oneToOneRoom, enabled: true, actions: targetActions) let affectedRules: [NotificationPushRuleId] = [.oneToOneRoom, .oneToOnePollStart, .msc3930oneToOnePollStart, .oneToOnePollEnd, .msc3930oneToOnePollEnd] From ab6d00e47ee4829576458acfc83928bc0aab14b6 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 28 May 2025 13:06:14 +0200 Subject: [PATCH 3/5] removed strings that don't work --- Riot/Assets/ar.lproj/Vector.strings | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Riot/Assets/ar.lproj/Vector.strings b/Riot/Assets/ar.lproj/Vector.strings index 5cee2c098..7faac7573 100644 --- a/Riot/Assets/ar.lproj/Vector.strings +++ b/Riot/Assets/ar.lproj/Vector.strings @@ -2283,7 +2283,6 @@ "device_verification_emoji_book" = "كتاب"; "key_backup_setup_success_from_recovery_key_make_copy_action" = "اصنع نسخة"; "key_backup_setup_passphrase_setup_recovery_key_action" = "(متقدم) الإعداد باستخدام مفتاح الأمان"; -"key_backup_recover_from_private_key_progress" = "٪@٪٪ مكتمل"; "device_verification_emoji_fish" = "سمكة"; "device_verification_emoji_corn" = "حبوب ذرة"; "device_verification_emoji_robot" = "روبوت"; @@ -2375,7 +2374,6 @@ "spaces_explore_rooms" = "استكشاف الغرف"; "device_verification_emoji_bell" = "جرس"; "device_verification_emoji_pin" = "دبوس"; -"pin_protection_settings_section_header_with_biometrics" = "دبوس & ٪@"; "space_feature_unavailable_title" = "المساحات ليست هنا بعد"; "spaces_explore_rooms_format" = "يستكشف ٪@"; "key_verification_bootstrap_not_setup_message" = "يجب عليك أولاً تمهيد التوقيع المتبادل."; @@ -2530,7 +2528,6 @@ "user_other_session_filter_menu_verified" = "تم التحقق"; "user_other_session_no_inactive_sessions" = "لم يتم العثور على جلسات غير نشطة."; "device_verification_emoji_hat" = "قبعة"; -"room_intro_cell_information_room_with_topic_sentence2" = "موضوع: ٪@"; "space_beta_announce_badge" = "بيتا (تجريبي)"; "spaces_creation_new_rooms_title" = "ما هي بعض المناقشات التي ستجريها؟"; "spaces_creation_invite_by_username_title" = "ادعُ فريقك"; @@ -2606,7 +2603,6 @@ "voice_message_remaining_recording_time" = "%@s متبقية"; "spaces_creation_sharing_type_title" = "مع من تعمل؟"; "side_menu_action_feedback" = "تعليق"; -"location_sharing_loading_map_error_title" = "تعذر تحميل الخريطة. يُرجى المحاولة لاحقًا."; "user_session_unverified" = "جلسة غير مُتحققة"; "user_other_session_security_recommendation_title" = "جلسات أخرى"; "user_session_details_application_version" = "إصدار"; From e3fc7f1baad4e75a17fa40ff1e083ba1c87e1ef1 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 28 May 2025 13:30:23 +0200 Subject: [PATCH 4/5] removed broken localization strings --- Riot/Assets/ar.lproj/Vector.strings | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Riot/Assets/ar.lproj/Vector.strings b/Riot/Assets/ar.lproj/Vector.strings index 7faac7573..076873b5b 100644 --- a/Riot/Assets/ar.lproj/Vector.strings +++ b/Riot/Assets/ar.lproj/Vector.strings @@ -2355,7 +2355,6 @@ "secrets_recovery_with_passphrase_passphrase_placeholder" = "أدخل عبارة الأمان"; "create_room_section_footer_type_restricted" = "يمكن لأي شخص في اسم المساحة البحث والانضمام."; "space_beta_announce_information" = "المساحات هي طريقة جديدة لتجميع الغرف والأشخاص. لم تتوفر بعد على نظام iOS، ولكن يمكنك استخدامها الآن على الويب وسطح المكتب."; -"leave_space_title" = "يترك ٪@"; "leave_space_message_admin_warning" = "أنت مسؤول عن هذه المساحة، تأكد من أنك قمت بنقل حقوق المسؤول إلى عضو آخر قبل المغادرة."; "spaces_creation_settings_message" = "أضف بعض التفاصيل لإبرازها. يمكنك تغييرها في أي وقت."; "device_verification_emoji_anchor" = "مِرسَاة"; @@ -2375,7 +2374,6 @@ "device_verification_emoji_bell" = "جرس"; "device_verification_emoji_pin" = "دبوس"; "space_feature_unavailable_title" = "المساحات ليست هنا بعد"; -"spaces_explore_rooms_format" = "يستكشف ٪@"; "key_verification_bootstrap_not_setup_message" = "يجب عليك أولاً تمهيد التوقيع المتبادل."; "user_verification_session_details_verify_action_other_user" = "التحقق يدويًا"; "secrets_recovery_with_passphrase_information_verify_device" = "استخدم عبارة الأمان الخاصة بك للتحقق من هذا الجهاز."; @@ -2509,7 +2507,6 @@ "wysiwyg_composer_link_action_link" = "وصلة"; "device_type_name_unknown" = "غير معروف"; "user_other_session_verified_sessions_header_subtitle" = "للحصول على أفضل مستوى من الأمان، قم بتسجيل الخروج من أي جلسة لا تعرفها أو لا تستخدمها بعد الآن."; -"device_name_mobile" = "٪@ جوال"; "device_type_name_desktop" = "سطح المكتب"; "wysiwyg_composer_link_action_create_title" = "إنشاء رابط"; "deselect_all" = "إلغاء تحديد الكل"; @@ -2556,9 +2553,7 @@ "room_event_encryption_info_key_authenticity_not_guaranteed" = "لا يمكن ضمان صحة هذه الرسالة المشفرة على هذا الجهاز."; "spaces_creation_sharing_type_me_and_teammates_title" = "أنا وزملائي في الفريق"; "spaces_creation_invite_by_username" = "دعوة عن طريق اسم المستخدم"; -"spaces_creation_in_spacename" = "في ٪@"; "spaces_creation_in_spacename_plus_one" = "في %@ + 1 مساحة"; -"room_event_action_reaction_more" = "٪@ أكثر"; "side_menu_action_help" = "مساعدة"; "user_session_push_notifications" = "إشعارات الدفع"; "user_other_session_filter_menu_all" = "جميع الجلسات"; @@ -2616,7 +2611,6 @@ "spaces_creation_post_process_creating_room" = "إنشاء %@"; "spaces_creation_post_process_adding_rooms" = "إضافة %@ غرف"; "spaces_creation_in_one_space" = "في مساحة واحدة"; -"side_menu_app_version" = "إصدار ٪@"; "voice_message_lock_screen_placeholder" = "رسالة صوتية"; "user_session_verified_short" = "تم التحقق"; "user_other_session_unverified_additional_info" = "قم بالتحقق من هذه الجلسة أو تسجيل الخروج منها للحصول على أفضل مستوى من الأمان والموثوقية."; From 58920f3c48fe015e5eb1c8a92b34963cb6414573 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 28 May 2025 13:45:44 +0200 Subject: [PATCH 5/5] another malformatted string removed --- Riot/Assets/ar.lproj/Vector.strings | 1 - 1 file changed, 1 deletion(-) diff --git a/Riot/Assets/ar.lproj/Vector.strings b/Riot/Assets/ar.lproj/Vector.strings index 076873b5b..838be3117 100644 --- a/Riot/Assets/ar.lproj/Vector.strings +++ b/Riot/Assets/ar.lproj/Vector.strings @@ -2315,7 +2315,6 @@ "key_backup_recover_from_passphrase_passphrase_placeholder" = "أدخل العبارة"; "deactivate_account_informations_part3" = "\n\nإلغاء تنشيط حسابك "; "user_verification_sessions_list_user_trust_level_unknown_title" = "غير معروف"; -"room_invite_to_space_option_title" = "ل ٪@"; "spaces_coming_soon_detail" = "لم تُطبّق هذه الميزة هنا، ولكنها في طريقها. حاليًا، يمكنك القيام بذلك باستخدام %@ على جهاز الكمبيوتر."; "space_feature_unavailable_subtitle" = "لم يتم إطلاق Spaces على نظام التشغيل iOS بعد، ولكن يمكنك استخدامها الآن على الويب وسطح المكتب"; "space_feature_unavailable_information" = "المساحات وسيلة جديدة لتجميع الغرف والأشخاص.\n\nستتوفر قريبًا. حاليًا، إذا انضممت إلى واحدة عبر منصة أخرى، ستتمكن من الوصول إلى أي غرف تنضم إليها هنا.";