From f65a4bd437f0e3d7dfcaf15fe044695b7d7d32f7 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 18 Jun 2024 16:54:53 +0200 Subject: [PATCH 01/39] 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/39] 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/39] 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 @@ - (void)render:(id)cellData { 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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. From 3ba96830c318d089a25361d48074b29657ebc289 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 23 Jul 2024 14:13:03 +0200 Subject: [PATCH 16/39] finish version++ From 3149392143ac7a3d34887f1fcca141116a06c81f Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 23 Jul 2024 14:13:11 +0200 Subject: [PATCH 17/39] 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 084508c89..92f56844f 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.11.16 -CURRENT_PROJECT_VERSION = 1.11.16 +MARKETING_VERSION = 1.11.17 +CURRENT_PROJECT_VERSION = 1.11.17 From 0d65fc1dde44e4c07f6e5d6ff75ebfb49b68e952 Mon Sep 17 00:00:00 2001 From: Guillaume <88834548+guillaumevillemont@users.noreply.github.com> Date: Mon, 5 Aug 2024 10:54:37 +0200 Subject: [PATCH 18/39] Update sonarcloud project key (#7826) --- .github/workflows/sonarcloud.yml | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index d902ca136..ae78b6908 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -25,7 +25,7 @@ jobs: with: # Additional arguments for the sonarcloud scanner args: - -Dsonar.projectKey=vector-im_element-ios - -Dsonar.organization=new_vector_ltd_organization + -Dsonar.projectKey=element-ios + -Dsonar.organization=element-hq -Dsonar.inclusions=RiotSwiftUI/** # For more info about the parameters, please refer to https://docs.sonarcloud.io/advanced-setup/analysis-parameters/ \ No newline at end of file diff --git a/README.md b/README.md index 8ebf0f2c6..da462ce03 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ [![Build status](https://badge.buildkite.com/cc8f93e32da93fa7c1172398bd8af66254490567c7195a5f3f.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-ios/builds?branch=develop) [![Weblate](https://translate.riot.im/widgets/riot-ios/-/svg-badge.svg)](https://translate.riot.im/engage/riot-ios/?utm_source=widget) [![codecov](https://codecov.io/gh/element-hq/element-ios/branch/develop/graph/badge.svg?token=INNm5o6XWg)](https://codecov.io/gh/element-hq/element-ios) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-ios&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=vector-im_element-ios) -[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-ios&metric=bugs)](https://sonarcloud.io/summary/new_code?id=vector-im_element-ios) -[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-ios&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=vector-im_element-ios) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=element-ios&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=element-ios) +[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=element-ios&metric=bugs)](https://sonarcloud.io/summary/new_code?id=element-ios) +[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=element-ios&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=element-ios) [![Element iOS Matrix room #element-ios:matrix.org](https://img.shields.io/matrix/element-ios:matrix.org.svg?label=%23element-ios:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-ios:matrix.org) ![GitHub](https://img.shields.io/github/license/element-hq/element-ios) [![Twitter URL](https://img.shields.io/twitter/url?label=Element&url=https%3A%2F%2Ftwitter.com%2Felement_hq)](https://twitter.com/element_hq) From 2229487c8229c2fc9228303b2562ef021260fd41 Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 7 Aug 2024 13:56:14 +0100 Subject: [PATCH 19/39] Update FLEX. Fixes a build issue with Xcode 15.4. --- Podfile | 2 +- Podfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Podfile b/Podfile index f6f26f61c..4035934fb 100644 --- a/Podfile +++ b/Podfile @@ -61,7 +61,7 @@ abstract_target 'RiotPods' do pod 'SideMenu', '~> 6.5' pod 'DSWaveformImage', '~> 6.1.1' - pod 'FLEX', '~> 4.5.0', :configurations => ['Debug'], :inhibit_warnings => true + pod 'FLEX', '~> 5.22.10', :configurations => ['Debug'], :inhibit_warnings => true target 'RiotTests' do inherit! :search_paths diff --git a/Podfile.lock b/Podfile.lock index 6e3ce20f9..5131afefa 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -20,7 +20,7 @@ PODS: - Down (0.11.0) - DSBottomSheet (0.3.0) - DSWaveformImage (6.1.1) - - FLEX (4.5.0) + - FLEX (5.22.10) - FlowCommoniOS (1.12.2) - GBDeviceInfo (7.1.0): - GBDeviceInfo/Core (= 7.1.0) @@ -94,7 +94,7 @@ DEPENDENCIES: - Down (~> 0.11.0) - DSBottomSheet (~> 0.3) - DSWaveformImage (~> 6.1.1) - - FLEX (~> 4.5.0) + - FLEX (~> 5.22.10) - FlowCommoniOS (~> 1.12.0) - GBDeviceInfo (~> 7.1.0) - Introspect (~> 0.1) @@ -173,7 +173,7 @@ SPEC CHECKSUMS: Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612 DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce - FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b + FLEX: f21ee4f498eed3f8a1eded66b21939fd3b7a22ce FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2 GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376 GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868 @@ -207,6 +207,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 -PODFILE CHECKSUM: b622ffadc1a0fe5442787bd9023ca3d110384814 +PODFILE CHECKSUM: 7e14a7efb021fca69b3ffc2ffbe5fe632e6df7ea COCOAPODS: 1.14.3 From c4387b9d840bd77e7cbfa691c328c46f201d6a75 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Wed, 14 Aug 2024 18:20:02 +0100 Subject: [PATCH 20/39] Check power level before starting live sharing location (#7832) Update RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift Use local var `roomPowerLevels` Co-authored-by: Nicolas Buquet --- .../Coordinator/LocationSharingCoordinator.swift | 15 +++++++-------- changelog.d/pr-7808.change | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 changelog.d/pr-7808.change diff --git a/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift index 9cd5853c7..c2494be12 100644 --- a/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift +++ b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift @@ -166,17 +166,16 @@ final class LocationSharingCoordinator: Coordinator, Presentable { // Check if user can send beacon info state event private func canShareLiveLocation() -> Bool { - guard let myUserId = parameters.roomDataSource.mxSession.myUserId else { + guard let myUserId = parameters.roomDataSource.mxSession.myUserId, + let roomPowerLevels = parameters.roomDataSource.roomState.powerLevels, + let userPowerLevel = RoomPowerLevel(rawValue: roomPowerLevels.powerLevelOfUser(withUserID: myUserId)) else { return false } - let userPowerLevelRawValue = parameters.roomDataSource.roomState.powerLevels.powerLevelOfUser(withUserID: myUserId) - - guard let userPowerLevel = RoomPowerLevel(rawValue: userPowerLevelRawValue) else { - return false - } - - return userPowerLevel.rawValue >= RoomPowerLevel.moderator.rawValue + // CHeck user power level in room against power level needed to post geolocation state event. + let liveSharingPowerLevel = roomPowerLevels.minimumPowerLevelForSendingStateEvent(.beaconInfo) + + return userPowerLevel.rawValue >= liveSharingPowerLevel } private func showLabFlagPromotionIfNeeded(completion: @escaping ((Bool) -> Void)) { diff --git a/changelog.d/pr-7808.change b/changelog.d/pr-7808.change new file mode 100644 index 000000000..cc803849f --- /dev/null +++ b/changelog.d/pr-7808.change @@ -0,0 +1 @@ +Check power level before starting live sharing location \ No newline at end of file From 39a359d079c69d4d07abb10268a7d256ee1291a8 Mon Sep 17 00:00:00 2001 From: Hugh Nimmo-Smith Date: Wed, 14 Aug 2024 18:23:15 +0100 Subject: [PATCH 21/39] Fix dead image link (#7682) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da462ce03..7a437e62c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Element iOS is an iOS [Matrix](https://matrix.org/) client provided by [Element]

- Download on the app store + Download on the app store

From 09b9f4e771a6836458333a344ec476752b7d4e12 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Tue, 20 Aug 2024 13:56:04 +0100 Subject: [PATCH 22/39] Use the codecov token. (#7834) * Use the codecov token and v4 action --- .github/workflows/ci-tests.yml | 3 ++- .github/workflows/ci-ui-tests.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index e71d7b99b..aca66a553 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -62,6 +62,7 @@ jobs: run: bundle exec fastlane test - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: + token: ${{ secrets.CODECOV_TOKEN }} flags: unittests diff --git a/.github/workflows/ci-ui-tests.yml b/.github/workflows/ci-ui-tests.yml index 322323739..f325b210f 100644 --- a/.github/workflows/ci-ui-tests.yml +++ b/.github/workflows/ci-ui-tests.yml @@ -57,7 +57,7 @@ jobs: run: bundle exec fastlane uitest - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: + token: ${{ secrets.CODECOV_TOKEN }} flags: uitests - \ No newline at end of file From 6169266462837b0a58a7351ff37d4c8d407fdce0 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 20 Aug 2024 13:57:26 +0100 Subject: [PATCH 23/39] Update the SDK submodule. --- matrix-ios-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-ios-sdk b/matrix-ios-sdk index 1c4b3f5c3..1f3fa5aa7 160000 --- a/matrix-ios-sdk +++ b/matrix-ios-sdk @@ -1 +1 @@ -Subproject commit 1c4b3f5c32ed3bcf27d3404c770e000a50417352 +Subproject commit 1f3fa5aa795c4610f62f0c3fabd91521c4bfd257 From 1c2282e6826a998e10651df44348333dce0ac7fb Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 20 Aug 2024 14:01:52 +0100 Subject: [PATCH 24/39] version++ --- CHANGES.md | 7 +++++++ changelog.d/pr-7808.change | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 changelog.d/pr-7808.change diff --git a/CHANGES.md b/CHANGES.md index 11ffc2409..73dda9aeb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +## Changes in 1.11.17 (2024-08-20) + +🙌 Improvements + +- Check power level before starting live sharing location ([#7808](https://github.com/element-hq/element-ios/pull/7808)) + + ## Changes in 1.11.16 (2024-07-23) No significant changes. diff --git a/changelog.d/pr-7808.change b/changelog.d/pr-7808.change deleted file mode 100644 index cc803849f..000000000 --- a/changelog.d/pr-7808.change +++ /dev/null @@ -1 +0,0 @@ -Check power level before starting live sharing location \ No newline at end of file From 6c9b06c32ecee4a342ccf0a9e4497f503eb1db79 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 20 Aug 2024 16:12:02 +0100 Subject: [PATCH 25/39] finish version++ From 907be3f8d4e72d9dd63746beb197e4b00d0b8728 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 20 Aug 2024 16:12:08 +0100 Subject: [PATCH 26/39] 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 92f56844f..9d2bff91c 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.11.17 -CURRENT_PROJECT_VERSION = 1.11.17 +MARKETING_VERSION = 1.11.18 +CURRENT_PROJECT_VERSION = 1.11.18 From 3c581432d9cdadd5abd783d30f07f1644c6eb8ce Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 13 Sep 2024 16:49:38 +0200 Subject: [PATCH 27/39] fixed some swiftlint errors --- Riot/Modules/Pills/PillAttachmentView.swift | 2 +- Riot/Modules/Pills/PillProvider.swift | 4 ++-- Riot/Modules/Pills/PillTextAttachment.swift | 4 ++-- Riot/Modules/Pills/PillTextAttachmentData.swift | 10 +++++----- Riot/Modules/Pills/PillType.swift | 4 ++-- Riot/Modules/Pills/PillsFormatter.swift | 4 ++-- .../Room/VoiceMessages/VoiceMessagePlaybackView.swift | 2 +- .../SettingsIdentityServerViewModel.swift | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Riot/Modules/Pills/PillAttachmentView.swift b/Riot/Modules/Pills/PillAttachmentView.swift index 575808bd7..cf5760260 100644 --- a/Riot/Modules/Pills/PillAttachmentView.swift +++ b/Riot/Modules/Pills/PillAttachmentView.swift @@ -17,7 +17,7 @@ import UIKit /// Base view class for mention Pills. -@available (iOS 15.0, *) +@available(iOS 15.0, *) @objcMembers class PillAttachmentView: UIView { // MARK: - Internal Structs diff --git a/Riot/Modules/Pills/PillProvider.swift b/Riot/Modules/Pills/PillProvider.swift index 1941f8af1..a98f97cba 100644 --- a/Riot/Modules/Pills/PillProvider.swift +++ b/Riot/Modules/Pills/PillProvider.swift @@ -16,13 +16,13 @@ import Foundation -@available (iOS 15.0, *) +@available(iOS 15.0, *) private enum PillAttachmentKind { case attachment(PillTextAttachment) case string(NSAttributedString) } -@available (iOS 15.0, *) +@available(iOS 15.0, *) struct PillProvider { private let session: MXSession private let eventFormatter: MXKEventFormatter diff --git a/Riot/Modules/Pills/PillTextAttachment.swift b/Riot/Modules/Pills/PillTextAttachment.swift index c6771fa4a..e9d0df853 100644 --- a/Riot/Modules/Pills/PillTextAttachment.swift +++ b/Riot/Modules/Pills/PillTextAttachment.swift @@ -18,7 +18,7 @@ import UIKit import MatrixSDK /// Text attachment for pills display. -@available (iOS 15.0, *) +@available(iOS 15.0, *) @objcMembers class PillTextAttachment: NSTextAttachment { // MARK: - Properties @@ -133,7 +133,7 @@ class PillTextAttachment: NSTextAttachment { } // MARK: - Private -@available (iOS 15.0, *) +@available(iOS 15.0, *) private extension PillTextAttachment { func updateBounds() { diff --git a/Riot/Modules/Pills/PillTextAttachmentData.swift b/Riot/Modules/Pills/PillTextAttachmentData.swift index a119c941b..7356a95f7 100644 --- a/Riot/Modules/Pills/PillTextAttachmentData.swift +++ b/Riot/Modules/Pills/PillTextAttachmentData.swift @@ -17,7 +17,7 @@ import Foundation import UIKit -@available (iOS 15.0, *) +@available(iOS 15.0, *) struct PillAssetColor: Codable { var red: CGFloat = 0.0, green: CGFloat = 0.0, blue: CGFloat = 0.0, alpha: CGFloat = 0.0 @@ -30,7 +30,7 @@ struct PillAssetColor: Codable { } } -@available (iOS 15.0, *) +@available(iOS 15.0, *) struct PillAssetParameter: Codable { var tintColor: PillAssetColor? var backgroundColor: PillAssetColor? @@ -38,7 +38,7 @@ struct PillAssetParameter: Codable { var padding: CGFloat = 2.0 } -@available (iOS 15.0, *) +@available(iOS 15.0, *) enum PillTextAttachmentItem: Codable { case text(String) case avatar(url: String?, string: String?, matrixId: String) @@ -46,7 +46,7 @@ enum PillTextAttachmentItem: Codable { case asset(named: String, parameters: PillAssetParameter) } -@available (iOS 15.0, *) +@available(iOS 15.0, *) extension PillTextAttachmentItem { var string: String? { switch self { @@ -59,7 +59,7 @@ extension PillTextAttachmentItem { } /// Data associated with a Pill text attachment. -@available (iOS 15.0, *) +@available(iOS 15.0, *) struct PillTextAttachmentData: Codable { // MARK: - Properties /// Pill type diff --git a/Riot/Modules/Pills/PillType.swift b/Riot/Modules/Pills/PillType.swift index 53b42e0e2..17aadbb1e 100644 --- a/Riot/Modules/Pills/PillType.swift +++ b/Riot/Modules/Pills/PillType.swift @@ -16,14 +16,14 @@ import Foundation -@available (iOS 15.0, *) +@available(iOS 15.0, *) enum PillType: Codable { case user(userId: String) /// userId case room(roomId: String) /// roomId case message(roomId: String, eventId: String) // roomId, eventId } -@available (iOS 15.0, *) +@available(iOS 15.0, *) extension PillType { private static var regexPermalinkTarget: NSRegularExpression? = { let clientBaseUrl = BuildSettings.clientPermalinkBaseUrl ?? kMXMatrixDotToUrl diff --git a/Riot/Modules/Pills/PillsFormatter.swift b/Riot/Modules/Pills/PillsFormatter.swift index ecdfac5fe..2108c5fc3 100644 --- a/Riot/Modules/Pills/PillsFormatter.swift +++ b/Riot/Modules/Pills/PillsFormatter.swift @@ -18,7 +18,7 @@ import Foundation import UIKit /// Provides utilities funcs to handle Pills inside attributed strings. -@available (iOS 15.0, *) +@available(iOS 15.0, *) @objcMembers class PillsFormatter: NSObject { // MARK: - Internal Properties @@ -214,7 +214,7 @@ class PillsFormatter: NSObject { } // MARK: - Private Methods -@available (iOS 15.0, *) +@available(iOS 15.0, *) extension PillsFormatter { struct MarkdownLinkResult: Equatable { let url: URL diff --git a/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.swift b/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.swift index b5fae41d8..90d2b55c0 100644 --- a/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.swift +++ b/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.swift @@ -49,7 +49,7 @@ class VoiceMessagePlaybackView: UIView, NibLoadable, Themable { @IBOutlet private var playButton: UIButton! @IBOutlet private var elapsedTimeLabel: UILabel! @IBOutlet private var waveformContainerView: UIView! - @IBOutlet private (set)var stackViewTrailingContraint: NSLayoutConstraint! + @IBOutlet private(set) var stackViewTrailingContraint: NSLayoutConstraint! private var longPressGestureRecognizer: UILongPressGestureRecognizer! private var panGestureRecognizer: UIPanGestureRecognizer! diff --git a/Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewModel.swift b/Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewModel.swift index 205d7c174..25561e18a 100644 --- a/Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewModel.swift +++ b/Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewModel.swift @@ -92,7 +92,7 @@ final class SettingsIdentityServerViewModel: SettingsIdentityServerViewModelType private func checkCanAddIdentityServer(newIdentityServer: String, viewStateUpdate: @escaping (SettingsIdentityServerViewState) -> Void, - canAddcompletion: @escaping(() -> Void)) { + canAddcompletion: @escaping (() -> Void)) { viewStateUpdate(.loading) self.checkIdentityServerValidity(identityServer: newIdentityServer) { (identityServerValidityResponse) in @@ -228,7 +228,7 @@ final class SettingsIdentityServerViewModel: SettingsIdentityServerViewModelType private func checkCanDisconnectIdentityServer(identityServer: String, viewStateUpdate: @escaping (SettingsIdentityServerViewState) -> Void, - canDisconnectCompletion: @escaping(() -> Void)) { + canDisconnectCompletion: @escaping (() -> Void)) { self.update(viewState: .loading) self.checkExistingDataOnIdentityServer { (response) in From f8d7cffefa9d77183f42c849b689eb87a75db08d Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Mon, 16 Sep 2024 10:13:58 +0200 Subject: [PATCH 28/39] update SDK commit --- matrix-ios-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-ios-sdk b/matrix-ios-sdk index 1f3fa5aa7..8a65ea10e 160000 --- a/matrix-ios-sdk +++ b/matrix-ios-sdk @@ -1 +1 @@ -Subproject commit 1f3fa5aa795c4610f62f0c3fabd91521c4bfd257 +Subproject commit 8a65ea10ef8eb3b1511b1f9a0a6d5b8c018a04bc From 909c38bc1c465b49e6bbce3264d3bbad0526ffd5 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Mon, 16 Sep 2024 10:23:18 +0200 Subject: [PATCH 29/39] update podfile.lock --- Podfile.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 5131afefa..939565c09 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -26,7 +26,7 @@ PODS: - GBDeviceInfo/Core (= 7.1.0) - GBDeviceInfo/Core (7.1.0) - GZIP (1.3.2) - - Introspect (0.11.0) + - Introspect (0.12.0) - JitsiMeetSDKLite (8.1.2-lite): - JitsiWebRTC (~> 111.0) - JitsiWebRTC (111.0.2) @@ -39,20 +39,20 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) - - MatrixSDK (0.27.11): - - MatrixSDK/Core (= 0.27.11) - - MatrixSDK/Core (0.27.11): + - MatrixSDK (0.27.13): + - MatrixSDK/Core (= 0.27.13) + - MatrixSDK/Core (0.27.13): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) - - MatrixSDKCrypto (= 0.4.2) + - MatrixSDKCrypto (= 0.4.3) - OLMKit (~> 3.2.5) - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.27.11): + - MatrixSDK/JingleCallStack (0.27.13): - JitsiMeetSDKLite (= 8.1.2-lite) - MatrixSDK/Core - - MatrixSDKCrypto (0.4.2) + - MatrixSDKCrypto (0.4.3) - OLMKit (3.2.12): - OLMKit/olmc (= 3.2.12) - OLMKit/olmcpp (= 3.2.12) @@ -72,15 +72,15 @@ PODS: - Sentry/Core (7.15.0) - SideMenu (6.5.0) - SwiftBase32 (0.9.0) - - SwiftFormat/CLI (0.50.2) - - SwiftGen (6.6.2) + - SwiftFormat/CLI (0.54.5) + - SwiftGen (6.6.3) - SwiftJWT (3.6.200): - BlueCryptor (~> 1.0) - BlueECC (~> 1.1) - BlueRSA (~> 1.0) - KituraContracts (~> 1.2) - LoggerAPI (~> 1.7) - - SwiftLint (0.49.1) + - SwiftLint (0.57.0) - SwiftyBeaver (1.9.5) - UICollectionViewLeftAlignedLayout (1.0.2) - UICollectionViewRightAlignedLayout (0.0.3) @@ -177,7 +177,7 @@ SPEC CHECKSUMS: FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2 GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376 GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868 - Introspect: 4cc1e4c34dd016540c8d86a591c231c09dafbee3 + Introspect: b66b675de8a85d9ef832f3a710d8e3c7db186884 JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7 JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51 @@ -187,8 +187,8 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b - MatrixSDK: 7c29e5cc8934cfc1f81f83fcfa17cd652612086d - MatrixSDKCrypto: 736069ee0a5ec12852ab3498bf2242acecc443fc + MatrixSDK: 1dae186c839eb145974fc1fc127ec903de60a297 + MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e OLMKit: da115f16582e47626616874e20f7bb92222c7a51 ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2 @@ -196,10 +196,10 @@ SPEC CHECKSUMS: Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7 SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2 SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17 - SwiftFormat: 710117321c55c82675c0dc03055128efbb13c38f - SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c + SwiftFormat: 543a7b1ab4a6ce2d88bd5616a17903446ca3dc5c + SwiftGen: 4993cbf71cbc4886f775e26f8d5c3a1188ec9f99 SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae - SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5 + SwiftLint: eb47480d47c982481592c195c221d11013a679cc SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82 UICollectionViewLeftAlignedLayout: 830bf6fa5bab9f9b464f62e3384f9d2e00b3c0f6 UICollectionViewRightAlignedLayout: 823eef8c567eba4a44c21bc2ffcb0d0d5f361e2d @@ -207,6 +207,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 -PODFILE CHECKSUM: 7e14a7efb021fca69b3ffc2ffbe5fe632e6df7ea +PODFILE CHECKSUM: fb3e1c62f9e35a9bdbafce743664bf4f620af028 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 From 260aed1c2b1d75349551baa54b6ae6fd657919ef Mon Sep 17 00:00:00 2001 From: A1ae17 Date: Mon, 26 Aug 2024 06:19:31 +0000 Subject: [PATCH 30/39] Translated using Weblate (Korean) Currently translated at 60.1% (1455 of 2420 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ko/ --- Riot/Assets/ko.lproj/Vector.strings | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Riot/Assets/ko.lproj/Vector.strings b/Riot/Assets/ko.lproj/Vector.strings index dc0ce0d07..785b13ee3 100644 --- a/Riot/Assets/ko.lproj/Vector.strings +++ b/Riot/Assets/ko.lproj/Vector.strings @@ -24,7 +24,7 @@ "camera" = "카메라"; // String for App Store "store_short_description" = "안전한 분산 대화/VoIP"; -"store_full_description" = "Element는 다음과 같은 기능을 제공하는 새로운 유형의 메신저입니다.\n\n1. 프라이버시를 관리할 수 있는 권한을 제공합니다.\n2. Matrix 네트워크의 사용자와 통신할 수 있을 뿐만 아니라 Slack 등의 \n앱을 연계하여 다른 네트워크와도 통신할 수 있습니다.\n3. 광고, 데이터마이닝, 백도어와 클로즈 플랫폼으로부터의 사용자를 보호합니다.\n4. 교차 검증과 강력한 종단간 암호화을 통해 사용자를 보호합니다.\n\nElement는 탈중앙화이며 오픈 소스이기 때문에 다른 메신저 앱과는 완전히 다릅니다.\n\nElement에서는 데이터 및 대화에 대한 소유권 및 제어 권한을 가질 수 있도록 자체 호스팅을 통해 \n직접 메신저 서버를 운영할 수 있고, 다른 사용자가 제공하고 있는 서버를 선택할 수 있습니다. 또한 개방형 네트워크에 액세스할 수 있으므로 Element 이외의 사용자와도 이야기할 수 있습니다. 그리고 매우 안전합니다.\n\nElement는 개방-분산형 통신의 표준인 Matrix에서 동작하기 때문에 이 모든 것을 수행할 수 있습니다.\n\nElement는 어떤 서버를 사용할지 사용자가 직접 Element 앱에서 결정할 수 있습니다.\n\n1. matrix.org의 공식 서버에서 무료 계정을 생성한다.\n2. 자체 호스팅을 통해 직접 서버를 운영하고 계정을 관리한다.\n3. Element Matrix Services의 호스팅 플랫폼에 가입하여 사용자 커스텀 서버에서 계정을 만든다.\n\n왜 Element를 선택해야합니까?\n\n내 데이터를 내가 소유함: 데이터나 메시지를 보관할 곳을 스스로 정할 수 있습니다. 데이터를 수집하거나 제 3자에게 데이터를 제공하는 거대 IT 기업이 아닌, 사용자가 스스로 데이터를 소유하고 제어할 수 있습니다.\n\n개방적인 메시징 및 협업: Element 또는 다른 Matrix 앱을 사용하든, 심지어 Slack, IRC, XMPP와 같은 다른 메시징 시스템을 사용하던 상관없이 Matrix 네트워크 상의 다른 사용자와 채팅할 수 있습니다.\n\n매우 안전함: 강력한 종단간 암호화(대화에 참여하고 있는 사람만 메시지를 복호화할 수 있습니다) 및 대화 참가자의 장치를 확인하기 위한 교차 검증을 실시할 수 있습니다.\n\n완벽한 커뮤니케이션: 메시징, 음성 및 화상 통화, 파일 공유, 화면 공유 및 다양한 통합, 봇, 위젯 등을 제공합니다. 방이나 커뮤니티를 만들어 서로 연락하고 일을 원활하게 해낼 수 있습니다.\n\n언제 어디서나: 모든 장치 및 웹(https://element.io/app)에서 메시지가 완전히 동기화되므로 언제 어디서나 연락을 취할 수 있습니다."; +"store_full_description" = "Element는 다음과 같은 기능을 제공하는 새로운 유형의 메신저입니다.\n\n1. 프라이버시를 관리할 수 있는 권한을 제공합니다.\n2. Matrix 네트워크의 사용자와 통신할 수 있을 뿐만 아니라 Slack 등의 \n앱을 연계하여 다른 네트워크와도 통신할 수 있습니다.\n3. 광고, 데이터마이닝, 백도어와 클로즈 플랫폼으로부터의 사용자를 보호합니다.\n4. 교차 검증과 강력한 종단간 암호화을 통해 사용자를 보호합니다.\n\nElement는 탈중앙화이며 오픈 소스이기 때문에 다른 메신저 앱과는 완전히 다릅니다.\n\nElement에서는 데이터 및 대화에 대한 소유권 및 제어 권한을 가질 수 있도록 자체 호스팅을 통해 \n직접 메신저 서버를 운영할 수 있고, 다른 사용자가 제공하고 있는 서버를 선택할 수 있습니다. 또한 개방형 네트워크에 액세스할 수 있으므로 Element 이외의 사용자와도 이야기할 수 있습니다. 그리고 매우 안전합니다.\n\nElement는 개방-분산형 통신의 표준인 Matrix에서 동작하기 때문에 이 모든 것을 수행할 수 있습니다.\n\nElement는 어떤 서버를 사용할지 사용자가 직접 Element 앱에서 결정할 수 있습니다.\n\n1. matrix.org의 공식 서버에서 무료 계정을 생성한다.\n2. 자체 호스팅을 통해 직접 서버를 운영하고 계정을 관리한다.\n3. Element Matrix Services의 호스팅 플랫폼에 가입하여 사용자 커스텀 서버에서 계정을 만든다.\n\n왜 Element를 선택해야합니까?\n\n내 데이터를 내가 소유함: 데이터나 메시지를 보관할 곳을 스스로 정할 수 있습니다. 데이터를 수집하거나 제 3자에게 데이터를 제공하는 거대 IT 기업이 아닌, 사용자가 스스로 데이터를 소유하고 제어할 수 있습니다.\n\n개방적인 메시징 및 협업: Element 또는 다른 Matrix 앱을 사용하든, 심지어 Slack, IRC, XMPP와 같은 다른 메시징 시스템을 사용하던 상관없이 Matrix 네트워크 상의 다른 사용자와 채팅할 수 있습니다.\n\n매우 안전함: 강력한 종단간 암호화(대화에 참여하고 있는 사람만 메시지를 복호화할 수 있습니다) 및 대화 참가자의 장치를 확인하기 위한 교차 검증을 실시할 수 있습니다.\n\n완벽한 커뮤니케이션: 메시징, 음성 및 화상 통화, 파일 공유, 화면 공유 및 다양한 통합, 봇, 위젯 등을 제공합니다. 방이나 커뮤니티를 만들어 서로 연락하고 일을 원활하게 해낼 수 있습니다.\n\n언제 어디서나: 모든 장치 및 웹(https://app.element.io/)에서 메시지가 완전히 동기화되므로 언제 어디서나 연락을 취할 수 있습니다."; "join" = "참가"; "decline" = "끊기"; "accept" = "수락"; @@ -340,7 +340,7 @@ "settings_add_email_address" = "이메일 주소 추가"; "settings_phone_number" = "휴대 전화"; "settings_add_phone_number" = "전화번호 추가"; -"settings_change_password" = "Matrix 계정 비밀번호 변경"; +"settings_change_password" = "비밀번호 변경"; "settings_night_mode" = "야간 모드"; "settings_fail_to_update_profile" = "프로필 업데이트에 실패함"; "settings_enable_push_notif" = "이 기기에서 알림"; @@ -388,7 +388,7 @@ "settings_crypto_device_key" = "\n세션 키:\n"; "settings_crypto_export" = "키 내보내기"; "settings_crypto_blacklist_unverified_devices" = "검증된 세션만 암호화"; -"settings_deactivate_my_account" = "내 계정 비활성화"; +"settings_deactivate_my_account" = "계정 영구 비활성화"; "settings_key_backup_info" = "암호화된 메시지는 종단간 암호화로 보호됩니다. 오직 당신과 참가자만 키를 갖고 있어서 이 메시지를 읽을 수 있습니다."; "settings_key_backup_info_checking" = "확인 중…"; "settings_key_backup_info_none" = "키가 이 세션에서 백업되지 않았습니다."; @@ -1525,14 +1525,14 @@ "settings_enable_room_message_bubbles" = "메시지 버블"; "settings_labs_use_only_latest_user_avatar_and_name" = "대화 기록에서 사용자의 최신 프로필 사진 및 이름 표시"; "settings_labs_enable_auto_report_decryption_errors" = "복호화 오류 자동 보고"; -"settings_labs_enable_threads" = "스레드 메시징"; +"settings_labs_enable_threads" = "스레드 메시지"; "room_participants_invite_prompt_to_msg" = "%@을(를) %@에 초대하시겠습니까?"; "rooms_empty_view_information" = "방은 비공개와 공개 모두 그룹채팅에 적합합니다. +를 눌러 기존에 개설된 방을 찾거나, 새로 개설할 수 있습니다."; "onboarding_celebration_button" = "출발"; -"onboarding_celebration_message" = "설정이 저장되었습니다."; -"onboarding_celebration_title" = "모두 설정했어요!"; +"onboarding_celebration_message" = "프로필을 업데이트하려면 설정으로 가세요"; +"onboarding_celebration_title" = "보기 좋네요!"; "onboarding_avatar_accessibility_label" = "프로필 사진"; -"onboarding_avatar_message" = "언제든지 수정할 수 있습니다."; +"onboarding_avatar_message" = "언제든지 수정할 수 있습니다"; "onboarding_avatar_title" = "프로필 사진 추가"; "onboarding_display_name_max_length" = "프로필 이름은 256자 미만이어야 합니다"; "onboarding_display_name_hint" = "나중에 수정할 수 있습니다"; @@ -1544,14 +1544,14 @@ "onboarding_congratulations_home_button" = "홈 화면으로 이동"; "onboarding_congratulations_personalize_button" = "프로필 설정"; /* The placeholder string contains the user's matrix ID */ -"onboarding_congratulations_message" = "계정 %@이(가) 새롭게 생성되었습니다."; +"onboarding_congratulations_message" = "계정 %@이(가) 새롭게 생성되었습니다"; "onboarding_congratulations_title" = "축하합니다!"; "onboarding_use_case_existing_server_message" = "기존 서버에 가입하려고 하시나요?"; "onboarding_use_case_skip_button" = "질문 넘기기"; /* The placeholder string contains onboarding_use_case_skip_button as a tappable action */ "onboarding_use_case_not_sure_yet" = "아직 확실하지 않으신가요? %@"; "onboarding_use_case_personal_messaging" = "친구와 가족"; -"onboarding_use_case_message" = "연결할 수 있도록 도와드릴게요."; +"onboarding_use_case_message" = "연결할 수 있도록 도와드릴게요"; "onboarding_use_case_title" = "누구와 가장 많이 대화하나요?"; "onboarding_splash_page_2_message" = "데이터 및 대화가 저장될 서버를 선택하여 내 정보에 대한 통제력과 독립성을 확보하세요. Matrix를 통해 연결됩니다."; "onboarding_splash_page_1_title" = "대화 내용을 소유하세요."; @@ -1586,7 +1586,7 @@ // Start "user_verification_start_verify_action" = "검증 시작하기"; -"key_verification_user_title" = "검증"; +"key_verification_user_title" = "인증"; "key_verification_tile_request_outgoing_title" = "검증 전송됨"; "widget_picker_manage_integrations" = "통합 관리하기…"; "room_widget_permission_room_id_permission" = "방 ID"; @@ -1632,3 +1632,4 @@ "room_preview_decline_invitation_options" = "초대를 거부하거나 친구를 차단하시겠습니까?"; "threads_beta_information_link" = "더 알아보기"; "threads_beta_title" = "스레드"; +"room_access_settings_screen_upgrade_alert_message" = "%@에 있는 사람은 누구나 이 방을 찾아 참여할 수 있습니다 - 모두를 수동으로 초대할 필요가 없습니다. 당신은 언제든지 방 설정에서 변경할 수 있습니다."; From 5d214398ca87e5b2a1384860f80c0ed770f20169 Mon Sep 17 00:00:00 2001 From: A1ae17 Date: Mon, 26 Aug 2024 06:06:56 +0000 Subject: [PATCH 31/39] Translated using Weblate (Korean) Currently translated at 100.0% (8 of 8 strings) Translation: Element iOS/Element iOS (Dialogs) Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-dialogs/ko/ --- Riot/Assets/ko.lproj/InfoPlist.strings | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Riot/Assets/ko.lproj/InfoPlist.strings b/Riot/Assets/ko.lproj/InfoPlist.strings index 45ef46ab9..90c09e51a 100644 --- a/Riot/Assets/ko.lproj/InfoPlist.strings +++ b/Riot/Assets/ko.lproj/InfoPlist.strings @@ -1,8 +1,9 @@ // Permissions usage explanations -"NSCameraUsageDescription" = "카메라는 사진과 영상 촬영, 영상 통화를 하는 데 쓰입니다."; -"NSPhotoLibraryUsageDescription" = "포토 라이브러리는 사진과 영상을 보내는데 쓰입니다."; +"NSCameraUsageDescription" = "카메라는 영상 통화를 하거나 사진과 비디오를 찍고 업로드하는 데 사용됩니다."; +"NSPhotoLibraryUsageDescription" = "사진 및 동영상을 라이브러리에서 업로드할 수 있도록 사진 접근을 허용하세요."; "NSMicrophoneUsageDescription" = "Element는 통화와 동영상 촬영 및 음성 메시지 녹음을 하기 위해 마이크에 액세스해야 합니다."; -"NSContactsUsageDescription" = "Element는 채팅에 초대할 수 있도록 연락처를 표시합니다."; +"NSContactsUsageDescription" = "다른사람이 매트릭스에서 당신의 연락처를 찾는 데 도움을 주기 위해 당신의 아이디 서버와 공유될 것입니다."; "NSCalendarsUsageDescription" = "앱에서 예정된 회의를 봅니다."; "NSLocationWhenInUseUsageDescription" = "사람들에게 위치 정보를 공유할때, Element에서 지도를 표시 하기 위한 권한이 필요합니다."; "NSFaceIDUsageDescription" = "Face ID 권한은 앱에 액세스하는 데 사용됩니다."; +"NSLocationAlwaysAndWhenInUseUsageDescription" = "당신의 위치를 사람들과 공유할 때, Element는 그들에게 지도를 보여주기 위해 접근이 필요합니다."; From 85226c145bf146f7f91b7862762e48abf8c8cdf5 Mon Sep 17 00:00:00 2001 From: A1ae17 Date: Mon, 26 Aug 2024 06:15:54 +0000 Subject: [PATCH 32/39] Translated using Weblate (Korean) Currently translated at 100.0% (50 of 50 strings) Translation: Element iOS/Element iOS (Push) Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/ko/ --- Riot/Assets/ko.lproj/Localizable.strings | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Riot/Assets/ko.lproj/Localizable.strings b/Riot/Assets/ko.lproj/Localizable.strings index f76cb7db0..b997fafea 100644 --- a/Riot/Assets/ko.lproj/Localizable.strings +++ b/Riot/Assets/ko.lproj/Localizable.strings @@ -128,3 +128,6 @@ /** General **/ "Notification" = "알림"; + +/* New voice broadcast from a specific person, not referencing a room. */ +"VOICE_BROADCAST_FROM_USER" = "%@ 음성 방송을 시작했습니다"; From 1e19a4602f63e344f402a585044bacf9d2fa65f6 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 17 Sep 2024 14:29:08 +0200 Subject: [PATCH 33/39] version++ --- CHANGES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 73dda9aeb..dd1e1797a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +## Changes in 1.11.18 (2024-09-17) + +No significant changes. + + ## Changes in 1.11.17 (2024-08-20) 🙌 Improvements From 24eb2e9bbf6f7896a85ddd0659220f58f5141272 Mon Sep 17 00:00:00 2001 From: Mauro <34335419+Velin92@users.noreply.github.com> Date: Tue, 17 Sep 2024 14:32:10 +0200 Subject: [PATCH 34/39] Update CHANGES.md --- CHANGES.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index dd1e1797a..103e1d9d0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,8 @@ ## Changes in 1.11.18 (2024-09-17) -No significant changes. +🙌 Improvements + +- Replaced deprecated OlmKit APIs from ContentScanner with ones from the CryptoSDK. ## Changes in 1.11.17 (2024-08-20) From 5e779971060ae602f1b5a5cc0e7c9f076c199aac Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 17 Sep 2024 15:18:04 +0200 Subject: [PATCH 35/39] finish version++ From 36258eead490ec8c4fa29a550227d942e9d66cb8 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Thu, 26 Sep 2024 11:27:43 +0200 Subject: [PATCH 36/39] Resolve conflicts on Rebase/Element-v1.11.18 into Tchap --- .github/workflows/ci-tests.yml | 8 ----- .github/workflows/ci-ui-tests.yml | 4 +-- .github/workflows/sonarcloud.yml | 4 +-- Config/AppVersion.xcconfig | 7 +---- Podfile | 3 -- Podfile.lock | 14 --------- README.md | 9 ------ RiotNSE/BuildSettings.swift | 16 +++++----- RiotShareExtension/BuildSettings.swift | 20 ++++++------ .../LocationSharingCoordinator.swift | 31 ------------------- 10 files changed, 23 insertions(+), 93 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 221523521..5ffde41ac 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -63,15 +63,7 @@ jobs: - name: Unit tests run: bundle exec fastlane test -<<<<<<< HEAD # - name: Upload coverage to Codecov # uses: codecov/codecov-action@v3 # with: # flags: unittests -======= - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - token: ${{ secrets.CODECOV_TOKEN }} - flags: unittests ->>>>>>> v1.11.18 diff --git a/.github/workflows/ci-ui-tests.yml b/.github/workflows/ci-ui-tests.yml index f325b210f..322323739 100644 --- a/.github/workflows/ci-ui-tests.yml +++ b/.github/workflows/ci-ui-tests.yml @@ -57,7 +57,7 @@ jobs: run: bundle exec fastlane uitest - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v3 with: - token: ${{ secrets.CODECOV_TOKEN }} flags: uitests + \ No newline at end of file diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index ae78b6908..d902ca136 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -25,7 +25,7 @@ jobs: with: # Additional arguments for the sonarcloud scanner args: - -Dsonar.projectKey=element-ios - -Dsonar.organization=element-hq + -Dsonar.projectKey=vector-im_element-ios + -Dsonar.organization=new_vector_ltd_organization -Dsonar.inclusions=RiotSwiftUI/** # For more info about the parameters, please refer to https://docs.sonarcloud.io/advanced-setup/analysis-parameters/ \ No newline at end of file diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 1e5411699..f19a72c66 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,10 +15,5 @@ // // Version -<<<<<<< HEAD -MARKETING_VERSION = 2.8.1 +MARKETING_VERSION = 2.8.2 CURRENT_PROJECT_VERSION = 1 -======= -MARKETING_VERSION = 1.11.18 -CURRENT_PROJECT_VERSION = 1.11.18 ->>>>>>> v1.11.18 diff --git a/Podfile b/Podfile index 8feb19996..be4ce6b1d 100644 --- a/Podfile +++ b/Podfile @@ -40,10 +40,7 @@ def import_Common_pods pod 'DSWaveformImage', '~> 6.1.1' pod 'FLEX', '~> 5.22.10', :configurations => ['Debug'], :inhibit_warnings => true -<<<<<<< HEAD end -======= ->>>>>>> v1.11.18 abstract_target 'TchapPods' do diff --git a/Podfile.lock b/Podfile.lock index bd3b94a20..6ac6ebb4a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -74,13 +74,8 @@ PODS: - Sentry/Core (7.15.0) - SideMenu (6.5.0) - SwiftBase32 (0.9.0) -<<<<<<< HEAD - - SwiftFormat/CLI (0.54.0) - - SwiftGen (6.6.2) -======= - SwiftFormat/CLI (0.54.5) - SwiftGen (6.6.3) ->>>>>>> v1.11.18 - SwiftJWT (3.6.200): - BlueCryptor (~> 1.0) - BlueECC (~> 1.1) @@ -209,13 +204,8 @@ SPEC CHECKSUMS: Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7 SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2 SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17 -<<<<<<< HEAD - SwiftFormat: 0e0b577434e6aa63bc82a8905b40d9597b8452d4 - SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c -======= SwiftFormat: 543a7b1ab4a6ce2d88bd5616a17903446ca3dc5c SwiftGen: 4993cbf71cbc4886f775e26f8d5c3a1188ec9f99 ->>>>>>> v1.11.18 SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae SwiftLint: eb47480d47c982481592c195c221d11013a679cc SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82 @@ -225,10 +215,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 -<<<<<<< HEAD -PODFILE CHECKSUM: 971cd7529e2d127b237469afa2c18e6dced151ec -======= PODFILE CHECKSUM: fb3e1c62f9e35a9bdbafce743664bf4f620af028 ->>>>>>> v1.11.18 COCOAPODS: 1.15.2 diff --git a/README.md b/README.md index cf1cb441a..7606b93dd 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,6 @@ ![GitHub release (latest by date)](https://img.shields.io/github/v/release/dinsic-pim/tchap-ios) ![badge-languages](https://img.shields.io/badge/languages-Swift%20%7C%20ObjC-orange.svg) [![Swift 5.x](https://img.shields.io/badge/Swift-5.x-orange)](https://developer.apple.com/swift) -<<<<<<< HEAD -![GitHub](https://img.shields.io/github/license/dinsic-pim/tchap-ios) -======= [![Build status](https://badge.buildkite.com/cc8f93e32da93fa7c1172398bd8af66254490567c7195a5f3f.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-ios/builds?branch=develop) [![Weblate](https://translate.riot.im/widgets/riot-ios/-/svg-badge.svg)](https://translate.riot.im/engage/riot-ios/?utm_source=widget) [![codecov](https://codecov.io/gh/element-hq/element-ios/branch/develop/graph/badge.svg?token=INNm5o6XWg)](https://codecov.io/gh/element-hq/element-ios) @@ -15,18 +12,12 @@ [![Element iOS Matrix room #element-ios:matrix.org](https://img.shields.io/matrix/element-ios:matrix.org.svg?label=%23element-ios:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-ios:matrix.org) ![GitHub](https://img.shields.io/github/license/element-hq/element-ios) [![Twitter URL](https://img.shields.io/twitter/url?label=Element&url=https%3A%2F%2Ftwitter.com%2Felement_hq)](https://twitter.com/element_hq) ->>>>>>> v1.11.18 Tchap iOS is an iOS [Matrix](https://matrix.org/) client. It is based on [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk).

-<<<<<<< HEAD Download on the app store -======= - - Download on the app store ->>>>>>> v1.11.18

diff --git a/RiotNSE/BuildSettings.swift b/RiotNSE/BuildSettings.swift index 2b3b90bab..392f5b92d 100644 --- a/RiotNSE/BuildSettings.swift +++ b/RiotNSE/BuildSettings.swift @@ -203,10 +203,10 @@ final class BuildSettings: NSObject { #if DEBUG /// The configuration to use for analytics during development. Set `isEnabled` to false to disable analytics in debug builds. - static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: false, - host: "", - apiKey: "", - termsURL: URL(string: "https://")!) + static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: true, // Tchap: enable PostHog analytics on DEBUG + host: "https://us.i.posthog.com", // Tchap: dev posthog, + apiKey: "phc_eQOeaQiaIxdX9kaQmqYTD7RJLyFubYmGYKUI9czqqQD", // Tchap: dev posthog, + termsURL: URL(string: "https://tchap.beta.gouv.fr/politique-de-confidentialite")!) // Tchap: dev posthog, #else /// The configuration to use for analytics. Set `isEnabled` to false to disable analytics. static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: false, @@ -292,10 +292,10 @@ final class BuildSettings: NSObject { "agent.dev-durable.tchap.gouv.fr", "agent.education.tchap.gouv.fr" ], - // No activation of video calls actually in Tchap Production. -// tchapFeatureVideoOverIP: [ -// "agent.dinum.tchap.gouv.fr" -// ], + tchapFeatureVideoOverIP: [ + "agent.dinum.tchap.gouv.fr", + "agent.education.tchap.gouv.fr" + ], tchapFeatureGeolocationSharing: [ tchapFeatureAnyHomeServer ] diff --git a/RiotShareExtension/BuildSettings.swift b/RiotShareExtension/BuildSettings.swift index 2911cd225..392f5b92d 100644 --- a/RiotShareExtension/BuildSettings.swift +++ b/RiotShareExtension/BuildSettings.swift @@ -203,10 +203,10 @@ final class BuildSettings: NSObject { #if DEBUG /// The configuration to use for analytics during development. Set `isEnabled` to false to disable analytics in debug builds. - static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: false, - host: "", - apiKey: "", - termsURL: URL(string: "https://")!) + static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: true, // Tchap: enable PostHog analytics on DEBUG + host: "https://us.i.posthog.com", // Tchap: dev posthog, + apiKey: "phc_eQOeaQiaIxdX9kaQmqYTD7RJLyFubYmGYKUI9czqqQD", // Tchap: dev posthog, + termsURL: URL(string: "https://tchap.beta.gouv.fr/politique-de-confidentialite")!) // Tchap: dev posthog, #else /// The configuration to use for analytics. Set `isEnabled` to false to disable analytics. static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: false, @@ -272,7 +272,7 @@ final class BuildSettings: NSObject { tchapFeatureNotificationByEmail: [ tchapFeatureAnyHomeServer ], - // Audio calls for all except Finances in Tchap Production. + // Audio calls for all in Tchap Production. tchapFeatureVoiceOverIP: [ "agent.externe.tchap.gouv.fr", "agent.collectivites.tchap.gouv.fr", @@ -280,7 +280,7 @@ final class BuildSettings: NSObject { "agent.elysee.tchap.gouv.fr", "agent.pm.tchap.gouv.fr", "agent.ssi.tchap.gouv.fr", -// "agent.finances.tchap.gouv.fr", + "agent.finances.tchap.gouv.fr", "agent.social.tchap.gouv.fr", "agent.interieur.tchap.gouv.fr", "agent.agriculture.tchap.gouv.fr", @@ -292,10 +292,10 @@ final class BuildSettings: NSObject { "agent.dev-durable.tchap.gouv.fr", "agent.education.tchap.gouv.fr" ], - // No activation of video calls actually in Tchap Production. -// tchapFeatureVideoOverIP: [ -// "agent.dinum.tchap.gouv.fr" -// ], + tchapFeatureVideoOverIP: [ + "agent.dinum.tchap.gouv.fr", + "agent.education.tchap.gouv.fr" + ], tchapFeatureGeolocationSharing: [ tchapFeatureAnyHomeServer ] diff --git a/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift index df1862105..c2494be12 100644 --- a/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift +++ b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift @@ -166,36 +166,6 @@ final class LocationSharingCoordinator: Coordinator, Presentable { // Check if user can send beacon info state event private func canShareLiveLocation() -> Bool { -<<<<<<< HEAD - // Tchap: allow live sharing geolocation based on room power levels - // -// guard let myUserId = parameters.roomDataSource.mxSession.myUserId else { -// return false -// } -// -// let userPowerLevelRawValue = parameters.roomDataSource.roomState.powerLevels.powerLevelOfUser(withUserID: myUserId) -// -// guard let userPowerLevel = RoomPowerLevel(rawValue: userPowerLevelRawValue) else { -// return false -// } -// -// return userPowerLevel.rawValue >= RoomPowerLevel.moderator.rawValue - - guard let myUserId = parameters.roomDataSource.mxSession.myUserId, - let roomPowerLevels = parameters.roomDataSource.roomState.powerLevels, - let userPowerLevel = RoomPowerLevel(rawValue: parameters.roomDataSource.roomState.powerLevels.powerLevelOfUser(withUserID: myUserId)) else { - return false - } - - // Tchap: should call `minimumPowerLevelForSendingStateEvent(_ eventType: MXEventType) -> Int` from `MatrixSDK:MXRoomPowerLevels.swift` - // but can't because it is inaccessible due to 'internal' protection level - // - // let liveSharingPowerLevel = parameters.roomDataSource.roomState.powerLevels.minimumPowerLevelForSendingStateEvent(.beaconInfo) - // - - // Get live sharing power level from stable value, then unstable value and fallback on default value. - let liveSharingPowerLevel = (roomPowerLevels.events[kMXEventTypeStringBeaconInfo] ?? roomPowerLevels.events[kMXEventTypeStringBeaconInfoMSC3672]) as? Int ?? roomPowerLevels.stateDefault -======= guard let myUserId = parameters.roomDataSource.mxSession.myUserId, let roomPowerLevels = parameters.roomDataSource.roomState.powerLevels, let userPowerLevel = RoomPowerLevel(rawValue: roomPowerLevels.powerLevelOfUser(withUserID: myUserId)) else { @@ -204,7 +174,6 @@ final class LocationSharingCoordinator: Coordinator, Presentable { // CHeck user power level in room against power level needed to post geolocation state event. let liveSharingPowerLevel = roomPowerLevels.minimumPowerLevelForSendingStateEvent(.beaconInfo) ->>>>>>> v1.11.18 return userPowerLevel.rawValue >= liveSharingPowerLevel } From 747b11c9019f54e05bb2f38576335a96f87913b5 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Thu, 26 Sep 2024 15:56:29 +0200 Subject: [PATCH 37/39] Matrix-ios-SDK Updated --- matrix-ios-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-ios-sdk b/matrix-ios-sdk index 04e422e1f..36e240932 160000 --- a/matrix-ios-sdk +++ b/matrix-ios-sdk @@ -1 +1 @@ -Subproject commit 04e422e1f70eb3c32b9d0067cf9721bdc295caa0 +Subproject commit 36e2409322d66ee7c7fb2f5b72a01065d6dedb9b From 0d2f4e071eb6a6c50928d3d74f8991d87af02400 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Thu, 26 Sep 2024 16:31:20 +0200 Subject: [PATCH 38/39] Add changelog --- changelog.d/1096.change | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/1096.change diff --git a/changelog.d/1096.change b/changelog.d/1096.change new file mode 100644 index 000000000..2b1b3f31d --- /dev/null +++ b/changelog.d/1096.change @@ -0,0 +1 @@ +Rebase to Element 1.11.18 and Matrix 0.27.14 \ No newline at end of file From 0c0cdd109084730e9e14f024ddad16fe9afa211a Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Mon, 7 Oct 2024 11:28:52 +0200 Subject: [PATCH 39/39] Bump codecov-action version --- .github/workflows/ci-ui-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-ui-tests.yml b/.github/workflows/ci-ui-tests.yml index 322323739..9ad97d46b 100644 --- a/.github/workflows/ci-ui-tests.yml +++ b/.github/workflows/ci-ui-tests.yml @@ -57,7 +57,7 @@ jobs: run: bundle exec fastlane uitest - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: flags: uitests \ No newline at end of file