Merge remote-tracking branch 'origin/develop' into feature/No-Ticket-…

…Inhibit-all-warnings-from-pods

.github/workflows/ci-build.yml

@@ -15,7 +15,7 @@ env:
 jobs:
  build:
  name: Build
- runs-on: macos-11
+ runs-on: macos-12
 
  # Concurrency group not needed as this workflow only runs on develop which we always want to test.
 

.github/workflows/ci-tests.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  tests:
  name: Tests
- runs-on: macos-11
+ runs-on: macos-12
 
  concurrency:
  # When running on develop, use the sha to allow all runs of this workflow to run concurrently.

.github/workflows/ci-ui-tests.yml

@@ -14,7 +14,7 @@ env:
 jobs:
  tests:
  name: UI Tests
- runs-on: macos-11
+ runs-on: macos-12
 
  concurrency:
  # Only allow a single run of this workflow on each branch, automatically cancelling older runs.

.github/workflows/release-alpha.yml

@@ -14,7 +14,7 @@ env:
 
 jobs:
  check-secret:
- runs-on: macos-11
+ runs-on: macos-12
  outputs:
  out-key: ${{ steps.out-key.outputs.defined }}
  steps:
@@ -29,7 +29,7 @@ jobs:
  needs: [check-secret]
  if: needs.check-secret.outputs.out-key == 'true'
  name: Release
- runs-on: macos-11
+ runs-on: macos-12
 
  concurrency:
  # Only allow a single run of this workflow on each branch, automatically cancelling older runs.

CHANGES.md

