Merge pull request #1097 from tchapgouv/rebase/element-ios-1.11.18

Rebase to Element 1.11.18 and Matrix 0.27.14
tchapgouv · Oct 7, 2024 · aac30c5 · aac30c5
2 parents b376778 + 0c0cdd1
commit aac30c5
Show file tree

Hide file tree

Showing 30 changed files with 189 additions and 106 deletions.
diff --git 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
 
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,22 @@
+## Changes in 1.11.18 (2024-09-17)
+
+🙌 Improvements
+
+- Replaced deprecated OlmKit APIs from ContentScanner with ones from the CryptoSDK.
+
+
+## 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.
+
+
 ## Changes in 1.11.15 (2024-06-18)
 
 No significant changes.

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 2.8.1
+MARKETING_VERSION = 2.8.2
 CURRENT_PROJECT_VERSION = 1
diff --git a/Podfile.lock b/Podfile.lock
@@ -20,13 +20,13 @@ 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)
   - 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.10):
-    - MatrixSDK/Core (= 0.27.10)
-  - MatrixSDK/Core (0.27.10):
+  - 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.10):
+  - 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)
@@ -74,15 +74,15 @@ PODS:
   - Sentry/Core (7.15.0)
   - SideMenu (6.5.0)
   - SwiftBase32 (0.9.0)
-  - SwiftFormat/CLI (0.54.0)
-  - 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)
@@ -96,7 +96,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)
@@ -179,11 +179,11 @@ SPEC CHECKSUMS:
   Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
   DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a
   DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
-  FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
+  FLEX: f21ee4f498eed3f8a1eded66b21939fd3b7a22ce
   FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376
   GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868
-  Introspect: 4cc1e4c34dd016540c8d86a591c231c09dafbee3
+  Introspect: b66b675de8a85d9ef832f3a710d8e3c7db186884
   JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7
   JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
@@ -193,8 +193,8 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: c805f9306d60955215f4b15043ed0f96fd4867b3
-  MatrixSDKCrypto: 736069ee0a5ec12852ab3498bf2242acecc443fc
+  MatrixSDK: 1dae186c839eb145974fc1fc127ec903de60a297
+  MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -204,17 +204,17 @@ SPEC CHECKSUMS:
   Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7
   SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
   SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
-  SwiftFormat: 0e0b577434e6aa63bc82a8905b40d9597b8452d4
-  SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c
+  SwiftFormat: 543a7b1ab4a6ce2d88bd5616a17903446ca3dc5c
+  SwiftGen: 4993cbf71cbc4886f775e26f8d5c3a1188ec9f99
   SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae
-  SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
+  SwiftLint: eb47480d47c982481592c195c221d11013a679cc
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
   UICollectionViewLeftAlignedLayout: 830bf6fa5bab9f9b464f62e3384f9d2e00b3c0f6
   UICollectionViewRightAlignedLayout: 823eef8c567eba4a44c21bc2ffcb0d0d5f361e2d
   WeakDictionary: 8cd038acd77e5d54ca4ebaec3d20853d732b45e0
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-PODFILE CHECKSUM: 971cd7529e2d127b237469afa2c18e6dced151ec
+PODFILE CHECKSUM: fb3e1c62f9e35a9bdbafce743664bf4f620af028
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
diff --git a/README.md b/README.md
@@ -3,7 +3,15 @@
 ![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)
-![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)
+[![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)
 
 Tchap iOS is an iOS [Matrix](https://matrix.org/) client. It is based on [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk).
 

diff --git a/Riot/Assets/et.lproj/Vector.strings b/Riot/Assets/et.lproj/Vector.strings
@@ -2719,3 +2719,10 @@
 "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";
+
+
+// MARK: - WYSIWYG Composer
+"wysiwyg_composer_action_minimise_action" = "Peida tekstitoimeti";
+"wysiwyg_composer_action_maximise_action" = "Ava tekstitoimeti";
diff --git 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,14 @@
 "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";
+"room_command_discard_session_description" = "Kényszeríti a titkosított szobában lévő aktuális kimenő csoportmunkamenet elvetését";
diff --git 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";
diff --git 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";
diff --git 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는 그들에게 지도를 보여주기 위해 접근이 필요합니다.";
diff --git 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" = "%@ 음성 방송을 시작했습니다";