Merge branch 'release/1.10.4/master'

.github/workflows/triage-incoming.yml

@@ -13,3 +13,25 @@ jobs:
           project: Issue triage
           column: Incoming
           repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  add_to_triage:
+    runs-on: ubuntu-latest
+    if: >
+      github.repository == 'vector-im/element-x-ios'
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4AMlHr"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

CHANGES.md

@@ -1,3 +1,22 @@
+## Changes in 1.10.4 (2023-03-07)
+
+🙌 Improvements
+
+- CryptoV2: CryptoSDK phased rollout feature ([#7374](https://github.com/vector-im/element-ios/pull/7374))
+- Analytics: Use SwiftPM for AnalyticsEvents instead of CocoaPods ([#7401](https://github.com/vector-im/element-ios/pull/7401))
+- Upgrade MatrixSDK version ([v0.26.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.0)).
+- Session verification: automatically starts scanning for a QR code if we do not have a QR code to display. ([#3115](https://github.com/vector-im/element-ios/issues/3115))
+- Direct Message: manage encrypted DM in case of invite by email ([#6612](https://github.com/vector-im/element-ios/issues/6612))
+
+🐛 Bugfixes
+
+- fix issue on timeline's bubbles not showing proper content after decrypt ([#7397](https://github.com/vector-im/element-ios/pull/7397))
+- Fixes bug about centring user in live location sharing ([#7398](https://github.com/vector-im/element-ios/pull/7398))
+- Polls: improve rendering of poll ended events. ([#7402](https://github.com/vector-im/element-ios/pull/7402))
+- Fix an issue where SAS verification would fail between two iOS devices ([#3946](https://github.com/vector-im/element-ios/issues/3946))
+- Pin SwiftOGG to a release rather than main branch to avoid breaking changes in SwiftOGG causing bugs in element-ios. ([#7388](https://github.com/vector-im/element-ios/issues/7388))
+
+
 ## Changes in 1.10.3 (2023-02-21)
 
 🙌 Improvements

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.10.3
-CURRENT_PROJECT_VERSION = 1.10.3
+MARKETING_VERSION = 1.10.4
+CURRENT_PROJECT_VERSION = 1.10.4

Config/CommonConfiguration.swift

@@ -92,14 +92,8 @@ class CommonConfiguration: NSObject, Configurable {
 
         sdkOptions.enableNewClientInformationFeature = RiotSettings.shared.enableClientInformationFeature
 
-        if sdkOptions.isCryptoSDKAvailable {
-            let isEnabled = RiotSettings.shared.enableCryptoSDK
-            MXLog.debug("[CommonConfiguration] Crypto SDK is \(isEnabled ? "enabled" : "disabled")")
-            sdkOptions.enableCryptoSDK = isEnabled
-            sdkOptions.enableStartupProgress = isEnabled
-        } else {
-            MXLog.debug("[CommonConfiguration] Crypto SDK is not available)")
-        }
+        // Configure Crypto SDK feature deciding which crypto module to use
+        sdkOptions.cryptoSDKFeature = CryptoSDKFeature.shared
     }
 
     private func makeASCIIUserAgent() -> String? {

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.25.2'
+$matrixSDKVersion = '= 0.26.0'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
@@ -70,10 +70,8 @@ abstract_target 'RiotPods' do
   pod 'WeakDictionary', '~> 2.0'
 
   # PostHog for analytics
-  pod 'PostHog', '~> 1.4.4'
+  pod 'PostHog', '~> 2.0.0'
   pod 'Sentry', '~> 7.15.0'
-  pod 'AnalyticsEvents', :git => 'https://github.com/matrix-org/matrix-analytics-events.git', :branch => 'release/swift', :inhibit_warnings => false
-  # pod 'AnalyticsEvents', :path => '../matrix-analytics-events/AnalyticsEvents.podspec'
 
   pod 'OLMKit'
   pod 'zxcvbn-ios'

Podfile.lock

@@ -14,7 +14,6 @@ PODS:
   - AFNetworking/Serialization (4.0.1)
   - AFNetworking/UIKit (4.0.1):
     - AFNetworking/NSURLSession
-  - AnalyticsEvents (0.1.0)
   - BlueCryptor (1.0.32)
   - BlueECC (1.2.5)
   - BlueRSA (1.0.200)
@@ -38,26 +37,26 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.25.2):
-    - MatrixSDK/Core (= 0.25.2)
-  - MatrixSDK/Core (0.25.2):
+  - MatrixSDK (0.26.0):
+    - MatrixSDK/Core (= 0.26.0)
+  - MatrixSDK/Core (0.26.0):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
-    - MatrixSDKCrypto (= 0.2.0)
+    - MatrixSDKCrypto (= 0.2.1)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.25.2):
+  - MatrixSDK/JingleCallStack (0.26.0):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
-  - MatrixSDKCrypto (0.2.0)
+  - MatrixSDKCrypto (0.2.1)
   - OLMKit (3.2.12):
     - OLMKit/olmc (= 3.2.12)
     - OLMKit/olmcpp (= 3.2.12)
   - OLMKit/olmc (3.2.12)
   - OLMKit/olmcpp (3.2.12)
-  - PostHog (1.4.4)
+  - PostHog (2.0.0)
   - ReadMoreTextView (3.0.1)
   - Realm (10.27.0):
     - Realm/Headers (= 10.27.0)
@@ -91,7 +90,6 @@ PODS:
   - ZXingObjC/All (3.6.5)
 
 DEPENDENCIES:
-  - AnalyticsEvents (from `https://github.com/matrix-org/matrix-analytics-events.git`, branch `release/swift`)
   - Down (~> 0.11.0)
   - DSBottomSheet (~> 0.3)
   - DSWaveformImage (~> 6.1.1)
@@ -102,10 +100,10 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.25.2)
-  - MatrixSDK/JingleCallStack (= 0.25.2)
+  - MatrixSDK (= 0.26.0)
+  - MatrixSDK/JingleCallStack (= 0.26.0)
   - OLMKit
-  - PostHog (~> 1.4.4)
+  - PostHog (~> 2.0.0)
   - ReadMoreTextView (~> 3.0.1)
   - Reusable (~> 4.1)
   - Sentry (~> 7.15.0)
@@ -164,19 +162,8 @@ SPEC REPOS:
     - zxcvbn-ios
     - ZXingObjC
 
-EXTERNAL SOURCES:
-  AnalyticsEvents:
-    :branch: release/swift
-    :git: https://github.com/matrix-org/matrix-analytics-events.git
-
-CHECKOUT OPTIONS:
-  AnalyticsEvents:
-    :commit: 53ad46ba1ea1ee8f21139dda3c351890846a202f
-    :git: https://github.com/matrix-org/matrix-analytics-events.git
-
 SPEC CHECKSUMS:
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
-  AnalyticsEvents: 0cc8cf52da2fd464a2f39b788a295988151116ce
   BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
   BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc
   BlueRSA: dfeef51db96bcc4edec654956c1581adbda4e6a3
@@ -196,10 +183,10 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 354274127d163af37bdc55093ab96deea1be6a40
-  MatrixSDKCrypto: e1ef22aae76b5a6f030ace21a47be83864f4ff44
+  MatrixSDK: e324e51eeee6420cdde064d72d8e28e6452f3fb7
+  MatrixSDKCrypto: 477d818bf2cc37b6cf702a290eb647bc8cf3cb1b
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
-  PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
+  PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
   Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
@@ -217,6 +204,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 20544e99d9acfdfbc4bf98b21d20c1496b9d6fe9
+PODFILE CHECKSUM: 829420858b6f935bbfe58eb25a0533d799ccd78a
 
 COCOAPODS: 1.11.3

Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -36,6 +36,15 @@
         "version" : "5.12.2"
       }
     },
+    {
+      "identity" : "matrix-analytics-events",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/matrix-org/matrix-analytics-events",
+      "state" : {
+        "revision" : "2f5fa5f1e2f6c6ae1a47c33d953a3ce289167eb0",
+        "version" : "0.5.0"
+      }
+    },
     {
       "identity" : "matrix-wysiwyg-composer-swift",
       "kind" : "remoteSourceControl",
@@ -77,7 +86,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vector-im/swift-ogg",
       "state" : {
-        "branch" : "main",
+        "branch" : "0.0.1",
         "revision" : "e9a9e7601da662fd8b97d93781ff5c60b4becf88"
       }
     }

Riot/Assets/en.lproj/Vector.strings

@@ -365,6 +365,7 @@
 "room_creation_invite_another_user" = "User ID, name or email";
 "room_creation_error_invite_user_by_email_without_identity_server" = "No identity server is configured so you cannot add a participant with an email.";
 "room_creation_dm_error" = "We couldn't create your DM. Please check the users you want to invite and try again.";
+"room_creation_only_one_email_invite" = "You can only invite one email at a time";
 
 // Room recents
 "room_recents_directory_section" = "ROOM DIRECTORY";
@@ -1570,9 +1571,11 @@ Tap the + to start adding people.";
 "device_verification_self_verify_wait_new_sign_in_title" = "Verify this login";
 "device_verification_self_verify_wait_information" = "Verify this session from one of your other sessions, granting it access to encrypted messages.\n\nUse the latest %@ on your other devices:";
 "device_verification_self_verify_wait_additional_information" = "This works with %@ and other cross-signing capable Matrix clients.";
+"device_verification_self_verify_open_on_other_device_title" = "Open %@ on your other device";
+"device_verification_self_verify_open_on_other_device_information" = "You need to verify this session in order to read your secure message history.\n\nOpen Element on one of your other devices and follow the instructions.";
 "device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Use Security Key";
 "device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Use Security Phrase or Key";
-"device_verification_self_verify_wait_recover_secrets_additional_information" = "If you can't access an existing session";
+"device_verification_self_verify_wait_recover_secrets_additional_help" = "Can't access an existing %@ session?";
 "device_verification_self_verify_wait_recover_secrets_checking_availability" = "Checking for other verification capabilities ...";
 
 // MARK: Verify
@@ -1748,6 +1751,12 @@ Tap the + to start adding people.";
 "key_verification_verify_qr_code_scan_other_code_success_title" = "Code validated!";
 "key_verification_verify_qr_code_scan_other_code_success_message" = "QR code has been successfully validated.";
 
+"key_verification_scan_qr_code_title" = "Scan QR code";
+"key_verification_scan_qr_code_information_other_user" = "Point your camera at the QR code displayed on their device to verify their session";
+"key_verification_scan_qr_code_information_other_device" = "Point your camera at the QR code displayed on your other device to verify this session";
+"key_verification_scan_qr_code_information_other_session" = "Point your camera at the QR code displayed on your other device to verify your session";
+"key_verification_scan_qr_code_information_new_session" = "Point your camera at the QR code displayed on your other device to verify your new session";
+
 // MARK: Scan confirmation
 
 // Scanning
@@ -2287,6 +2296,9 @@ Tap the + to start adding people.";
 "room_invites_empty_view_title" = "Nothing new.";
 "room_invites_empty_view_information" = "This is where your invites appear.";
 
+"room_waiting_other_participants_title" = "Waiting for users to join %@";
+"room_waiting_other_participants_message" = "Once invited users have joined %@, you will be able to chat and the room will be end-to-end encrypted";
+
 // MARK: - Space Selector
 
 "space_selector_title" = "My spaces";

Riot/Categories/MXRoomSummary+Riot.m

@@ -27,7 +27,7 @@ - (void)setRoomAvatarImageIn:(MXKImageView*)mxkImageView
 {
     [mxkImageView vc_setRoomAvatarImageWith:self.avatar
                                      roomId:self.roomId
-                                displayName:self.displayname
+                                displayName:self.displayName
                                mediaManager:self.mxSession.mediaManager];
 }