Merge branch 'develop' into andy/sentry_fastlane

CHANGES.md

@@ -1,3 +1,61 @@
+## Changes in 1.8.22 (2022-07-13)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.12](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.12)).
+
+🐛 Bugfixes
+
+- Fix a bug where the login screen is shown after choosing to create an account. ([#6417](https://github.com/vector-im/element-ios/pull/6417))
+
+
+## Changes in 1.8.21 (2022-07-12)
+
+✨ Features
+
+- Analytics: Track non-fatal issues if consent provided ([#6308](https://github.com/vector-im/element-ios/pull/6308))
+- Notifications: Add a setting for in-app notifications and use the value with existing functionality in PushNotificationService. ([#1108](https://github.com/vector-im/element-ios/issues/1108))
+- Server Offline Activity Indicator ([#5607](https://github.com/vector-im/element-ios/issues/5607))
+
+🙌 Improvements
+
+- Add formatter build reply HTML unit tests ([#6380](https://github.com/vector-im/element-ios/pull/6380))
+- Upgrade MatrixSDK version ([v0.23.11](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.11)).
+- Update Files component ([#5372](https://github.com/vector-im/element-ios/issues/5372))
+- Location sharing: Update map credits display and behavior. ([#6108](https://github.com/vector-im/element-ios/issues/6108))
+- Location sharing: Add view to promote live location sharing labs flag on the sharing screen. ([#6238](https://github.com/vector-im/element-ios/issues/6238))
+- Remove legacy Riot-Defaults property list ([#6273](https://github.com/vector-im/element-ios/issues/6273))
+- DesignKit: Replace the local DesignKit target with the shared Swift package from ElementX. ([#6276](https://github.com/vector-im/element-ios/issues/6276))
+- Enhance the VectorHostingController to be presented as a bottom sheet ([#6376](https://github.com/vector-im/element-ios/issues/6376))
+- Location sharing: Live location sharing UI polishing. ([#6382](https://github.com/vector-im/element-ios/issues/6382))
+
+🐛 Bugfixes
+
+- VectorHostingController: Fix infinite loop due to the safe area insets fix. ([#6381](https://github.com/vector-im/element-ios/pull/6381))
+- Fix layout issues in timeline poll cells (PSB-125) ([#5326](https://github.com/vector-im/element-ios/issues/5326))
+- Fixed Invite user UI is always hidden by the keyboard ([#5341](https://github.com/vector-im/element-ios/issues/5341))
+- Cross-Signing: Use ZXing library to generate QR codes ([#6358](https://github.com/vector-im/element-ios/issues/6358))
+- Location sharing: Fix live location sharing lab flag activation, no more app relaunch needed. ([#6361](https://github.com/vector-im/element-ios/issues/6361))
+- Display fallback when replied event content is partially missing ([#6371](https://github.com/vector-im/element-ios/issues/6371))
+- Fix a few failing UI tests. ([#6386](https://github.com/vector-im/element-ios/issues/6386))
+- Rename riot-keys.txt to element-keys.txt. ([#6391](https://github.com/vector-im/element-ios/issues/6391))
+- Fix inoperant room links with alias/identifiers ([#6395](https://github.com/vector-im/element-ios/issues/6395))
+- Fix slash commands from room composer ([#6398](https://github.com/vector-im/element-ios/issues/6398))
+
+⚠️ API Changes
+
+- Replace DesignKit framework with [DesignKit package](https://github.com/vector-im/element-x-ios/tree/develop/DesignKit/Sources). Colours are now generated in the [DesignTokens repo](https://github.com/vector-im/element-design-tokens) to be shared across all of our apps. ([#6275](https://github.com/vector-im/element-ios/pull/6275))
+
+🧱 Build
+
+- Update Podfile.lock ([#6387](https://github.com/vector-im/element-ios/pull/6387))
+- Split `IntentHandler` into smaller, dedicated entities ([#6203](https://github.com/vector-im/element-ios/issues/6203))
+
+Others
+
+- Revert some font changes made when merging #6392. ([#6392](https://github.com/vector-im/element-ios/issues/6392))
+
+
 ## Changes in 1.8.20 (2022-06-28)
 
 ✨ Features

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.8.21
-CURRENT_PROJECT_VERSION = 1.8.21
+MARKETING_VERSION = 1.8.23
+CURRENT_PROJECT_VERSION = 1.8.23

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.10'
+$matrixSDKVersion = '= 0.23.12'
 # $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.10):
-    - MatrixSDK/Core (= 0.23.10)
-  - MatrixSDK/Core (0.23.10):
+  - MatrixSDK (0.23.12):
+    - MatrixSDK/Core (= 0.23.12)
+  - MatrixSDK/Core (0.23.12):
     - 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.10):
+  - MatrixSDK/CryptoSDK (0.23.12):
     - MatrixSDKCrypto (= 0.1.0)
-  - MatrixSDK/JingleCallStack (0.23.10):
+  - MatrixSDK/JingleCallStack (0.23.12):
     - 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.10)
-  - MatrixSDK/JingleCallStack (= 0.23.10)
+  - MatrixSDK (= 0.23.12)
+  - MatrixSDK/JingleCallStack (= 0.23.12)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -221,7 +221,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 58238bb5af7e6d9f6acce0373b86ca31413a09b5
+  MatrixSDK: cfc3316cbe8534ff9d4d7b49a1bc92dfb6b1296d
   MatrixSDKCrypto: 4b9146d5ef484550341be056a164c6930038028e
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
@@ -241,6 +241,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: b3c7c064fc2b74dc937762364faab403fc3fd041
+PODFILE CHECKSUM: c5629e0a7affba9c508e7c30572ada2200ab725d
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.11.2

Riot/Assets/en.lproj/Untranslated.strings

@@ -19,72 +19,3 @@
 // MARK: Onboarding Personalization WIP
 
 "image_picker_action_files" = "Choose from files";
-
-// MARK: Onboarding Authentication WIP
-"authentication_registration_title" = "Create your account";
-"authentication_registration_message" = "We’ll need some info to get you set up.";
-"authentication_registration_username" = "Username";
-"authentication_registration_username_footer" = "You can’t change this later";
-"authentication_registration_password_footer" = "Must be 8 characters or more";
-
-"authentication_login_title" = "Welcome back!";
-"authentication_login_username" = "Username or Email";
-"authentication_login_forgot_password" = "Forgot password";
-
-"authentication_server_info_title" = "Choose your server to store your data";
-"authentication_server_info_matrix_description" = "Join millions for free on the largest public server";
-
-"authentication_server_selection_title" = "Choose your server";
-"authentication_server_selection_message" = "What is the address of your server? A server is like a home for all your data.";
-"authentication_server_selection_server_url" = "Server URL";
-"authentication_server_selection_server_footer" = "You can only connect to a server that has already been set up";
-"authentication_server_selection_generic_error" = "Cannot find a server at this URL, please check it is correct.";
-
-"authentication_cancel_flow_confirmation_message" = "Your account is not created yet. Stop the registration process?";
-
-"authentication_verify_email_input_title" = "Enter your email address";
-"authentication_verify_email_input_message" = "This will help verify your account and enables password recovery.";
-"authentication_verify_email_text_field_placeholder" = "Email Address";
-"authentication_verify_email_waiting_title" = "Check your email to verify.";
-"authentication_verify_email_waiting_message" = "To confirm your email address, tap the button in the email we just sent to %@";
-"authentication_verify_email_waiting_hint" = "Did not receive an email?";
-"authentication_verify_email_waiting_button" = "Resend email";
-
-"authentication_forgot_password_input_title" = "Enter your email address";
-"authentication_forgot_password_input_message" = "We will send you a verification link.";
-"authentication_forgot_password_text_field_placeholder" = "Email Address";
-"authentication_forgot_password_waiting_title" = "Check your email";
-"authentication_forgot_password_waiting_message" = "To confirm your email address, tap the button in the email we just sent to %@";
-"authentication_forgot_password_waiting_hint" = "Did not receive an email?";
-"authentication_forgot_password_waiting_button" = "Resend email";
-
-"authentication_choose_password_input_title" = "Choose a new password";
-"authentication_choose_password_input_message" = "Make sure it’s 8 characters or more.";
-"authentication_choose_password_text_field_placeholder" = "New Password";
-"authentication_choose_password_signout_all_devices" = "Sign out of all devices";
-"authentication_choose_password_submit_button" = "Reset Password";
-
-"authentication_verify_msisdn_input_title" = "Enter your phone number";
-"authentication_verify_msisdn_input_message" = "This will help verify your account and enables password recovery.";
-"authentication_verify_msisdn_text_field_placeholder" = "Phone Number";
-"authentication_verify_msisdn_otp_text_field_placeholder" = "Verification Code";
-"authentication_verify_msisdn_waiting_title" = "Confirm your phone number";
-"authentication_verify_msisdn_waiting_message" = "We just sent a code to %@. Enter it  below to verify it’s you.";
-"authentication_verify_msisdn_waiting_button" = "Resend code";
-"authentication_verify_msisdn_invalid_phone_number" = "Invalid phone number";
-
-"authentication_terms_title" = "Privacy policy";
-"authentication_terms_message" = "Please read through T&C. You must accept in order to continue.";
-"authentication_terms_policy_url_error" = "Unable to find the selected policy. Please try again later.";
-
-"authentication_recaptcha_message" = "This server would like to make sure you are not a robot";
-
-// MARK: Password Validation
-"password_validation_info_header" = "Your password should meet the criteria below:";
-"password_validation_error_header" = "Given password does not meet the criteria below:";
-"password_validation_error_min_length" = "At least %d characters.";
-"password_validation_error_max_length" = "Not exceed %d characters.";
-"password_validation_error_contain_lowercase_letter" = "Contain a lower-case letter.";
-"password_validation_error_contain_uppercase_letter" = "Contain an upper-case letter.";
-"password_validation_error_contain_number" = "Contain a number.";
-"password_validation_error_contain_symbol" = "Contain a symbol.";

Riot/Assets/en.lproj/Vector.strings

@@ -96,7 +96,7 @@
 "accessibility_checkbox_label" = "checkbox";
 "accessibility_button_label" = "button";
 
-// Onboarding
+// MARK: Onboarding
 "onboarding_splash_register_button_title" = "Create account";
 "onboarding_splash_login_button_title" = "I already have an account";
 "onboarding_splash_page_1_title" = "Own your conversations.";
@@ -109,13 +109,13 @@
 "onboarding_splash_page_4_message" = "Element is also great for the workplace. It’s trusted by the world’s most secure organisations.";
 
 "onboarding_use_case_title" = "Who will you chat to the most?";
-"onboarding_use_case_message" = "We’ll help you get connected.";
+"onboarding_use_case_message" = "We’ll help you get connected";
 "onboarding_use_case_personal_messaging" = "Friends and family";
 "onboarding_use_case_work_messaging" = "Teams";
 "onboarding_use_case_community_messaging" = "Communities";
 /* The placeholder string contains onboarding_use_case_skip_button as a tappable action */
-"onboarding_use_case_not_sure_yet" = "Not sure yet? You can %@";
-"onboarding_use_case_skip_button" = "skip this question";
+"onboarding_use_case_not_sure_yet" = "Not sure yet? %@";
+"onboarding_use_case_skip_button" = "Skip this question";
 "onboarding_use_case_existing_server_message" = "Looking to join an existing server?";
 "onboarding_use_case_existing_server_button" = "Connect to server";
 
@@ -135,14 +135,89 @@
 "onboarding_display_name_max_length" = "Your display name must be less than 256 characters";
 
 "onboarding_avatar_title" = "Add a profile picture";
-"onboarding_avatar_message" = "You can change this anytime.";
+"onboarding_avatar_message" = "Time to put a face to the name";
 "onboarding_avatar_accessibility_label" = "Profile picture";
 
-"onboarding_celebration_title" = "You’re all set!";
-"onboarding_celebration_message" = "Your preferences have been saved.";
+"onboarding_celebration_title" = "Looking good!";
+"onboarding_celebration_message" = "Head to settings anytime to update your profile.";
 "onboarding_celebration_button" = "Let's go";
 
-// Authentication
+// MARK: Authentication
+"authentication_registration_title" = "Create your account";
+"authentication_registration_username" = "Username";
+"authentication_registration_username_footer" = "You can’t change this later";
+/* The placeholder will show the full Matrix ID that has been entered. */
+"authentication_registration_username_footer_available" = "Others can discover you %@";
+"authentication_registration_password_footer" = "Must be 8 characters or more";
+
+"authentication_login_title" = "Welcome back!";
+"authentication_login_username" = "Username / Email / Phone";
+"authentication_login_forgot_password" = "Forgot password";
+
+"authentication_server_info_title" = "Where your conversations will live";
+
+"authentication_server_selection_login_title" = "Connect to homeserver";
+"authentication_server_selection_login_message" = "What is the address of your server?";
+"authentication_server_selection_register_title" = "Select your homeserver";
+"authentication_server_selection_register_message" = "What is the address of your server? This is like a home for all your data";
+"authentication_server_selection_server_url" = "Homeserver URL";
+"authentication_server_selection_generic_error" = "Cannot find a server at this URL, please check it is correct.";
+
+"authentication_cancel_flow_confirmation_message" = "Your account is not created yet. Stop the registration process?";
+
+"authentication_verify_email_input_title" = "Enter your email";
+"authentication_verify_email_input_message" = "%@ needs to verify your account";
+"authentication_verify_email_text_field_placeholder" = "Email";
+"authentication_verify_email_waiting_title" = "Check your email to verify.";
+/* The placeholder will show the email address that was entered. */
+"authentication_verify_email_waiting_message" = "To confirm your email, tap the button in the email we just sent to %@";
+"authentication_verify_email_waiting_hint" = "Did not receive an email?";
+"authentication_verify_email_waiting_button" = "Resend email";
+
+"authentication_forgot_password_input_title" = "Enter your email";
+"authentication_forgot_password_input_message" = "%@ will send you a verification link";
+"authentication_forgot_password_text_field_placeholder" = "Email";
+"authentication_forgot_password_waiting_title" = "Check your email.";
+/* The placeholder will show the email address that was entered. */
+"authentication_forgot_password_waiting_message" = "Follow the instructions sent to %@";
+"authentication_forgot_password_waiting_button" = "Resend email";
+
+"authentication_choose_password_input_title" = "Choose a new password";
+"authentication_choose_password_input_message" = "Make sure it’s 8 characters or more";
+"authentication_choose_password_text_field_placeholder" = "New Password";
+"authentication_choose_password_signout_all_devices" = "Sign out of all devices";
+"authentication_choose_password_submit_button" = "Reset Password";
+
+"authentication_verify_msisdn_input_title" = "Enter your phone number";
+"authentication_verify_msisdn_input_message" = "%@ needs to verify your account";
+"authentication_verify_msisdn_text_field_placeholder" = "Phone Number";
+"authentication_verify_msisdn_otp_text_field_placeholder" = "Confirmation Code";
+"authentication_verify_msisdn_waiting_title" = "Verify your phone number";
+/* The placeholder will show the phone number that was entered. */
+"authentication_verify_msisdn_waiting_message" = "A code was sent to %@";
+"authentication_verify_msisdn_waiting_button" = "Resend code";
+"authentication_verify_msisdn_invalid_phone_number" = "Invalid phone number";
+
+"authentication_terms_title" = "Server policies";
+"authentication_terms_message" = "Please read %@’s terms and policies";
+"authentication_terms_policy_url_error" = "Unable to find the selected policy. Please try again later.";
+
+"authentication_recaptcha_title" = "Are you a human?";
+
+// MARK: Password Validation
+"password_validation_info_header" = "Your password should meet the criteria below:";
+"password_validation_error_header" = "Given password does not meet the criteria below:";
+/* The placeholder will show a number */
+"password_validation_error_min_length" = "At least %d characters.";
+/* The placeholder will show a number */
+"password_validation_error_max_length" = "Not exceed %d characters.";
+"password_validation_error_contain_lowercase_letter" = "Contain a lower-case letter.";
+"password_validation_error_contain_uppercase_letter" = "Contain an upper-case letter.";
+"password_validation_error_contain_number" = "Contain a number.";
+"password_validation_error_contain_symbol" = "Contain a symbol.";
+
+
+// MARK: Legacy Authentication
 "auth_login" = "Log in";
 "auth_register" = "Register";
 "auth_submit" = "Submit";
@@ -2167,6 +2242,7 @@ Tap the + to start adding people.";
 To enable access, tap Settings> Location and select Always";
 "location_sharing_allow_background_location_validate_action" = "Settings";
 "location_sharing_allow_background_location_cancel_action" = "Not now";
+"location_sharing_map_credits_title" = "© Copyright";
 
 // MARK: Live location sharing
 
@@ -2444,6 +2520,7 @@ To enable access, tap Settings> Location and select Always";
 "message_reply_to_sender_sent_a_voice_message" = "sent a voice message.";
 "message_reply_to_sender_sent_a_file" = "sent a file.";
 "message_reply_to_sender_sent_their_location" = "has shared their location.";
+"message_reply_to_sender_sent_their_live_location" = "has shared their live location.";
 "message_reply_to_message_to_reply_to_prefix" = "In reply to";
 
 // Room members