Merge commit 'a8c505c2f9175ae0bece1f62708e6fc31e587897' into feature/3746_merge_element_1.9.10

# Conflicts:
#	Config/AppConfiguration.swift
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/AppCoordinator.swift
#	Riot/Modules/Common/Avatar/AvatarView.swift
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/Settings/Security/SecurityViewController.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	Riot/target.yml
#	fastlane/Fastfile
#	project.yml

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -5,7 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thank you for taking the time to propose a new feature or make a suggestion.
+        Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas)
   - type: textarea
     id: usecase
     attributes:

.github/workflows/ci-tests.yml

@@ -63,3 +63,5 @@ jobs:
       
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
+        with:
+          flags: unittests

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

@@ -1,9 +1,6 @@
 name: UI Tests CI
 
 on:
-  push:
-    branches: [ develop ]
-
   pull_request:
 
   workflow_dispatch:
@@ -61,4 +58,6 @@ jobs:
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
+        with:
+          flags: uitests
         

.github/workflows/release-alpha.yml

@@ -4,6 +4,7 @@ on:
 
   # Triggers the workflow on any pull request
   pull_request:
+    types: [ labeled, synchronized, opened, reopened ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -27,7 +28,11 @@ jobs:
   build:
     # Run job if secrets are available (not available for forks).
     needs: [check-secret]
-    if: needs.check-secret.outputs.out-key == 'true'
+    if: |
+      needs.check-secret.outputs.out-key == 'true' &&
+      (github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'Trigger-PR-Build')))
+
     name: Release
     runs-on: macos-12
     

.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/graphql-action@v2.x
         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/graphql-action@v2.x
+        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/graphql-action@v2.x
+        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/graphql-action@v2.x
+        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/graphql-action@v2.x
+        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 }}

.github/workflows/triage-priority-bugs.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
           project: iOS App Team
-          column: P1
+          column: "Important Issues & Topics (P1)"
           repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   P1_issues_to_crypto_team_workboard:

CHANGES.md

