Merge branch 'release/1.10.12/master'

element-hq · May 16, 2023 · 5ff7135 · 5ff7135
2 parents 7d18f34 + 8aa3afc
commit 5ff7135
Show file tree

Hide file tree

Showing 134 changed files with 2,640 additions and 2,395 deletions.
diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
@@ -53,186 +53,32 @@ jobs:
        contains(github.event.issue.labels.*.name, 'O-Frequent')) ||
        contains(github.event.issue.labels.*.name, 'A11y'))
     steps:
-      - uses: octokit/[email protected]
-        id: add_to_project
+      - uses: actions/add-to-project@main
         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_kwDOAM0swc0sUA"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+          project-url: https://github.com/orgs/vector-im/projects/18
+          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   add_product_issues_to_project:
     name: X-Needs-Product to Design project board
     runs-on: ubuntu-latest
     if: >
       contains(github.event.issue.labels.*.name, 'X-Needs-Product')
     steps:
-      - uses: octokit/[email protected]
-        id: add_to_project
+      - uses: actions/add-to-project@main
         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_kwDOAM0swc4AAg6N"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  Delight_issues_to_board:
-    name: Spaces issues to Delight project board
-    runs-on: ubuntu-latest
-    if: >
-        contains(github.event.issue.labels.*.name, 'Team: Delight') ||
-        contains(github.event.issue.labels.*.name, 'Z-AppLayout')
-    steps:
-      - uses: octokit/[email protected]
-        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_kwDOAM0swc1HvQ"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  move_voice-message_issues:
-    name: A-Voice Messages to voice message board
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Voice Messages')
-    steps:
-      - uses: octokit/[email protected]
-        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_kwDOAM0swc2KCw"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-  move_message_bubble_issues:
-    name: A-Message-Bubbles to Message bubble board
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Message-Bubbles')
-    steps:
-      - uses: octokit/[email protected]
-        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_kwDOAM0swc3m-g"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  move_FTUE_issues:
-    name: Z-FTUE to FTUE board
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'Z-FTUE')
-    steps:
-      - uses: octokit/[email protected]
-        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_kwDOAM0swc4AAqVx"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  move_WTF_issues:
-    name: Z-WTF to WTF board
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'Z-WTF')
-    steps:
-      - uses: octokit/[email protected]
-        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_kwDOAM0swc4AArk0"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+          project-url: https://github.com/orgs/vector-im/projects/28
+          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   ex_plorers:
     name: Add labelled issues to X-Plorer project
     runs-on: ubuntu-latest
     if: >
       contains(github.event.issue.labels.*.name, 'Team: Element X Feature')
     steps:
-      - uses: octokit/[email protected]
-        id: add_to_project
+      - uses: actions/add-to-project@main
         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_kwDOAM0swc4ALoFY"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+          project-url: https://github.com/orgs/vector-im/projects/73
+          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   ps_features1:
     name: Add labelled issues to PS features team 1
@@ -245,23 +91,10 @@ jobs:
       (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
+      - uses: actions/add-to-project@main
         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 }}
+          project-url: https://github.com/orgs/vector-im/projects/56
+          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   ps_features2:
     name: Add labelled issues to PS features team 2
@@ -270,68 +103,29 @@ jobs:
       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
+      - uses: actions/add-to-project@main
         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 }}
+          project-url: https://github.com/orgs/vector-im/projects/58
+          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
+      - uses: actions/add-to-project@main
         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 }}
+          project-url: https://github.com/orgs/vector-im/projects/57
+          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
+      - uses: actions/add-to-project@main
         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 }}
