Merge branch 'gil/6079-Delight_Edit_layout_experiment' into gil/6410-…

…Implement_new_Space_selector_bottom_sheet

# Conflicts:
#	Riot/Modules/ContextMenu/ActionProviders/AllChatsActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift

CHANGES.md

@@ -1,3 +1,41 @@
+## Changes in 1.8.24 (2022-07-26)
+
+✨ Features
+
+- Enable the new authentication and personalisation flows in the onboarding coordinator. ([#5151](https://github.com/vector-im/element-ios/issues/5151))
+- Read tile server URL from .well-known (PSG-592) ([#6472](https://github.com/vector-im/element-ios/issues/6472))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.13](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.13)).
+- Replaces the usage of ffmpeg in the app again(Change was previously reverted). ([#6419](https://github.com/vector-im/element-ios/issues/6419))
+- Location sharing: Handle live location sharing start event reply in the timeline. ([#6423](https://github.com/vector-im/element-ios/issues/6423))
+- Location sharing: Show map credits on live location timeline tile only when map is shown. ([#6448](https://github.com/vector-im/element-ios/issues/6448))
+- Location sharing: Handle live location sharing delete in the timeline. ([#6470](https://github.com/vector-im/element-ios/issues/6470))
+- Location sharing: Display clearer error message when the user doesn't have permission to share location in the room. ([#6477](https://github.com/vector-im/element-ios/issues/6477))
+
+🐛 Bugfixes
+
+- Registration: Trim any whitespace away when verifying the user's email address. ([#2594](https://github.com/vector-im/element-ios/issues/2594))
+- AuthenticationViewController is now correctly configured for a deep link if the link is opened before the view gets shown. ([#6425](https://github.com/vector-im/element-ios/issues/6425))
+
+🧱 Build
+
+- Fix UI tests failing on CI but not being reported by prefixing all tests with `test`. ([#6432](https://github.com/vector-im/element-ios/issues/6432))
+
+🚧 In development 🚧
+
+- Update strings for FTUE authentication flow following final review. ([#6427](https://github.com/vector-im/element-ios/issues/6427))
+- Check for a phone number during login and send an MSISDN when using the new flow. ([#6428](https://github.com/vector-im/element-ios/issues/6428))
+- Fix ReCaptcha form sometimes being slow to react to taps in the new flow. ([#6429](https://github.com/vector-im/element-ios/issues/6429))
+- When entering a full MXID during registration on the new flow, update the homeserver to match. ([#6430](https://github.com/vector-im/element-ios/issues/6430))
+- Always perform the dummy stage in the registration wizard, irregardless of whether it is mandatory or optional. ([#6459](https://github.com/vector-im/element-ios/issues/6459))
+
+Others
+
+- Crypto: Convert verification request and transaction to protocols ([#6444](https://github.com/vector-im/element-ios/pull/6444))
+
+
 ## Changes in 1.8.23 (2022-07-15)
 
 🙌 Improvements

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.8.24
-CURRENT_PROJECT_VERSION = 1.8.24
+MARKETING_VERSION = 1.8.25
+CURRENT_PROJECT_VERSION = 1.8.25

Config/BuildSettings.swift

@@ -402,7 +402,8 @@ final class BuildSettings: NSObject {
 
     // MARK: - Location Sharing
 
-    static let tileServerMapStyleURL = URL(string: "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx")!
+    /// Overwritten by the home server's .well-known configuration (if any exists)
+    static let defaultTileServerMapStyleURL = URL(string: "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx")!
 
     static let locationSharingEnabled = true
 

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.23.12'
+$matrixSDKVersion = '= 0.23.13'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }

Podfile.lock

@@ -56,19 +56,19 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.23.12):
-    - MatrixSDK/Core (= 0.23.12)
-  - MatrixSDK/Core (0.23.12):
+  - MatrixSDK (0.23.13):
+    - MatrixSDK/Core (= 0.23.13)
+  - MatrixSDK/Core (0.23.13):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - MatrixSDK/CryptoSDK
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/CryptoSDK (0.23.12):
+  - MatrixSDK/CryptoSDK (0.23.13):
     - MatrixSDKCrypto (= 0.1.0)
-  - MatrixSDK/JingleCallStack (0.23.12):
+  - MatrixSDK/JingleCallStack (0.23.13):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.1.0)
@@ -123,8 +123,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.23.12)
-  - MatrixSDK/JingleCallStack (= 0.23.12)
+  - MatrixSDK (= 0.23.13)
+  - MatrixSDK/JingleCallStack (= 0.23.13)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -221,7 +221,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: cfc3316cbe8534ff9d4d7b49a1bc92dfb6b1296d
+  MatrixSDK: 4e14176a819982d9aec9d19e30afad9f63968a32
   MatrixSDKCrypto: 4b9146d5ef484550341be056a164c6930038028e
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
@@ -241,6 +241,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: c5629e0a7affba9c508e7c30572ada2200ab725d
+PODFILE CHECKSUM: c7d08e5d0654296048d53c9c6720783efcf897bd
 
 COCOAPODS: 1.11.2

Riot/Assets/ar.lproj/InfoPlist.strings

@@ -1,10 +1,11 @@
 
 
-"NSContactsUsageDescription" = "سيعَرض Element جِهات الاتصال الخاصّة بِك حَتى تتمَكَّنَ من دَعوتهم للمُحادثَة.";
-"NSFaceIDUsageDescription" = "يُستخدَم Face ID لِلوُصُول إلى التَّطبيق الخاصّ بِك.";
+"NSContactsUsageDescription" = "سيعَرض إيليمنت جِهات الاتصال الخاصّة بِك حَتى تتمَكَّنَ من دَعوتهم للمُحادثَة.";
+"NSFaceIDUsageDescription" = "يُستخدَم خاصية التعرف على الوجه لِلوُصُول إلى التَّطبيق الخاصّ بِك.";
 "NSCalendarsUsageDescription" = "اطَّلِع عَلَى اِجتِماعاتِك المُجَدوَلَة في التَّطبيق.";
-"NSMicrophoneUsageDescription" = "يحتاجَ Element الوُصول إلى المِيكرُوفُون لإجراء المُكالمات واستِقبالها، والتِقاط مقاطَع الفيدِيو، وتَسجيل الرسائل الصَوتية.";
+"NSMicrophoneUsageDescription" = "يحتاجَ إيليمنت الوُصول إلى المِيكرُوفُون لإجراء المُكالمات واستِقبالها، والتِقاط مقاطَع الفيدِيو، وتَسجيل الرسائل الصَوتية.";
 // Permissions usage explanations
 "NSCameraUsageDescription" = "تُستَخدَم الكاميرا لاِلتِقاط الصُّوَر، المَقاطِع المَرئيَّة وإجراءُ مُكالَمَةٍ مَرئيَّة.";
 "NSPhotoLibraryUsageDescription" = "مَكتَبَة الصُّوَر تُستَخدَم لإرسال الصُّوَر وَالمَقاطِع المَرئيَّة.";
-"NSLocationWhenInUseUsageDescription" = "عِندَما تَشارَكَ مَوقِعك مَعَ أشَخاص، يحتاجَ Element إلى الوُصول لإظهار خَريطة لهم.";
+"NSLocationWhenInUseUsageDescription" = "عِندَما تَشارَكَ مَوقِعك مَعَ أشَخاص آخرين، سيحتاجَ إيليمنت إلى الصلاحية لإظهار الخَريطة لهم.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "إذاما شاركت موقعك مع أشخاص آخرين, فسيحتاج إيليمنت الصلاحية لإظهار خريطة لهم.";

Riot/Assets/de.lproj/InfoPlist.strings

@@ -6,3 +6,4 @@
 "NSCalendarsUsageDescription" = "Sieh dir deine geplanten Meetings in der App an.";
 "NSFaceIDUsageDescription" = "Face-ID wird zum Zugriff auf deine App verwendet.";
 "NSLocationWhenInUseUsageDescription" = "Wenn du deinen Standort mit Personen teilst, braucht Element Zugriff um ihnen eine Karte anzuzeigen.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "Zum Teilen deines Standorts benötigt Element Zugriff, damit es dir eine Karte zeigen kann.";

Riot/Assets/de.lproj/Vector.strings

@@ -1628,12 +1628,12 @@
 "room_event_action_view_in_room" = "Im Raum anzeigen";
 "location_sharing_open_open_street_maps" = "In OpenStreetMap öffnen";
 "onboarding_use_case_title" = "Mit wem wirst du am meisten chatten?";
-"onboarding_use_case_message" = "Wir helfen dir, dich zu verbinden.";
+"onboarding_use_case_message" = "Wir helfen dir, dich zu verbinden";
 "onboarding_use_case_personal_messaging" = "Freunde und Familie";
 "onboarding_use_case_work_messaging" = "Teams";
 "onboarding_use_case_community_messaging" = "Gemeinschaften";
 /* The placeholder string contains onboarding_use_case_skip_button as a tappable action */
-"onboarding_use_case_skip_button" = "diese Frage überspringen";
+"onboarding_use_case_skip_button" = "Diese Frage überspringen";
 "onboarding_use_case_existing_server_message" = "Willst du einem existierenden Server beitreten?";
 "onboarding_use_case_existing_server_button" = "Mit Server verbinden";
 "search_filter_placeholder" = "Filtern";
@@ -2137,7 +2137,7 @@
 "callbar_active_and_single_paused" = "1 aktiver Anruf (%@) · 1 unterbrochener Anruf";
 "onboarding_congratulations_personalize_button" = "Profil personalisieren";
 /* The placeholder string contains the user's matrix ID */
-"onboarding_congratulations_message" = "Dein Account %@ wurde erstellt.";
+"onboarding_congratulations_message" = "Dein Account %@ wurde erstellt";
 "onboarding_congratulations_title" = "Herzlichen Glückwunsch!";
 "saving" = "Speichern";
 
@@ -2149,3 +2149,86 @@
 "add" = "Hinzufügen";
 "new_word" = "Neu";
 "stop" = "Stop";
+"onboarding_display_name_placeholder" = "Anzeigename";
+"onboarding_personalization_skip" = "Schritt überspringen";
+/* The placeholder string contains onboarding_use_case_skip_button as a tappable action */
+"onboarding_use_case_not_sure_yet" = "Noch nicht sicher? %@";
+"onboarding_avatar_message" = "Zeit dem Gesicht einen Namen zu geben";
+"onboarding_display_name_message" = "Dies wird angezeigt wenn du Nachrichten sendest.";
+"onboarding_display_name_hint" = "Du kannst dies später noch ändern";
+"onboarding_congratulations_home_button" = "Zurück nach hause";
+"onboarding_celebration_title" = "Sieht gut aus!";
+"authentication_verify_email_waiting_hint" = "Keine E-Mail erhalten?";
+/* The placeholder will show the email address that was entered. */
+"authentication_verify_email_waiting_message" = "Folge den Anweisungen, die an %@ geschickt wurden";
+"authentication_verify_email_waiting_title" = "Bestätige deine E-Mail-Adresse.";
+/* The placeholder will show the homeserver's domain */
+"authentication_verify_email_input_message" = "%@ muss deinen Account verifizieren";
+"authentication_cancel_flow_confirmation_message" = "Dein Account ist noch nicht angelegt. Registrierung wirklich abbrechen?";
+"authentication_server_selection_generic_error" = "Unter dieser URL konnte kein Server gefunden werden. Bitte überprüfe die Eingabe.";
+"authentication_server_selection_register_message" = "Wie ist die Adresse deines Servers? Der Server ist wie ein Zuhause für all deine Daten";
+"authentication_server_info_title_login" = "Wo deine Unterhaltungen zum Leben erwachen";
+"authentication_server_info_title" = "Wo deine Unterhaltungen zum Leben erwachen";
+"authentication_registration_username_footer" = "Du kannst dies später nicht mehr ändern";
+
+// MARK: Authentication
+"authentication_registration_title" = "Account erstellen";
+"password_validation_error_contain_symbol" = "Mindestens ein Sonderzeichen.";
+"password_validation_error_contain_number" = "Mindestens eine Ziffer.";
+"password_validation_error_contain_uppercase_letter" = "Mindestens ein Großbuchstabe.";
+"password_validation_error_contain_lowercase_letter" = "Mindestens ein Kleinbuchstabe.";
+/* The placeholder will show a number */
+"password_validation_error_max_length" = "Nicht mehr als %d Zeichen.";
+/* The placeholder will show a number */
+"password_validation_error_min_length" = "Mindestens %d Zeichen.";
+"password_validation_error_header" = "Das eingegebene Passwort erfüllt nicht die folgenden Anforderungen:";
+
+// MARK: Password Validation
+"password_validation_info_header" = "Dein Passwort muss die folgenden Anforderungen erfüllen:";
+"authentication_recaptcha_title" = "Bist du ein Mensch?";
+"authentication_terms_policy_url_error" = "Richtlinie konnte nicht gefunden werden. Versuche es später noch einmal.";
+/* The placeholder will show the homeserver's domain */
+"authentication_terms_message" = "Bitte lies %@s Nutzungsbedingungen";
+"authentication_terms_title" = "Serverrichtlinien";
+"authentication_verify_msisdn_invalid_phone_number" = "Ungültige Telefonnummer";
+"authentication_verify_msisdn_waiting_button" = "Code erneut senden";
+/* The placeholder will show the phone number that was entered. */
+"authentication_verify_msisdn_waiting_message" = "Ein Code wurde an %@ gesendet";
+"authentication_verify_msisdn_waiting_title" = "Bestätige deine Telefonnummer";
+"authentication_verify_msisdn_otp_text_field_placeholder" = "Bestätigungscode";
+"authentication_verify_msisdn_text_field_placeholder" = "Telefonnummer";
+/* The placeholder will show the homeserver's domain */
+"authentication_verify_msisdn_input_message" = "%@ muss deinen Account verifizieren";
+"authentication_verify_msisdn_input_title" = "Gib deine Telefonnummer ein";
+"authentication_choose_password_submit_button" = "Passwort zurücksetzen";
+"authentication_choose_password_signout_all_devices" = "Auf allen Geräten abmelden";
+"authentication_choose_password_text_field_placeholder" = "Neues Passwort";
+"authentication_choose_password_input_message" = "Gib 8 Zeichen oder mehr ein";
+"authentication_choose_password_input_title" = "Wähle ein neues Passwort";
+/* The placeholder will show the email address that was entered. */
+"authentication_forgot_password_waiting_message" = "Folge den Anweisungen, die an %@ gesendet wurden";
+"authentication_forgot_password_waiting_title" = "Schau in deine E-Mails.";
+"authentication_forgot_password_text_field_placeholder" = "E-Mail-Adresse";
+/* The placeholder will show the homeserver's domain */
+"authentication_forgot_password_input_message" = "%@ wird dir einen Bestätigungslink senden";
+"authentication_forgot_password_input_title" = "Gib deine E-Mail-Adresse ein";
+"authentication_verify_email_waiting_button" = "E-mail erneut senden";
+"authentication_server_selection_server_url" = "Homeserver-URL";
+"authentication_server_selection_login_message" = "Wie ist die Adresse deines Servers?";
+"authentication_server_selection_register_title" = "Wähle deinen Homeserver aus";
+"authentication_verify_email_text_field_placeholder" = "E-Mail-Adresse";
+"authentication_forgot_password_waiting_button" = "E-Mail erneut senden";
+"authentication_verify_email_input_title" = "Gib deine E-Mail-Adresse ein";
+/* The placeholder will show the full Matrix ID that has been entered. */
+"authentication_registration_username_footer_available" = "Andere Nutzer können dich als %@ finden";
+"authentication_registration_username" = "Nutzername";
+"onboarding_celebration_message" = "Dein kannst dein Profil jederzeit in den Einstellungen ändern";
+"authentication_registration_password_footer" = "8 Zeichen oder mehr";
+"onboarding_avatar_title" = "Profilbild hinzufügen";
+"onboarding_display_name_max_length" = "Dein Nutzername muss weniger als 256 Zeichen haben";
+"onboarding_celebration_button" = "Los geht's";
+"onboarding_avatar_accessibility_label" = "Profilbild";
+"authentication_login_forgot_password" = "Passwort vergessen";
+"authentication_login_username" = "Nutzername / E-Mail-Adresse / Telefonnummer";
+"authentication_login_title" = "Willkommen zurück!";
+"authentication_server_selection_login_title" = "Mit Homeserver verbinden";

Riot/Assets/en.lproj/Vector.strings

@@ -2268,6 +2268,9 @@ Tap the + to start adding people.";
 
 "location_sharing_invalid_authorization_settings" = "Settings";
 
+"location_sharing_invalid_power_level_title" = "You don’t have permission to share live location";
+"location_sharing_invalid_power_level_message" = "You need to have the right permissions in order to share live location in this room.";
+
 "location_sharing_open_apple_maps" = "Open in Apple Maps";
 
 "location_sharing_open_google_maps" = "Open in Google Maps";