@@ -1,3 +1,27 @@
+## Changes in 1.8.17 (2022-05-31)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.7)).
+- Location sharing: Add a spinner view for starting state in timeline cell ([#6101](https://github.com/vector-im/element-ios/issues/6101))
+- Location sharing: Add labs flag for live location sharing ([#6195](https://github.com/vector-im/element-ios/issues/6195))
+
+🐛 Bugfixes
+
+- Added attempt at fixing random crashes while calculating timeline cell heights. ([#6188](https://github.com/vector-im/element-ios/pull/6188))
+- Fix ITMS Warning on CFBundleDocumentTypes ([#6159](https://github.com/vector-im/element-ios/issues/6159))
+- RoomViewController: Fix confirmation for RTL overridden links. ([#6208](https://github.com/vector-im/element-ios/issues/6208))
+- Fix issue with mention pill avatar consuming tap gestures ([#6212](https://github.com/vector-im/element-ios/issues/6212))
+
+🚧 In development 🚧
+
+- Authentication: Add Email/Terms/ReCaptcha screens into the flow. ([#5151](https://github.com/vector-im/element-ios/issues/5151))
+- Authentication: Implement msisdn verification screen. ([#6182](https://github.com/vector-im/element-ios/issues/6182))
+- Location sharing: Support sending live device location. ([#5722](https://github.com/vector-im/element-ios/issues/5722))
+- Authentication: Implement the LoginWizard to match Element Android. ([#5896](https://github.com/vector-im/element-ios/issues/5896))
+- Location sharing: Support restarting location sending after app kill. ([#6199](https://github.com/vector-im/element-ios/issues/6199))
+
+
 ## Changes in 1.8.16 (2022-05-19)
 
 🙌 Improvements

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.8.17
-CURRENT_PROJECT_VERSION = 1.8.17
+MARKETING_VERSION = 1.8.18
+CURRENT_PROJECT_VERSION = 1.8.18

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

Podfile.lock

@@ -57,16 +57,16 @@ PODS:
  - LoggerAPI (1.9.200):
  - Logging (~> 1.1)
  - Logging (1.4.0)
- - MatrixSDK (0.23.6):
- - MatrixSDK/Core (= 0.23.6)
- - MatrixSDK/Core (0.23.6):
+ - MatrixSDK (0.23.7):
+ - MatrixSDK/Core (= 0.23.7)
+ - MatrixSDK/Core (0.23.7):
  - AFNetworking (~> 4.0.0)
  - GZIP (~> 1.3.0)
  - libbase58 (~> 0.1.4)
  - OLMKit (~> 3.2.5)
- - Realm (= 10.16.0)
+ - Realm (= 10.26.0)
  - SwiftyBeaver (= 1.9.5)
- - MatrixSDK/JingleCallStack (0.23.6):
+ - MatrixSDK/JingleCallStack (0.23.7):
  - JitsiMeetSDK (= 5.0.2)
  - MatrixSDK/Core
  - OLMKit (3.2.5):
@@ -76,9 +76,9 @@ PODS:
  - OLMKit/olmcpp (3.2.5)
  - PostHog (1.4.4)
  - ReadMoreTextView (3.0.1)
- - Realm (10.16.0):
- - Realm/Headers (= 10.16.0)
- - Realm/Headers (10.16.0)
+ - Realm (10.26.0):
+ - Realm/Headers (= 10.26.0)
+ - Realm/Headers (10.26.0)
  - Reusable (4.1.2):
  - Reusable/Storyboard (= 4.1.2)
  - Reusable/View (= 4.1.2)
@@ -117,8 +117,8 @@ DEPENDENCIES:
  - KeychainAccess (~> 4.2.2)
  - KTCenterFlowLayout (~> 1.3.1)
  - libPhoneNumber-iOS (~> 0.9.13)
- - MatrixSDK (= 0.23.6)
- - MatrixSDK/JingleCallStack (= 0.23.6)
+ - MatrixSDK (= 0.23.7)
+ - MatrixSDK/JingleCallStack (= 0.23.7)
  - OLMKit
  - PostHog (~> 1.4.4)
  - ReadMoreTextView (~> 3.0.1)
@@ -212,11 +212,11 @@ SPEC CHECKSUMS:
  libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
  LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
  Logging: beeb016c9c80cf77042d62e83495816847ef108b
- MatrixSDK: 1cc198c33d653d48ab6a8be952592fda99d80635
+ MatrixSDK: a05d8235ac82e62034d08811b2027f8218ece152
  OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
  PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
  ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
- Realm: b6027801398f3743fc222f096faa85281b506e6c
+ Realm: 97bc2540088e1e88a4b2051ba4b8eac85be0039a
  Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
  SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
  SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
@@ -229,6 +229,6 @@ SPEC CHECKSUMS:
  zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 58eaf3c43ff9aa421acb52c5340537c6b9403c6e
+PODFILE CHECKSUM: 37d7f07953015898ac6f2e628e9b20c2bdd55753
 
 COCOAPODS: 1.11.3

Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
  LastUpgradeVersion = "1200"
- version = "1.3">
+ version = "1.7">
  <BuildAction
  parallelizeBuildables = "YES"
  buildImplicitDependencies = "YES"

Riot/Assets/Images.xcassets/Authentication/authentication_msisdn_icon.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+ "images" : [
+ {
+ "filename" : "authentication_msisdn_icon.svg",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "preserves-vector-representation" : true,
+ "template-rendering-intent" : "template"
+ }
+}

Riot/Assets/cs.lproj/Vector.strings

@@ -376,3 +376,33 @@
 "done" = "Hotovo";
 "open" = "Otevřít";
 "enable" = "Povolit";
+"onboarding_avatar_accessibility_label" = "Profilová fotka";
+"onboarding_avatar_message" = "Toto můžeš změnit kdykoliv.";
+"onboarding_avatar_title" = "Přidat profilovou fotku";
+"onboarding_display_name_max_length" = "Tvoje jméno musí být kratší než 256 charakterů";
+"onboarding_display_name_hint" = "Tohle můžeš změnit později";
+"onboarding_display_name_placeholder" = "Svoje jméno";
+"onboarding_display_name_message" = "Tohle se ukáže, když pošleš zprávy.";
+"onboarding_display_name_title" = "Vyber si svoje jméno";
+"onboarding_personalization_skip" = "Přeskočit tento krok";
+"onboarding_personalization_save" = "Uložit a pokračovat";
+"onboarding_congratulations_home_button" = "Vezmi mě domů";
+"onboarding_congratulations_personalize_button" = "Personalizovat profil";
+/* The placeholder string contains the user's matrix ID */
+"onboarding_congratulations_message" = "Váš účet %@ byl vytvořen.";
+"onboarding_congratulations_title" = "Gratulace!";
+"saving" = "Ukládání";
+
+// Activities
+"loading" = "Načítání";
+"confirm" = "Potvrdit";
+"edit" = "Upravit";
+"suggest" = "Doporučit";
+"error" = "Chyba";
+"add" = "Přidat";
+"existing" = "Existující";
+"new_word" = "Nový";
+"stop" = "Zastavit";
+"public" = "Veřejný";
+"private" = "Soukromý";
+"joining" = "Připojování";

Riot/Assets/en.lproj/Untranslated.strings

@@ -23,13 +23,17 @@
 // 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_server_title" = "Choose your server to store your data";
-"authentication_registration_matrix_description" = "Join millions for free on the largest public server";
 "authentication_registration_username" = "Username";
-"authentication_registration_password" = "Password";
 "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";
@@ -46,6 +50,15 @@
 "authentication_verify_email_waiting_hint" = "Did not receive an email?";
 "authentication_verify_email_waiting_button" = "Resend email";
 
+"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.";

Riot/Assets/en.lproj/Vector.strings

@@ -643,6 +643,7 @@ Tap the + to start adding people.";
 "settings_calls_stun_server_fallback_description" = "Allow fallback call assist server %@ when your homeserver does not offer one (your IP address would be shared during a call).";
 
 "settings_integrations_allow_button" = "Manage integrations";
+/* The %@ placeholder will be replaced with the integration manager's URL. */
 "settings_integrations_allow_description" = "Use an integration manager (%@) to manage bots, bridges, widgets and sticker packs.\n\nIntegration managers receive configuration data, and can modify widgets, send room invites and set power levels on your behalf.";
 
 "settings_ui_language" = "Language";
@@ -673,6 +674,7 @@ Tap the + to start adding people.";
 "settings_labs_enable_threads" = "Threaded messaging";
 "settings_labs_enable_auto_report_decryption_errors" = "Auto Report Decryption Errors";
 "settings_labs_use_only_latest_user_avatar_and_name" = "Show latest avatar and name for users in message history";
+"settings_labs_enable_live_location_sharing" = "Live location sharing - share current location (active development, and temporarily, locations persist in room history)";
 
 "settings_version" = "Version %@";
 "settings_olm_version" = "Olm Version %@";

Riot/Assets/es.lproj/Vector.strings

@@ -159,8 +159,8 @@
 "directory_cell_title" = "Explorar directorio";
 "directory_cell_description" = "%tu salas";
 "directory_search_results_title" = "Explorar resultados de directorio";
-"directory_search_results" = "%tu resultados encontrados para %@";
-"directory_search_results_more_than" = ">%tu resultados encontrados para %@";
+"directory_search_results" = "%1$tu resultados encontrados para %2$@";
+"directory_search_results_more_than" = ">%1$tu resultados encontrados para %2$@";
 "directory_search_fail" = "Error al buscar datos";
 "contacts_address_book_no_contact" = "No hay contactos locales";
 "contacts_address_book_permission_required" = "Se requiere permiso para acceder a tus contactos locales";
@@ -2393,3 +2393,28 @@
 "edit" = "Editar";
 "add" = "Añadir";
 "new_word" = "Nuevo";
+"location_sharing_live_timer_incoming" = "Compartiendo hasta %@";
+"onboarding_avatar_message" = "Puedes cambiarlo más adelante.";
+"onboarding_avatar_title" = "Añadir una foto de perfil";
+"confirm" = "Confirmar";
+"room_access_space_chooser_other_spaces_section_info" = "Probablemente, otros administradores de %@ forman parte de ellos.";
+"create_room_suggest_room_footer" = "Se sugerirá a los usuarios del espacio unirse a las salas marcadas como sugeridas.";
+"create_room_section_footer_type_public" = "Solo las personas invitadas pueden encontrarla y unirse a ella, no solo la gente en Space name.";
+"room_access_settings_screen_upgrade_alert_message_no_param" = "Cualquiera en el espacio superior podrá encontrar esta sala y unirse a ella, no hace falta que invites a todo el mundo manualmente. Podrás cambiar esto en los ajustes de la sala.";
+"threads_notice_information" = "Los temas creados durante el periodo de pruebas ahora <b>aparecerán como respuestas ordinarias</b>.<br/><br/>Esto solo va a pasar esta vez, ya que los hilos son ahora parte de la especificación de Matrix.";
+"suggest" = "Sugerir";
+"existing" = "Existente";
+"joining" = "Entrando";
+"room_participants_invite_prompt_to_msg" = "¿Seguro que quieres invitar a %@ a %@?";
+"room_details_promote_room_title" = "Promocionar sala";
+"create_room_section_footer_type_restricted" = "Cualquiera en el espacio puede encontrarla y unirse.";
+"live_location_sharing_ended" = "Fin de la ubicación en tiempo real";
+"location_sharing_live_no_user_locations_error_title" = "Ninguna ubicación de usuarios disponible";
+"location_sharing_live_stop_sharing_progress" = "Dejar de compartir ubicación";
+"location_sharing_live_stop_sharing_error" = "Fallo al dejar de compartir ubicación";
+"location_sharing_live_timer_selector_long" = "8 horas";
+"location_sharing_live_timer_selector_medium" = "1 hora";
+"location_sharing_live_timer_selector_short" = "15 minutos";
+"location_sharing_live_timer_selector_title" = "Elige cuánto tiempo quieres que los demás vean tu ubicación precisa.";
+"location_sharing_live_error" = "Error en la ubicación en tiempo real";
+"location_sharing_live_loading" = "Cargando ubicación en tiempo real…";

Riot/Assets/et.lproj/Vector.strings

@@ -2262,3 +2262,7 @@
 "location_sharing_live_timer_incoming" = "Asukoha jagamine toimib kuni %@";
 "live_location_sharing_ended" = "Reaalajas asukoha jagamine on lõppenud";
 "confirm" = "Kinnita";
+/* The placeholder %1$tu will be replaced with a number and %2$@ with the user's search terms. Note the > at the start indicates "more than 20 results". */
+"directory_search_results_more_than" = ">%2$@ kohta leidsin %1$tu tulemust";
+/* The placeholder %1$tu will be replaced with a number and %2$@ with the user's search terms. */
+"directory_search_results" = "%2$@ kohta leidsin %1$tu tulemust";