@@ -1,3 +1,97 @@
+## 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
+
+- Added RendezvousService and secure channel establishment implementation ([#6806](https://github.com/vector-im/element-ios/pull/6806))
+- Implemented login with QR code flows when scanning from mobile ([#6857](https://github.com/vector-im/element-ios/pull/6857))
+
+🙌 Improvements
+
+- User agents: Ignore OS version for web based sessions (PSG-826). ([#6852](https://github.com/vector-im/element-ios/pull/6852))
+- Upgrade MatrixSDK version ([v0.24.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.24.1)).
+- Display push toggle for sessions with m.local_notification_settings.<device-id> events in account_data ([#6797](https://github.com/vector-im/element-ios/issues/6797))
+- CryptoV2: Incoming verification requests ([#6809](https://github.com/vector-im/element-ios/issues/6809))
+- Check enabled field in notification settings push toggles ([#6814](https://github.com/vector-im/element-ios/issues/6814))
+- Only use device type name as fallback for session display name ([#6820](https://github.com/vector-im/element-ios/issues/6820))
+- Include app name in default session display name ([#6828](https://github.com/vector-im/element-ios/issues/6828))
+- Tidy up TabBarCoordinator now that AllChatsCoordinator exists. ([#6853](https://github.com/vector-im/element-ios/issues/6853))
+- Sign Out: Add a SignOutFlowPresenter and use this in All Chats, Settings and the Device Manager. ([#6854](https://github.com/vector-im/element-ios/issues/6854))
+- Improved the Rich Text Editor to match design requirements. ([#6903](https://github.com/vector-im/element-ios/issues/6903))
+
+🐛 Bugfixes
+
+- Filter out application section in session details if needed. ([#6898](https://github.com/vector-im/element-ios/pull/6898))
+- Rich text editor now supports interactive dismissal by dragging the timeline. ([#6919](https://github.com/vector-im/element-ios/pull/6919), [#6900](https://github.com/vector-im/element-ios/issues/6900))
+- Location sharing: removing the loader. ([#5571](https://github.com/vector-im/element-ios/issues/5571))
+- Element freezes after searching in a room. ([#6762](https://github.com/vector-im/element-ios/issues/6762))
+- Settings: Use regular titles for all of the sub-screens. ([#6804](https://github.com/vector-im/element-ios/issues/6804))
+- All Chats: Fix a header glitch when aborting a pop gesture. ([#6833](https://github.com/vector-im/element-ios/issues/6833))
+- Device manager: Fixes from x-platform testing. ([#6864](https://github.com/vector-im/element-ios/issues/6864))
+- All chats shows no rooms in the list. ([#6869](https://github.com/vector-im/element-ios/issues/6869))
+- Device Manager: Navigating to session overview goes to session details. ([#6877](https://github.com/vector-im/element-ios/issues/6877))
+- "Notifications on this device" not refreshed in user settings screen ([#6888](https://github.com/vector-im/element-ios/issues/6888))
+- Rich text editor now always focuses if field is tapped within the border. ([#6897](https://github.com/vector-im/element-ios/issues/6897))
+- Device Manger: Device client information not updated. ([#6904](https://github.com/vector-im/element-ios/issues/6904))
+
+🧱 Build
+
+- Remove the (now unused) FFMPEG pod. ([#6419](https://github.com/vector-im/element-ios/issues/6419))
+- Update build tools from Cocoapods. ([#6886](https://github.com/vector-im/element-ios/issues/6886))
+
+🚧 In development 🚧
+
+- Device manager: Inactive sessions screen. ([#6786](https://github.com/vector-im/element-ios/issues/6786))
+- Device manager: Unverified sessions screen. ([#6801](https://github.com/vector-im/element-ios/issues/6801))
+- Device Manager: Add logout actions to UserSessionsOverview and UserSessionOverview ([#6802](https://github.com/vector-im/element-ios/issues/6802))
+- Device Manager: 'View all' button in other sessions list. ([#6817](https://github.com/vector-im/element-ios/issues/6817))
+- Device manager: Add UserSessionName and Rename actions to UserSessionsOverview and UserSessionOverview. ([#6823](https://github.com/vector-im/element-ios/issues/6823))
+- Device Manager: Filter sessions. ([#6838](https://github.com/vector-im/element-ios/issues/6838))
+- Device manager: Add verify device actions to UserSessionsOverview and UserSessionOverview. ([#6845](https://github.com/vector-im/element-ios/issues/6845))
+- Device manager: Identify inactive sessions. ([#6881](https://github.com/vector-im/element-ios/issues/6881))
+
+Others
+
+- Expose AuthenticationRestClient async login token generation method ([#6827](https://github.com/vector-im/element-ios/pull/6827))
+- Use unstable prefixes for login with QR flows. ([#6899](https://github.com/vector-im/element-ios/pull/6899))
+
+
 ## Changes in 1.9.8 (2022-10-04)
 
 🙌 Improvements

Config/AppConfiguration.swift

@@ -35,7 +35,8 @@ class AppConfiguration: CommonConfiguration {
         // bwi: add additional event for nicknames
         MXKAppSettings.standard()?.addSupportedEventTypes([kWidgetMatrixEventTypeString,
                                                            kWidgetModularEventTypeString,
-                                                           BWIBuildSettings.shared.bwiUserLabelEventTypeString])
+                                                           BWIBuildSettings.shared.bwiUserLabelEventTypeString,
+                                                          VoiceBroadcastSettings.voiceBroadcastInfoContentKeyType])
         
         // Hide undecryptable messages that were sent while the user was not in the room
         MXKAppSettings.standard()?.hidePreJoinedUndecryptableEvents = true

Config/AppVersion.xcconfig

@@ -16,5 +16,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.26.0
+MARKETING_VERSION = 2.0.0
 CURRENT_PROJECT_VERSION = 20220714163152

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.0'
+$matrixSDKVersion = '= 0.24.2'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
@@ -63,6 +63,7 @@ end
 def import_SwiftUI_pods
     pod 'Introspect', '~> 0.1'
     pod 'DSBottomSheet', '~> 0.3'
+    pod 'ZXingObjC', '~> 3.6.5'
 end
 
 abstract_target 'RiotPods' do
@@ -85,8 +86,9 @@ abstract_target 'RiotPods' do
   pod 'zxcvbn-ios'
 
   # Tools
-  pod 'SwiftGen', '~> 6.3'
-  pod 'SwiftLint', '~> 0.44.0'
+  pod 'SwiftGen'
+  pod 'SwiftLint'
+  pod 'SwiftFormat/CLI'
 
   target "Riot" do
     import_MatrixSDK
@@ -97,7 +99,6 @@ abstract_target 'RiotPods' do
     pod 'UICollectionViewRightAlignedLayout', '~> 0.0.3'
     pod 'UICollectionViewLeftAlignedLayout', '~> 1.0.2'
     pod 'KTCenterFlowLayout', '~> 1.3.1'
-    pod 'ZXingObjC', '~> 3.6.5'
     pod 'FlowCommoniOS', '~> 1.12.0'
     pod 'DTTJailbreakDetection', '~> 0.4.0'
     pod 'ReadMoreTextView', '~> 3.0.1'
@@ -105,7 +106,6 @@ abstract_target 'RiotPods' do
     pod 'SwiftJWT', '~> 3.6.200'
     pod 'SideMenu', '~> 6.5'
     pod 'DSWaveformImage', '~> 6.1.1'
-    pod 'ffmpeg-kit-ios-audio', '4.5.1'
     
     pod 'FLEX', '~> 4.5.0', :configurations => ['Debug'], :inhibit_warnings => true
 
@@ -198,6 +198,15 @@ 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
 
   Dir.glob("#{installer.sandbox.target_support_files_root}/**/*.pch") do |item|

Podfile.lock

@@ -38,8 +38,6 @@ PODS:
     - DTFoundation/Core
   - DTFoundation/UIKit (1.7.18):
     - DTFoundation/Core
-  - DTTJailbreakDetection (0.4.0)
-  - ffmpeg-kit-ios-audio (4.5.1)
   - FLEX (4.5.0)
   - FlowCommoniOS (1.12.2)
   - GBDeviceInfo (6.6.0):
@@ -57,12 +55,9 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatomoTracker (7.4.1):
-    - MatomoTracker/Core (= 7.4.1)
-  - MatomoTracker/Core (7.4.1)
-  - MatrixSDK (0.24.0):
-    - MatrixSDK/Core (= 0.24.0)
-  - MatrixSDK/Core (0.24.0):
+  - 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)
@@ -70,12 +65,12 @@ PODS:
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/CryptoSDK (0.24.0):
-    - MatrixSDKCrypto (= 0.1.0)
-  - MatrixSDK/JingleCallStack (0.24.0):
+  - MatrixSDK/CryptoSDK (0.24.2):
+    - MatrixSDKCrypto (= 0.1.5)
+  - MatrixSDK/JingleCallStack (0.24.2):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
-  - MatrixSDKCrypto (0.1.0)
+  - MatrixSDKCrypto (0.1.5)
   - OLMKit (3.2.12):
     - OLMKit/olmc (= 3.2.12)
     - OLMKit/olmcpp (= 3.2.12)
@@ -96,6 +91,7 @@ PODS:
   - Sentry/Core (7.15.0)
   - SideMenu (6.5.0)
   - SwiftBase32 (0.9.0)
+  - SwiftFormat/CLI (0.50.2)
   - SwiftGen (6.6.2)
   - SwiftJWT (3.6.200):
     - BlueCryptor (~> 1.0)
@@ -103,7 +99,7 @@ PODS:
     - BlueRSA (~> 1.0)
     - KituraContracts (~> 1.2)
     - LoggerAPI (~> 1.7)
-  - SwiftLint (0.44.0)
+  - SwiftLint (0.49.1)
   - SwiftyBeaver (1.9.5)
   - UICollectionViewLeftAlignedLayout (1.0.2)
   - UICollectionViewRightAlignedLayout (0.0.3)
@@ -119,8 +115,6 @@ DEPENDENCIES:
   - DSBottomSheet (~> 0.3)
   - DSWaveformImage (~> 6.1.1)
   - DTCoreText (~> 1.6.25)
-  - DTTJailbreakDetection (~> 0.4.0)
-  - ffmpeg-kit-ios-audio (= 4.5.1)
   - FLEX (~> 4.5.0)
   - FlowCommoniOS (~> 1.12.0)
   - GBDeviceInfo (~> 6.6.0)
@@ -128,9 +122,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatomoTracker (~> 7.4.1)
-  - MatrixSDK (from `https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk`, tag `v0.24.0_bwi_dev`)
-  - MatrixSDK/JingleCallStack (from `https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk`, tag `v0.24.0_bwi_dev`)
+  - MatrixSDK (= 0.24.2)
+  - MatrixSDK/JingleCallStack (= 0.24.2)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -138,9 +131,10 @@ DEPENDENCIES:
   - Sentry (~> 7.15.0)
   - SideMenu (~> 6.5)
   - SwiftBase32 (~> 0.9.0)
-  - SwiftGen (~> 6.3)
+  - SwiftFormat/CLI
+  - SwiftGen
   - SwiftJWT (~> 3.6.200)
-  - SwiftLint (~> 0.44.0)
+  - SwiftLint
   - UICollectionViewLeftAlignedLayout (~> 1.0.2)
   - UICollectionViewRightAlignedLayout (~> 0.0.3)
   - WeakDictionary (~> 2.0)
@@ -158,8 +152,6 @@ SPEC REPOS:
     - DSWaveformImage
     - DTCoreText
     - DTFoundation
-    - DTTJailbreakDetection
-    - ffmpeg-kit-ios-audio
     - FLEX
     - FlowCommoniOS
     - GBDeviceInfo
@@ -173,7 +165,7 @@ SPEC REPOS:
     - libPhoneNumber-iOS
     - LoggerAPI
     - Logging
-    - MatomoTracker
+    - MatrixSDK
     - MatrixSDKCrypto
     - OLMKit
     - PostHog
@@ -183,6 +175,7 @@ SPEC REPOS:
     - Sentry
     - SideMenu
     - SwiftBase32
+    - SwiftFormat
     - SwiftGen
     - SwiftJWT
     - SwiftLint
@@ -197,17 +190,11 @@ EXTERNAL SOURCES:
   AnalyticsEvents:
     :branch: release/swift
     :git: https://github.com/matrix-org/matrix-analytics-events.git
-  MatrixSDK:
-    :git: https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk
-    :tag: v0.24.0_bwi_dev
 
 CHECKOUT OPTIONS:
   AnalyticsEvents:
     :commit: 53ad46ba1ea1ee8f21139dda3c351890846a202f
     :git: https://github.com/matrix-org/matrix-analytics-events.git
-  MatrixSDK:
-    :git: https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk
-    :tag: v0.24.0_bwi_dev
 
 SPEC CHECKSUMS:
   AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
@@ -220,8 +207,6 @@ SPEC CHECKSUMS:
   DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
   DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce
   DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536
-  DTTJailbreakDetection: 5e356c5badc17995f65a83ed9483f787a0057b71
-  ffmpeg-kit-ios-audio: 662ce2064e56733ca7d8216705efbc38d9e1c3fe
   FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
   FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: ed0db16230d2fa280e1cbb39a5a7f60f6946aaec
@@ -235,9 +220,8 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
-  MatrixSDK: 196ae670143c5169ca9d02ff4d4a87f1e4dd8f08
-  MatrixSDKCrypto: 4b9146d5ef484550341be056a164c6930038028e
+  MatrixSDK: 1b64384084050652fcffafdf8641200f1ab25060
+  MatrixSDKCrypto: dcab554bc7157cad31c01fc1137cf5acb01959a4
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -246,9 +230,10 @@ SPEC CHECKSUMS:
   Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7
   SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
   SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
+  SwiftFormat: 710117321c55c82675c0dc03055128efbb13c38f
   SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c
   SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae
-  SwiftLint: e96c0a8c770c7ebbc4d36c55baf9096bb65c4584
+  SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
   UICollectionViewLeftAlignedLayout: 830bf6fa5bab9f9b464f62e3384f9d2e00b3c0f6
   UICollectionViewRightAlignedLayout: 823eef8c567eba4a44c21bc2ffcb0d0d5f361e2d
@@ -256,6 +241,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 76f4286f10bb28fa143ae00ccb47a2bdd09e95a4
+PODFILE CHECKSUM: 96a971e076c61e54ae5bb7bf30ecba80563eeacf
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.11.2

Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -27,6 +27,14 @@
         "version" : "5.12.2"
       }
     },
+    {
+      "identity" : "matrix-wysiwyg-composer-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/matrix-org/matrix-wysiwyg-composer-swift",
+      "state" : {
+        "revision" : "d5ef7054fb43924d5b92d5d627347ca2bc333717"
+      }
+    },
     {
       "identity" : "ogg-swift",
       "kind" : "remoteSourceControl",

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

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

Riot/Assets/Images.xcassets/Authentication/authentication_qrlogin_confirm_icon.imageset/Secure connection.svg

@@ -0,0 +1,11 @@
+<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="70" height="70" rx="35" fill="#0DBD8B"/>
+<g clip-path="url(#clip0_432_24662)">
+<path d="M61.6666 34.9997C61.6666 33.533 60.4666 32.333 59 32.333H53.48C52.1733 23.293 44.4133 16.333 35 16.333C25.5866 16.333 17.8266 23.293 16.52 32.333H11C9.53331 32.333 8.33331 33.533 8.33331 34.9997C8.33331 36.4663 9.53331 37.6663 11 37.6663H16.52C17.8266 46.7063 25.5866 53.6663 35 53.6663C44.4133 53.6663 52.1733 46.7063 53.48 37.6663H59C60.4666 37.6663 61.6666 36.4663 61.6666 34.9997ZM43 41.6663C43 43.133 41.8 44.333 40.3333 44.333H29.6666C28.2 44.333 27 43.133 27 41.6663V33.6663C27 32.1997 28.2 30.9997 29.6666 30.9997V28.333C29.6666 25.1063 32.5466 22.5197 35.9066 23.0797C38.52 23.5063 40.3333 25.9597 40.3333 28.6263V30.9997C41.8 30.9997 43 32.1997 43 33.6663V41.6663ZM37 37.6663C37 38.7597 36.0933 39.6663 35 39.6663C33.9066 39.6663 33 38.7597 33 37.6663C33 36.573 33.9066 35.6663 35 35.6663C36.0933 35.6663 37 36.573 37 37.6663ZM37.6666 28.333V30.9997H32.3333V28.333C32.3333 26.8663 33.5333 25.6663 35 25.6663C36.4666 25.6663 37.6666 26.8663 37.6666 28.333Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_432_24662">
+<rect width="64" height="64" fill="white" transform="translate(3 3)"/>
+</clipPath>
+</defs>
+</svg>

Riot/Assets/Images.xcassets/Common/exclamation_circle.imageset/Contents.json

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

Riot/Assets/Images.xcassets/Common/exclamation_circle.imageset/exclamation_circle.svg

@@ -0,0 +1,3 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20 40C31.0457 40 40 31.0457 40 20C40 8.9543 31.0457 0 20 0C8.9543 0 0 8.9543 0 20C0 31.0457 8.9543 40 20 40ZM18.0843 14.6883C18.0072 13.8089 18.6552 13.0374 19.5346 12.9757C20.3986 12.914 21.17 13.562 21.2626 14.4414V14.6883L20.7689 20.8597C20.7226 21.4306 20.2443 21.8626 19.6735 21.8626H19.5809C19.0409 21.8163 18.6243 21.3997 18.578 20.8597L18.0843 14.6883ZM21.015 24.8868C21.015 25.6366 20.4071 26.2445 19.6573 26.2445C18.9075 26.2445 18.2996 25.6366 18.2996 24.8868C18.2996 24.1369 18.9075 23.5291 19.6573 23.5291C20.4071 23.5291 21.015 24.1369 21.015 24.8868Z" fill="white"/>
+</svg>

Riot/Assets/Images.xcassets/Composer/Bold.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Bold.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Bold@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Bold@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/Code.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Code.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Code@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Code@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/Indent_increase.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Indent increase.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Indent increase@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Indent increase@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/Italic.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Italic.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Italic@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Italic@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/Link.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Link.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Link@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Link@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/Numbered list.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Numbered list.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Numbered list@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Numbered list@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/Quote.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Quote.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Quote@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Quote@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/Strikethrough.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Strikethrough.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Strikethrough@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Strikethrough@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/Underlined.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Underlined.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Underlined@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Underlined@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/bullet_list.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Bullet list.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Bullet list@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Bullet list@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/indent_decrease.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Indent decrease.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Indent decrease@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Indent decrease@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/maximise_composer.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "maximise_composer.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "maximise_composer@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "maximise_composer@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/minimise_composer.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "minimise_composer.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "minimise_composer@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "minimise_composer@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Composer/start_compose_module.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "start_compose_module.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "start_compose_module@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "start_compose_module@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

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

Riot/Assets/Images.xcassets/DeviceManager/user_other_sessions_filter.imageset/user_other_sessions_filter.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 18H13C13.55 18 14 17.55 14 17C14 16.45 13.55 16 13 16H11C10.45 16 10 16.45 10 17C10 17.55 10.45 18 11 18ZM3 7C3 7.55 3.45 8 4 8H20C20.55 8 21 7.55 21 7C21 6.45 20.55 6 20 6H4C3.45 6 3 6.45 3 7ZM7 13H17C17.55 13 18 12.55 18 12C18 11.45 17.55 11 17 11H7C6.45 11 6 11.45 6 12C6 12.55 6.45 13 7 13Z" fill="#0DBD8B"/>
+</svg>

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

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

Riot/Assets/Images.xcassets/DeviceManager/user_other_sessions_filter_selected.imageset/user_other_sessions_filter_selected.svg

@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 6H4C3.45 6 3 6.45 3 7C3 7.55 3.45 8 4 8H13.3414C13.1203 7.37444 13 6.70127 13 6Z" fill="#0DBD8B"/>
+<path d="M15.6822 11C16.3676 11.4557 17.1521 11.7743 17.9965 11.9165C17.9988 11.944 18 11.9719 18 12C18 12.55 17.55 13 17 13H7C6.45 13 6 12.55 6 12C6 11.45 6.45 11 7 11H15.6822Z" fill="#0DBD8B"/>
+<path d="M11 18H13C13.55 18 14 17.55 14 17C14 16.45 13.55 16 13 16H11C10.45 16 10 16.45 10 17C10 17.55 10.45 18 11 18Z" fill="#0DBD8B"/>
+<path d="M19 9C20.6569 9 22 7.65685 22 6C22 4.34315 20.6569 3 19 3C17.3431 3 16 4.34315 16 6C16 7.65685 17.3431 9 19 9Z" fill="#0DBD8B"/>
+</svg>

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

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

Riot/Assets/Images.xcassets/DeviceManager/user_other_sessions_inactive.imageset/user_other_sessions_inactive.svg

@@ -0,0 +1,3 @@
+<svg width="12" height="20" viewBox="0 0 12 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 0C0.9 0 0 0.9 0 2L0.0100002 5.18C0.0100002 5.71 0.22 6.21 0.59 6.59L4 10L0.59 13.43C0.22 13.8 0.0100002 14.31 0.0100002 14.84L0 18C0 19.1 0.9 20 2 20H10C11.1 20 12 19.1 12 18V14.84C12 14.31 11.79 13.8 11.42 13.43L8 10L11.41 6.6C11.79 6.22 12 5.71 12 5.18V2C12 0.9 11.1 0 10 0H2ZM10 14.91V17C10 17.55 9.55 18 9 18H3C2.45 18 2 17.55 2 17V14.91C2 14.64 2.11 14.39 2.29 14.2L6 10.5L9.71 14.21C9.89 14.39 10 14.65 10 14.91Z" fill="#737D8C"/>
+</svg>

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

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

Riot/Assets/Images.xcassets/DeviceManager/user_other_sessions_unverified.imageset/user_other_sessions_unverified.svg

@@ -0,0 +1,5 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.21228 17.436C9.12341 17.4591 9.05182 17.4763 9 17.4883C8.94819 17.4763 8.87659 17.4591 8.78772 17.436C8.58344 17.3827 8.28861 17.2983 7.9335 17.175C7.22166 16.9279 6.27643 16.5277 5.33499 15.9158C3.45846 14.696 1.625 12.6603 1.625 9.30375V2.68082L9 0.521L16.375 2.68082V9.30375C16.375 12.6603 14.5415 14.696 12.665 15.9158C11.7236 16.5277 10.7783 16.9279 10.0665 17.175C9.71139 17.2983 9.41656 17.3827 9.21228 17.436Z" fill="#FF4B55" stroke="white"/>
+<path d="M1.125 9.30375V2.30625L9 0L16.875 2.30625V9.30375C16.875 16.4587 9 18 9 18C9 18 1.125 16.4587 1.125 9.30375Z" fill="#FF4B55"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.13964 6.05402C8.09745 5.57308 8.45183 5.15121 8.93276 5.11746C9.40526 5.08371 9.82714 5.43808 9.87776 5.91902V6.05402L9.60776 9.42902C9.58245 9.74121 9.32089 9.97746 9.0087 9.97746H8.95808C8.66276 9.95215 8.43495 9.72433 8.40964 9.42902L8.13964 6.05402ZM9.74171 11.6303C9.74171 12.0404 9.40929 12.3728 8.99921 12.3728C8.58914 12.3728 8.25671 12.0404 8.25671 11.6303C8.25671 11.2202 8.58914 10.8878 8.99921 10.8878C9.40929 10.8878 9.74171 11.2202 9.74171 11.6303Z" fill="white"/>
+</svg>

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

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

Riot/Assets/Images.xcassets/DeviceManager/user_other_sessions_verified.imageset/user_other_sessions_verified.svg

@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.125 9.30375V2.30625L9 0L16.875 2.30625V9.30375C16.875 16.4587 9 18 9 18C9 18 1.125 16.4587 1.125 9.30375Z" fill="#0DBD8B"/>
+<path d="M13.0617 5.10705C12.8592 4.8933 12.5217 4.88205 12.3079 5.08455L7.50415 9.58455L5.7379 8.34705C5.50165 8.18955 5.1754 8.18955 4.9504 8.39205C4.6804 8.61705 4.6579 9.02205 4.8829 9.29205L6.91915 11.6321C6.9529 11.6658 6.98665 11.7108 7.03165 11.7333C7.41415 12.0483 7.9879 11.9921 8.3029 11.6096L8.33665 11.5646L13.0842 5.8158C13.2417 5.6133 13.2417 5.30955 13.0617 5.10705Z" fill="white"/>
+</svg>

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

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

Riot/Assets/Images.xcassets/DeviceManager/user_session_list_item_inactive_session.imageset/user_session_list_item_inactive_session.svg

@@ -0,0 +1,3 @@
+<svg width="8" height="15" viewBox="0 0 8 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.33333 0.833984C0.6 0.833984 0 1.43398 0 2.16732L0.00666682 4.28732C0.00666682 4.64065 0.146667 4.97398 0.393333 5.22732L2.66667 7.50065L0.393333 9.78732C0.146667 10.034 0.00666682 10.374 0.00666682 10.7273L0 12.834C0 13.5673 0.6 14.1673 1.33333 14.1673H6.66667C7.4 14.1673 8 13.5673 8 12.834V10.7273C8 10.374 7.86 10.034 7.61333 9.78732L5.33333 7.50065L7.60667 5.23398C7.86 4.98065 8 4.64065 8 4.28732V2.16732C8 1.43398 7.4 0.833984 6.66667 0.833984H1.33333ZM6.66667 10.774V12.1673C6.66667 12.534 6.36667 12.834 6 12.834H2C1.63333 12.834 1.33333 12.534 1.33333 12.1673V10.774C1.33333 10.594 1.40667 10.4273 1.52667 10.3007L4 7.83398L6.47333 10.3073C6.59333 10.4273 6.66667 10.6007 6.66667 10.774Z" fill="#737D8C"/>
+</svg>

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_not_selected.imageset/user_session_list_item_not_selected.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 0.5C4.5 0.5 0 5 0 10.5C0 16 4.5 20.5 10 20.5C15.5 20.5 20 16 20 10.5C20 5 15.5 0.5 10 0.5ZM10 18.5C5.6 18.5 2 14.9 2 10.5C2 6.1 5.6 2.5 10 2.5C14.4 2.5 18 6.1 18 10.5C18 14.9 14.4 18.5 10 18.5Z" fill="#C1C6CD"/>
+</svg>

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/DeviceManager/user_session_list_item_selected.imageset/user_session_list_item_selected.svg

@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 0C4.5 0 0 4.5 0 10C0 15.5 4.5 20 10 20C15.5 20 20 15.5 20 10C20 4.5 15.5 0 10 0Z" fill="#0DBD8B"/>
+<path d="M4.54541 10.8887L7.80299 14.243L15.4545 6.36426" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

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

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "user_session_verification_unknown.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Riot/Assets/Images.xcassets/DeviceManager/user_session_verification_unknown.imageset/user_session_verification_unknown.svg

@@ -0,0 +1,4 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.75 6.2025V1.5375L6 0L11.25 1.5375V6.2025C11.25 10.9725 6 12 6 12C6 12 0.75 10.9725 0.75 6.2025Z" fill="#737D8C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.00166 8.25C6.2887 8.25 6.5214 8.01731 6.5214 7.73027C6.5214 7.44323 6.2887 7.21054 6.00166 7.21054C5.71462 7.21054 5.48193 7.44323 5.48193 7.73027C5.48193 8.01731 5.71462 8.25 6.00166 8.25ZM5.2796 4.91146C5.2796 4.51143 5.60417 4.1896 6.00145 4.1896C6.39757 4.1896 6.7233 4.51533 6.7233 4.91146C6.7233 5.09491 6.64483 5.16038 6.3357 5.37396C6.19873 5.4686 6.01087 5.60006 5.86459 5.79288C5.70801 5.99929 5.61165 6.25669 5.61165 6.58398H6.39125C6.39125 6.42367 6.43384 6.33241 6.48569 6.26406C6.54784 6.18213 6.6379 6.11274 6.77884 6.01536C6.79364 6.00514 6.80927 5.99451 6.82558 5.98341C7.08109 5.80962 7.50289 5.52273 7.50289 4.91146C7.50289 4.08477 6.82814 3.41 6.00145 3.41C5.17591 3.41 4.5 4.07857 4.5 4.91146H5.2796Z" fill="white"/>
+</svg>

Riot/Assets/Images.xcassets/Room/Actions/action_live.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "action_live.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Riot/Assets/Images.xcassets/Room/Actions/action_live.imageset/action_live.svg

@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.1893 4.18664C19.8502 3.7507 19.222 3.67216 18.786 4.01123C18.3505 4.34993 18.2717 4.97719 18.6095 5.41308L18.6102 5.41406L18.6112 5.41535L18.6249 5.43351C18.6381 5.45131 18.6595 5.48037 18.6877 5.52021C18.7444 5.59993 18.8286 5.72248 18.9313 5.88389C19.137 6.20722 19.415 6.68336 19.6938 7.28061C20.254 8.48115 20.7999 10.134 20.7999 12.0006C20.7999 13.8672 20.254 15.52 19.6938 16.7206C19.415 17.3178 19.137 17.7939 18.9313 18.1173C18.8286 18.2787 18.7444 18.4012 18.6877 18.481C18.6595 18.5208 18.6381 18.5499 18.6249 18.5677L18.6112 18.5858L18.6102 18.5871L18.6093 18.5883C18.2717 19.0241 18.3506 19.6513 18.786 19.9899C19.222 20.329 19.8502 20.2505 20.1893 19.8145L19.444 19.2349C20.1893 19.8145 20.1893 19.8145 20.1893 19.8145L20.1913 19.812L20.1942 19.8082L20.2025 19.7974L20.2289 19.7622C20.2508 19.7328 20.2811 19.6915 20.3184 19.639C20.393 19.5339 20.4963 19.3832 20.6186 19.191C20.8629 18.8072 21.1849 18.2548 21.5061 17.5663C22.1459 16.1954 22.7999 14.2483 22.7999 12.0006C22.7999 9.75288 22.1459 7.80573 21.5061 6.43484C21.1849 5.74638 20.8629 5.19394 20.6186 4.81014C20.4963 4.61797 20.393 4.46731 20.3184 4.36221C20.2811 4.30963 20.2508 4.26839 20.2289 4.23898L20.2025 4.20377L20.1942 4.19292L20.1913 4.18921L20.1902 4.18778C20.1902 4.18778 20.1893 4.18664 19.3999 4.80058L20.1893 4.18664Z" fill="#0DBD8B"/>
+<path d="M17.5902 7.78686C17.2511 7.35091 16.6228 7.27238 16.1869 7.61145C15.7521 7.94964 15.6728 8.57552 16.0088 9.01132L16.0123 9.0159C16.0167 9.02189 16.0252 9.03338 16.0371 9.05012C16.0609 9.08363 16.0982 9.13788 16.1447 9.21089C16.2379 9.35744 16.3659 9.57643 16.4946 9.85226C16.7549 10.4099 17.0008 11.1628 17.0008 12.0008C17.0008 12.8388 16.7549 13.5917 16.4946 14.1493C16.3659 14.4252 16.2379 14.6442 16.1447 14.7907C16.0982 14.8637 16.0609 14.918 16.0371 14.9515C16.0252 14.9682 16.0167 14.9797 16.0123 14.9857L16.0088 14.9903C15.6728 15.4261 15.7521 16.052 16.1869 16.3902C16.6228 16.7292 17.2511 16.6507 17.5902 16.2147L16.8008 15.6008C17.5902 16.2147 17.5902 16.2147 17.5902 16.2147L17.592 16.2125L17.5942 16.2096L17.5999 16.2021L17.6163 16.1802C17.6295 16.1626 17.6468 16.139 17.6677 16.1095C17.7095 16.0506 17.766 15.9682 17.832 15.8645C17.9637 15.6574 18.1357 15.3621 18.307 14.9951C18.6468 14.2671 19.0008 13.2199 19.0008 12.0008C19.0008 10.7817 18.6468 9.73452 18.307 9.00649C18.1357 8.63946 17.9637 8.34416 17.832 8.13714C17.766 8.03337 17.7095 7.95101 17.6677 7.89211C17.6468 7.86264 17.6295 7.83897 17.6163 7.82137L17.5999 7.7995L17.5942 7.79202L17.592 7.78915L17.591 7.78793C17.591 7.78793 17.5902 7.78686 16.8008 8.4008L17.5902 7.78686Z" fill="#0DBD8B"/>
+<path d="M3.6105 19.8145C3.94957 20.2504 4.57785 20.3289 5.0138 19.9899C5.44926 19.6512 5.52809 19.0239 5.19033 18.588L5.18957 18.587L5.18859 18.5857L5.17495 18.5676C5.16169 18.5498 5.14035 18.5207 5.11206 18.4809C5.05545 18.4012 4.97123 18.2786 4.86852 18.1172C4.66276 17.7939 4.38476 17.3177 4.10604 16.7205C3.54579 15.5199 2.99986 13.8671 2.99986 12.0005C2.99986 10.1339 3.54579 8.48109 4.10604 7.28055C4.38476 6.68329 4.66276 6.20716 4.86852 5.88382C4.97123 5.72242 5.05545 5.59986 5.11206 5.52014C5.14035 5.48031 5.16169 5.45124 5.17495 5.43344L5.18859 5.41529L5.18957 5.414L5.19047 5.41283C5.52808 4.97695 5.4492 4.34981 5.0138 4.01117C4.57785 3.6721 3.94957 3.75063 3.6105 4.18658L4.35576 4.76622C3.6105 4.18659 3.6105 4.18658 3.6105 4.18658L3.60851 4.18914L3.60565 4.19286L3.59735 4.20371L3.57086 4.23891C3.54896 4.26832 3.51874 4.30957 3.4814 4.36214C3.40676 4.46725 3.30348 4.61791 3.18119 4.81007C2.93695 5.19388 2.61495 5.74632 2.29367 6.43478C1.65393 7.80566 0.999856 9.75282 0.999856 12.0005C0.999856 14.2482 1.65393 16.1954 2.29367 17.5663C2.61495 18.2547 2.93695 18.8072 3.18119 19.191C3.30348 19.3831 3.40676 19.5338 3.4814 19.6389C3.51874 19.6915 3.54896 19.7327 3.57086 19.7621L3.59735 19.7973L3.60565 19.8082L3.60851 19.8119L3.60962 19.8133C3.60962 19.8133 3.6105 19.8145 4.39986 19.2005L3.6105 19.8145Z" fill="#0DBD8B"/>
+<path d="M6.20962 16.2142C6.5487 16.6502 7.17697 16.7287 7.61292 16.3896C8.04773 16.0515 8.12699 15.4256 7.79098 14.9898L7.78754 14.9852C7.78308 14.9792 7.77463 14.9677 7.76274 14.951C7.73894 14.9175 7.7016 14.8632 7.65514 14.7902C7.56188 14.6437 7.43388 14.4247 7.30516 14.1488C7.04491 13.5912 6.79898 12.8383 6.79898 12.0003C6.79898 11.1623 7.04491 10.4094 7.30516 9.85175C7.43388 9.57593 7.56188 9.35694 7.65514 9.21039C7.7016 9.13737 7.73894 9.08312 7.76274 9.04961C7.77463 9.03288 7.78308 9.02139 7.78754 9.01539L7.79099 9.01081C8.12699 8.575 8.04772 7.94913 7.61292 7.61095C7.17697 7.27188 6.5487 7.35041 6.20962 7.78636L6.99898 8.4003C6.20962 7.78636 6.20962 7.78636 6.20962 7.78636L6.20785 7.78864L6.20564 7.79151L6.19991 7.799L6.18346 7.82086C6.17034 7.83847 6.15302 7.86214 6.13209 7.89161C6.09026 7.95051 6.03385 8.03286 5.96781 8.13664C5.83607 8.34366 5.66408 8.63895 5.49279 9.00598C5.15305 9.73401 4.79898 10.7812 4.79898 12.0003C4.79898 13.2194 5.15305 14.2666 5.49279 14.9946C5.66408 15.3616 5.83607 15.6569 5.96781 15.864C6.03385 15.9677 6.09026 16.0501 6.13209 16.109C6.15302 16.1385 6.17034 16.1621 6.18346 16.1797L6.19991 16.2016L6.20564 16.2091L6.20785 16.212L6.2088 16.2132C6.2088 16.2132 6.20962 16.2142 6.99898 15.6003L6.20962 16.2142Z" fill="#0DBD8B"/>
+<circle cx="12" cy="12" r="2" fill="#0DBD8B"/>
+</svg>

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"
     }