Merge branch 'release/1.10.6/master'

element-hq · Mar 21, 2023 · 3569c61 · 3569c61
2 parents fb197d0 + c3d6d70
commit 3569c61
Show file tree

Hide file tree

Showing 67 changed files with 4,115 additions and 904 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,21 @@
+## Changes in 1.10.6 (2023-03-21)
+
+🙌 Improvements
+
+- Encryption: Refactor user / room encryption trust level ([#7430](https://github.com/vector-im/element-ios/pull/7430))
+- Crypto: Increase local rust crypto rollout to 20% of all users ([#7434](https://github.com/vector-im/element-ios/pull/7434))
+- Upgrade MatrixSDK version ([v0.26.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.2)).
+- Permalinks to a room/space are pillified ([#7409](https://github.com/vector-im/element-ios/issues/7409))
+- Permalinks to a matrix user are pillified ([#7411](https://github.com/vector-im/element-ios/issues/7411))
+- Permalinks to messages are pillified ([#7412](https://github.com/vector-im/element-ios/issues/7412))
+- Loading: Update startup progress UX ([#7417](https://github.com/vector-im/element-ios/issues/7417))
+
+🐛 Bugfixes
+
+- Room list: increase tappability area of the avatar button. ([#7427](https://github.com/vector-im/element-ios/pull/7427))
+- Manage bad m.file attachment format. ([#7406](https://github.com/vector-im/element-ios/issues/7406))
+
+
 ## Changes in 1.10.5 (2023-03-13)
 
 🙌 Improvements

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.10.5
-CURRENT_PROJECT_VERSION = 1.10.5
+MARKETING_VERSION = 1.10.6
+CURRENT_PROJECT_VERSION = 1.10.6
diff --git a/Podfile b/Podfile
@@ -16,7 +16,7 @@ use_frameworks!
 # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixSDKVersion = '= 0.26.1'
+$matrixSDKVersion = '= 0.26.2'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }

diff --git a/Podfile.lock b/Podfile.lock
@@ -37,20 +37,20 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.26.1):
-    - MatrixSDK/Core (= 0.26.1)
-  - MatrixSDK/Core (0.26.1):
+  - MatrixSDK (0.26.2):
+    - MatrixSDK/Core (= 0.26.2)
+  - MatrixSDK/Core (0.26.2):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
-    - MatrixSDKCrypto (= 0.2.1)
+    - MatrixSDKCrypto (= 0.3.0)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.26.1):
+  - MatrixSDK/JingleCallStack (0.26.2):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
-  - MatrixSDKCrypto (0.2.1)
+  - MatrixSDKCrypto (0.3.0)
   - OLMKit (3.2.12):
     - OLMKit/olmc (= 3.2.12)
     - OLMKit/olmcpp (= 3.2.12)
@@ -100,8 +100,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.26.1)
-  - MatrixSDK/JingleCallStack (= 0.26.1)
+  - MatrixSDK (= 0.26.2)
+  - MatrixSDK/JingleCallStack (= 0.26.2)
   - OLMKit
   - PostHog (~> 2.0.0)
   - ReadMoreTextView (~> 3.0.1)
@@ -183,8 +183,8 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 0a371af6c33ef20c9c5000cf2badf3d600c25d26
-  MatrixSDKCrypto: 477d818bf2cc37b6cf702a290eb647bc8cf3cb1b
+  MatrixSDK: 010cdccea670b6b2e1a665976bd1a1e6ea5330ca
+  MatrixSDKCrypto: 05ebe373ccebf40f8a0cff37d8f8b24fd01b9883
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -204,6 +204,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: d0f3ced275c85b9eadb07bd1b92ad8ae7a40e243
+PODFILE CHECKSUM: 90e256afba3906cdb4c1a3c1eb764abff6843a76
 
 COCOAPODS: 1.11.3
diff --git a/Riot/Assets/Images.xcassets/Room/Pill/Contents.json b/Riot/Assets/Images.xcassets/Room/Pill/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Pill/pill_user.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Pill/pill_user.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "pill_user.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Pill/pill_user.imageset/pill_user.png b/Riot/Assets/Images.xcassets/Room/Pill/pill_user.imageset/pill_user.png
diff --git a/Riot/Assets/Images.xcassets/Room/Pill/pill_user.imageset/[email protected] b/Riot/Assets/Images.xcassets/Room/Pill/pill_user.imageset/[email protected]
diff --git a/Riot/Assets/Images.xcassets/Room/Pill/pill_user.imageset/[email protected] b/Riot/Assets/Images.xcassets/Room/Pill/pill_user.imageset/[email protected]
diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings
@@ -2661,12 +2661,6 @@
 
 // Unverified sessions
 "key_verification_alert_title" = "Du hast nicht verifizierte Sitzungen";
-"launch_loading_processing_response" = "Verarbeite Daten\n%@ %%";
-"launch_loading_server_syncing_nth_attempt" = "Synchronisiere mit dem Server\n(%@ Versuch)";
-
-// MARK: - Launch loading
-
-"launch_loading_server_syncing" = "Synchronisiere mit dem Server";
 "user_other_session_permanently_unverified_additional_info" = "Diese Sitzung unterstützt keine Verschlüsselung und kann deshalb nicht verifiziert werden.";
 "voice_broadcast_time_left" = "%@ übrig";
 "voice_broadcast_buffering" = "Puffere …";
@@ -2716,10 +2710,6 @@
 "wysiwyg_composer_format_action_unordered_list" = "Unsortierte Liste umschalten";
 "voice_broadcast_recorder_connection_error" = "Verbindungsfehler − Aufnahme pausiert";
 "poll_timeline_reply_ended_poll" = "Beendete Umfrage";
-
-// MARK: - Launch loading
-
-"launch_loading_migrating_data" = "Migriere Daten\n%@ %%";
 "settings_labs_disable_crypto_sdk" = "Rust-Ende-zu-Ende-Verschlüsselung (zum Deaktivieren abmelden)";
 "settings_labs_confirm_crypto_sdk" = "Bitte beachte, dass diese Funktion noch experimentell ist, womöglich nicht wie erwartet funktioniert und unerwünschte Nebeneffekte haben kann. Melde dich zum deaktivieren einfach ab und erneut an. Nutze diese Funktion nach eigenem Ermessen und mit Vorsicht.";
 "settings_labs_enable_crypto_sdk" = "Rust-Ende-zu-Ende-Verschlüsselung";
@@ -2736,3 +2726,19 @@
 "settings_push_rules_error" = "Ein Fehler ist während der Aktualisierung deiner Benachrichtigungseinstellungen aufgetreten. Bitte versuche die Option erneut umzuschalten.";
 "poll_history_detail_view_in_timeline" = "Umfrage im Verlauf anzeigen";
 "authentication_qr_login_failure_device_not_supported" = "Die Verbindung mit diesem Gerät wird nicht unterstützt.";
+"room_waiting_other_participants_message" = "Sobald eingeladene Benutzer %@ beigetreten sind, werdet ihr euch unterhalten können und der Raum Ende-zu-Ende-verschlüsselt sein";
+"room_waiting_other_participants_title" = "Warte darauf, dass Benutzer %@ beitreten";
+"key_verification_scan_qr_code_information_new_session" = "Richte deine Kamera auf den QR-Code deines anderen Gerätes, um deine neue Sitzung zu verifizieren";
+"key_verification_scan_qr_code_information_other_session" = "Richte deine Kamera auf den QR-Code deines anderen Gerätes, um deine Sitzung zu verifizieren";
+"key_verification_scan_qr_code_information_other_device" = "Richte deine Kamera auf den QR-Code deines anderen Gerätes, um diese Sitzung zu verifizieren";
+"key_verification_scan_qr_code_information_other_user" = "Richte deine Kamera auf den QR-Code des anderen Gerätes, um die Sitzung der anderen Person zu verifizieren";
+"key_verification_scan_qr_code_title" = "QR-Code einlesen";
+"device_verification_self_verify_wait_recover_secrets_additional_help" = "Du hast keinen Zugriff auf eine bestehende %@-Sitzung?";
+"device_verification_self_verify_open_on_other_device_information" = "Du musst diese Sitzung verifizieren, um deinen verschlüsselten Nachrichtenverlauf lesen zu können.\n\nÖffne Element auf einem deiner anderen Geräte und folge den Anweisungen.";
+"device_verification_self_verify_open_on_other_device_title" = "Öffne %@ auf deinem anderen Gerät";
+"room_creation_only_one_email_invite" = "Du kannst E-Mail-Einladung nur nacheinander verschicken";
+"launch_loading_delay_warning" = "Das könnte eine Weile dauern.\nDanke für deine Geduld.";
+
+// MARK: - Launch loading
+
+"launch_loading_generic" = "Synchronisiere deine Unterhaltungen";
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
@@ -1991,10 +1991,8 @@ Tap the + to start adding people.";
 
 // MARK: - Launch loading
 
-"launch_loading_migrating_data" = "Migrating data\n%@ %%";
-"launch_loading_server_syncing" = "Syncing with the server";
-"launch_loading_server_syncing_nth_attempt" = "Syncing with the server\n(%@ attempt)";
-"launch_loading_processing_response" = "Processing data\n%@ %%";
+"launch_loading_generic" = "Syncing your conversations";
+"launch_loading_delay_warning" = "This may take a little longer.\nThanks for your patience.";
 
 // MARK: - Home
 
@@ -3158,3 +3156,9 @@ To enable access, tap Settings> Location and select Always";
 "ssl_unexpected_existing_expl" = "The certificate has changed from one that was trusted by your phone. This is HIGHLY UNUSUAL. It is recommended that you DO NOT ACCEPT this new certificate.";
 "ssl_expected_existing_expl" = "The certificate has changed from a previously trusted one to one that is not trusted. The server may have renewed its certificate. Contact the server administrator for the expected fingerprint.";
 "ssl_only_accept" = "ONLY accept the certificate if the server administrator has published a fingerprint that matches the one above.";
+
+// Pills
+"pill_room_fallback_display_name" = "Space/Room";
+"pill_message" = "Message";
+"pill_message_from" = "Message from %@";
+"pill_message_in" = "Message in %@";
diff --git a/Riot/Assets/et.lproj/Vector.strings b/Riot/Assets/et.lproj/Vector.strings
@@ -2601,12 +2601,6 @@
 "key_verification_alert_title" = "Sul on verifitseerimata sessioone";
 "user_other_session_permanently_unverified_additional_info" = "Seda sessiooni ei saa verifitseerida, sest seal puudub krüptimise tugi.";
 "voice_broadcast_time_left" = "aega jäänud %@";
-"launch_loading_processing_response" = "Töötleme andmeid\n%@ %%";
-"launch_loading_server_syncing_nth_attempt" = "Sünkroniseerime andmeid serveriga\n(katse: %@)";
-
-// MARK: - Launch loading
-
-"launch_loading_server_syncing" = "Sünkroniseerimine serveriga";
 "voice_broadcast_buffering" = "Andmed on puhverdamisel…";
 "voice_broadcast_stop_alert_agree_button" = "Jah, lõpetame";
 "voice_broadcast_stop_alert_description" = "Kas sa oled kindel, et soovid otseeetri lõpetada? Sellega ringhäälingukõne salvestamine lõppeb ja salvestis on kättesaadav kõigile jututoas.";
@@ -2629,7 +2623,7 @@
 "notice_voice_broadcast_ended" = "%@ lõpetas ringhäälingukõne.";
 "notice_voice_broadcast_live" = "Ringhäälingukõne on eetris";
 "user_other_session_security_recommendation_title" = "Muud sessioonid";
-"poll_timeline_decryption_error" = "Krüptimisvigade tõttu jääb osa hääli lugemata";
+"poll_timeline_decryption_error" = "Dekrüptimisvigade tõttu jääb osa hääli lugemata";
 "voice_message_broadcast_in_progress_title" = "Häälsõnumi salvestamine või esitamine ei õnnestu";
 "voice_message_broadcast_in_progress_message" = "Kuna sa hetkel salvestad ringhäälingukõnet, siis häälsõnumi salvestamine või esitamine ei õnnestu. Selleks palun lõpeta ringhäälingukõne";
 "poll_timeline_ended_text" = "Küsitlus on lõppenud";
@@ -2654,10 +2648,6 @@
 "wysiwyg_composer_format_action_unordered_list" = "Lülita täpploend sisse/välja";
 "voice_broadcast_recorder_connection_error" = "Viga võrguühenduses - salvestamine on peatatud";
 "poll_timeline_reply_ended_poll" = "Lõppenud küsitlus";
-
-// MARK: - Launch loading
-
-"launch_loading_migrating_data" = "Tõstame andmeid ümber\n%@ %%";
 "settings_labs_disable_crypto_sdk" = "Rust'i-põhine läbiv krüptimine (väljalülitamiseks pead välja logima)";
 "settings_labs_confirm_crypto_sdk" = "Palun arvesta, et see funktsionaalsus on alles katseline ja ei pruugi toimida eesmärgipäraselt. Kui ta juba on kasutusel, siis väljalülitamiseks pead hiljem korraks võrgust välja logima. Jätka ettevaatlikult ja omal äranägemisel.";
 "settings_labs_enable_crypto_sdk" = "Rust'i-põhine läbiv krüptimine";
@@ -2674,3 +2664,19 @@
 "settings_push_rules_error" = "Teavituste eelistuste muutmisel tekkis viga. Palun proovi sama valikut uuesti sisse/välja lülitada.";
 "poll_history_detail_view_in_timeline" = "Näita küsitlust ajajoonel";
 "authentication_qr_login_failure_device_not_supported" = "Sidumine selle seadmega ei ole toetatud.";
+"room_waiting_other_participants_message" = "Kui kutse saanud kasutajad on liitunud jututoaga %@, siis saad sa nendega suhelda ja jututuba on läbivalt krüptitud";
+"room_waiting_other_participants_title" = "Kasutajate liitumise ootel jututoaga %@";
+"key_verification_scan_qr_code_information_new_session" = "Suuna oma nutiseadme kaamera oma seadmes kuvatavale QR-koodile ja verifitseeri oma uus sessioon";
+"key_verification_scan_qr_code_information_other_user" = "Suuna oma nutiseadme kaamera teise kasutaja seadmes kuvatavale QR-koodile ja verifitseeri tema sessioon";
+"key_verification_scan_qr_code_information_other_device" = "Suuna kaamera oma teises seadmes kuvatavale QR-koodile ja verifitseeri see sessioon";
+"key_verification_scan_qr_code_information_other_session" = "Suuna oma seadme kaamera teises seadmes kuvatavale QR-koodile ja verifitseeri oma sessioon";
+"key_verification_scan_qr_code_title" = "Loe QR-koodi";
+"device_verification_self_verify_wait_recover_secrets_additional_help" = "Sul puudub ligipääs olemasolevale %@ sessioonile?";
+"device_verification_self_verify_open_on_other_device_information" = "Oma krüptitud sõnumite ajaloo lugemiseks pead selle seadme verifitseerima.\n\nAva Element või mõni muu ühilduv Matrixi klient on teises seadmes ja järgi juhendit.";
+"device_verification_self_verify_open_on_other_device_title" = "Ava %@ oma teises seadmes";
+"room_creation_only_one_email_invite" = "E-posti teel saad saata kutseid vaid ükshaaval";
+"launch_loading_delay_warning" = "Selleks võib natuke rohkem aega kuluda.\nTänud ootamast.";
+
+// MARK: - Launch loading
+
+"launch_loading_generic" = "Sinu vestlused on sünkroniseerimisel";
diff --git a/Riot/Assets/fr.lproj/Vector.strings b/Riot/Assets/fr.lproj/Vector.strings
@@ -2616,7 +2616,6 @@
 "poll_history_loading_text" = "Afficher les sondages";
 "voice_message_broadcast_in_progress_title" = "Impossible de démarrer l'enregistrement vocal";
 "home_context_menu_mark_as_unread" = "Marquer comme non lu";
-"launch_loading_processing_response" = "Traitement des données\n%@ %%";
 "notice_voice_broadcast_ended_by_you" = "Vous avez terminé une diffusion vocale.";
 "notice_voice_broadcast_ended" = "%@ a terminé une diffusion vocale.";
 "notice_voice_broadcast_live" = "Diffusion en direct";
@@ -2721,12 +2720,7 @@
 // MARK: - Voice Broadcast
 "voice_broadcast_unauthorized_title" = "Impossible de démarrer une nouvelle diffusion vocale";
 "voice_message_broadcast_in_progress_message" = "Vous ne pouvez pas démarrer d'enregistrement vocal car vous diffusez en direct. Veuillez interrompre votre diffusion pour démarrer l'enregistrement vocal";
-"launch_loading_server_syncing_nth_attempt" = "Synchronisation avec le serveur\n(%@ tentatives)";
-"launch_loading_server_syncing" = "Synchronisation avec le serveur";
 
-// MARK: - Launch loading
-
-"launch_loading_migrating_data" = "Migration des données\n%@ %%";
 "key_backup_recover_from_private_key_progress" = "%@%% Fini";
 "room_details_polls" = "Historique des sondages";
 "settings_labs_disable_crypto_sdk" = "Chiffrement de bout en bout avec Rust (se déconnecter pour désactiver)";

diff --git a/Riot/Assets/hu.lproj/Vector.strings b/Riot/Assets/hu.lproj/Vector.strings
@@ -2654,12 +2654,7 @@
 "voice_broadcast_stop_alert_title" = "Megszakítod az élő közvetítést?";
 "voice_broadcast_buffering" = "Pufferelés…";
 "voice_broadcast_time_left" = "%@ van vissza";
-"launch_loading_processing_response" = "Adat feldolgozása\n%@ %%";
-"launch_loading_server_syncing_nth_attempt" = "Szinkronizálás a szerverrel\n(%@ próbálkozás)";
 
-// MARK: - Launch loading
-
-"launch_loading_server_syncing" = "Szinkronizálás a szerverrel";
 "password_policy_pwd_in_dict_error" = "Ez a jelszó megtalálható a szótárban ezért nem engedélyezett.";
 "password_policy_weak_pwd_error" = "Ez a jelszó túl gyenge. Legalább 8 karakternek kell lennie és minden típusból legalább egy: nagybetű, kisbetű, szám és speciális karakter.";
 
@@ -2707,9 +2702,6 @@
 "poll_history_no_active_poll_period_text" = "%@ napja nincs aktív szavazás. További szavazások betöltése az előző havi szavazások megjelenítéséhez";
 "poll_history_loading_text" = "Szavazások megjelenítése";
 
-// MARK: - Launch loading
-
-"launch_loading_migrating_data" = "Adatok migrálása\n%@ %%";
 "settings_labs_disable_crypto_sdk" = "Rust végpontok közötti titkosítás (kikapcsoláshoz kijelentkezés szükséges)";
 "settings_labs_confirm_crypto_sdk" = "Ez a funkció még kísérleti fázisban van. Lehet, hogy nem az elvártnak megfelelően fog működni és előre nem látható következménye lehet. A funkció kikapcsolásához egyszerű ki-, és bejelentkezés szükséges. Használata csak saját felelősségre.";
 "settings_labs_enable_crypto_sdk" = "Rust végpontok közötti titkosítás";
@@ -2722,3 +2714,9 @@
 "poll_history_detail_view_in_timeline" = "Szavazás megjelenítése az idővonalon";
 "settings_push_rules_error" = "Hiba történt az értesítések beállításának frissítésekor. Próbáld meg az beállítást újra átkapcsolni.";
 "authentication_qr_login_failure_device_not_supported" = "Ezzel az eszközzel való összeköttetés nem támogatott.";
+"room_waiting_other_participants_message" = "Miután a meghívott felhasználók csatlakoztak a(z) %@ alkalmazáshoz beszélhet velük és a szoba végpontok között titkosítva lesz";
+"room_waiting_other_participants_title" = "%@ alkalmazáshoz csatlakozó felhasználókra várakozás";
+"key_verification_scan_qr_code_title" = "QR kód beolvasása";
+"device_verification_self_verify_wait_recover_secrets_additional_help" = "Nem férsz hozzá létező munkamenethez, %@?";
+"device_verification_self_verify_open_on_other_device_title" = "Nyisd meg ezt: %@ a másik eszközön";
+"room_creation_only_one_email_invite" = "E-mail meghívóból egyszerre csak egy küldhető";