+          project-url: https://github.com/orgs/vector-im/projects/41
+          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,34 @@
+## Changes in 1.10.12 (2023-05-16)
+
+✨ Features
+
+- Add composer suggestions for slash commands ([#7493](https://github.com/vector-im/element-ios/issues/7493))
+
+🙌 Improvements
+
+- Crypto: Deprecate MXLegacyCrypto ([#7508](https://github.com/vector-im/element-ios/pull/7508))
+- Add a flag in the build settings to force the user to define a homeserver instead of using the default one. ([#7541](https://github.com/vector-im/element-ios/pull/7541))
+- Upgrade MatrixSDK version ([v0.26.10](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.10)).
+- Add an audio alert when the voice broadcast recording is automatically paused ([#7504](https://github.com/vector-im/element-ios/issues/7504))
+- Timeline: Remove the matrix ID displayed when someone has changed its display name. ([#7517](https://github.com/vector-im/element-ios/issues/7517))
+
+🐛 Bugfixes
+
+- Fix an issue where the Secrets Reset screen would open twice. ([#7404](https://github.com/vector-im/element-ios/pull/7404))
+- Make sure to use the chosen language for the VoiceOver voice too. ([#7493](https://github.com/vector-im/element-ios/pull/7493))
+- Fix the position of the send confirmation icon. ([#7512](https://github.com/vector-im/element-ios/pull/7512))
+- Disable accessibility for emojis during session verification. ([#7521](https://github.com/vector-im/element-ios/pull/7521))
+- Fix accessibility when entering the PIN to unlock the app. ([#7522](https://github.com/vector-im/element-ios/pull/7522))
+- Fix voiceover order of room creation header and message composer. ([#7543](https://github.com/vector-im/element-ios/pull/7543))
+- Fix: The last event description text color now matches the active theme. ([#7545](https://github.com/vector-im/element-ios/pull/7545))
+- Fix mention pills display in thread list ([#7322](https://github.com/vector-im/element-ios/issues/7322))
+- Poll: The timeline sometimes displayed closed polls in the wrong order. ([#7497](https://github.com/vector-im/element-ios/issues/7497))
+- Fix a flickering issue when the timeline datasource is reloaded. ([#7523](https://github.com/vector-im/element-ios/issues/7523))
+- Fix the position of the marker highlighting an event. ([#7526](https://github.com/vector-im/element-ios/issues/7526))
+- Fix application crashing when opening a thread with RTE enabled ([#7530](https://github.com/vector-im/element-ios/issues/7530))
+- Labs: Rich Text Editor: Fix partial text messages not being saved for each room ([#7535](https://github.com/vector-im/element-ios/issues/7535))
+
+
 ## Changes in 1.10.11 (2023-04-18)
 
 🙌 Improvements

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.10.11
-CURRENT_PROJECT_VERSION = 1.10.11
+MARKETING_VERSION = 1.10.12
+CURRENT_PROJECT_VERSION = 1.10.12
diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
@@ -98,10 +98,15 @@ final class BuildSettings: NSObject {
 
     // MARK: - Server configuration
 
-    // Default servers proposed on the authentication screen
+    /// Force the user to set a homeserver instead of using the default one
+    static let forceHomeserverSelection = false
+
+    /// Default server proposed on the authentication screen
     static let serverConfigDefaultHomeserverUrlString = "https://matrix.org"
-    static let serverConfigDefaultIdentityServerUrlString = "https://vector.im"
 
+    /// Default identity server
+    static let serverConfigDefaultIdentityServerUrlString = "https://vector.im"
+
     static let serverConfigSygnalAPIUrlString = "https://matrix.org/_matrix/push/v1/notify"
 
 

diff --git a/Config/CommonConfiguration.swift b/Config/CommonConfiguration.swift
@@ -92,8 +92,7 @@ class CommonConfiguration: NSObject, Configurable {
 
         sdkOptions.enableNewClientInformationFeature = RiotSettings.shared.enableClientInformationFeature
 
-        // Configure Crypto SDK feature deciding which crypto module to use
-        sdkOptions.cryptoSDKFeature = CryptoSDKFeature.shared
+        sdkOptions.cryptoMigrationDelegate = self
     }
 
     private func makeASCIIUserAgent() -> String? {
@@ -168,14 +167,16 @@ class CommonConfiguration: NSObject, Configurable {
         if RiotSettings.shared.allowStunServerFallback, let stunServerFallback = BuildSettings.stunServerFallbackUrlString {
             callManager.fallbackSTUNServer = stunServerFallback
         }
+    }    
+}
+
+extension CommonConfiguration: MXCryptoV2MigrationDelegate {
+    var needsVerificationUpgrade: Bool {
+        get {
+            RiotSettings.shared.showVerificationUpgradeAlert
+        }
+        set {
+            RiotSettings.shared.showVerificationUpgradeAlert = newValue
+        }
     }
-
-
-    // MARK: - Per loaded matrix session settings
-
-    func setupSettingsWhenLoaded(for matrixSession: MXSession) {
-        // Do not warn for unknown devices. We have cross-signing now
-        (matrixSession.crypto as? MXLegacyCrypto)?.warnOnUnknowDevices = false
-    }
-
 }