Merge branch 'release/1.11.16/master'

element-hq · Jul 23, 2024 · 56d9e1f · 56d9e1f
2 parents 942c85e + 3ba9683
commit 56d9e1f
Show file tree

Hide file tree

Showing 13 changed files with 93 additions and 18 deletions.
diff --git 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.

diff --git 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
diff --git a/Podfile.lock b/Podfile.lock
@@ -39,17 +39,17 @@ 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)
     - MatrixSDKCrypto (= 0.4.2)
     - 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/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/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";
diff --git 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";
diff --git 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";
diff --git 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" = "Зменшити редактор";
diff --git a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m
@@ -60,6 +60,16 @@ - (void)render:(id<MXKDirectoryServerCellDataStoring>)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