From 344cbec4cc6e0b0f6a55c9c7ebb1e1a1d86c6b0f Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 13 Sep 2023 16:06:27 +0100 Subject: [PATCH 01/34] Prepare for new sprint --- Config/AppVersion.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index eabcc9b01e..de47f2bd6a 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.11.3 -CURRENT_PROJECT_VERSION = 1.11.3 +MARKETING_VERSION = 1.11.4 +CURRENT_PROJECT_VERSION = 1.11.4 From b04a43012de3388c3c8ad0566aaa3a95c350e78c Mon Sep 17 00:00:00 2001 From: Besnik Bleta Date: Wed, 23 Aug 2023 09:15:19 +0000 Subject: [PATCH 02/34] Translated using Weblate (Albanian) Currently translated at 99.6% (2402 of 2411 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/ --- Riot/Assets/sq.lproj/Vector.strings | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Riot/Assets/sq.lproj/Vector.strings b/Riot/Assets/sq.lproj/Vector.strings index c5f738cafe..79d2def266 100644 --- a/Riot/Assets/sq.lproj/Vector.strings +++ b/Riot/Assets/sq.lproj/Vector.strings @@ -2746,3 +2746,9 @@ // Room commands descriptions "room_command_change_display_name_description" = "Kjo ndryshon nofkën tuaj në ekran"; +"room_creation_user_not_found_prompt_title" = "Ripohim"; +"room_creation_user_not_found_prompt_message" = "S’arrihet të gjenden profile për këtë ID Matrix. Doni të niset një MD, sido që të jetë?"; +"room_creation_user_not_found_prompt_invite_action" = "Nis MD, sido qoftë"; +"room_participants_invite_unknown_participant_prompt_to_msg" = "S’arrihet të gjenden profile për këtë ID Matrix. Jeni i sigurt se doni të ftohet %@ te %@?"; +"room_participants_invite_anyway" = "Ftoje, sido qoftë"; +"poll_timeline_loading" = "Po ngarkohet…"; From 1ee8428cae56adff6175bc7fdb36af4a63b66825 Mon Sep 17 00:00:00 2001 From: phardyle Date: Thu, 24 Aug 2023 16:34:44 +0000 Subject: [PATCH 03/34] Translated using Weblate (Chinese (Simplified)) Currently translated at 84.1% (2029 of 2411 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/ --- Riot/Assets/zh_Hans.lproj/Vector.strings | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings index c59b7a61a1..bf6f750221 100644 --- a/Riot/Assets/zh_Hans.lproj/Vector.strings +++ b/Riot/Assets/zh_Hans.lproj/Vector.strings @@ -2349,3 +2349,6 @@ // User sessions management "user_sessions_settings" = "管理登陆会话"; "settings_presence_offline_mode_description" = "如果开启此选项，对其他用户来说，你看起来就会像下线了一样，即使你正在使用此软件。"; +"room_creation_user_not_found_prompt_title" = "确认"; +"room_creation_user_not_found_prompt_message" = "无法找到此Matrix ID的profiles。你仍然想开始私信吗？"; +"room_creation_user_not_found_prompt_invite_action" = "无论如何都要开始私信"; From 02aff3148f6a48d1d07acd8ffd8aa7f1e320eea8 Mon Sep 17 00:00:00 2001 From: phardyle Date: Thu, 24 Aug 2023 16:37:06 +0000 Subject: [PATCH 04/34] Translated using Weblate (Chinese (Simplified)) Currently translated at 84.1% (2030 of 2411 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/ --- Riot/Assets/zh_Hans.lproj/Vector.strings | 1 + 1 file changed, 1 insertion(+) diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings index bf6f750221..dfd786fc9d 100644 --- a/Riot/Assets/zh_Hans.lproj/Vector.strings +++ b/Riot/Assets/zh_Hans.lproj/Vector.strings @@ -2352,3 +2352,4 @@ "room_creation_user_not_found_prompt_title" = "确认"; "room_creation_user_not_found_prompt_message" = "无法找到此Matrix ID的profiles。你仍然想开始私信吗？"; "room_creation_user_not_found_prompt_invite_action" = "无论如何都要开始私信"; +"room_participants_invite_anyway" = "无论如何，邀请"; From 566ae93a005448a1b4a82b82582ca4bfeedcec1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E7=85=9C=E6=81=92?= Date: Thu, 24 Aug 2023 16:38:17 +0000 Subject: [PATCH 05/34] Translated using Weblate (Chinese (Simplified)) Currently translated at 84.2% (2032 of 2411 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/ --- Riot/Assets/zh_Hans.lproj/Vector.strings | 1 + 1 file changed, 1 insertion(+) diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings index dfd786fc9d..e29b8ab5be 100644 --- a/Riot/Assets/zh_Hans.lproj/Vector.strings +++ b/Riot/Assets/zh_Hans.lproj/Vector.strings @@ -2353,3 +2353,4 @@ "room_creation_user_not_found_prompt_message" = "无法找到此Matrix ID的profiles。你仍然想开始私信吗？"; "room_creation_user_not_found_prompt_invite_action" = "无论如何都要开始私信"; "room_participants_invite_anyway" = "无论如何，邀请"; +"threads_discourage_information_1" = "你的主服务器目前不支持消息线程，所以此功能可能不可靠。有的线程中的消息可能不一定可用。 "; From 1c1f032c3eda7ea06926500ad1a07817f16c2c92 Mon Sep 17 00:00:00 2001 From: phardyle Date: Thu, 24 Aug 2023 16:37:33 +0000 Subject: [PATCH 06/34] Translated using Weblate (Chinese (Simplified)) Currently translated at 84.2% (2032 of 2411 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/ --- Riot/Assets/zh_Hans.lproj/Vector.strings | 1 + 1 file changed, 1 insertion(+) diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings index e29b8ab5be..3e61b666e8 100644 --- a/Riot/Assets/zh_Hans.lproj/Vector.strings +++ b/Riot/Assets/zh_Hans.lproj/Vector.strings @@ -2354,3 +2354,4 @@ "room_creation_user_not_found_prompt_invite_action" = "无论如何都要开始私信"; "room_participants_invite_anyway" = "无论如何，邀请"; "threads_discourage_information_1" = "你的主服务器目前不支持消息线程，所以此功能可能不可靠。有的线程中的消息可能不一定可用。 "; +"room_command_emote_description" = "显示动作"; From 99eccab6de247725654e51862ac7485ac3bb970e Mon Sep 17 00:00:00 2001 From: phardyle Date: Thu, 24 Aug 2023 16:39:53 +0000 Subject: [PATCH 07/34] Translated using Weblate (Chinese (Simplified)) Currently translated at 84.3% (2034 of 2411 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/ --- Riot/Assets/zh_Hans.lproj/Vector.strings | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings index 3e61b666e8..8ff1960b65 100644 --- a/Riot/Assets/zh_Hans.lproj/Vector.strings +++ b/Riot/Assets/zh_Hans.lproj/Vector.strings @@ -2353,5 +2353,7 @@ "room_creation_user_not_found_prompt_message" = "无法找到此Matrix ID的profiles。你仍然想开始私信吗？"; "room_creation_user_not_found_prompt_invite_action" = "无论如何都要开始私信"; "room_participants_invite_anyway" = "无论如何，邀请"; -"threads_discourage_information_1" = "你的主服务器目前不支持消息线程，所以此功能可能不可靠。有的线程中的消息可能不一定可用。 "; +"threads_discourage_information_1" = "你的家服务器目前不支持消息列，所以此功能可能不可靠。有的消息列消息不一定可用。 "; "room_command_emote_description" = "显示动作"; +"threads_discourage_information_2" = "\n\n无论如何，启用消息列吗？"; +"settings_timeline" = "时间线"; From e38b3d5558689cb74c2bdc4068fb9aace19fcaab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E7=85=9C=E6=81=92?= Date: Thu, 24 Aug 2023 16:41:47 +0000 Subject: [PATCH 08/34] Translated using Weblate (Chinese (Simplified)) Currently translated at 84.4% (2035 of 2411 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/ --- Riot/Assets/zh_Hans.lproj/Vector.strings | 1 + 1 file changed, 1 insertion(+) diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings index 8ff1960b65..b180d13025 100644 --- a/Riot/Assets/zh_Hans.lproj/Vector.strings +++ b/Riot/Assets/zh_Hans.lproj/Vector.strings @@ -2357,3 +2357,4 @@ "room_command_emote_description" = "显示动作"; "threads_discourage_information_2" = "\n\n无论如何，启用消息列吗？"; "settings_timeline" = "时间线"; +"settings_labs_enable_threads" = "允许消息线程"; From ea2d1787f0b6b1ef30abff975b713444d22ef8ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E7=85=9C=E6=81=92?= Date: Thu, 24 Aug 2023 16:42:08 +0000 Subject: [PATCH 09/34] Translated using Weblate (Chinese (Simplified)) Currently translated at 84.4% (2036 of 2411 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/ --- Riot/Assets/zh_Hans.lproj/Vector.strings | 1 + 1 file changed, 1 insertion(+) diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings index b180d13025..c3282e02b6 100644 --- a/Riot/Assets/zh_Hans.lproj/Vector.strings +++ b/Riot/Assets/zh_Hans.lproj/Vector.strings @@ -2358,3 +2358,4 @@ "threads_discourage_information_2" = "\n\n无论如何，启用消息列吗？"; "settings_timeline" = "时间线"; "settings_labs_enable_threads" = "允许消息线程"; +"settings_labs_use_only_latest_user_avatar_and_name" = "在历史消息中显示用户的最新头像和昵称"; From 623409a0bf07d9f31a4d6348d94d9963d4c0b134 Mon Sep 17 00:00:00 2001 From: phardyle Date: Thu, 24 Aug 2023 16:42:00 +0000 Subject: [PATCH 10/34] Translated using Weblate (Chinese (Simplified)) Currently translated at 84.4% (2036 of 2411 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/ --- Riot/Assets/zh_Hans.lproj/Vector.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings index c3282e02b6..d01515c254 100644 --- a/Riot/Assets/zh_Hans.lproj/Vector.strings +++ b/Riot/Assets/zh_Hans.lproj/Vector.strings @@ -2357,5 +2357,5 @@ "room_command_emote_description" = "显示动作"; "threads_discourage_information_2" = "\n\n无论如何，启用消息列吗？"; "settings_timeline" = "时间线"; -"settings_labs_enable_threads" = "允许消息线程"; +"settings_labs_enable_threads" = "消息列消息"; "settings_labs_use_only_latest_user_avatar_and_name" = "在历史消息中显示用户的最新头像和昵称"; From 769772b58c19fbdea464f8562f7e5b86483a4264 Mon Sep 17 00:00:00 2001 From: phardyle Date: Thu, 24 Aug 2023 16:42:34 +0000 Subject: [PATCH 11/34] Translated using Weblate (Chinese (Simplified)) Currently translated at 84.7% (2043 of 2411 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/ --- Riot/Assets/zh_Hans.lproj/Vector.strings | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings index d01515c254..1c6c33e5fa 100644 --- a/Riot/Assets/zh_Hans.lproj/Vector.strings +++ b/Riot/Assets/zh_Hans.lproj/Vector.strings @@ -2358,4 +2358,12 @@ "threads_discourage_information_2" = "\n\n无论如何，启用消息列吗？"; "settings_timeline" = "时间线"; "settings_labs_enable_threads" = "消息列消息"; -"settings_labs_use_only_latest_user_avatar_and_name" = "在历史消息中显示用户的最新头像和昵称"; +"settings_labs_use_only_latest_user_avatar_and_name" = "在消息历史中显示用户的最新头像和名称"; +"manage_session_name_hint" = "自定义会话名称能帮你更轻松地识别设备。"; +"manage_session_rename" = "重命名会话"; +/* The placeholder will be replaces with manage_session_name_info_link */ +"manage_session_name_info" = "请注意，与你通信的人也可以看到会话名称。%@"; +"manage_session_sign_out_other_sessions" = "登出全部其他会话"; +"settings_presence_offline_mode" = "离线模式"; +"room_details_polls" = "投票历史"; +"settings_labs_enable_new_app_layout" = "新版应用布局"; From 518991da330c56ba1b307c835a37218039e13bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Fri, 25 Aug 2023 13:02:14 +0000 Subject: [PATCH 12/34] Translated using Weblate (Estonian) Currently translated at 100.0% (2414 of 2414 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/et/ --- Riot/Assets/et.lproj/Vector.strings | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Riot/Assets/et.lproj/Vector.strings b/Riot/Assets/et.lproj/Vector.strings index 0cad547d7b..4f81dd8f27 100644 --- a/Riot/Assets/et.lproj/Vector.strings +++ b/Riot/Assets/et.lproj/Vector.strings @@ -2714,3 +2714,6 @@ "room_creation_user_not_found_prompt_message" = "Sellele Matrix'i kasutajatunnuse profiili ei leidu. Kas sa ikkagi tahaksid temaga vestlust alustada?"; "room_participants_invite_unknown_participant_prompt_to_msg" = "Sellele Matrix'i kasutajatunnuse profiili ei leidu. Kas sa ikkagi tahaksid saata kutset kasutajale %@ jututuppa %@?"; "room_participants_invite_anyway" = "Kutsu siiski"; +"settings_manage_account_title" = "Kasutajakonto"; +"settings_manage_account_action" = "Halda kasutajakontot"; +"settings_manage_account_description" = "Halda kasutajakontot koduserveris %@"; From 634674447910daf8556f55e2b59b442b6fcb1528 Mon Sep 17 00:00:00 2001 From: Ihor Hordiichuk Date: Fri, 25 Aug 2023 15:15:25 +0000 Subject: [PATCH 13/34] Translated using Weblate (Ukrainian) Currently translated at 100.0% (2414 of 2414 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/ --- Riot/Assets/uk.lproj/Vector.strings | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Riot/Assets/uk.lproj/Vector.strings b/Riot/Assets/uk.lproj/Vector.strings index d5113e3c76..3e89b8d1f8 100644 --- a/Riot/Assets/uk.lproj/Vector.strings +++ b/Riot/Assets/uk.lproj/Vector.strings @@ -2967,3 +2967,6 @@ "room_creation_user_not_found_prompt_title" = "Підтвердження"; "room_creation_user_not_found_prompt_message" = "Не вдалося знайти профілі для цього Matrix ID. Усе одно хочете розпочати приватну бесіду?"; "room_participants_invite_unknown_participant_prompt_to_msg" = "Не вдалося знайти профілі для цього Matrix ID. Ви впевнені, що хочете запросити %@ до %@?"; +"settings_manage_account_title" = "Обліковий запис"; +"settings_manage_account_action" = "Керувати обліковим записом"; +"settings_manage_account_description" = "Керувати обліковим записом у %@"; From a0a4ee1f289e1815ecf6a35cc85054c6bec62d10 Mon Sep 17 00:00:00 2001 From: Jozef Gaal Date: Sat, 26 Aug 2023 01:05:36 +0000 Subject: [PATCH 14/34] Translated using Weblate (Slovak) Currently translated at 100.0% (2414 of 2414 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sk/ --- Riot/Assets/sk.lproj/Vector.strings | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Riot/Assets/sk.lproj/Vector.strings b/Riot/Assets/sk.lproj/Vector.strings index 061991f16f..e2fdc7c7ab 100644 --- a/Riot/Assets/sk.lproj/Vector.strings +++ b/Riot/Assets/sk.lproj/Vector.strings @@ -2965,3 +2965,6 @@ "room_participants_invite_anyway" = "Napriek tomu pozvať"; "room_creation_user_not_found_prompt_message" = "Nie je možné nájsť používateľské profily pre toto Matrix ID. Chcete aj tak poslať priamu správu?"; "room_participants_invite_unknown_participant_prompt_to_msg" = "Nie je možné nájsť profily pre toto Matrix ID. Ste si istí, že chcete pozvať %@ do %@?"; +"settings_manage_account_title" = "Účet"; +"settings_manage_account_action" = "Spravovať účet"; +"settings_manage_account_description" = "Spravujte svoj účet na %@"; From 25a99b3e713bb5bc997f966d827bd0084725e3ad Mon Sep 17 00:00:00 2001 From: Linerly Date: Sat, 26 Aug 2023 08:02:45 +0000 Subject: [PATCH 15/34] Translated using Weblate (Indonesian) Currently translated at 100.0% (2414 of 2414 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/id/ --- Riot/Assets/id.lproj/Vector.strings | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Riot/Assets/id.lproj/Vector.strings b/Riot/Assets/id.lproj/Vector.strings index 8652674c6d..2530f647b8 100644 --- a/Riot/Assets/id.lproj/Vector.strings +++ b/Riot/Assets/id.lproj/Vector.strings @@ -2964,3 +2964,11 @@ "room_command_change_display_name_description" = "Mengubah nama tampilan Anda"; "notice_display_name_changed_to" = "%@ mengubah nama tampilannya menjadi %@"; "poll_timeline_loading" = "Memuat..."; +"room_creation_user_not_found_prompt_message" = "Tidak dapat mencari profil untuk ID Matrix ini. Apakah Anda masih ingin membuat percakapan langsung?"; +"room_creation_user_not_found_prompt_title" = "Konfirmasi"; +"room_creation_user_not_found_prompt_invite_action" = "Tetap buat percakapan langsung"; +"room_participants_invite_unknown_participant_prompt_to_msg" = "Tidak dapat mencari profil untuk ID Matrix ini. Apakah Anda masih ingin mengundang %@ ke %@?"; +"room_participants_invite_anyway" = "Tetap undang"; +"settings_manage_account_title" = "Akun"; +"settings_manage_account_action" = "Kelola akun"; +"settings_manage_account_description" = "Kelola akun Anda di %@"; From 896d9870494340d6c72a6db4f9edaa0218497f79 Mon Sep 17 00:00:00 2001 From: random Date: Sat, 26 Aug 2023 10:14:07 +0000 Subject: [PATCH 16/34] Translated using Weblate (Italian) Currently translated at 100.0% (2414 of 2414 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/it/ --- Riot/Assets/it.lproj/Vector.strings | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Riot/Assets/it.lproj/Vector.strings b/Riot/Assets/it.lproj/Vector.strings index d3c3cf5c56..73bf125b68 100644 --- a/Riot/Assets/it.lproj/Vector.strings +++ b/Riot/Assets/it.lproj/Vector.strings @@ -2742,3 +2742,6 @@ "room_participants_invite_anyway" = "Invita lo stesso"; "room_participants_invite_unknown_participant_prompt_to_msg" = "Impossibile trovare profili con questo ID Matrix. Vuoi davvero invitare %@ in %@?"; "room_creation_user_not_found_prompt_message" = "Impossibile trovare profili con questo ID Matrix. Vuoi comunque iniziare un messaggio diretto?"; +"settings_manage_account_title" = "Account"; +"settings_manage_account_action" = "Gestisci account"; +"settings_manage_account_description" = "Gestisci il tuo account su %@"; From c81b5765ee4608613d1d36a06fa1722ae5293086 Mon Sep 17 00:00:00 2001 From: Ihor Hordiichuk Date: Mon, 28 Aug 2023 17:32:46 +0000 Subject: [PATCH 17/34] Translated using Weblate (Ukrainian) Currently translated at 100.0% (2416 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/ --- Riot/Assets/uk.lproj/Vector.strings | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Riot/Assets/uk.lproj/Vector.strings b/Riot/Assets/uk.lproj/Vector.strings index 3e89b8d1f8..e271707e71 100644 --- a/Riot/Assets/uk.lproj/Vector.strings +++ b/Riot/Assets/uk.lproj/Vector.strings @@ -2970,3 +2970,5 @@ "settings_manage_account_title" = "Обліковий запис"; "settings_manage_account_action" = "Керувати обліковим записом"; "settings_manage_account_description" = "Керувати обліковим записом у %@"; +"manage_session_redirect" = "Вас буде перенаправлено до постачальника автентифікації вашого сервера для завершення виходу."; +"manage_session_redirect_error" = "Функціональність наразі недоступна. Зверніться до адміністратора вашого домашнього сервера"; From 38788e07564c33f833464c252d9a6935d1f36f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Mon, 28 Aug 2023 17:25:11 +0000 Subject: [PATCH 18/34] Translated using Weblate (Estonian) Currently translated at 100.0% (2416 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/et/ --- Riot/Assets/et.lproj/Vector.strings | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Riot/Assets/et.lproj/Vector.strings b/Riot/Assets/et.lproj/Vector.strings index 4f81dd8f27..5080a7ea52 100644 --- a/Riot/Assets/et.lproj/Vector.strings +++ b/Riot/Assets/et.lproj/Vector.strings @@ -2717,3 +2717,5 @@ "settings_manage_account_title" = "Kasutajakonto"; "settings_manage_account_action" = "Halda kasutajakontot"; "settings_manage_account_description" = "Halda kasutajakontot koduserveris %@"; +"manage_session_redirect" = "Järgmiseks suuname sind sinu serveriteenuse autentijale ning seal saad sa väljalogimise lõpuni viia."; +"manage_session_redirect_error" = "See funktsionaalsus pole hetkel saadaval. Lisateavet saad oma koduserveri haldajalt"; From 1c43a871725c7e7f144165b153429f660c149329 Mon Sep 17 00:00:00 2001 From: Jozef Gaal Date: Mon, 28 Aug 2023 21:13:43 +0000 Subject: [PATCH 19/34] Translated using Weblate (Slovak) Currently translated at 100.0% (2416 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sk/ --- Riot/Assets/sk.lproj/Vector.strings | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Riot/Assets/sk.lproj/Vector.strings b/Riot/Assets/sk.lproj/Vector.strings index e2fdc7c7ab..6f4eda6a4a 100644 --- a/Riot/Assets/sk.lproj/Vector.strings +++ b/Riot/Assets/sk.lproj/Vector.strings @@ -2968,3 +2968,5 @@ "settings_manage_account_title" = "Účet"; "settings_manage_account_action" = "Spravovať účet"; "settings_manage_account_description" = "Spravujte svoj účet na %@"; +"manage_session_redirect" = "Budete presmerovaní na poskytovateľa overovania vášho servera, aby ste dokončili odhlásenie."; +"manage_session_redirect_error" = "Funkcia aktuálne nie je dostupná. Obráťte sa na správcu vášho domovského servera"; From 4ba7f158f0e63e6abbee45a99cc5c9122ac598e1 Mon Sep 17 00:00:00 2001 From: Linerly Date: Tue, 29 Aug 2023 08:13:36 +0000 Subject: [PATCH 20/34] Translated using Weblate (Indonesian) Currently translated at 100.0% (2416 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/id/ --- Riot/Assets/id.lproj/Vector.strings | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Riot/Assets/id.lproj/Vector.strings b/Riot/Assets/id.lproj/Vector.strings index 2530f647b8..0a43411c32 100644 --- a/Riot/Assets/id.lproj/Vector.strings +++ b/Riot/Assets/id.lproj/Vector.strings @@ -2972,3 +2972,5 @@ "settings_manage_account_title" = "Akun"; "settings_manage_account_action" = "Kelola akun"; "settings_manage_account_description" = "Kelola akun Anda di %@"; +"manage_session_redirect" = "Anda akan dialihkan ke penyedia autentikasi server Anda untuk menyelesaikan proses keluar."; +"manage_session_redirect_error" = "Fungsi saat ini tidak tersedia. Silakan hubungi admin homeserver Anda"; From 1d300c2cc5ec1b93ff186c47687a9dc769d65924 Mon Sep 17 00:00:00 2001 From: Besnik Bleta Date: Tue, 29 Aug 2023 08:52:13 +0000 Subject: [PATCH 21/34] Translated using Weblate (Albanian) Currently translated at 99.6% (2407 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/ --- Riot/Assets/sq.lproj/Vector.strings | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Riot/Assets/sq.lproj/Vector.strings b/Riot/Assets/sq.lproj/Vector.strings index 79d2def266..1dc4968b50 100644 --- a/Riot/Assets/sq.lproj/Vector.strings +++ b/Riot/Assets/sq.lproj/Vector.strings @@ -2752,3 +2752,8 @@ "room_participants_invite_unknown_participant_prompt_to_msg" = "S’arrihet të gjenden profile për këtë ID Matrix. Jeni i sigurt se doni të ftohet %@ te %@?"; "room_participants_invite_anyway" = "Ftoje, sido qoftë"; "poll_timeline_loading" = "Po ngarkohet…"; +"settings_manage_account_description" = "Administroni llogarinë tuaj në %@"; +"manage_session_redirect_error" = "Funksion që s’mund të kihet aktualisht. Ju lutemi, lidhuni me përgjegjësin e shërbyesit tuaj Home"; +"settings_manage_account_title" = "Llogari"; +"settings_manage_account_action" = "Administroni llogari"; +"manage_session_redirect" = "Do të ridrejtoheni te shërbimi i mirëfilltësimit të shërbyesit tuaj, për të plotësuar daljen nga llogaria."; From cb5f8d4015bd25f64034b24ce1386711a6d1d4b6 Mon Sep 17 00:00:00 2001 From: random Date: Tue, 29 Aug 2023 10:30:13 +0000 Subject: [PATCH 22/34] Translated using Weblate (Italian) Currently translated at 100.0% (2416 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/it/ --- Riot/Assets/it.lproj/Vector.strings | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Riot/Assets/it.lproj/Vector.strings b/Riot/Assets/it.lproj/Vector.strings index 73bf125b68..5658e74789 100644 --- a/Riot/Assets/it.lproj/Vector.strings +++ b/Riot/Assets/it.lproj/Vector.strings @@ -2745,3 +2745,5 @@ "settings_manage_account_title" = "Account"; "settings_manage_account_action" = "Gestisci account"; "settings_manage_account_description" = "Gestisci il tuo account su %@"; +"manage_session_redirect" = "Verrai reindirizzato al fornitore di autenticazione del tuo server per completare la disconnessione."; +"manage_session_redirect_error" = "Funzionalità attualmente non disponibile. Contatta l'amministratore del tuo homeserver"; From c79797a6628dc3871647dcf7c35e74c40a537087 Mon Sep 17 00:00:00 2001 From: Vri Date: Tue, 29 Aug 2023 13:22:11 +0000 Subject: [PATCH 23/34] Translated using Weblate (German) Currently translated at 100.0% (2416 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/ --- Riot/Assets/de.lproj/Vector.strings | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings index ae6ee3d054..80eb951724 100644 --- a/Riot/Assets/de.lproj/Vector.strings +++ b/Riot/Assets/de.lproj/Vector.strings @@ -2776,3 +2776,8 @@ "room_creation_user_not_found_prompt_invite_action" = "Dennoch DM beginnen"; "room_participants_invite_unknown_participant_prompt_to_msg" = "Wir konnten kein Profil für diese Matrix-ID finden. Möchtest du wirklich %@ nach %@ einladen?"; "room_participants_invite_anyway" = "Dennoch einladen"; +"settings_manage_account_title" = "Konto"; +"settings_manage_account_description" = "Verwalte dein Konto bei %@"; +"settings_manage_account_action" = "Konto verwalten"; +"manage_session_redirect" = "Du wirst zum Authentifizierungsdienst deines Servers weitergeleitet, um das Abmelden abzuschließen."; +"manage_session_redirect_error" = "Funktion aktuell nicht verfügbar. Bitte kontaktiere deine Home-Server-Administration"; From 97c94e8473fc2f267900dff24e3a1cad152d5fbe Mon Sep 17 00:00:00 2001 From: Ihor Hordiichuk Date: Thu, 7 Sep 2023 00:17:39 +0000 Subject: [PATCH 24/34] Translated using Weblate (Ukrainian) Currently translated at 100.0% (2416 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/ --- Riot/Assets/uk.lproj/Vector.strings | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Riot/Assets/uk.lproj/Vector.strings b/Riot/Assets/uk.lproj/Vector.strings index e271707e71..04e9b75d54 100644 --- a/Riot/Assets/uk.lproj/Vector.strings +++ b/Riot/Assets/uk.lproj/Vector.strings @@ -801,7 +801,7 @@ "directory_server_all_native_rooms" = "Усі кімнати сервера Matrix"; "group_participants_invite_malformed_id_title" = "Помилка запрошення"; "group_participants_remove_prompt_msg" = "Ви справді хочете вилучити %@ з цієї групи?"; -"room_notifs_settings_encrypted_room_notice" = "Зверніть увагу, що сповіщення про згадки та ключові слова недоступні в зашифрованих кімнатах на мобільних пристроях."; +"room_notifs_settings_encrypted_room_notice" = "Зауважте, що сповіщення про згадки та ключові слова недоступні в зашифрованих кімнатах на мобільних пристроях."; "room_notifs_settings_account_settings" = "Налаштування облікового запису"; "room_notifs_settings_manage_notifications" = "Ви можете керувати сповіщеннями у %@"; "room_notifs_settings_cancel_action" = "Скасувати"; @@ -2548,7 +2548,7 @@ "room_accessibility_record_voice_message_hint" = "Двічі торкніться й утримуйте для запису."; "room_accessibility_record_voice_message" = "Записати голосове повідомлення"; "location_sharing_live_lab_promotion_activation" = "Увімкнути надсилання геоданих наживо"; -"location_sharing_live_lab_promotion_text" = "Зверніть увагу: це експериментальна функція, яка використовує тимчасову реалізацію, яка дозволяє іншим людям у кімнаті постійно бачити історію поширеного вами місця перебування."; +"location_sharing_live_lab_promotion_text" = "Зауважте: це експериментальна функція, яка використовує тимчасову реалізацію, що дозволяє іншим людям у кімнаті постійно бачити історію поширеного вами місця перебування."; "location_sharing_live_lab_promotion_title" = "Надсилання місця перебування наживо"; "location_sharing_map_credits_title" = "© Авторське право"; "room_info_back_button_title" = "Відомості кімнати"; From 7c133d4a5eff6102b198f362a973f605218c60ab Mon Sep 17 00:00:00 2001 From: LinAGKar Date: Tue, 12 Sep 2023 19:18:32 +0000 Subject: [PATCH 25/34] Translated using Weblate (Swedish) Currently translated at 100.0% (2416 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sv/ --- Riot/Assets/sv.lproj/Vector.strings | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Riot/Assets/sv.lproj/Vector.strings b/Riot/Assets/sv.lproj/Vector.strings index 48d13aea80..cb9918a3a4 100644 --- a/Riot/Assets/sv.lproj/Vector.strings +++ b/Riot/Assets/sv.lproj/Vector.strings @@ -2704,3 +2704,13 @@ "pill_message" = "Meddelande"; "key_verification_scan_qr_code_information_new_session" = "Rikta kameran mot QR-koden som visas på din andra enhet för att verifiera din nya session"; "key_verification_scan_qr_code_information_other_session" = "Rikta kameran mot QR-koden som visas på din andra enhet för att verifiera din session"; +"room_creation_user_not_found_prompt_title" = "Bekräftelse"; +"room_creation_user_not_found_prompt_message" = "Kunde inte hitta profiler för det här Matrix-ID:t. Vill du starta en DM ändå?"; +"room_creation_user_not_found_prompt_invite_action" = "Starta en DM ändå"; +"room_participants_invite_unknown_participant_prompt_to_msg" = "Kunde inte hitta profiler för det här Matrix-ID:t. Är du säker på att du vill bjuda in %@ till %@?"; +"room_participants_invite_anyway" = "Bjud in ändå"; +"settings_manage_account_title" = "Konto"; +"settings_manage_account_action" = "Hantera konto"; +"settings_manage_account_description" = "Hantera ditt konto på %@"; +"manage_session_redirect" = "Du kommer att omdirigeras till din servers autentiseringsleverantör för att fortsätta utloggning."; +"manage_session_redirect_error" = "Funktion för närvarande otillgänglig. Vänligen kontakta din hemserveradministratör"; From 7efa7a22e7ef8418414257cc85f59a677d91f3a5 Mon Sep 17 00:00:00 2001 From: raspin0 Date: Thu, 14 Sep 2023 10:42:22 +0000 Subject: [PATCH 26/34] Translated using Weblate (Polish) Currently translated at 100.0% (2416 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/pl/ --- Riot/Assets/pl.lproj/Vector.strings | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Riot/Assets/pl.lproj/Vector.strings b/Riot/Assets/pl.lproj/Vector.strings index 48216c0aee..21be89f5de 100644 --- a/Riot/Assets/pl.lproj/Vector.strings +++ b/Riot/Assets/pl.lproj/Vector.strings @@ -2851,3 +2851,13 @@ "user_session_verified_session_description" = "Sesje zweryfikowane są wszędzie, gdzie korzystasz z Element po wprowadzeniu swojego hasła lub zweryfikowaniu swojej tożsamości za pomocą innej sesji zweryfikowanej.\n\nTo oznacza, że posiadasz wszystkie niezbędne klucze wymagane do odblokowania swoich zaszyfrowanych wiadomości i oznajmiasz innym użytkownikom, że ufasz tej sesji."; "space_invite_nav_title" = "Zaproszenie do przestrzeni"; "user_other_session_unverified_sessions_header_subtitle" = "Dla wzmocnienia bezpiecznych wiadomości, zweryfikuj swoje sesje i wyloguj się ze wszystkich sesji, których nie rozpoznajesz lub nie używasz."; +"manage_session_redirect" = "Zostaniesz przekierowany do swojego dostawcy uwierzytelniania, aby zakończyć logowanie."; +"manage_session_redirect_error" = "Funkcja obecnie niedostępna. Skontaktuj się ze swoim administratorem serwera domowego"; +"room_creation_user_not_found_prompt_title" = "Potwierdzenie"; +"room_creation_user_not_found_prompt_message" = "Nie można znaleźć profili dla poniższych ID Matrix. Czy chcesz rozpocząć wiadomość prywatną mimo to?"; +"room_creation_user_not_found_prompt_invite_action" = "Rozpocznij wiadomość prywatną mimo to"; +"room_participants_invite_unknown_participant_prompt_to_msg" = "Nie można znaleźć profili dla poniższych ID Matrix. Czy na pewno chcesz zaprosić %@ do %@?"; +"room_participants_invite_anyway" = "Zaproś mimo to"; +"settings_manage_account_title" = "Konto"; +"settings_manage_account_action" = "Zarządzaj kontem"; +"settings_manage_account_description" = "Zarządzaj swoim kontem w %@"; From 8b94215317cc3473aef674e71889d0d40b452520 Mon Sep 17 00:00:00 2001 From: Dinh Quang Tuyen Date: Fri, 22 Sep 2023 07:16:59 +0000 Subject: [PATCH 27/34] Translated using Weblate (Vietnamese) Currently translated at 63.3% (1531 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/vi/ --- Riot/Assets/vi.lproj/Vector.strings | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Riot/Assets/vi.lproj/Vector.strings b/Riot/Assets/vi.lproj/Vector.strings index f46d98bccd..d7449ba3f7 100644 --- a/Riot/Assets/vi.lproj/Vector.strings +++ b/Riot/Assets/vi.lproj/Vector.strings @@ -210,7 +210,7 @@ "room_delete_unsent_messages" = "Xoá các tin nhắn chưa được gửi"; "room_event_action_copy" = "Sao chép"; "room_event_action_quote" = "Trích dẫn"; -"room_event_action_redact" = "Biên tập lại"; +"room_event_action_redact" = "Xóa"; "room_event_action_more" = "Thêm"; "room_event_action_share" = "Chia sẻ"; "room_event_action_permalink" = "Liên kết"; @@ -1898,7 +1898,7 @@ "send" = "Gửi"; "copy_button_name" = "Sao chép"; "resend" = "Gửi lại"; -"redact" = "Biên tập lại"; +"redact" = "Xóa"; "share" = "Chia sẻ"; "set_power_level" = "Độ nhiệt huyết"; "delete" = "Xoá"; From db464a74845e368869625a1353f7ba1461c0dddf Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 27 Sep 2023 10:56:18 +0100 Subject: [PATCH 28/34] Update cocoapods to 1.13.0. --- Gemfile | 2 +- Gemfile.lock | 87 +++++++++---------- Podfile.lock | 2 +- .../xcshareddata/xcschemes/Riot.xcscheme | 37 ++++---- 4 files changed, 59 insertions(+), 69 deletions(-) diff --git a/Gemfile b/Gemfile index 6ae4945284..a34178384f 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "xcode-install" gem "fastlane" -gem "cocoapods", '~>1.11.2' +gem "cocoapods", '~>1.13.0' gem "slather" plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') diff --git a/Gemfile.lock b/Gemfile.lock index 5bbce9861e..851230fb3f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,13 +9,12 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (6.1.7.3) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) @@ -23,33 +22,33 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.770.0) - aws-sdk-core (3.173.1) + aws-partitions (1.828.0) + aws-sdk-core (3.183.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.64.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.71.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.122.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.136.0) + aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.6) + aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) clamp (1.3.2) - cocoapods (1.11.3) + cocoapods (1.13.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.3) + cocoapods-core (= 1.13.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -57,10 +56,10 @@ GEM gh_inspector (~> 1.0) molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (>= 1.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.11.3) - activesupport (>= 5.0, < 7) + ruby-macho (>= 2.3.0, < 3.0) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.13.0) + activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -84,7 +83,7 @@ GEM highline (~> 2.0.0) concurrent-ruby (1.2.2) declarative (0.0.20) - digest-crc (0.6.4) + digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -93,7 +92,7 @@ GEM escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - excon (0.99.0) + excon (0.103.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -123,7 +122,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.7) - fastlane (2.213.0) + fastlane (2.216.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -144,6 +143,7 @@ GEM google-apis-playcustomapp_v1 (~> 0.1) google-cloud-storage (~> 1.31) highline (~> 2.0) + http-cookie (~> 1.0.5) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) @@ -155,7 +155,7 @@ GEM security (= 0.1.3) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) + terminal-table (~> 3) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) @@ -165,16 +165,16 @@ GEM fastlane-plugin-brew (0.1.1) fastlane-plugin-sentry (1.15.0) os (~> 1.1, >= 1.1.4) - fastlane-plugin-versioning (0.5.1) + fastlane-plugin-versioning (0.5.2) fastlane-plugin-xcodegen (1.1.0) fastlane-plugin-brew (~> 0.1.1) - ffi (1.15.5) + ffi (1.16.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.42.0) + google-apis-androidpublisher_v3 (0.50.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.0) + google-apis-core (0.11.1) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -203,10 +203,9 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.5.2) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) @@ -214,16 +213,15 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.13.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) jmespath (1.6.2) json (2.6.3) - jwt (2.7.0) - memoist (0.16.2) + jwt (2.7.1) mini_magick (4.12.0) - mini_mime (1.1.2) - mini_portile2 (2.8.2) - minitest (5.18.0) + mini_mime (1.1.5) + mini_portile2 (2.8.4) + minitest (5.20.0) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.3.0) @@ -231,27 +229,27 @@ GEM nap (1.1.0) naturally (2.2.1) netrc (0.11.0) - nokogiri (1.15.2) + nokogiri (1.15.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) optparse (0.1.1) os (1.1.4) plist (3.7.0) public_suffix (4.0.7) - racc (1.6.2) + racc (1.7.1) rake (13.0.6) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.5) + rexml (3.2.6) rouge (2.0.7) ruby-macho (2.5.1) ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -266,8 +264,8 @@ GEM nokogiri (>= 1.13.9) xcodeproj (~> 1.21) terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) trailblazer-option (0.1.2) tty-cursor (0.7.1) tty-screen (0.8.1) @@ -281,13 +279,13 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (1.8.0) + unicode-display_width (2.4.2) webrick (1.8.1) word_wrap (1.0.0) xcode-install (2.8.1) claide (>= 0.9.1) fastlane (>= 2.1.0, < 3.0.0) - xcodeproj (1.22.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -298,13 +296,12 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) - zeitwerk (2.6.8) PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.11.2) + cocoapods (~> 1.13.0) fastlane fastlane-plugin-diawi! fastlane-plugin-sentry diff --git a/Podfile.lock b/Podfile.lock index ec974f0f28..e0d119c27a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -210,4 +210,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: b926e281576aabcdbc2bdcb40ef3ad3e0991abe8 -COCOAPODS: 1.11.3 +COCOAPODS: 1.13.0 diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme index 52ec9a4e18..9350fef630 100644 --- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme +++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme @@ -1,11 +1,10 @@ + version = "1.3"> + buildImplicitDependencies = "YES"> @@ -35,11 +34,20 @@ + + + + @@ -52,17 +60,6 @@ - - - - - - - - - - From f1b6f52fde85ab665e10f48db474acc8047d1711 Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 27 Sep 2023 13:03:28 +0100 Subject: [PATCH 29/34] Allow the use of Jitsi for 1:1 calls via the client well-known. --- .../HomeserverConfigurationBuilder.swift | 5 ++++- .../HomeserverJitsiConfiguration.swift | 4 +++- Riot/Model/WellKnown/VectorWellKnown.swift | 3 ++- Riot/Modules/Room/RoomViewController.m | 8 ++++++-- changelog.d/7684.change | 1 + 5 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 changelog.d/7684.change diff --git a/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift b/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift index af4beb29e5..3bb6c86e1a 100644 --- a/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift +++ b/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift @@ -72,6 +72,8 @@ final class HomeserverConfigurationBuilder: NSObject { jitsiServerURL = hardcodedJitsiServerURL } + let useJitsiFor1To1Calls = vectorWellKnownJitsiConfiguration?.useFor1To1Calls + // Tile server configuration let tileServerMapStyleURL: URL @@ -87,7 +89,8 @@ final class HomeserverConfigurationBuilder: NSObject { // Create HomeserverConfiguration let jitsiConfiguration = HomeserverJitsiConfiguration(serverDomain: jitsiPreferredDomain, - serverURL: jitsiServerURL) + serverURL: jitsiServerURL, + useFor1To1Calls: useJitsiFor1To1Calls) return HomeserverConfiguration(jitsi: jitsiConfiguration, encryption: encryptionConfiguration, diff --git a/Riot/Model/HomeserverConfiguration/HomeserverJitsiConfiguration.swift b/Riot/Model/HomeserverConfiguration/HomeserverJitsiConfiguration.swift index e31ea363cc..16714b5dc3 100644 --- a/Riot/Model/HomeserverConfiguration/HomeserverJitsiConfiguration.swift +++ b/Riot/Model/HomeserverConfiguration/HomeserverJitsiConfiguration.swift @@ -21,10 +21,12 @@ import Foundation final class HomeserverJitsiConfiguration: NSObject { let serverDomain: String? let serverURL: URL? + let useFor1To1Calls: Bool - init(serverDomain: String?, serverURL: URL?) { + init(serverDomain: String?, serverURL: URL?, useFor1To1Calls: Bool?) { self.serverDomain = serverDomain self.serverURL = serverURL + self.useFor1To1Calls = useFor1To1Calls ?? false super.init() } diff --git a/Riot/Model/WellKnown/VectorWellKnown.swift b/Riot/Model/WellKnown/VectorWellKnown.swift index 71c127e89b..356fbdde8c 100644 --- a/Riot/Model/WellKnown/VectorWellKnown.swift +++ b/Riot/Model/WellKnown/VectorWellKnown.swift @@ -74,7 +74,8 @@ extension VectorWellKnownEncryptionConfiguration: Decodable { // MARK: - Jitsi struct VectorWellKnownJitsiConfiguration: Decodable { - /// Default Jitsi server let preferredDomain: String? + /// Override native calling with Jitsi for 1:1 calls. + let useFor1To1Calls: Bool? } diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index 71b2e81074..a65ba666cf 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -1942,7 +1942,9 @@ - (void)refreshRoomTitle if (self.supportCallOption) { - if (self.roomDataSource.room.summary.membersCount.joined == 2 && self.roomDataSource.room.isDirect) + if (self.roomDataSource.room.summary.membersCount.joined == 2 + && self.roomDataSource.room.isDirect + && !self.mainSession.vc_homeserverConfiguration.jitsi.useFor1To1Calls) { // voice call button for Matrix call UIBarButtonItem *itemVoice = [[UIBarButtonItem alloc] initWithImage:AssetImages.voiceCallHangonIcon.image @@ -5038,7 +5040,9 @@ - (void)placeCallWithVideo2:(BOOL)video } else { - if (self.roomDataSource.room.summary.membersCount.joined == 2 && self.roomDataSource.room.isDirect) + if (self.roomDataSource.room.summary.membersCount.joined == 2 + && self.roomDataSource.room.isDirect + && !self.mainSession.vc_homeserverConfiguration.jitsi.useFor1To1Calls) { // Matrix call [self.roomDataSource.room placeCallWithVideo:video success:nil failure:nil]; diff --git a/changelog.d/7684.change b/changelog.d/7684.change new file mode 100644 index 0000000000..6c2916d5c3 --- /dev/null +++ b/changelog.d/7684.change @@ -0,0 +1 @@ +Allow the use of Jitsi for 1:1 calls via a well-known configuration flag. \ No newline at end of file From b08ad642605b22948d85965cc3bb43221532c918 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Tue, 3 Oct 2023 13:18:16 +0300 Subject: [PATCH 30/34] Fixes #7687 - Wait for MXSession state update before proceeding with the login process --- .../Service/MatrixSDK/QRLoginService.swift | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift b/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift index 9cf127bb7d..daf2e93f5f 100644 --- a/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift +++ b/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift @@ -265,19 +265,7 @@ class QRLoginService: NSObject, QRLoginServiceProtocol { MXLog.debug("[QRLoginService] Got acess token") - let session = sessionCreator.createSession(credentials: credentials, client: client, removeOtherAccounts: false) - - let cryptoResult = await withCheckedContinuation { continuation in - session.enableCrypto(true) { response in - continuation.resume(returning: response) - } - } - - guard case .success = cryptoResult else { - MXLog.error("[QRLoginService] Failed enabling crypto") - await teardownRendezvous(state: .failed(error: .rendezvousFailed)) - return - } + let session = await createSession(credentials: credentials, client: client) MXLog.debug("[QRLoginService] Session created, sending device details") let successPayload = flow == .SETUP_ADDITIONAL_DEVICE_V1 @@ -363,6 +351,28 @@ class QRLoginService: NSObject, QRLoginServiceProtocol { state = .completed(session: session, securityCompleted: true) } + private func createSession(credentials: MXCredentials, client: AuthenticationRestClient) async -> MXSession { + let session = await sessionCreator.createSession(credentials: credentials, client: client, removeOtherAccounts: false) + + if session.state == .storeDataReady { + return session + } + + await withCheckedContinuation { continuation in + NotificationCenter.default.addObserver(forName: NSNotification.Name.mxSessionStateDidChange, object: session, queue: nil) { notification in + guard let session = notification.object as? MXSession else { + fatalError() + } + + if session.state == .storeDataReady { + continuation.resume() + } + } + } + + return session + } + private func declineRendezvous() async { guard let requestData = try? JSONEncoder().encode(QRLoginRendezvousPayload(type: .loginFinish, outcome: .declined)) else { return From df21fa7dc5e80febdeb875f659dcaf0d926de9c7 Mon Sep 17 00:00:00 2001 From: Alfonso Grillo Date: Tue, 3 Oct 2023 17:11:17 +0200 Subject: [PATCH 31/34] Fix DM crash with RTE enabled --- Riot/Modules/Room/RoomViewController.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index a65ba666cf..ee118fcaf4 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -3121,15 +3121,16 @@ - (void)displayRoomPreview:(RoomPreviewData *)previewData - (void)displayNewDirectChatWithTargetUser:(nonnull MXUser*)directChatTargetUser session:(nonnull MXSession*)session { + // `[displayRoom:]` may require the session, setting it here before calling it + [self addMatrixSession:session]; + // Release existing room data source or preview [self displayRoom:nil]; self.directChatTargetUser = directChatTargetUser; self.eventsAcknowledgementEnabled = NO; - - [self addMatrixSession:session]; - + [self refreshRoomTitle]; [self refreshRoomInputToolbar]; } From 4790fb4fc2b1347a25637560e07263ac55f42572 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 4 Oct 2023 13:07:21 +0300 Subject: [PATCH 32/34] changelog.d: Upgrade MatrixSDK version ([v0.27.3](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.3)). --- Podfile | 2 +- changelog.d/x-nolink-0.change | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/x-nolink-0.change diff --git a/Podfile b/Podfile index c0d1847133..d408e4f72f 100644 --- a/Podfile +++ b/Podfile @@ -16,7 +16,7 @@ use_frameworks! # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI # # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it -$matrixSDKVersion = '= 0.27.2' +$matrixSDKVersion = '= 0.27.3' # $matrixSDKVersion = :local # $matrixSDKVersion = { :branch => 'develop'} # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } } diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change new file mode 100644 index 0000000000..1c7c6921e9 --- /dev/null +++ b/changelog.d/x-nolink-0.change @@ -0,0 +1 @@ +Upgrade MatrixSDK version ([v0.27.3](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.3)). \ No newline at end of file From 77f019631d64fe8042a62cad13c450eba4a436a2 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 4 Oct 2023 13:07:22 +0300 Subject: [PATCH 33/34] version++ --- CHANGES.md | 8 ++++++++ changelog.d/7684.change | 1 - changelog.d/x-nolink-0.change | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/7684.change delete mode 100644 changelog.d/x-nolink-0.change diff --git a/CHANGES.md b/CHANGES.md index 9aacbd1686..4758b42f62 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,11 @@ +## Changes in 1.11.4 (2023-10-04) + +🙌 Improvements + +- Upgrade MatrixSDK version ([v0.27.3](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.3)). +- Allow the use of Jitsi for 1:1 calls via a well-known configuration flag. ([#7684](https://github.com/vector-im/element-ios/issues/7684)) + + ## Changes in 1.11.3 (2023-09-13) 🐛 Bugfixes diff --git a/changelog.d/7684.change b/changelog.d/7684.change deleted file mode 100644 index 6c2916d5c3..0000000000 --- a/changelog.d/7684.change +++ /dev/null @@ -1 +0,0 @@ -Allow the use of Jitsi for 1:1 calls via a well-known configuration flag. \ No newline at end of file diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change deleted file mode 100644 index 1c7c6921e9..0000000000 --- a/changelog.d/x-nolink-0.change +++ /dev/null @@ -1 +0,0 @@ -Upgrade MatrixSDK version ([v0.27.3](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.3)). \ No newline at end of file From 859971fad84c36f140e298b131e58edaab65b308 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 4 Oct 2023 13:08:17 +0300 Subject: [PATCH 34/34] finish version++ --- Podfile.lock | 28 +++++++------- .../xcshareddata/xcschemes/Riot.xcscheme | 37 +++++++++++-------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index e0d119c27a..90b67132b9 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -25,7 +25,7 @@ PODS: - GBDeviceInfo (7.1.0): - GBDeviceInfo/Core (= 7.1.0) - GBDeviceInfo/Core (7.1.0) - - GZIP (1.3.0) + - GZIP (1.3.1) - Introspect (0.11.0) - JitsiMeetSDKLite (8.1.2-lite): - JitsiWebRTC (~> 111.0) @@ -39,20 +39,20 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) - - MatrixSDK (0.27.2): - - MatrixSDK/Core (= 0.27.2) - - MatrixSDK/Core (0.27.2): + - MatrixSDK (0.27.3): + - MatrixSDK/Core (= 0.27.3) + - MatrixSDK/Core (0.27.3): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) - - MatrixSDKCrypto (= 0.3.12) + - MatrixSDKCrypto (= 0.3.13) - OLMKit (~> 3.2.5) - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.27.2): + - MatrixSDK/JingleCallStack (0.27.3): - JitsiMeetSDKLite (= 8.1.2-lite) - MatrixSDK/Core - - MatrixSDKCrypto (0.3.12) + - MatrixSDKCrypto (0.3.13) - OLMKit (3.2.12): - OLMKit/olmc (= 3.2.12) - OLMKit/olmcpp (= 3.2.12) @@ -102,8 +102,8 @@ DEPENDENCIES: - KeychainAccess (~> 4.2.2) - KTCenterFlowLayout (~> 1.3.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.27.2) - - MatrixSDK/JingleCallStack (= 0.27.2) + - MatrixSDK (= 0.27.3) + - MatrixSDK/JingleCallStack (= 0.27.3) - OLMKit - PostHog (~> 2.0.0) - ReadMoreTextView (~> 3.0.1) @@ -176,7 +176,7 @@ SPEC CHECKSUMS: FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2 GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376 - GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3 + GZIP: e6922ed5bdd1d77d84589d50821ac34ea0c38d4b Introspect: 4cc1e4c34dd016540c8d86a591c231c09dafbee3 JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7 JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b @@ -187,8 +187,8 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b - MatrixSDK: a39e229a03a00394e055ffa7490e9602d45f8a44 - MatrixSDKCrypto: 25929a40733b4ab54f659aaf6a730552a0a06504 + MatrixSDK: 83fd36133b8e9147aa2f770953dc7921dda4e8b5 + MatrixSDKCrypto: bf08b72f2cd015d8749420a2b8b92fc0536bedf4 OLMKit: da115f16582e47626616874e20f7bb92222c7a51 PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d @@ -208,6 +208,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: b926e281576aabcdbc2bdcb40ef3ad3e0991abe8 +PODFILE CHECKSUM: 20f5e721c3f48c117b9610409e79661637454aa1 -COCOAPODS: 1.13.0 +COCOAPODS: 1.11.3 diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme index 9350fef630..52ec9a4e18 100644 --- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme +++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme @@ -1,10 +1,11 @@ + version = "1.7"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> @@ -34,20 +35,11 @@ - - - - @@ -60,6 +52,17 @@ + + + + + + + + + +