From f65a4bd437f0e3d7dfcaf15fe044695b7d7d32f7 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 18 Jun 2024 16:54:53 +0200 Subject: [PATCH 01/16] 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 716ff33d7..084508c89 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.11.15 -CURRENT_PROJECT_VERSION = 1.11.15 +MARKETING_VERSION = 1.11.16 +CURRENT_PROJECT_VERSION = 1.11.16 From 515cfdeea4b387f9872bdf769d8cfc6bbfcad085 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:33:50 +0100 Subject: [PATCH 02/16] Update the SDK. (#7819) * Update the SDK. * Run pod install. --- Podfile.lock | 10 +++++----- matrix-ios-sdk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index ce0165a2b..6e3ce20f9 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -39,9 +39,9 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) - - MatrixSDK (0.27.10): - - MatrixSDK/Core (= 0.27.10) - - MatrixSDK/Core (0.27.10): + - MatrixSDK (0.27.11): + - MatrixSDK/Core (= 0.27.11) + - MatrixSDK/Core (0.27.11): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) @@ -49,7 +49,7 @@ PODS: - OLMKit (~> 3.2.5) - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.27.10): + - MatrixSDK/JingleCallStack (0.27.11): - JitsiMeetSDKLite (= 8.1.2-lite) - MatrixSDK/Core - MatrixSDKCrypto (0.4.2) @@ -187,7 +187,7 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b - MatrixSDK: c805f9306d60955215f4b15043ed0f96fd4867b3 + MatrixSDK: 7c29e5cc8934cfc1f81f83fcfa17cd652612086d MatrixSDKCrypto: 736069ee0a5ec12852ab3498bf2242acecc443fc OLMKit: da115f16582e47626616874e20f7bb92222c7a51 ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d diff --git a/matrix-ios-sdk b/matrix-ios-sdk index ff2b2a402..04e422e1f 160000 --- a/matrix-ios-sdk +++ b/matrix-ios-sdk @@ -1 +1 @@ -Subproject commit ff2b2a4024b48dbeba5d4157d2622161b3034ba4 +Subproject commit 04e422e1f70eb3c32b9d0067cf9721bdc295caa0 From 2063a4a74413b47b9a6b3d6886ffc3604a462558 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 5 Jul 2024 16:11:47 +0200 Subject: [PATCH 03/16] updated SDK and added a fix for the discover server table view cell --- .../Views/DirectoryServerTableViewCell.m | 10 ++++++++++ matrix-ios-sdk | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m index 6ec9484e6..3daadd924 100644 --- a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m +++ b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m @@ -60,6 +60,16 @@ { iconURL = [NSString stringWithFormat:@"%@%@", kMXContentUriScheme, [iconURL substringFromIndex:range.location + range.length]]; } + // Check also if we are using the authenticated endpoint + else + { + mxMediaPrefix = [NSString stringWithFormat:@"/%@/download/", kMXAuthenticatedContentPrefixPath]; + range = [iconURL rangeOfString:mxMediaPrefix]; + if (range.location != NSNotFound) + { + iconURL = [NSString stringWithFormat:@"%@%@", kMXContentUriScheme, [iconURL substringFromIndex:range.location + range.length]]; + } + } [self.iconImageView setImageURI:iconURL withType:nil andImageOrientation:UIImageOrientationUp diff --git a/matrix-ios-sdk b/matrix-ios-sdk index 04e422e1f..66f05d046 160000 --- a/matrix-ios-sdk +++ b/matrix-ios-sdk @@ -1 +1 @@ -Subproject commit 04e422e1f70eb3c32b9d0067cf9721bdc295caa0 +Subproject commit 66f05d0468390bdddf838b73135353408fa5390c From 17d4d68d545ddabced0dc12b5a5a73992fd79610 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 5 Jul 2024 18:08:38 +0200 Subject: [PATCH 04/16] updated the submodule --- matrix-ios-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-ios-sdk b/matrix-ios-sdk index 66f05d046..1c4b3f5c3 160000 --- a/matrix-ios-sdk +++ b/matrix-ios-sdk @@ -1 +1 @@ -Subproject commit 66f05d0468390bdddf838b73135353408fa5390c +Subproject commit 1c4b3f5c32ed3bcf27d3404c770e000a50417352 From 269d71da4e995f263ddc37cbf23ff5e8603adc41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Mon, 17 Jun 2024 10:55:06 +0000 Subject: [PATCH 05/16] Translated using Weblate (Estonian) Currently translated at 99.9% (2418 of 2420 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 22e9f3419..8311104ce 100644 --- a/Riot/Assets/et.lproj/Vector.strings +++ b/Riot/Assets/et.lproj/Vector.strings @@ -2719,3 +2719,5 @@ "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"; +"room_action_report" = "Teata jututoast"; +"room_action_report_prompt_reason" = "Jututoast teatamise põhjus"; From 9192664c549e03cb1085f2fe43bce349fb18b3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Mon, 17 Jun 2024 19:41:28 +0000 Subject: [PATCH 06/16] Translated using Weblate (Estonian) Currently translated at 100.0% (2420 of 2420 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/et/ --- Riot/Assets/et.lproj/Vector.strings | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Riot/Assets/et.lproj/Vector.strings b/Riot/Assets/et.lproj/Vector.strings index 8311104ce..c21f0ba26 100644 --- a/Riot/Assets/et.lproj/Vector.strings +++ b/Riot/Assets/et.lproj/Vector.strings @@ -2721,3 +2721,8 @@ "manage_session_redirect_error" = "See funktsionaalsus pole hetkel saadaval. Lisateavet saad oma koduserveri haldajalt"; "room_action_report" = "Teata jututoast"; "room_action_report_prompt_reason" = "Jututoast teatamise põhjus"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Peida tekstitoimeti"; +"wysiwyg_composer_action_maximise_action" = "Ava tekstitoimeti"; From 3f7aa67b3e729810bb98f548aec7707266413672 Mon Sep 17 00:00:00 2001 From: Besnik Bleta Date: Tue, 18 Jun 2024 08:52:46 +0000 Subject: [PATCH 07/16] Translated using Weblate (Albanian) Currently translated at 99.6% (2411 of 2420 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/ --- Riot/Assets/sq.lproj/Vector.strings | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Riot/Assets/sq.lproj/Vector.strings b/Riot/Assets/sq.lproj/Vector.strings index cd338d626..b1158c152 100644 --- a/Riot/Assets/sq.lproj/Vector.strings +++ b/Riot/Assets/sq.lproj/Vector.strings @@ -14,7 +14,7 @@ "leave" = "Dilni"; "remove" = "Hiqe"; "invite" = "Ftoje"; -"retry" = "Riprovo"; +"retry" = "Riprovoni"; "off" = "Off"; "cancel" = "Anuloje"; "save" = "Ruaje"; @@ -2757,3 +2757,10 @@ "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."; +"room_action_report" = "Raportojeni dhomën"; +"room_action_report_prompt_reason" = "Arsye për raportimin e kësaj dhome"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Tkurre hartuesin"; +"wysiwyg_composer_action_maximise_action" = "Zgjeroje hartuesin"; From 8a021d8ae5f497cdcc77577e35e145da0b87d63d Mon Sep 17 00:00:00 2001 From: Linerly Date: Tue, 18 Jun 2024 12:17:47 +0000 Subject: [PATCH 08/16] Translated using Weblate (Indonesian) Currently translated at 100.0% (2420 of 2420 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/id/ --- Riot/Assets/id.lproj/Vector.strings | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Riot/Assets/id.lproj/Vector.strings b/Riot/Assets/id.lproj/Vector.strings index 5e8e1c027..a27d04098 100644 --- a/Riot/Assets/id.lproj/Vector.strings +++ b/Riot/Assets/id.lproj/Vector.strings @@ -2974,3 +2974,10 @@ "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"; +"room_action_report_prompt_reason" = "Alasan melaporkan ruangan ini"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Kecilkan komposer"; +"wysiwyg_composer_action_maximise_action" = "Luaskan komposer"; +"room_action_report" = "Laporkan ruangan"; From 9099ab395d41b93172198b20413bd2feb6d050b3 Mon Sep 17 00:00:00 2001 From: LinAGKar Date: Thu, 20 Jun 2024 18:47:02 +0000 Subject: [PATCH 09/16] Translated using Weblate (Swedish) Currently translated at 100.0% (2420 of 2420 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sv/ --- Riot/Assets/sv.lproj/Vector.strings | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Riot/Assets/sv.lproj/Vector.strings b/Riot/Assets/sv.lproj/Vector.strings index 85662f029..4ba032603 100644 --- a/Riot/Assets/sv.lproj/Vector.strings +++ b/Riot/Assets/sv.lproj/Vector.strings @@ -2714,3 +2714,10 @@ "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"; +"room_action_report" = "Rapportera rum"; +"room_action_report_prompt_reason" = "Anledning att rapportera det här rummet"; +"wysiwyg_composer_action_maximise_action" = "Expandera redigerare"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Krymp redigerare"; From 61a942eeba943b3ca79c9eba3c28213b186e45dc Mon Sep 17 00:00:00 2001 From: Jozef Gaal Date: Wed, 26 Jun 2024 10:56:37 +0000 Subject: [PATCH 10/16] Translated using Weblate (Slovak) Currently translated at 100.0% (2420 of 2420 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sk/ --- Riot/Assets/sk.lproj/Vector.strings | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Riot/Assets/sk.lproj/Vector.strings b/Riot/Assets/sk.lproj/Vector.strings index a18873e4d..5ad14f43f 100644 --- a/Riot/Assets/sk.lproj/Vector.strings +++ b/Riot/Assets/sk.lproj/Vector.strings @@ -2970,3 +2970,10 @@ "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"; +"room_action_report_prompt_reason" = "Dôvod nahlásenia tejto miestnosti"; +"wysiwyg_composer_action_maximise_action" = "Rozšíriť editor"; +"room_action_report" = "Nahlásiť miestnosť"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Zmenšiť editor"; From 1da77bc73d790c551e9e7b111ad737c27d44fa41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= Date: Fri, 28 Jun 2024 09:37:34 +0000 Subject: [PATCH 11/16] Translated using Weblate (Hungarian) Currently translated at 99.9% (2419 of 2420 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/hu/ --- Riot/Assets/hu.lproj/Vector.strings | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/Riot/Assets/hu.lproj/Vector.strings b/Riot/Assets/hu.lproj/Vector.strings index 216ab88fd..bac644244 100644 --- a/Riot/Assets/hu.lproj/Vector.strings +++ b/Riot/Assets/hu.lproj/Vector.strings @@ -2478,9 +2478,9 @@ "user_sessions_settings" = "Munkamenetek kezelése"; "invite_to" = "Meghívó ide: %@"; "device_name_unknown" = "Ismeretlen kliens"; -"device_name_mobile" = "%@ Mobil"; -"device_name_desktop" = "%@ Alkalmazás"; -"device_name_web" = "%@ Web"; +"device_name_mobile" = "Mobilos %@"; +"device_name_desktop" = "Asztali %@"; +"device_name_web" = "Webes %@"; "user_session_item_details" = "%1$@ · %2$@"; // First item is client name and second item is session display name @@ -2528,19 +2528,19 @@ "user_session_details_device_os" = "Operációs rendszer"; "user_session_details_device_browser" = "Böngésző"; "user_session_details_device_model" = "Modell"; -"user_session_details_device_ip_location" = "Tartózkodási helyem"; +"user_session_details_device_ip_location" = "Saját tartózkodási hely"; "user_session_details_device_ip_address" = "IP cím"; "user_session_details_last_activity" = "Utolsó tevékenység"; -"user_session_details_session_section_footer" = "A másoláshoz koppints és tartsd rajta az ujjad."; -"user_session_details_session_id" = "Kapcsolat azonosító"; +"user_session_details_session_section_footer" = "A másoláshoz koppintson és tartsa lenyomva."; +"user_session_details_session_id" = "Kapcsolatazonosító"; "user_session_details_session_name" = "Munkamenet neve"; "user_session_details_device_section_header" = "Eszköz"; "user_session_details_application_section_header" = "Alkalmazás"; "user_session_details_session_section_header" = "Munkamenet"; -"user_session_details_title" = "Munkamenet információk"; +"user_session_details_title" = "Munkamenet-információk"; "device_type_name_unknown" = "Ismeretlen"; -"device_type_name_mobile" = "Mobil"; -"device_type_name_web" = "Web"; +"device_type_name_mobile" = "Mobilos"; +"device_type_name_web" = "Webes"; "device_type_name_desktop" = "Asztali"; "user_inactive_session_item_with_date" = "90+ napja inaktív (%@)"; "user_inactive_session_item" = "90+ napja inaktív"; @@ -2763,3 +2763,13 @@ "settings_manage_account_action" = "Fiók kezelése"; "settings_manage_account_description" = "A fiókja kezelése itt: %@"; "room_command_change_room_topic_description" = "Beállítja a szoba témáját"; +"room_action_report" = "Szoba jelentése"; +"room_action_report_prompt_reason" = "A szoba jelentésének oka"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Szerkesztő összecsukása"; +"wysiwyg_composer_action_maximise_action" = "Szerkesztő kibontása"; +"room_command_set_user_power_level_description" = "Meghatározza a felhasználó szintjét"; +"room_command_reset_user_power_level_description" = "Elveszi az adott azonosítójú felhasználó operátori jogosultságát"; +"room_command_error_unknown_command" = "Érvénytelen vagy nem kezelt parancs"; From 74c54d0ff55573302f5805b72ab39b4ca946913a Mon Sep 17 00:00:00 2001 From: Ihor Hordiichuk Date: Sun, 30 Jun 2024 12:53:35 +0000 Subject: [PATCH 12/16] Translated using Weblate (Ukrainian) Currently translated at 100.0% (2420 of 2420 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/ --- Riot/Assets/uk.lproj/Vector.strings | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Riot/Assets/uk.lproj/Vector.strings b/Riot/Assets/uk.lproj/Vector.strings index 7c18d9f8b..0119a6575 100644 --- a/Riot/Assets/uk.lproj/Vector.strings +++ b/Riot/Assets/uk.lproj/Vector.strings @@ -2972,3 +2972,10 @@ "settings_manage_account_description" = "Керувати обліковим записом у %@"; "manage_session_redirect" = "Вас буде перенаправлено до постачальника автентифікації вашого сервера для завершення виходу."; "manage_session_redirect_error" = "Функціональність наразі недоступна. Зверніться до адміністратора вашого домашнього сервера"; +"wysiwyg_composer_action_maximise_action" = "Розгорнути редактор"; +"room_action_report" = "Поскаржитися на кімнату"; +"room_action_report_prompt_reason" = "Причина скарги на цю кімнату"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Зменшити редактор"; From 63e547deeb14435624f2b6e7e4d4735fe99d702e Mon Sep 17 00:00:00 2001 From: random Date: Sat, 13 Jul 2024 09:21:50 +0000 Subject: [PATCH 13/16] Translated using Weblate (Italian) Currently translated at 100.0% (2420 of 2420 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/it/ --- Riot/Assets/it.lproj/Vector.strings | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Riot/Assets/it.lproj/Vector.strings b/Riot/Assets/it.lproj/Vector.strings index 0e893b97c..55551cc09 100644 --- a/Riot/Assets/it.lproj/Vector.strings +++ b/Riot/Assets/it.lproj/Vector.strings @@ -2747,3 +2747,10 @@ "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"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Rimpicciolisci il compositore"; +"wysiwyg_composer_action_maximise_action" = "Espandi il compositore"; +"room_action_report" = "Segnala stanza"; +"room_action_report_prompt_reason" = "Motivo della segnalazione della stanza"; From f477807d4feb1bff956e5dd28b4e16168e685ea9 Mon Sep 17 00:00:00 2001 From: simsononroad Date: Sun, 14 Jul 2024 11:22:12 +0000 Subject: [PATCH 14/16] Translated using Weblate (Hungarian) Currently translated at 99.9% (2419 of 2420 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/hu/ --- Riot/Assets/hu.lproj/Vector.strings | 1 + 1 file changed, 1 insertion(+) diff --git a/Riot/Assets/hu.lproj/Vector.strings b/Riot/Assets/hu.lproj/Vector.strings index bac644244..8e324169f 100644 --- a/Riot/Assets/hu.lproj/Vector.strings +++ b/Riot/Assets/hu.lproj/Vector.strings @@ -2773,3 +2773,4 @@ "room_command_set_user_power_level_description" = "Meghatározza a felhasználó szintjét"; "room_command_reset_user_power_level_description" = "Elveszi az adott azonosítójú felhasználó operátori jogosultságát"; "room_command_error_unknown_command" = "Érvénytelen vagy nem kezelt parancs"; +"room_command_discard_session_description" = "Kényszeríti a titkosított szobában lévő aktuális kimenő csoportmunkamenet elvetését"; From b7ff327160afa18ef32d7095c10a5da4b8018428 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 23 Jul 2024 13:41:51 +0200 Subject: [PATCH 15/16] version++ --- CHANGES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 907d69b54..11ffc2409 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +## Changes in 1.11.16 (2024-07-23) + +No significant changes. + + ## Changes in 1.11.15 (2024-06-18) No significant changes.