Merge branch 'release/1.9.10/master'

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

@@ -1,9 +1,6 @@
 name: UI Tests CI
 
 on:
-  push:
-    branches: [ develop ]
-
   pull_request:
 
   workflow_dispatch:

.github/workflows/triage-move-labelled.yml

@@ -17,7 +17,8 @@ jobs:
       contains(github.event.issue.labels.*.name, 'Z-IA') ||
       contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
       contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-      contains(github.event.issue.labels.*.name, 'A-Tags')
+      contains(github.event.issue.labels.*.name, 'A-Tags') ||
+      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
     steps:
       - uses: actions/github-script@v5
         with:
@@ -44,7 +45,13 @@ jobs:
     name: P1 X-Needs-Design to Design project board
     runs-on: ubuntu-latest
     if: >
-      contains(github.event.issue.labels.*.name, 'X-Needs-Design')
+      contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
+      (contains(github.event.issue.labels.*.name, 'S-Critical') &&
+       (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+       (contains(github.event.issue.labels.*.name, 'S-Major') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent')) ||
+       contains(github.event.issue.labels.*.name, 'A11y'))
     steps:
       - uses: octokit/[email protected]
         id: add_to_project
@@ -202,3 +209,105 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAM0swc4AArk0"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features1:
+    name: Add labelled issues to PS features team 1
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-Polls') ||
+      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
+      (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
+        !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
+      (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
+        contains(github.event.issue.labels.*.name, 'A-User-Settings'))
+    steps:
+      - uses: octokit/[email protected]
+        id: add_to_project
+        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_kwDOAM0swc4AHJKF"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features2:
+    name: Add labelled issues to PS features team 2
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
+      contains(github.event.issue.labels.*.name, 'A-Broadcast')
+    steps:
+      - uses: octokit/[email protected]
+        id: add_to_project
+        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_kwDOAM0swc4AHJKd"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features3:
+    name: Add labelled issues to PS features team 3
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
+    steps:
+      - uses: octokit/[email protected]
+        id: add_to_project
+        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_kwDOAM0swc4AHJKW"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  voip:
+    name: Add labelled issues to VoIP project board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'Team: VoIP')
+    steps:
+      - uses: octokit/[email protected]
+        id: add_to_project
+        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_kwDOAM0swc4ABMIk"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

CHANGES.md

@@ -1,3 +1,40 @@
+## Changes in 1.9.10 (2022-11-01)
+
+✨ Features
+
+- Changed the info in the background audio message player. ([#6870](https://github.com/vector-im/element-ios/pull/6870))
+- Added voice message support to the Rich Text Composer ([#6941](https://github.com/vector-im/element-ios/issues/6941))
+
+🙌 Improvements
+
+- Improves external links interaction UX. ([#6936](https://github.com/vector-im/element-ios/pull/6936))
+- Verification: Deprecate legacy device-to-device verification ([#6937](https://github.com/vector-im/element-ios/pull/6937))
+- Crypto: Define MXCrypto and MXCrossSigning as protocols ([#6943](https://github.com/vector-im/element-ios/pull/6943))
+- Hide the old session list when the new device manager is enabled. ([#6999](https://github.com/vector-im/element-ios/pull/6999))
+- Upgrade MatrixSDK version ([v0.24.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.24.2)).
+- Added a responsive placeholder text to the Rich Text Composer ([#6935](https://github.com/vector-im/element-ios/issues/6935))
+- Added the maximise/minimise toggle button to the Rich Text Composer ([#6954](https://github.com/vector-im/element-ios/issues/6954))
+
+🐛 Bugfixes
+
+- Timeline: Fix layout for SwiftUI content views. ([#5326](https://github.com/vector-im/element-ios/issues/5326))
+- Updates the avatar image loading logics. ([#6847](https://github.com/vector-im/element-ios/issues/6847))
+- Fixes input text view height when containing multiple lines of text. ([#6849](https://github.com/vector-im/element-ios/issues/6849))
+- Fixed the placeholder flickering in the input toolbar when there is an height change. ([#6949](https://github.com/vector-im/element-ios/issues/6949))
+
+🧱 Build
+
+- Add Z-Labs tag for rich text editor and update to the new label naming. ([#6996](https://github.com/vector-im/element-ios/pull/6996))
+
+🚧 In development 🚧
+
+- Device Manager: Multi-session selection. ([#6928](https://github.com/vector-im/element-ios/issues/6928))
+
+Others
+
+- Updated templates readme file. ([#6925](https://github.com/vector-im/element-ios/issues/6925))
+
+
 ## Changes in 1.9.9 (2022-10-18)
 
 ✨ Features

Config/AppConfiguration.swift

@@ -33,7 +33,7 @@ class AppConfiguration: CommonConfiguration {
         // Get additional events (modular widget, voice broadcast...)
         MXKAppSettings.standard()?.addSupportedEventTypes([kWidgetMatrixEventTypeString,
                                                            kWidgetModularEventTypeString,
-                                                           VoiceBroadcastSettings.eventType])
+                                                           VoiceBroadcastSettings.voiceBroadcastInfoContentKeyType])
 
         // Hide undecryptable messages that were sent while the user was not in the room
         MXKAppSettings.standard()?.hidePreJoinedUndecryptableEvents = true

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.9.9
-CURRENT_PROJECT_VERSION = 1.9.9
+MARKETING_VERSION = 1.9.10
+CURRENT_PROJECT_VERSION = 1.9.10

Config/BuildSettings.swift

@@ -234,6 +234,8 @@ final class BuildSettings: NSObject {
 
     static let allowInviteExernalUsers: Bool = true
 
+    static let allowBackgroundAudioMessagePlayback: Bool = true
+
     // MARK: - Side Menu
     static let enableSideMenu: Bool = true && !newAppLayoutEnabled
     static let sideMenuShowInviteFriends: Bool = true
@@ -406,7 +408,7 @@ final class BuildSettings: NSObject {
     static let locationSharingEnabled = true
 
     // MARK: - Voice Broadcast
-    static let voiceBroadcastChunkLength: Int = 600
+    static let voiceBroadcastChunkLength: Int = 120
     static let voiceBroadcastMaxLength: UInt64 = 144000
 
     // MARK: - MXKAppSettings

Config/CommonConfiguration.swift

@@ -172,7 +172,7 @@ class CommonConfiguration: NSObject, Configurable {
 
     func setupSettingsWhenLoaded(for matrixSession: MXSession) {
         // Do not warn for unknown devices. We have cross-signing now
-        matrixSession.crypto?.warnOnUnknowDevices = false
+        (matrixSession.crypto as? MXLegacyCrypto)?.warnOnUnknowDevices = false
     }
 
 }

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.24.1'
+$matrixSDKVersion = '= 0.24.2'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
@@ -154,5 +154,14 @@ post_install do |installer|
       config.build_settings['WARNING_CFLAGS'] ||= ['$(inherited)','-Wno-nullability-completeness']
       config.build_settings['OTHER_SWIFT_FLAGS'] ||= ['$(inherited)', '-Xcc', '-Wno-nullability-completeness']
     end
+
+    # Fix Xcode 14 resource bundle signing issues
+    # https://github.com/CocoaPods/CocoaPods/issues/11402#issuecomment-1259231655
+    if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+      target.build_configurations.each do |config|
+        config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+      end
+    end
+
   end
 end

Podfile.lock

@@ -55,22 +55,22 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.24.1):
-    - MatrixSDK/Core (= 0.24.1)
-  - MatrixSDK/Core (0.24.1):
+  - MatrixSDK (0.24.2):
+    - MatrixSDK/Core (= 0.24.2)
+  - MatrixSDK/Core (0.24.2):
     - 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.24.1):
-    - MatrixSDKCrypto (= 0.1.2)
-  - MatrixSDK/JingleCallStack (0.24.1):
+  - MatrixSDK/CryptoSDK (0.24.2):
+    - MatrixSDKCrypto (= 0.1.5)
+  - MatrixSDK/JingleCallStack (0.24.2):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
-  - MatrixSDKCrypto (0.1.2)
+  - MatrixSDKCrypto (0.1.5)
   - OLMKit (3.2.12):
     - OLMKit/olmc (= 3.2.12)
     - OLMKit/olmcpp (= 3.2.12)
@@ -122,8 +122,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.24.1)
-  - MatrixSDK/JingleCallStack (= 0.24.1)
+  - MatrixSDK (= 0.24.2)
+  - MatrixSDK/JingleCallStack (= 0.24.2)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -220,8 +220,8 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 0cb0727dd82f88d0115da93ce94ed9556a195c9b
-  MatrixSDKCrypto: e6e69cb16f9e459761567d078af0c17929f6a3c2
+  MatrixSDK: 1b64384084050652fcffafdf8641200f1ab25060
+  MatrixSDKCrypto: dcab554bc7157cad31c01fc1137cf5acb01959a4
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -241,6 +241,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 82fb79d0a6b074f77950ec73304a749eb0329d12
+PODFILE CHECKSUM: 96a971e076c61e54ae5bb7bf30ecba80563eeacf
 
 COCOAPODS: 1.11.2

Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -23,7 +23,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-wysiwyg-composer-swift",
       "state" : {
-        "revision" : "11dad16e3e589dba423f6cc5707e9df8aace89b0"
+        "revision" : "d5ef7054fb43924d5b92d5d627347ca2bc333717"
       }
     },
     {

Riot/Assets/Images.xcassets/DeviceManager/user_session_list_item_not_selected.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "user_session_list_item_not_selected.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/DeviceManager/user_session_list_item_selected.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "user_session_list_item_selected.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Room/VoiceMessages/voice_message_record_button_default.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "action_voice_message.png",
+      "filename" : "Microphone icon.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "action_voice_message@2x.png",
+      "filename" : "Microphone icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "action_voice_message@3x.png",
+      "filename" : "Microphone icon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Riot/Assets/Images.xcassets/Room/VoiceMessages/voice_message_record_button_recording.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "voice_message_record_button_recording.png",
+      "filename" : "Microphone asset.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "voice_message_record_button_recording@2x.png",
+      "filename" : "Microphone asset@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "voice_message_record_button_recording@3x.png",
+      "filename" : "Microphone asset@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }