Merge branch 'feature/6847_changelog' into 'hotfix/v2.23.1'

Feature/6847 changelog

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!421

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: true
 contact_links:
   - name: Enhancement or feature request
-    url: https://github.com/vector-im/element-meta/discussions/categories/ideas
+    url: https://github.com/element-hq/element-meta/discussions/categories/ideas
     about: Do you have a suggestion or feature request?
   - name: Element iOS Community Support
     url: https://matrix.to/#/#element-ios:matrix.org

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### Pull Request Checklist
 
-- [ ] I read the [contributing guide](https://github.com/vector-im/element-ios/blob/develop/CONTRIBUTING.md)
+- [ ] I read the [contributing guide](https://github.com/element-hq/element-ios/blob/develop/CONTRIBUTING.md)
 - [ ] UI change has been tested on both light and dark themes, in portrait and landscape orientations and on iPhone and iPad simulators
 - [ ] Accessibility has been taken into account.
 * [ ] Pull request is based on the develop branch

.github/workflows/ci-build.yml

@@ -15,12 +15,14 @@ env:
 jobs:
   build:
     name: Build
-    runs-on: macos-12
+    runs-on: macos-14
     
     # Concurrency group not needed as this workflow only runs on develop which we always want to test.
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+            submodules: 'true'
 
       # Common cache
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
@@ -49,8 +51,6 @@ jobs:
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
-      - name: Use right MatrixSDK versions
-        run: bundle exec fastlane point_dependencies_to_related_branches
 
       # Main step
       - name: Build iOS simulator

.github/workflows/ci-tests.yml

@@ -16,7 +16,7 @@ env:
 jobs:
   tests:
     name: Tests
-    runs-on: macos-12
+    runs-on: macos-14
     
     concurrency:
       # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
@@ -25,7 +25,9 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+            submodules: 'true'
 
       # Common cache
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
@@ -54,14 +56,13 @@ jobs:
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
-      - name: Use right MatrixSDK versions
-        run: bundle exec fastlane point_dependencies_to_related_branches
 
       # Main step
       - name: Unit tests
         run: bundle exec fastlane test
       
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           flags: unittests

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

@@ -12,7 +12,7 @@ env:
 jobs:
   tests:
     name: UI Tests
-    runs-on: macos-12
+    runs-on: macos-14
     
     concurrency:
       # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
@@ -20,7 +20,9 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+            submodules: 'true'
 
       # Common cache
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
@@ -49,15 +51,13 @@ jobs:
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
-      - name: Use right MatrixSDK versions
-        run: bundle exec fastlane point_dependencies_to_related_branches
 
       # Main step
       - name: UI tests
         run: bundle exec fastlane uitest
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           flags: uitests
-        

.github/workflows/release-alpha.yml

@@ -17,7 +17,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'Trigger-PR-Build')
 
     name: Release
-    runs-on: macos-12
+    runs-on: macos-14
     
     concurrency:
       # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
@@ -25,7 +25,9 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+            submodules: 'true'
 
       # Common cache
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
@@ -57,8 +59,6 @@ jobs:
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
-      - name: Use right MatrixSDK versions
-        run: bundle exec fastlane point_dependencies_to_related_branches
 
       # Import alpha release private signing certificate
       - name: Import signing certificate

.github/workflows/sonarcloud.yml

@@ -18,14 +18,14 @@ jobs:
       - name: Analyze with SonarCloud         
 
         # You can pin the exact commit or the version.
-        uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049
+        uses: SonarSource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}   # Generate the token on Sonarcloud.io, add it to the secrets of this repo
         with:
           # Additional arguments for the sonarcloud scanner
           args:
-            -Dsonar.projectKey=vector-im_element-ios
-            -Dsonar.organization=new_vector_ltd_organization
+            -Dsonar.projectKey=element-ios
+            -Dsonar.organization=element-hq
             -Dsonar.inclusions=RiotSwiftUI/**
             # For more info about the parameters, please refer to https://docs.sonarcloud.io/advanced-setup/analysis-parameters/

.github/workflows/triage-incoming.yml

@@ -1,37 +0,0 @@
-name: Move new issues onto Issue triage board
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  automate-project-columns:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
-        with:
-          project: Issue triage
-          column: Incoming
-          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  add_to_triage:
-    runs-on: ubuntu-latest
-    if: >
-      github.repository == 'vector-im/element-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 }}

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

@@ -30,17 +30,6 @@ jobs:
               labels: ['Z-Labs']
             })
 
-  move_needs_info_issues:
-    name: X-Needs-Info issues to Need info column on triage board
-    runs-on: ubuntu-latest
-    steps:
-      - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
-        with:
-          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-          project-url: "https://github.com/vector-im/element-ios/projects/12"
-          column-name: "Need info"
-          label-name: "X-Needs-Info"
-
   add_priority_design_issues_to_project:
     name: P1 X-Needs-Design to Design project board
     runs-on: ubuntu-latest
@@ -55,7 +44,7 @@ jobs:
     steps:
       - uses: actions/add-to-project@main
         with:
-          project-url: https://github.com/orgs/vector-im/projects/18
+          project-url: https://github.com/orgs/element-hq/projects/18
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   add_product_issues_to_project:
@@ -66,66 +55,5 @@ jobs:
     steps:
       - uses: actions/add-to-project@main
         with:
-          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: actions/add-to-project@main
-        with:
-          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
-    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: actions/add-to-project@main
-        with:
-          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
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
-      contains(github.event.issue.labels.*.name, 'A-Broadcast')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          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: actions/add-to-project@main
-        with:
-          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: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/41
+          project-url: https://github.com/orgs/element-hq/projects/28
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

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

@@ -1,61 +0,0 @@
-name: Move unlabelled from needs info columns to triaged
-
-on:
-  issues:
-    types: [unlabeled]
-    
-jobs:
-  Move_Unabeled_Issue_On_Project_Board:
-    name: Move no longer X-Needs-Info issues to Triaged
-    runs-on: ubuntu-latest
-    if: >
-        ${{
-        !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
-    env:
-      BOARD_NAME: "Issue triage"
-      OWNER: ${{ github.repository_owner }}
-      REPO: ${{ github.event.repository.name }}
-      ISSUE: ${{ github.event.issue.number }}
-    steps:
-      - name: Check if issue is already in "${{ env.BOARD_NAME }}"
-        run: |
-          if curl -i -H 'Content-Type: application/json' -H "Authorization: bearer ${{ secrets.GITHUB_TOKEN }}" -X POST -d '{"query": "query($issue: Int!, $owner: String!, $repo: String!) { repository(owner: $owner, name: $repo) { issue(number: $issue) { projectCards { nodes { project { name } } } } } } ", "variables" : "{ \"issue\": '${ISSUE}', \"owner\": \"'${OWNER}'\", \"repo\": \"'${REPO}'\" }" }' https://api.github.com/graphql | grep "\b$BOARD_NAME\b"; then
-            echo "Issue is already in Project '$BOARD_NAME', proceeding";
-            echo "ALREADY_IN_BOARD=true" >> $GITHUB_ENV
-          else
-            echo "Issue is not in project '$BOARD_NAME', cancelling this workflow"
-            echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
-          fi
-      - name: Move issue
-        uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
-        if: ${{ env.ALREADY_IN_BOARD == 'true' }}
-        with:
-          project: Issue triage
-          column: Triaged
-          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  remove_Z-Labs_label:
-    name: Remove Z-Labs label when features behind labs flags are removed
-    runs-on: ubuntu-latest
-    if: >
-        !(contains(github.event.issue.labels.*.name, 'A-Maths') || 
-        contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
-        contains(github.event.issue.labels.*.name, 'A-Threads') ||
-        contains(github.event.issue.labels.*.name, 'A-Polls') ||
-        contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-        contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
-        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, 'Z-Labs')
-    steps:
-      - uses: actions/github-script@v5
-        with:
-          script: |
-            github.rest.issues.removeLabel({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              name: ['Z-Labs']
-            })

.github/workflows/triage-review-requests.yml

@@ -14,7 +14,7 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             query find_team_members($team: String!) {
-              organization(login: "vector-im") {
+              organization(login: "element-hq") {
                 team(slug: $team) {
                   members {
                     nodes {
@@ -81,7 +81,7 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             query find_team_members($team: String!) {
-              organization(login: "vector-im") {
+              organization(login: "element-hq") {
                 team(slug: $team) {
                   members {
                     nodes {

.gitmodules

@@ -0,0 +1,3 @@
+# [submodule "matrix-ios-sdk"]
+#	path = matrix-ios-sdk
+#	url = git@github.com:matrix-org/matrix-ios-sdk.git

BroadcastUploadExtension/SupportingFiles/PrivacyInfo.xcprivacy

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>1C8F.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>7D9E.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>3D61.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>

BroadcastUploadExtension/target.yml

@@ -38,5 +38,6 @@ targets:
     sources:
     - path: .
     - path: ../Config/BuildSettings.swift
+    - path: ../Config/MDMSettings.swift
     - path: ../Riot/Categories/Bundle.swift
     - path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift

CHANGES.md

@@ -1,3 +1,197 @@
+## Changes in 1.11.19 (2024-10-15)
+
+No significant changes.
+
+
+## Changes in 1.11.18 (2024-09-17)
+
+🙌 Improvements
+
+- Replaced deprecated OlmKit APIs from ContentScanner with ones from the CryptoSDK.
+
+
+## Changes in 1.11.17 (2024-08-20)
+
+🙌 Improvements
+
+- Check power level before starting live sharing location ([#7808](https://github.com/element-hq/element-ios/pull/7808))
+
+
+## Changes in 1.11.16 (2024-07-23)
+
+No significant changes.
+
+
+## Changes in 1.11.15 (2024-06-18)
+
+No significant changes.
+
+
+## Changes in 1.11.14 (2024-06-17)
+
+🙌 Improvements
+
+- Room retention event implementation ([#7809](https://github.com/element-hq/element-ios/pull/7809))
+
+
+## Changes in 1.11.13 (2024-06-12)
+
+Others
+
+- Analytics | Add support for super properties and appPlatform ([#7801](https://github.com/element-hq/element-ios/issues/7801))
+
+
+## Changes in 1.11.12 (2024-05-30)
+
+🐛 Bugfixes
+
+- Fix a crash when the user taps play multiple times and the video download fails. ([#7791](https://github.com/element-hq/element-ios/issues/7791))
+
+
+## Changes in 1.11.11 (2024-05-29)
+
+No significant changes.
+
+
+## Changes in 1.11.10 (2024-05-01)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.7)).
+
+Others
+
+- Improvements to reporting of decryption failures.
+
+
+## Changes in 1.11.9 (2024-04-02)
+
+Others
+
+- Update matrix-analytics-events to version 0.15.0 ([#7768](https://github.com/element-hq/element-ios/pull/7768))
+- Upgrade to build with Xcode 15.2
+- Add a privacy manifest
+
+
+## Changes in 1.11.8 (2024-03-05)
+
+🙌 Improvements
+
+- Disable the mark as unread feature to avoid it clashing with the new MSC2876 based one ([#7758](https://github.com/element-hq/element-ios/pull/7758))
+
+🐛 Bugfixes
+
+- Fix a bug where QR codes aren't detected if the camera is too close. ([#7762](https://github.com/element-hq/element-ios/pull/7762))
+- Fix dictation when using the Rich Text Editor ([#7752](https://github.com/element-hq/element-ios/issues/7752))
+
+
+## Changes in 1.11.7 (2024-02-07)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.6)).
+
+🐛 Bugfixes
+
+- Fix swapped accessibility label between strikethrough and underline format buttons in RTE. ([#7743](https://github.com/element-hq/element-ios/pull/7743))
+
+
+## Changes in 1.11.6 (2024-01-09)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.5)).
+
+🧱 Build
+
+- Update CocoaPods and other gems. ([#7720](https://github.com/element-hq/element-ios/pull/7720))
+
+
+## Changes in 1.11.5 (2023-11-28)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.4)).
+- Upgrade Rich Text Editor version. ([v2.18.0](https://github.com/matrix-org/matrix-rich-text-editor/releases/tag/2.18.0))
+
+🐛 Bugfixes
+
+- Call destroy in dealloc to remove all observers of SettingsViewController ([#7697](https://github.com/vector-im/element-ios/pull/7697))
+- Editing a message that ends with an emoji now works as expected. ([#7681](https://github.com/vector-im/element-ios/issues/7681))
+- The "Quote" action has been removed from the menu of the selected message. ([#7691](https://github.com/vector-im/element-ios/issues/7691))
+- The slide to end call for everyone button for the Jitsi widget now also ends the call for the current user. ([#7704](https://github.com/vector-im/element-ios/issues/7704))
+- If a Jitsi call in a room is ongoing when the Jitsi widget is removed from such room the call ends. ([#7706](https://github.com/vector-im/element-ios/issues/7706))
+- If a moderator ends a Jitsi call for everyone the call is now dismissed. ([#7709](https://github.com/vector-im/element-ios/issues/7709))
+
+⚠️ API Changes
+
+- Drop support for iOS 14, raising the deployment target to iOS 15 to support the latest Rich Text Editor version. ([#7711](https://github.com/vector-im/element-ios/pull/7711))
+
+
+## Changes in 1.11.4 (2023-10-04)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.3](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.3)).
+- Allow the use of Jitsi for 1:1 calls via a well-known configuration flag. ([#7684](https://github.com/vector-im/element-ios/issues/7684))
+
+
+## Changes in 1.11.3 (2023-09-13)
+
+🐛 Bugfixes
+
+- Show OIDC account management UI using embedded browser instead of system browser. ([#7671](https://github.com/vector-im/element-ios/issues/7671))
+- Hide Sign Out X/All Sessions buttons in the Device Manager when using OIDC. ([#7672](https://github.com/vector-im/element-ios/issues/7672))
+
+
+## Changes in 1.11.2 (2023-09-12)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.2)).
+
+🐛 Bugfixes
+
+- Fix an issue where rooms were not correctly sorted after forwarding a message. ([#7641](https://github.com/vector-im/element-ios/issues/7641))
+- Add phone number UI and explanatory text is hidden if the 3 pid changes capability is disabled. ([#7670](https://github.com/vector-im/element-ios/issues/7670))
+
+
+## Changes in 1.11.1 (2023-08-29)
+
+✨ Features
+
+- New settings cell to manage your account through MAS if the home server allows it. ([#7653](https://github.com/vector-im/element-ios/issues/7653))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.1)).
+
+🐛 Bugfixes
+
+- Prevent mention crashes when room members are missing display names (objc interop) ([#7649](https://github.com/vector-im/element-ios/pull/7649))
+- Add email UI is hidden if the 3 pid changes capability is disabled. ([#7645](https://github.com/vector-im/element-ios/issues/7645))
+- You can now log out from other sessions using MAS on supported OIDC home servers. ([#7646](https://github.com/vector-im/element-ios/issues/7646))
+- Deactivate account is hidden for servers with OIDC auth. ([#7648](https://github.com/vector-im/element-ios/issues/7648))
+- Prevent pill crashes when room members are missing display names (objc interop) ([#7651](https://github.com/vector-im/element-ios/issues/7651))
+
+
+## Changes in 1.11.0 (2023-08-15)
+
+✨ Features
+
+- Integrate Device Dehydration v2 through the Crypto SDK ([#7630](https://github.com/vector-im/element-ios/pull/7630))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.0)).
+- Disable Siri, Share and Reply (from NSE) Extensions. ([#7618](https://github.com/vector-im/element-ios/issues/7618))
+
+🐛 Bugfixes
+
+- Fix bug in SSO URL generation that was non-compliant with the spec. ([#7639](https://github.com/vector-im/element-ios/pull/7639))
+- Fix a crash when opening v11 rooms. ([#7633](https://github.com/vector-im/element-ios/issues/7633))
+
+
 ## Changes in 1.10.14 (2023-06-21)
 
 🙌 Improvements

CHANGES_BWI.md

@@ -1,3 +1,440 @@
+Changes in BWI project 2.23.1 (2025-01-08)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+
+Improvements 🙌:
+- MESSENGER-6727 replace makesalt with a more secure function
+- MESSENGER-6846 save sensible data in app space
+
+Bugfix 🐛:
+- MESSENGER-6726 force logout in case of incorrect pin
+
+Translations 🗣   :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Documentation 📄:
+
+Changes in BWI project 2.23.0 (2024-11-04)
+===================================================
+
+Upstream merge ✨:
+- v1.11.19
+
+Features ✨:
+- MESSNEGER-6570 show happy birthday popup
+- MESSENGER-6595 add hash
+- MESSENGER-6542 change appearance of matomo alert
+
+Improvements 🙌:
+
+Bugfix 🐛:
+- MESSENGER-6440 security fix - removed unused library OLMKit 
+- MESSENGER-6687 fix token fetching
+
+Translations 🗣   :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Documentation 📄:
+
+Changes in BWI project 2.22.0 (2024-10-08)
+===================================================
+
+Upstream merge ✨:
+- v1.11.18
+
+Features ✨:
+- MESSENGER-6522 add hash
+
+Improvements 🙌:
+- MESSENGER-6526 clarify what happens to room if last room member leaves
+- MESSENGER-5783 clarify last room member with open invites
+
+Bugfix 🐛:
+- MESSENGER-6393 fix permalink pill for messages
+- MESSENGER-6348 fix invite notifications
+
+Translations 🗣   :
+
+SDK API changes ⚠️:
+- MESSENGER-6076 disable room message retention
+
+Build 🧱:
+- MESSENGER-6377 Use match for apple certificates
+
+Documentation 📄:
+
+Changes in BWI project 2.21.0 (2024-08-09)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+- MESSENGER-6162 add server selection protection with jwt
+- MESSENGER-6273 add hash
+- MESSENGER-6236 add hash
+- MESSENGER-6229 add hash
+- MESSENGER-6372 add hash
+
+Improvements 🙌:
+
+Bugfix 🐛:
+- MESSENGER-5896 disable periodic maintenance on logout
+- MESSENGER-4172 use fixed sdk version
+- MESSENGER-4172 read message marker
+
+Translations 🗣   :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+- MESSENGER-6243 change ci runner
+
+Documentation 📄:
+- MESSENGER-MESSENGER new license file
+
+Changes in BWI project 2.20.0 (2024-07-04)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+
+Improvements 🙌:
+- MESSENGER-6171 federated rooms are indicated is visible on invitation screens
+- MESSENGER-6103 Nicer store grafics
+
+Bugfix 🐛:
+- MESSENGER-6173 Status events at room creation are visible again
+- MESSENGER-6138 Exiting the app on first start does not cause passphrase generation to be skipped
+- MESSENGER-6152 Fix crash on muting a user
+- MESSENGER-5716 Fix error messages when entering a room that is no longer federated
+- MESSENGER-6019 Fix eeor message when following a permalink to a message that can't be unencrypted because the user was not part of the room at that time
+
+Translations 🗣   :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+- MESSENGER-6142 Removed some unused libraries (posthog, sentry, jitsi)
+
+Changes in BWI project 2.19.0 (2024-06-03)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+
+Improvements 🙌:
+- Alligne timeout information text with other platforms for simplified login (disabled) (#6018)
+
+Bugfix 🐛:
+- Fix multiple permalink bugs (#6019)
+- Fix feature banner not visible has not joined a room yet (#6114)
+
+Translations 🗣   :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.18.0 (2024-05-03)
+===================================================
+
+Upstream merge ✨:
+- v1.11.9
+
+Features ✨:
+
+Improvements 🙌:
+- Add save alert for changing users avatar (#5799)
+- Change matomo alert text (#5829)
+
+Bugfix 🐛:
+- Fixed a crash when trying to add system errors to matrix error list (#5950)
+- Fix picture selection for simulators (#5872)
+- Fix button font in dark mode (#5999)
+- Deactivate save button for functions if no text is provided (#5791)
+
+Translations 🗣   :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+- Use XCode 15 for builds (#5948)
+- Parallelized builds (#5761)
+
+Changes in BWI project 2.17.0 (2024-04-11)
+===================================================
+
+Upstream merge ✨:
+- v1.11.8
+
+Features ✨:
+- Simplified login (disabled) (#5145)
+- Federation announcement in new feature banner (#5458)
+
+Improvements 🙌:
+- Activate federation support with well-known (#5892)
+- Reveal lab settings with hidden gesture (#5938)
+- Use new text for unknown and remove filename for size (#5793)
+
+Bugfix 🐛:
+- Disable slash commands in old composer (#5951)
+- Deleted location sharing events were shown as live location (#5806)
+- Maintenance requests sometimes not handled in sync (#5556)
+
+Translations 🗣   :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.16.0 (2024-03-13)
+===================================================
+
+Upstream merge ✨:
+- v1.11.6
+
+Features ✨:
+- Use new iOS Fotopicker (#5365)
+
+Improvements 🙌:
+- Federation Announcement (#5706)
+- Federation explanation for avatars (disabled) (#5610)
+- Federation Introduction (disabled) (#5660)
+- Show ACL related status events in timeline (disabled) (#5575)
+- Matomo Events for federation (disabled) (#5393)
+- Success message when federating a room (disabled) (#5578)
+- Remove "Remind later" Button from alert for unfederated rooms (#5715)
+- Better text for passphrase reset (#5595)
+- disallow http (#5759)
+- Better keybackup UI (#5668)
+- Better Readme (#5734)
+- Change composer default to old composer (bwm only) (#5768)
+
+Bugfix 🐛:
+- Room and user Avatars without borders (#5697)
+- Remove federation status from invites (#5715)
+- Fix Links to answers leading out of the app (#5603)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.15.0 (2024-02-13)
+===================================================
+
+Upstream merge ✨:
+- v1.11.6
+
+Features ✨:
+- Added federation decision view for old rooms (disabled) (#5304)
+
+Improvements 🙌:
+- Changed layout position of matrix id in user search (#5205)
+- Mark federated users when joining / leaving rooms (disabled) (#5290)
+- Added federation in timeline (disabled) (#5223)
+- Added federation in timeline header (disabled) (#5226)
+- No federated admins (disabled) (#5381)
+- Added federation info about users in member search (disabled) (#5300)
+- Users can only be invited to a room if acl is set (disabled) (#5386)
+- Check alias when acl settings are changed (disabled) (#5383)
+- Use the latest avatar in timeline (#5506)
+
+Bugfix 🐛:
+- Swipe gesture for removing room members from a room have been removed (#5671)
+- Fix multiple notes rooms (#5740)
+- Fix permalink prefix (#5158)
+- Fix ACL json (disabled) (#5681)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.14.0 (2024-01-16)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+- Change federation setting in room settings (disabled) (#5410)
+- Change fedration setting on room creation (disabled) (#4846)
+
+Improvements 🙌:
+- Federation info about users in member details (disabled) (#5204)
+
+Bugfix 🐛:
+- Better handling of permalink prefix on testservers (#5158)
+- Outdated app versions shown as pop up (#5276)
+- Copyright claims for location sharing set correctly from style.json (#5279)
+- Corrected appstore link for app version popup (#5276)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+- Enable Renovate
+- Fix Sonarcube warnings
+
+Changes in BWI project 2.12.1 (2023-12-11)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+
+Improvements 🙌:
+- Ability to call SSO over browsers via MDM (#5316, #5308)
+- Crosssigning request is now triggered by a button (#5271)
+- UI Update for server display in login view (+5319s)
+
+Bugfix 🐛:
+- Fix half shown button in room list for new user (#5307)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.12.0 (2023-11-21)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+
+Improvements 🙌:
+- Layout changes OIDC login (#5033)
+- Added restore key backup in settings (#5184)
+- Added federation icons for beta app (#5203, #5208, #5220)
+- Remove grey shield (#5236)
+- Tracking of decryption duration (#5265)
+
+Bugfix 🐛:
+- Fix empty chat bubble (#5297)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.11.0 (2023-10-24)
+===================================================
+
+Upstream merge ✨:
+- v1.11.4
+
+Features ✨:
+
+Improvements 🙌:
+- Corrected behaviour on errors in maintenance (#5031)
+- Tracking of Rust encryption errors with matomo (#4956)
+- Tracking of room size dimension for encryption errors (#4821)
+- Use content scanner upload size correctly for all file types (#4433)
+
+Bugfix 🐛:
+- Crashfix notes room favorite check (#5240)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.10.0 (2023-09-26)
+===================================================
+
+Upstream merge ✨:
+- v1.11.1
+
+Features ✨:
+- New WYSIWYG composer (#4941)
+
+Improvements 🙌:
+- UI optimization room overview (#4704, #4806)
+- Change date format for poll details (#4798)
+- Add additional information to the developer menu for Beta app (#4565)
+- Update huddle permissions for new rooms (#4928)
+- Update element call permissions when resetting room permissions (#5035)
+- Disable all WYSIWYG commands (#4955)
+- Change date format for maintenance to ISO-8601 (#5071)
+- Update notes room layout in room overview (#4802)
+- Enable/disable notes room in settings (#4730)
+
+Bugfix 🐛:
+- Crashfix for dm creation when WYSIWYG composer is enabled (#5133)
+- Change permalink URL scheme (#4910)
+- No popup for successful password change (#4951)
+
+Translations 🗣  :
+- German translations voice message (#5017)
+- German translations wrong password (#4857)
+- Add special characters for password creation/resetting (#4952)
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.9.1 (2023-09-08)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+
+Improvements 🙌:
+
+Bugfix 🐛:
+- Maintenance Popup on server selection (#5130)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.9.0 (2023-08-31)
+===================================================
+
+Upstream merge ✨:
+
+- v1.10.14
+
+Features ✨:
+
+Improvements 🙌:
+- Maintenance fixes (#4979, #4976)
+- Maintenance ignore blocking (#4982)
+- Maintenance adhoc messages (#4295)
+- Maintenance time zone change (#5071)
+- Huddle set correct rights (#5035, #4928)
+
+Bugfix 🐛:
+- Crosssigning web
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+
 Changes in BWI project 2.8.0 (2023-08-03)
 ===================================================
 

CONTRIBUTING.md

@@ -7,7 +7,7 @@ Please read the matrix-ios-sdk [contributing guide](https://github.com/matrix-or
 ## I want to help translating
 
 If you want to fix an issue for an English string, please submit a pull request to the Element iOS GitHub repository.
-If you want to fix an issue for another language, add a missing translation, or  add a new language, please read [Element Web translating guide](https://github.com/vector-im/element-web/blob/develop/docs/translating.md) first and then use the Element iOS [Weblate](https://translate.riot.im/projects/riot-ios/).
+If you want to fix an issue for another language, add a missing translation, or  add a new language, please read [Element Web translating guide](https://github.com/element-hq/element-web/blob/develop/docs/translating.md) first and then use the Element iOS [Weblate](https://translate.riot.im/projects/riot-ios/).
 
 If you have any question regarding translations please ask in [Element Translation room](https://matrix.to/#/#element-translations:matrix.org).
 
@@ -26,7 +26,7 @@ Otherwise please have a look to [Apple Swift conventions](https://swift.org/docu
 
 ## Pull request
 
-When you are making a pull request please read carefully the [Pull Request Checklist](https://github.com/vector-im/element-ios/blob/develop/.github/PULL_REQUEST_TEMPLATE.md).
+When you are making a pull request please read carefully the [Pull Request Checklist](https://github.com/element-hq/element-ios/blob/develop/.github/PULL_REQUEST_TEMPLATE.md).
 
 ## Thanks
 

CommonKit/CommonKit.h

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 #import <Foundation/Foundation.h>

CommonKit/Source/UserIndicators/Tests/UserIndicatorPresenterSpy.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

CommonKit/Source/UserIndicators/Tests/UserIndicatorQueueTests.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

CommonKit/Source/UserIndicators/Tests/UserIndicatorTests.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

CommonKit/Source/UserIndicators/UserIndicator.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

CommonKit/Source/UserIndicators/UserIndicatorDismissal.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

CommonKit/Source/UserIndicators/UserIndicatorPresentationContext.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2022 New Vector Ltd
+// Copyright 2022-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

CommonKit/Source/UserIndicators/UserIndicatorQueue.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

CommonKit/Source/UserIndicators/UserIndicatorRequest.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

CommonKit/Source/UserIndicators/UserIndicatorViewPresentable.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

Config/AppConfiguration.swift

@@ -1,18 +1,10 @@
 // 
+// Copyright 2024 New Vector Ltd.
 // Copyright 2020 Vector Creations Ltd
 // Copyright (c) 2021 BWI GmbH
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation
@@ -55,6 +47,12 @@ class AppConfiguration: CommonConfiguration {
         
         // bwi: explicitly set option for key sharing
         MXSDKOptions.sharedInstance().enableRoomSharedHistoryOnInvite = BWIBuildSettings.shared.allowKeySharingOnRoomInvite
+        
+        // bwi: #4941 deactivate voice broadcast
+        RiotSettings.shared.enableVoiceBroadcast = BWIBuildSettings.shared.enableFeatureVoiceBroadcastsByDefault
+        
+        // bwi: #5506 activate use latest avatar
+        RiotSettings.shared.roomScreenUseOnlyLatestUserAvatarAndName = BWIBuildSettings.shared.enableRoomScreenUseOnlyLatestUserAvatarAndNameByDefault
     }
     
     

Config/AppIdentifiers.xcconfig

@@ -19,7 +19,11 @@
 BUNDLE_DISPLAY_NAME = BuM-Beta
 BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-beta
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger-beta
-APPLICATION_SCHEME = element
+APPLICATION_SCHEME = BuM
+
+// NSE
+NSE_PROVISIONING_PROFILE_SPECIFIER_DEV = match Development de.bwi.messenger-beta.nse
+NSE_PROVISIONING_PROFILE_SPECIFIER_STORE = match AppStore de.bwi.messenger-beta.nse
 
 // Team
 DEVELOPMENT_TEAM = Q111Q11QQ1

Config/AppVersion.xcconfig

@@ -16,5 +16,5 @@
 //
 
 // Version
-MARKETING_VERSION = 2.8.2
+MARKETING_VERSION = 2.23.1
 CURRENT_PROJECT_VERSION = 20220714163152

Config/BWIBuildSettings.swift

@@ -36,6 +36,8 @@ class BWIBuildSettings: NSObject {
     
     private enum UserDefaultsKeys {
         static let additionalBwiHeaderKey = "bwiHeader"
+        static let isWellknownFederationEnabled = "isWellknownFederationEnabled"
+        static let isLabsFederationEnabled = "isLabsFederationEnabled"
     }
     
     private struct BwiSettingsConstants {
@@ -136,7 +138,6 @@ class BWIBuildSettings: NSObject {
     var bwiAutoCreateAliasOnRoomCreation = true
     
     var bwiLocationShareButtonVisible = false
-    var bwiUseCustomPersonalNotesAvatar = true
     var bwiBetterIgnoredUsers = true
     var bwiSettingsShowInAppNotifications = false
     var bwiFilteredContextMenu = true
@@ -172,8 +173,8 @@ class BWIBuildSettings: NSObject {
     var bwiHashes = [ "a3f65e35a7476799afe8d80282fb3c45b39dab06d1d8c70dc98e45ab7d8e93a9",
                       "2fda1a831655c22a5e6096d7cfbff4429fbf27891141e191b46adbf168142a11",
                       "4f8cbb3fef885f7284d0477d797d7007f0e1ba76221834132752f4d645796e28",
-                      "24c2ec541e61e8e68944b96dc45ed5df12f6bdbda283cb0b3a522742aa970256",
-                      "1be0b314a6c915d4475290522baef5b642db1b6d68937792b8e0eb5b7b0d6666",
+                       "24c2ec541e61e8e68944b96dc45ed5df12f6bdbda283cb0b3a522742aa970256",
+                       "1be0b314a6c915d4475290522baef5b642db1b6d68937792b8e0eb5b7b0d6666",
                       "3deb73db8cafcd1d5a59e25e251c35816162e1f6ee67b5d7d011da0e8d6ef931",
                       "42e57985d61202c2c7dd87d898cef9bdce020877a4c7a8c7cd699f6a28f58c0c",
                       "e1c3c7cac12bd65bd48de79a2677187d2e768d2769377627534023588b8d7a33",
@@ -200,14 +201,42 @@ class BWIBuildSettings: NSObject {
                       "d5a7298dde23aa0269c4cbd3b2a543e6ede94ce78fc20e4bfb888eb6057b5c52",
                       "00136d830dd2acd5047efcf8419e939ef7ef97a84bef1930df86aace3f855265",
                       "64cbbeea37237814445b35c941d010b9d5d024e4c584a476864b00c7c9909bce",
-                      "e79f4ce0f3c2772b45fd492a9c11e4e10e869ca21af68f13ff48c9c3bbd446ea"
+                      "e79f4ce0f3c2772b45fd492a9c11e4e10e869ca21af68f13ff48c9c3bbd446ea",
+                      "2d582bed323f226a0e18b6b7104c0d28ccc36423833220a7b5fd2854262ab27e",
+                      "c56904235e283557626c327f8013c3b1c654eae86a5e314531e3a6fcb200ff92",
+                      "202bbbaa7c5cd665106d14012c29bcda8217a4b3606cce83e6e6ea0d30733229",
+                      "cca10f6b4b583da69bbd3815ee0fccd193cf0cfd046aee1aeffaa7b5245e8f83",
+                      "36a9ec7368bddedd9deb1e2d1c627bd7304865135c9be30b1979659e3ac9ad07",
+                      "dbaf8618e8a2f8d681591dfbcc73243c921c10dec69a2e5ee50bc91ca7dedcda",
+                      "ed1af0fd873ec749f17c3b61ce4e481ab1644c132003f97a9c4e36516325788a",
+                      "081e6ef90ba86102d678756fd13b07ca744340ad4d58a340e1956dca992f18e3",
+                      "40b22592f2417c8031a0c38098c83dd0bfd28dee4c77ed1e9a022556c6ec0ded",
+                      "098d7b8e7487c2228e6848c1baf6b5fec716b8d94d0210c22bad6adba5a332bf",
+                      "bce875bbf120c13246f2591af8681bbc554068d0b0cbf3837604607fdf99001e",
+                      "8362cb3205fb58345f1cc43115023027ea420b589da099271e127b9e9addb06c",
+                      "2ae47272786b03f790ffef1331dc92b114f65bc2fc321f82ca78a32ae471043e",
+                      "224185dd537000a0f5be5e09be1bd39103363b38bb8e49719d14f680a4d5e5ee",
+                      "8bab8d8d993259213d7ef2295e3494382b4611f2d68596a120e7cdfbb33485d2",
+                      "b9aa60d0067f63aa81eb6521af2120f2405e4bde4963b060ac34890e41734937",
+                      "2fd5548d873cdd2b48691593d3a3121b452e4f990d2b0eddfca2bc44255ccb46",
+                      "05a294b2e2214e326d9dc55a5ae4b1d91d0bd0e95177e59159c42ebaf8dae243",
+                      "983a96007faae2d5321aadf10198bf1a568d4166eec24f9c878de12ad5da8b85",
+                      "09940562c6e5d1b4071873c1be36dfe526c33a9c87bce30935c43ed451a67d72",
+                      "c58c1892ba63b2a482a2ad72d563d523eff08759e6026b8630d64d41b48e7ae0",
+                      "db0c9012e0886da4cbbaf4fae3d4c8d345a95fcc004c0fa8132b5f718963750d",
+                      "e4920edcf64870e0d86a8e511ad3ba0dc91f7208c891329d6ee9a64b4b7a07e6",
+                      "9f60d10d6ee4d1be2a5f301c57aae3224a3d010564c302346395ab1a7e2aa35f",
+                      "ddf38402e479dcfe29066efd81fde1fdd2e767b1780d1736bdb8def2753065d1",
+                      "6e9020ced31422578601a91bc96474c1e36c1b0c2f4a4193c9c49f1bde6749fb"
     ]
+    // bwi #6162 login protection with jwt tokens
+    var bwiEnableTokenizedLoginProtection = false
     
     // use a different badge color if the user was mentioned in a room
     var showMentionsInRoom = true
 
     // replace feature history link variable with the appropiate build setting
-    var bwiFeatureHistoryLink = "https://messenger.bwi.de/bwmessenger#c6110"
+    var bwiFeatureHistoryLink = "https://messenger.bwi.de/bwmessenger#c7385"
     var bwiReplaceFeatureLink = true
     
     // feature history file path
@@ -257,6 +286,8 @@ class BWIBuildSettings: NSObject {
     
     // Default servers proposed on the authentication screen
     var serverConfigDefaultHomeserverUrlString = "https://bundesmessenger.isthebest.real"
+    // (#4549) this is needed because a real URL is expected by Element, for all of our systems this should be overwritten by well-known
+    var serverConfigDefaultMapstyleURLString = "https://default.mapstyle.url"
     var serverConfigDefaultIdentityServerUrlString = ""
     var serverConfigPreSelections = ["":""]
     var serverConfigSygnalAPIUrlString = "http://push-local/_matrix/push/v1/notify"
@@ -267,6 +298,9 @@ class BWIBuildSettings: NSObject {
     var applicationTermsConditionsUrlString = ""
     var applicationPrivacyPolicyWithMatomoSectionUrlString = "https://messenger.bwi.de/datenschutz#c6637"
     
+    // (#4751) use privacy policy link of well known
+    var bwiUseWellKnownPrivacyPolicyLink: Bool = false
+    
     // MARk: - Matrix permalinks
     // Paths for URLs that will considered as Matrix permalinks. Those permalinks are opened within the app
     var permalinkSupportedHosts: [String: [String]] = [:]
@@ -391,7 +425,6 @@ class BWIBuildSettings: NSObject {
 
     var settingsScreenShowNotificationDecodedContentOption = false
     var settingsScreenShowSystemSettingsOption = false
-    var settingsScreenShowNsfwRoomsOption = false
     var settingsScreenShowSupportSetting = true
     var settingsScreenSupportSettingHTML = "support"
 
@@ -505,7 +538,7 @@ class BWIBuildSettings: NSObject {
     var passwordIndicatorOnLogin = true
     
     // MARK: Displays the element base version on the settings screen
-    var elementBaseVersion = "1.10.14"
+    var elementBaseVersion = "1.11.19"
     
     var showElementBaseVersion = true
 
@@ -526,8 +559,14 @@ class BWIBuildSettings: NSObject {
     var bwiPersonalNotesRoom = false
     var bwiPersonalNotesRoomLeavable = false
     var bwiResetPersonalNotesAccountData = false
+    var bwiUseCustomPersonalNotesAvatar = true
+    var bwiPersonalNotesVisibilityInSettings = false
+    
     var bwiShowTimelineSettings = false
     
+    // #5506 alway use the latest avatar for data privacy
+    var enableRoomScreenUseOnlyLatestUserAvatarAndNameByDefault = true
+    
     // MARK BWI personal state
     var bwiPersonalState = false
 
@@ -549,7 +588,7 @@ class BWIBuildSettings: NSObject {
     var bwiEnableRegisterInfo = false
     
     var bwiShowHappyBirthdayCampaign = false
-    var bwiHappyBirthdayCampaignIdentifier: String = "2022"
+    var bwiHappyBirthdayCampaignIdentifier: String = "2024"
     var bwiDisableSecuritySettingsUntrustedDevices = true
     
     
@@ -607,7 +646,7 @@ class BWIBuildSettings: NSObject {
     var allowScanServerQRCode = true
     
     // MARK: - Login with qr code
-    var allowLoginWithQR = false   // should be set by the server but we disable it with false also in the app
+    var allowLoginWithQR = true   // should be set by the server but we disable it with false also in the app
 
     // MARK: - Scan permalink qr code
     var clientPermalinkBaseUrl = ""
@@ -615,8 +654,9 @@ class BWIBuildSettings: NSObject {
     var showMyQRCode = false
     
     // MARK: - Maintenance
-    var enableMaintenanceInfoOnWelcomeScreen = false
-    var showMaintenanceInfoMessageType = false
+    var enableMaintenanceInfoOnLogin = true
+    var showMaintenanceInfoMessageType = true
+    var ignoreBlockingMaintenance = false
     
     // MARK: User Search
     var sortUserSearchResultsAlphabetically = true
@@ -648,8 +688,88 @@ class BWIBuildSettings: NSObject {
     var accessibilityDeclarationFileEn = ""
 
     // MARK: Voice Broadcast
-    var enableLabFeatureVoiceBroadcasts = false
+    var enableFeatureVoiceBroadcastsByDefault = false
     
     // MARK: WYSIWYG
-    var enableLabFeatureWYSIWYG = false
+    var enableFeatureWYSIWYGByDefault = false
+    var bwiWYSIWYGVisibilityInSettings = true 
+    var enableWYSIWYGCommands = false
+    
+    // MARK: itunes
+    var itunesAppLink = ""
+    
+    // MARK: itunes
+    var showAllChatsFilterMenu = false
+    
+    // MARK: itunes
+    var roomFiltersToggle = true
+
+    // MARK: OIDC
+    var isOIDCEnabled = true
+    
+    // MARK: Change Password
+    var showPasswordChangedConfirmation = true
+
+    // MARK: Create Room Menu
+    var enableAllChatsToolbar = false
+    
+    // MARK: App Config
+    var avoidServerSelectionOnAppConfig = false
+    
+    // MARK: Content Scanner Status Thumbnail
+    var showContentScannerStatusWithFilename = true
+    
+    // MARK: Federation
+    // Enables federation functions and views
+    var isFederationEnabled: Bool {
+        return (isWellknownFederationEnabled || isLabsFederationEnabled)
+    }
+    
+    // Federation status from wellknown config
+    @UserDefault(key: UserDefaultsKeys.isWellknownFederationEnabled, defaultValue: false, storage: RiotSettings.defaults)
+    var isWellknownFederationEnabled
+    
+    // Federation status from labs setting
+    @UserDefault(key: UserDefaultsKeys.isLabsFederationEnabled, defaultValue: false, storage: RiotSettings.defaults)
+    var isLabsFederationEnabled
+    
+    // shows the grey/green/red shield for the room avatar / user avatar
+    var showEncryptionStatusBadgeOnAvatar = false
+    
+    // MARK: Backup restore
+    var enableRestoreKeysFromBackup = true
+    
+    // MARK: Backup restore
+    var showMatrixIDinRoomInfoScreen = false
+
+    
+    // MARK: New photos picker API
+    var useNewPhotosPickerAPI = true
+
+    // MARK: Contacts List
+    var showContactIdentifierInDetailRow = true
+    
+    // MARK: Room Participants
+    // activates swipe gesture action to remove participants from room (RoomParticipantsViewController)
+    var bwiCanEditRoomParticipants = false
+    
+    // MARK: Profile picture hint
+    // (only when federation is enabled)
+    var showChangeProfilePictureHint = false
+    
+    // MARK: Federation Introduction
+    // (only when federation is enabled in the client and well-known flag is set)
+    var showFederationIntroduction = false
+    
+    // MARK: Change Password
+    var showPasswordRequirements = false
+    
+    // MARK: Report Room
+    var showReportRoomButton = false
+    
+    // MARK: Enable NSFW filter
+    var enableNSFWFilter = false
+    
+    // MARK: Enable Room Retention
+    var enableRoomRetention = false
 }

Config/BuM-BWI-MDM/AppIdentifiers-bum-bwi-mdm.xcconfig

@@ -0,0 +1,43 @@
+// 
+// Copyright 2021 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+// App identity
+BUNDLE_DISPLAY_NAME = BuM-BWI-MDM
+BASE_BUNDLE_IDENTIFIER = de.bwi.bwmessenger.mdm
+APPLICATION_GROUP_IDENTIFIER = group.de.bwmessenger.mdm
+APPLICATION_SCHEME = BuM4BWI
+
+// NSE
+NSE_PROVISIONING_PROFILE_SPECIFIER_DEV = match Development de.bwi.bwmessenger.mdm.nse
+NSE_PROVISIONING_PROFILE_SPECIFIER_STORE = match AppStore de.bwi.bwmessenger.mdm.nse
+
+// Team
+DEVELOPMENT_TEAM = Q111Q11QQ1
+
+
+// Provisioning profiles
+RIOT_PROVISIONING_PROFILE_SPECIFIER = Vector App Store
+RIOT_PROVISIONING_PROFILE = 7579fa6f-9887-415e-90fc-2c7acd8812e6
+
+NSE_PROVISIONING_PROFILE_SPECIFIER = "Vector NSE: App Store"
+NSE_PROVISIONING_PROFILE = e73107b2-1bfe-4615-be3e-39fd4dcb2af0
+
+SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = "Vector Share Extension: App Store"
+SHARE_EXTENSION_PROVISIONING_PROFILE = 8c797ca0-0440-49bd-be8d-11d761152995
+
+SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER = "Vector Siri Intents: App Store"
+SIRI_INTENTS_PROVISIONING_PROFILE = 1690e81a-5ad3-4d99-b578-02693579be71

Config/BuM-BWI-MDM/BWIBuildSettings+BuM-BWI-MDM.swift

@@ -0,0 +1,36 @@
+//
+/*
+ * Copyright (c) 2022 BWI GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import Foundation
+
+extension BWIBuildSettings {
+    
+    func overrideTargetSpecificSettings() {
+        secondaryAppName = "BuM-BWI-MDM"
+        locationSharingEnabled = true
+        bwiLocationShareButtonVisible = false
+        bwiLoginFlowLayout = false
+        authScreenShowTestServerOptions = false
+        bwiNotificationTimes = true
+        enableNewSessionManagerByDefault = true
+        bwiUseWellKnownPrivacyPolicyLink = true
+        itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger/id1616866351"
+        avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
+    }
+    
+}

Config/BuM-Beta/AppIdentifiers-bum-beta.xcconfig

@@ -19,7 +19,11 @@
 BUNDLE_DISPLAY_NAME = BuM-Beta
 BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-beta
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger-beta
-APPLICATION_SCHEME = element 
+APPLICATION_SCHEME = BuM-Beta
+
+// NSE
+NSE_PROVISIONING_PROFILE_SPECIFIER_DEV = match Development de.bwi.messenger-beta.nse
+NSE_PROVISIONING_PROFILE_SPECIFIER_STORE = match AppStore de.bwi.messenger-beta.nse
 
 // Team
 DEVELOPMENT_TEAM = Q111Q11QQ1

Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift

@@ -24,20 +24,25 @@ extension BWIBuildSettings {
         secondaryAppName = "BundesMessenger"
         settingsScreenShowLabSettings = true
         authScreenShowRegister = true
-        showTopBanner = true
         bwiShowDeveloperSettings = true
         bwiPersonalState = true
         bwiMatomoTrackingDefaultState = false
         showSessionManager = false
-        locationSharingEnabled = false
+        locationSharingEnabled = true
         bwiLocationShareButtonVisible = false
         bwiLoginFlowLayout = false
         useRustEncryption = true
         bwiNotificationTimes = true
-        enableLabFeatureVoiceBroadcasts = true
         enableNewSessionManagerByDefault = true
-        enableLabFeatureWYSIWYG = true
         showMaintenanceInfoMessageType = true
+        ignoreBlockingMaintenance = true
+        bwiUseWellKnownPrivacyPolicyLink = true
+        showChangeProfilePictureHint = true
+        showFederationIntroduction = false
+        
+        itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger/id1616866351"
+        avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
+        bwiEnableTokenizedLoginProtection = true
     }
-    
 }

Config/BuM-Open/AppIdentifiers-bum-open.xcconfig

@@ -19,7 +19,11 @@
 BUNDLE_DISPLAY_NAME = BuM-Open
 BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-open
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger-open
-APPLICATION_SCHEME = element
+APPLICATION_SCHEME = BuM
+
+// NSE
+NSE_PROVISIONING_PROFILE_SPECIFIER_DEV = match Development de.bwi.messenger-open.nse
+NSE_PROVISIONING_PROFILE_SPECIFIER_STORE = match AppStore de.bwi.messenger-open.nse
 
 // Team
 DEVELOPMENT_TEAM = Q111Q11QQ1

Config/BuM-Open/BWIBuildSettings+BuM-Open.swift

@@ -21,7 +21,7 @@ extension BWIBuildSettings {
     
     func overrideTargetSpecificSettings() {
         secondaryAppName = "BundesMessenger"
-        locationSharingEnabled = false
+        locationSharingEnabled = true
         bwiLocationShareButtonVisible = false
         bwiLoginFlowLayout = false
         authScreenShowTestServerOptions = false
@@ -29,6 +29,10 @@ extension BWIBuildSettings {
         enableNewSessionManagerByDefault = true
         
         bwiEnableLoginProtection = false
+        
+        itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger-open/id6450672686"
+        avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
     }
     
 }

Config/BuM/AppIdentifiers-bum.xcconfig

@@ -19,7 +19,11 @@
 BUNDLE_DISPLAY_NAME = Messenger
 BASE_BUNDLE_IDENTIFIER = de.bwi.messenger
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger
-APPLICATION_SCHEME = element 
+APPLICATION_SCHEME = BuM
+
+// NSE
+NSE_PROVISIONING_PROFILE_SPECIFIER_DEV = match Development de.bwi.messenger.nse
+NSE_PROVISIONING_PROFILE_SPECIFIER_STORE = match AppStore de.bwi.messenger.nse
 
 // Team
 DEVELOPMENT_TEAM = Q111Q11QQ1

Config/BuM/BWIBuildSettings+BuM.swift

@@ -21,12 +21,17 @@ extension BWIBuildSettings {
     
     func overrideTargetSpecificSettings() {
         secondaryAppName = "BundesMessenger"
-        locationSharingEnabled = false
+        locationSharingEnabled = true
         bwiLocationShareButtonVisible = false
         bwiLoginFlowLayout = false
         authScreenShowTestServerOptions = false
         bwiNotificationTimes = true
         enableNewSessionManagerByDefault = true
+        bwiUseWellKnownPrivacyPolicyLink = true
+        itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger/id1616866351"
+        avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
+        bwiEnableTokenizedLoginProtection = true
     }
     
 }

Config/BuildSettings.swift

@@ -1,17 +1,9 @@
 // 
+// Copyright 2024 New Vector Ltd.
 // Copyright 2020 Vector Creations Ltd
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation
@@ -102,13 +94,16 @@ final class BuildSettings: NSObject {
     static let forceHomeserverSelection = false
 
     /// Default server proposed on the authentication screen
-    static let serverConfigDefaultHomeserverUrlString = "https://matrix.org"
+    static var serverConfigDefaultHomeserverUrlString: String {
+        MDMSettings.serverConfigDefaultHomeserverUrlString ?? "https://matrix.org"
+    }
     
     /// Default identity server
     static let serverConfigDefaultIdentityServerUrlString = "https://vector.im"
         
-    static let serverConfigSygnalAPIUrlString = "https://matrix.org/_matrix/push/v1/notify"
-    
+    static var serverConfigSygnalAPIUrlString: String {
+        MDMSettings.serverConfigSygnalAPIUrlString ?? "https://matrix.org/_matrix/push/v1/notify"
+    }
     
     // MARK: - Legal URLs
     
@@ -144,7 +139,9 @@ final class BuildSettings: NSObject {
     // This baseURL is used to generate permalinks within the app (E.g. timeline message permalinks).
     // Optional String that when set is used as permalink base, when nil matrix.to format is used.
     // Example value would be "https://www.example.com", note there is no trailing '/'.
-    static let clientPermalinkBaseUrl: String? = nil
+    static var clientPermalinkBaseUrl: String? {
+        MDMSettings.clientPermalinkBaseUrl
+    }
     
     // MARK: - VoIP
     static var allowVoIPUsage: Bool {
@@ -192,7 +189,7 @@ final class BuildSettings: NSObject {
     #else
     /// The configuration to use for analytics. Set `isEnabled` to false to disable analytics.
     static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: BuildSettings.baseBundleIdentifier.starts(with: "im.vector.app"),
-                                                               host: "https://posthog.hss.element.io",
+                                                               host: "https://posthog.element.io",
                                                                apiKey: "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
                                                                termsURL: URL(string: "https://element.io/cookie-policy")!)
     #endif
@@ -292,7 +289,6 @@ final class BuildSettings: NSObject {
     static let settingsScreenShowChangePassword:Bool = true
     static let settingsScreenShowEnableStunServerFallback: Bool = true
     static let settingsScreenShowNotificationDecodedContentOption: Bool = true
-    static let settingsScreenShowNsfwRoomsOption: Bool = true
     static let settingsSecurityScreenShowSessions:Bool = true
     static let settingsSecurityScreenShowSetupBackup:Bool = true
     static let settingsSecurityScreenShowRestoreBackup:Bool = true

Config/CommonConfiguration.swift

@@ -1,18 +1,10 @@
 // 
+// Copyright 2024 New Vector Ltd.
 // Copyright 2020 Vector Creations Ltd
 // Copyright (c) 2021 BWI GmbH
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

Config/Configurable.swift

@@ -1,17 +1,9 @@
 // 
+// Copyright 2024 New Vector Ltd.
 // Copyright 2020 Vector Creations Ltd
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

Config/MDMSettings.swift

@@ -0,0 +1,43 @@
+// 
+// Copyright 2023, 2024 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
+//
+
+import Foundation
+
+enum MDMSettings {
+    private static let appleManagedConfigurationKey = "com.apple.configuration.managed"
+    
+    private enum Key: String {
+        case serverConfigDefaultHomeserverUrlString = "im.vector.app.serverConfigDefaultHomeserverUrlString"
+        case serverConfigSygnalAPIUrlString = "im.vector.app.serverConfigSygnalAPIUrlString"
+        case clientPermalinkBaseUrl = "im.vector.app.clientPermalinkBaseUrl"
+    }
+    
+    static var serverConfigDefaultHomeserverUrlString: String? {
+        valueForKey(.serverConfigDefaultHomeserverUrlString) as? String
+    }
+    
+    static var serverConfigSygnalAPIUrlString: String? {
+        valueForKey(.serverConfigSygnalAPIUrlString) as? String
+    }
+    
+    static var clientPermalinkBaseUrl: String? {
+        valueForKey(.clientPermalinkBaseUrl) as? String
+    }
+    
+    // MARK: - Private
+    
+    static private func valueForKey(_ key: Key) -> Any? {
+        guard let managedConfiguration = UserDefaults.standard.dictionary(forKey: appleManagedConfigurationKey) else {
+            print("MDM configuration missing")
+            return nil
+        }
+        
+        print("Retrieved MDM configuration: \(managedConfiguration)")
+        
+        return managedConfiguration[key.rawValue]
+    }
+}

Config/Project-Debug.xcconfig

@@ -35,5 +35,5 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO
 
 
 // Code signing: Use the development team for all targets
-CODE_SIGN_IDENTITY = iPhone Developer
-CODE_SIGN_STYLE = Automatic
+CODE_SIGN_IDENTITY = Apple Development: App Dev (8WZM4UQ4LX)
+CODE_SIGN_STYLE = Manual

Config/Project-Release.xcconfig

@@ -29,5 +29,5 @@ SWIFT_COMPILATION_MODE = wholemodule
 
 
 // Code signing: Manual
-CODE_SIGN_IDENTITY = iPhone Distribution
+CODE_SIGN_IDENTITY = Apple Distribution: BWI GmbH (Q111Q11QQ1)
 CODE_SIGN_STYLE = Manual

Config/Project.xcconfig

@@ -26,7 +26,7 @@ KEYCHAIN_ACCESS_GROUP = $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER).keychain
 BROADCAST_UPLOAD_EXTENSION_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).broadcastUploadExtension
 
 // Build settings
-IPHONEOS_DEPLOYMENT_TARGET = 14.0
+IPHONEOS_DEPLOYMENT_TARGET = 15.0
 SDKROOT = iphoneos
 TARGETED_DEVICE_FAMILY = 1,2
 SWIFT_VERSION = 5.6

Config/copyMDMConfig.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+#  setConfig.sh
+#
+# Copyright (c) 2023 BWI GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+    # http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+cp -vf ../Config/BuM-BWI-MDM/AppIdentifiers-bum-bwi-mdm.xcconfig ../Config/AppIdentifiers.xcconfig

Config/nexus_upload.sh

@@ -5,16 +5,31 @@ EXT=$3
 VERSION=$4
 DATE_STR=$5
 GITHASH=$6
-SUBDIR=$7
+VERSION_TAG=$7
+SUBDIR=$8
 
-echo "params: $NEXUS_BASE_URL $VARIANT $EXT $VERSION $DATE_STR $GITHASH $SUBDIR"
+echo "params: $NEXUS_BASE_URL $VARIANT $EXT $VERSION $DATE_STR $GITHASH $SUBDIR $VERSION_TAG"
 echo "dir: $PWD"
 
+check_last_exit_code () {
+    if [ $1 -ne 0 ]; then
+        echo "Error: exit code != 0"
+        exit $1
+    fi
+}
+
+echo "checking if file is found"
+find ../out$SUBDIR -name "*$VARIANT*.$EXT" | grep .
+check_last_exit_code $?
+echo "find end"
+
 find ../out$SUBDIR -name "*$VARIANT*.$EXT" -print0 | while read -d $'\0' file
 do
   echo "Source: $file"
   zip -r $file.zip $file
-  BASENAME=$(basename $file .zip)-$VERSION-$DATE_STR-$GITHASH.$EXT$SUBDIR.zip
+  BASENAME=$(basename $file .zip)-$VERSION_TAG-$DATE_STR-$GITHASH.$EXT$SUBDIR.zip
   echo "Destination $NEXUS_BASE_URL/$VERSION/$BASENAME"
-  curl --fail -u $S_BWMESSENGER_ID:$S_BWMESSENGER_PASSWORD -v --upload-file $file.zip $NEXUS_BASE_URL/$VERSION/$BASENAME
-done
+  curl --fail -v -u $S_BWMESSENGER_ID:$S_BWMESSENGER_PASSWORD  --upload-file $file.zip $NEXUS_BASE_URL/$VERSION/$BASENAME
+  check_last_exit_code $?
+done
+check_last_exit_code $?

DesignKit/DesignKit.h

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 #import <Foundation/Foundation.h>

DesignKit/Extensions/UIFont.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import UIKit

DesignKit/Source/AvatarSize.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

DesignKit/Source/ColorValues.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

DesignKit/Source/Colors.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

DesignKit/Source/ColorsSwiftUI.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

DesignKit/Source/ColorsUIkit.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

DesignKit/Source/Fonts.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import UIKit

DesignKit/Source/FontsSwiftUI.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

DesignKit/Source/FontsUIkit.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

DesignKit/Source/ThemeV2.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

DesignKit/Variants/Colors/Dark/DarkColors.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

DesignKit/Variants/Colors/Light/LightColors.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import Foundation

DesignKit/Variants/Fonts/ElementFonts.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2021-2024 New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
 //
 
 import SwiftUI

Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "xcode-install"
 gem "fastlane"
-gem "cocoapods", '~>1.11.2'
+gem "cocoapods", '~>1.14.3'
 gem "slather"
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')

Gemfile.lock

@@ -1,55 +1,57 @@
-GIT
-  remote: https://github.com/mhtranbn/fastlane-plugin-diawi.git
-  revision: 6ca982cd41e7c315290240cd4570d5d7b799db38
-  specs:
-    fastlane-plugin-diawi (0.1.3)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (6.1.7.3)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.4)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
-    artifactory (3.0.15)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.770.0)
-    aws-sdk-core (3.173.1)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.1002.0)
+    aws-sdk-core (3.212.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.64.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.95.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.170.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     claide (1.1.0)
     clamp (1.3.2)
-    cocoapods (1.11.3)
+    cocoapods (1.14.3)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.3)
+      cocoapods-core (= 1.14.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -57,10 +59,10 @@ GEM
       gh_inspector (~> 1.0)
       molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.3)
-      activesupport (>= 5.0, < 7)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.14.3)
+      activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -70,7 +72,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.3)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -82,19 +84,20 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
+    drb (2.2.1)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.99.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -115,22 +118,22 @@ GEM
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.213.0)
+    fastimage (2.3.1)
+    fastlane (2.225.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -139,42 +142,47 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-brew (0.1.1)
-    fastlane-plugin-sentry (1.15.0)
+    fastlane-plugin-sentry (1.23.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-versioning (0.5.1)
+    fastlane-plugin-versioning (0.5.2)
     fastlane-plugin-xcodegen (1.1.0)
       fastlane-plugin-brew (~> 0.1.1)
-    ffi (1.15.5)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
+    ffi (1.17.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.42.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -182,76 +190,76 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.5.2)
+    googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.7)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.13.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.0)
-    memoist (0.16.2)
-    mini_magick (4.12.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.2)
-    minitest (5.18.0)
+    json (2.8.1)
+    jwt (2.9.3)
+      base64
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
+    minitest (5.23.1)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
-    nanaimo (0.3.0)
+    multipart-post (2.4.1)
+    mutex_m (0.2.0)
+    nanaimo (0.4.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.15.2)
+    nkf (0.2.0)
+    nokogiri (1.15.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    optparse (0.1.1)
+    optparse (0.6.0)
     os (1.1.4)
-    plist (3.7.0)
+    plist (3.7.1)
     public_suffix (4.0.7)
-    racc (1.6.2)
-    rake (13.0.6)
+    racc (1.8.0)
+    rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.3.9)
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.17.0)
+    security (0.1.5)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -259,54 +267,49 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    slather (2.7.4)
+    slather (2.8.0)
       CFPropertyList (>= 2.2, < 4)
       activesupport
       clamp (~> 1.3)
-      nokogiri (>= 1.13.9)
+      nokogiri (>= 1.14.3)
       xcodeproj (~> 1.21)
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.8.1)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
     xcode-install (2.8.1)
       claide (>= 0.9.1)
       fastlane (>= 2.1.0, < 3.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.11.2)
+  cocoapods (~> 1.14.3)
   fastlane
-  fastlane-plugin-diawi!
   fastlane-plugin-sentry
   fastlane-plugin-versioning
   fastlane-plugin-xcodegen

INSTALL.md

@@ -71,6 +71,25 @@ Be sure to use compatible branches for Element iOS and MatrixSDK. For example, i
 
 **Important**: By working with [XcodeGen](https://github.com/yonaskolb/XcodeGen) you will need to use the _New Build System_ in Xcode, to have your some of the xcconfig variables taken into account. It should be enabled by default on the latest Xcode versions, but if you need to enable it go to Xcode menu and select `File > Workspace Settings… > Build System` and then choose `New Build System`.
 
+- **Running a local rust MatrixCryptoSDK locally**
+
+If you want to debug locally or test local changes of the rust `MatrixSDKCrypto` with a local `MatrixSDK`, you must checkout [matrix-rust-sdk](https://github.com/matrix-org/matrix-rust-sdk), and follow the [instructions in the repository](https://github.com/matrix-org/matrix-rust-sdk/tree/main/bindings/apple).
+
+Once the framework is built using `./build_crypto_xcframework.sh` you will have to move `bindings/apple/MatrixSDKCrypto-Local.podspec` to the root of the `matrix-rust-sdk` folder and rename it to `MatrixSDKCrypto.podspec` then update `s.version` with the current pod version:
+
+```
+    s.version               = "0.3.12"
+```
+
+Then in the element-ios `Podfile`, add the following line under the existing `pod 'MatrixSDK' [..]`:
+
+```
+pod 'MatrixSDKCrypto', :path => '../matrix-rust-sdk/MatrixSDKCrypto.podspec'
+```
+
+Run `pod install` to refresh all.
+
+
 ### `$matrixSDKVersion` Modification
 
 Every time you change the `$matrixSDKVersion` variable in the `Podfile`, you have to run the `pod install` command again.

LICENSE

@@ -1,202 +1,661 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-   1. Definitions.
+                            Preamble
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+  The precise terms and conditions for copying, distribution and
+modification follow.
 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+                       TERMS AND CONDITIONS
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
+  0. Definitions.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
 
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
 
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
+  1. Source Code.
 
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-   END OF TERMS AND CONDITIONS
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-   APPENDIX: How to apply the Apache License to your work.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
+  2. Basic Permissions.
 
-   Copyright {yyyy} {name of copyright owner}
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
 
-       http://www.apache.org/licenses/LICENSE-2.0
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

Podfile

@@ -1,7 +1,7 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 # Uncomment this line to define a global platform for your project
-platform :ios, '14.0'
+platform :ios, '15.0'
 
 # By default, ignore all warnings from any pod
 inhibit_all_warnings!
@@ -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.26.12'
+$matrixSDKVersion = '= 0.27.6'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
@@ -43,13 +43,7 @@ when String # specific MatrixSDK released version
 $matrixSDKVersionSpec = $matrixSDKVersion
 end
 
-$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v0.26.12_bwi' }
-
-# Method to import the MatrixSDK
-def import_MatrixSDK
-  pod 'MatrixSDK', $matrixSDKVersionSpec, :inhibit_warnings => false
-  pod 'MatrixSDK/JingleCallStack', $matrixSDKVersionSpec, :inhibit_warnings => false
-end
+$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.23.1' }
 
 ########################################
 
@@ -63,7 +57,7 @@ end
 def import_SwiftUI_pods
     pod 'Introspect', '~> 0.1'
     pod 'DSBottomSheet', '~> 0.3'
-    pod 'ZXingObjC', '~> 3.6.5'
+    pod 'ZXingObjC', '~> 3.6.9'
 end
 
 abstract_target 'RiotPods' do
@@ -76,11 +70,6 @@ abstract_target 'RiotPods' do
   # Piwik for analytics
   pod 'MatomoTracker', '~> 7.5.2'
 
-  # PostHog for analytics
-  pod 'PostHog', '~> 2.0.0'
-  pod 'Sentry', '~> 7.15.0'
-
-  pod 'OLMKit'
   pod 'zxcvbn-ios'
 
   # Tools
@@ -89,7 +78,7 @@ abstract_target 'RiotPods' do
   pod 'SwiftFormat/CLI'
 
   target "Riot" do
-    import_MatrixSDK
+    pod 'MatrixSDK', $matrixSDKVersionSpec, :inhibit_warnings => false
     import_MatrixKit_pods
 
     import_SwiftUI_pods
@@ -100,14 +89,10 @@ abstract_target 'RiotPods' do
     pod 'FlowCommoniOS', '~> 1.12.0'
     pod 'DTTJailbreakDetection', '~> 0.4.0'
     pod 'ReadMoreTextView', '~> 3.0.1'
-    pod 'SwiftBase32', '~> 0.9.0'
-    pod 'SwiftJWT', '~> 3.6.200'
     pod 'SideMenu', '~> 6.5'
     pod 'DSWaveformImage', '~> 6.1.1'
-    
-    pod 'FLEX', '~> 4.5.0', :configurations => ['Debug'], :inhibit_warnings => true
 
-    target 'RiotTests' do
+   target 'RiotTests' do
       inherit! :search_paths
     end
 
@@ -117,7 +102,7 @@ abstract_target 'RiotPods' do
   end
 
   target "BundesMessenger" do
-      import_MatrixSDK
+      pod 'MatrixSDK', $matrixSDKVersionSpec, :inhibit_warnings => false
       import_MatrixKit_pods
 
       import_SwiftUI_pods
@@ -128,16 +113,12 @@ abstract_target 'RiotPods' do
       pod 'FlowCommoniOS', '~> 1.12.0'
       pod 'DTTJailbreakDetection', '~> 0.4.0'
       pod 'ReadMoreTextView', '~> 3.0.1'
-      pod 'SwiftBase32', '~> 0.9.0'
-      pod 'SwiftJWT', '~> 3.6.200'
       pod 'SideMenu', '~> 6.5'
       pod 'DSWaveformImage', '~> 6.1.1'
-
-      pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
   end
   
     target "BuM-Beta" do
-      import_MatrixSDK
+      pod 'MatrixSDK', $matrixSDKVersionSpec, :inhibit_warnings => false
       import_MatrixKit_pods
 
       import_SwiftUI_pods
@@ -148,16 +129,12 @@ abstract_target 'RiotPods' do
       pod 'FlowCommoniOS', '~> 1.12.0'
       pod 'DTTJailbreakDetection', '~> 0.4.0'
       pod 'ReadMoreTextView', '~> 3.0.1'
-      pod 'SwiftBase32', '~> 0.9.0'
-      pod 'SwiftJWT', '~> 3.6.200'
       pod 'SideMenu', '~> 6.5'
       pod 'DSWaveformImage', '~> 6.1.1'
-
-      pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
   end
     
     target "BuM-Open" do
-        import_MatrixSDK
+        pod 'MatrixSDK', $matrixSDKVersionSpec, :inhibit_warnings => false
         import_MatrixKit_pods
 
         import_SwiftUI_pods
@@ -168,31 +145,55 @@ abstract_target 'RiotPods' do
         pod 'FlowCommoniOS', '~> 1.12.0'
         pod 'DTTJailbreakDetection', '~> 0.4.0'
         pod 'ReadMoreTextView', '~> 3.0.1'
-        pod 'SwiftBase32', '~> 0.9.0'
-        pod 'SwiftJWT', '~> 3.6.200'
         pod 'SideMenu', '~> 6.5'
         pod 'DSWaveformImage', '~> 6.1.1'
-
-        pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
     end
+    
+    target "BuM-BWI-MDM" do
+      pod 'MatrixSDK', $matrixSDKVersionSpec, :inhibit_warnings => false
+      import_MatrixKit_pods
+
+      import_SwiftUI_pods
+
+      pod 'UICollectionViewLeftAlignedLayout', '~> 1.0.2'
+      pod 'UICollectionViewRightAlignedLayout', '~> 0.0.3'
+      pod 'KTCenterFlowLayout', '~> 1.3.1'
+      pod 'FlowCommoniOS', '~> 1.12.0'
+      pod 'DTTJailbreakDetection', '~> 0.4.0'
+      pod 'ReadMoreTextView', '~> 3.0.1'
+      pod 'SideMenu', '~> 6.5'
+      pod 'DSWaveformImage', '~> 6.1.1'
+  end
 
   target "RiotSwiftUI" do
     import_SwiftUI_pods
-  end 
+  end
 
   target "RiotSwiftUITests" do
     import_SwiftUI_pods
-  end 
+  end
 
   target "RiotNSE" do
-    import_MatrixSDK
+    pod 'MatrixSDK', $matrixSDKVersionSpec, :inhibit_warnings => false
     import_MatrixKit_pods
   end
 
   target "BroadcastUploadExtension" do
-    import_MatrixSDK
+    pod 'MatrixSDK', $matrixSDKVersionSpec, :inhibit_warnings => false
   end
 
+  # Disabled due to crypto corruption issues.
+  # https://github.com/element-hq/element-ios/issues/7618
+  # target "RiotShareExtension" do
+  #   import_MatrixSDK
+  #   import_MatrixKit_pods
+  # end
+  #
+  # target "SiriIntents" do
+  #   import_MatrixSDK
+  #   import_MatrixKit_pods
+  # end
+
 end
 
 post_install do |installer|

Podfile.lock

@@ -20,13 +20,13 @@ PODS:
   - Down (0.11.0)
   - DSBottomSheet (0.3.0)
   - DSWaveformImage (6.1.1)
-  - FLEX (4.5.0)
+  - FLEX (5.22.10)
   - FlowCommoniOS (1.12.2)
   - GBDeviceInfo (7.1.0):
     - GBDeviceInfo/Core (= 7.1.0)
   - GBDeviceInfo/Core (7.1.0)
-  - GZIP (1.3.0)
-  - Introspect (0.1.4)
+  - GZIP (1.3.2)
+  - Introspect (0.12.0)
   - JitsiMeetSDKLite (8.1.2-lite):
     - JitsiWebRTC (~> 111.0)
   - JitsiWebRTC (111.0.2)
@@ -39,26 +39,19 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.26.12):
-    - MatrixSDK/Core (= 0.26.12)
-  - MatrixSDK/Core (0.26.12):
+  - MatrixSDK (0.27.13):
+    - MatrixSDK/Core (= 0.27.13)
+  - MatrixSDK/Core (0.27.13):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
-    - MatrixSDKCrypto (= 0.3.4)
-    - OLMKit (~> 3.2.5)
+    - MatrixSDKCrypto (= 0.4.3)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.26.12):
+  - MatrixSDK/JingleCallStack (0.27.13):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
-  - MatrixSDKCrypto (0.3.4)
-  - 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 (2.0.0)
+  - MatrixSDKCrypto (0.4.3)
   - ReadMoreTextView (3.0.1)
   - Realm (10.27.0):
     - Realm/Headers (= 10.27.0)
@@ -73,39 +66,37 @@ PODS:
   - Sentry/Core (7.15.0)
   - SideMenu (6.5.0)
   - SwiftBase32 (0.9.0)
-  - SwiftFormat/CLI (0.50.2)
-  - SwiftGen (6.6.2)
+  - SwiftFormat/CLI (0.54.5)
+  - SwiftGen (6.6.3)
   - SwiftJWT (3.6.200):
     - BlueCryptor (~> 1.0)
     - BlueECC (~> 1.1)
     - BlueRSA (~> 1.0)
     - KituraContracts (~> 1.2)
     - LoggerAPI (~> 1.7)
-  - SwiftLint (0.49.1)
+  - SwiftLint (0.57.0)
   - SwiftyBeaver (1.9.5)
   - UICollectionViewLeftAlignedLayout (1.0.2)
   - UICollectionViewRightAlignedLayout (0.0.3)
   - WeakDictionary (2.0.2)
   - zxcvbn-ios (1.0.4)
-  - ZXingObjC (3.6.5):
-    - ZXingObjC/All (= 3.6.5)
-  - ZXingObjC/All (3.6.5)
+  - ZXingObjC (3.6.9):
+    - ZXingObjC/All (= 3.6.9)
+  - ZXingObjC/All (3.6.9)
 
 DEPENDENCIES:
   - Down (~> 0.11.0)
   - DSBottomSheet (~> 0.3)
   - DSWaveformImage (~> 6.1.1)
-  - FLEX (~> 4.5.0)
+  - FLEX (~> 5.22.10)
   - FlowCommoniOS (~> 1.12.0)
   - GBDeviceInfo (~> 7.1.0)
   - Introspect (~> 0.1)
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.26.12)
-  - MatrixSDK/JingleCallStack (= 0.26.12)
-  - OLMKit
-  - PostHog (~> 2.0.0)
+  - MatrixSDK (from `matrix-ios-sdk/MatrixSDK.podspec`)
+  - MatrixSDK/JingleCallStack (from `matrix-ios-sdk/MatrixSDK.podspec`)
   - ReadMoreTextView (~> 3.0.1)
   - Reusable (~> 4.1)
   - Sentry (~> 7.15.0)
@@ -119,7 +110,7 @@ DEPENDENCIES:
   - UICollectionViewRightAlignedLayout (~> 0.0.3)
   - WeakDictionary (~> 2.0)
   - zxcvbn-ios
-  - ZXingObjC (~> 3.6.5)
+  - ZXingObjC (~> 3.6.9)
 
 SPEC REPOS:
   trunk:
@@ -144,10 +135,7 @@ SPEC REPOS:
     - libPhoneNumber-iOS
     - LoggerAPI
     - Logging
-    - MatrixSDK
     - MatrixSDKCrypto
-    - OLMKit
-    - PostHog
     - ReadMoreTextView
     - Realm
     - Reusable
@@ -165,6 +153,10 @@ SPEC REPOS:
     - zxcvbn-ios
     - ZXingObjC
 
+EXTERNAL SOURCES:
+  MatrixSDK:
+    :path: matrix-ios-sdk/MatrixSDK.podspec
+
 SPEC CHECKSUMS:
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
   BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
@@ -173,11 +165,11 @@ SPEC CHECKSUMS:
   Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
   DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a
   DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
-  FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
+  FLEX: f21ee4f498eed3f8a1eded66b21939fd3b7a22ce
   FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376
-  GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
-  Introspect: b62c4dd2063072327c21d618ef2bedc3c87bc366
+  GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868
+  Introspect: b66b675de8a85d9ef832f3a710d8e3c7db186884
   JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7
   JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
@@ -187,27 +179,25 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 0af737bc461b82d0ec9edd6fdf8f70b02771ebd3
-  MatrixSDKCrypto: ac805c22c24f79f349cdbfa065855c73a4c81b51
-  OLMKit: da115f16582e47626616874e20f7bb92222c7a51
-  PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
+  MatrixSDK: b5756a518af19296b94e3ad9b6f16648f9eb17c3
+  MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
   Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
   Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7
   SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
   SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
-  SwiftFormat: 710117321c55c82675c0dc03055128efbb13c38f
-  SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c
+  SwiftFormat: 543a7b1ab4a6ce2d88bd5616a17903446ca3dc5c
+  SwiftGen: 4993cbf71cbc4886f775e26f8d5c3a1188ec9f99
   SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae
-  SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
+  SwiftLint: eb47480d47c982481592c195c221d11013a679cc
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
   UICollectionViewLeftAlignedLayout: 830bf6fa5bab9f9b464f62e3384f9d2e00b3c0f6
   UICollectionViewRightAlignedLayout: 823eef8c567eba4a44c21bc2ffcb0d0d5f361e2d
   WeakDictionary: 8cd038acd77e5d54ca4ebaec3d20853d732b45e0
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
-  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
+  ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-PODFILE CHECKSUM: 0e7e10f516d40d9df60cb874170b91603c632118
+PODFILE CHECKSUM: 484a1cdf04951cc82156f29de196efd76d3ad893
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.2

README.md

@@ -20,7 +20,7 @@ Fangen wir mit dem Wichtigsten an. Hier findest Du die offizielle App für iOS:
 
 Wenn Dir die App gefällt, lass gerne eine positive Bewertung da.
 
-BundesMessenger-iOS ist ein iOS Matrix Client basierend auf [Element iOS](https://github.com/vector-im/element-ios)
+BundesMessenger-iOS ist ein iOS Matrix Client basierend auf [Element iOS](https://github.com/element-hq/element-ios)
 von [Element Software](https://element.io/).
 
 Allgemeine Infos zum Thema BundesMessenger und was dahinter steckt findet ihr [hier](https://gitlab.opencode.de/bwi/bundesmessenger/info).
@@ -36,7 +36,7 @@ Hierzu durchlaufen wir folgenden Prozess:
   <img src="docs/img/element-bum-bwm.png" width="600">
 </p>
 
-Aufgrund der starken Bindung an *Element iOS* ist es aktuell nicht vorgesehen, dass ihr über das Repository Einfluss auf den BundesMessenger nehmen könnt. Wenn ihr euch beteiligen wollt, müsst ihr eure Contribution direkt in [Element iOS](https://github.com/vector-im/element-ios) einfließen lassen. Diese werden in der Regel im Anschluss in den BundesMessenger übernommen. 
+Aufgrund der starken Bindung an *Element iOS* ist es aktuell nicht vorgesehen, dass ihr über das Repository Einfluss auf den BundesMessenger nehmen könnt. Wenn ihr euch beteiligen wollt, müsst ihr eure Contribution direkt in [Element iOS](https://github.com/element-hq/element-ios) einfließen lassen. Diese werden in der Regel im Anschluss in den BundesMessenger übernommen. 
 
 Wenn ihr euch unsicher seid, haltet hierzu gerne [Rücksprache mit uns](#kontakt).
 
@@ -48,6 +48,35 @@ Wir möchten 100% transparent sein und euch die Möglichkeit geben den Source Co
 
 Wir freuen uns über euer Feedback. Öffnet gerne neue Issues für eure Fragen oder Probleme hier im GitLab.
 
+## Repo
+
+https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios
+
+## Fehler und Verbesserungsvorschläge
+
+https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios/-/issues
+
+
+## Abhängigkeiten
+
+[Element iOS](https://github.com/element-hq/element-iOS)
+
+[BundesMessenger iOS Matrix SDK](https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk)
+
+## Für Entwickler
+
+Weiterführende Dokumentation zum Projekt, dem Betrieb und der Architektur findest Du [hier](https://gitlab.opencode.de/bwi/bundesmessenger/info).
+
+Nachdem das Projekt ausgecheckt ist, reichen folgende Anweisungen zum Compilat und zum Start der App
+
+```
+$ bundle install                                        # Installiert Abhängigkeiten falls notwendig
+$ xcodegen                                              # Erzeugt das xcodeproj mit allen Quellcodedateien
+$ pod install                                           # Erzeugt den xcworkspace mit allen Projektabhängigkeiten
+$ Öffne Riot.xcworkspace                                # Öffnet Xcode
+$ Stelle das target auf BuM-Beta oder BundesMessenger
+```
+
 ## Updates
 
 In der Regel werden wir hier alle 4 Wochen ein Update veröffentlichen. In etwa zeitgleich erfolgt das Update der Apps in den App Stores.
@@ -78,13 +107,19 @@ Eine Nutzung derselben ist nur mit Freigabe durch die BWI möglich.
 | :warning: Wichtig: Falls ihr einen Fork erstellt, müssen alle Verweise (Texte & Bilder) auf BundesMessenger und die BWI zwingend entfernt werden! Das betrifft nicht die Git History, sondern die Releases der jeweiligen neuen Apps. |
 | --- |
 
-Die Lizenz des BundesMessenger iOS ist die [Apache 2.0](./LICENSE).
+Die Lizenz des BundesMessenger iOS ist die [AGPLv3](./LICENSE).
 
 ### Copyright
 
 - [BWI GmbH](https://messenger.bwi.de/copyright)
 - [Element](https://element.io/copyright)
 
+Copyright (c) 2014-2017 OpenMarket Ltd  
+Copyright (c) 2017 Vector Creations Ltd  
+Copyright (c) 2017-2024 New Vector Ltd
+
+SPDX-License-Identifier: AGPL-3.0-only. Please see [LICENSE](LICENSE) in the repository root for full details.
+
 ## Kontakt
 
 Für den Austausch zum BundesMessenger haben wir einen [Matrix Raum](https://matrix.to/#/#opencodebum:matrix.org) erstellt.

Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,32 @@
 {
   "pins" : [
+    {
+      "identity" : "bluecryptor",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Kitura/BlueCryptor.git",
+      "state" : {
+        "revision" : "cec97c24b111351e70e448972a7d3fe68a756d6d",
+        "version" : "2.0.2"
+      }
+    },
+    {
+      "identity" : "blueecc",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Kitura/BlueECC.git",
+      "state" : {
+        "revision" : "1485268a54f8135435a825a855e733f026fa6cc8",
+        "version" : "1.2.201"
+      }
+    },
+    {
+      "identity" : "bluersa",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Kitura/BlueRSA.git",
+      "state" : {
+        "revision" : "440f78db26d8bb073f29590f1c7bd31004da09ae",
+        "version" : "1.0.201"
+      }
+    },
     {
       "identity" : "devicekit",
       "kind" : "remoteSourceControl",
@@ -14,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Cocoanetics/DTCoreText",
       "state" : {
-        "revision" : "9d2d4d2296e5d2d852a7d3c592b817d913a5d020",
-        "version" : "1.6.27"
+        "revision" : "b664664825da565b4c2b7a17dbe2369f68ae43d9",
+        "version" : "1.6.26"
       }
     },
     {
@@ -27,6 +54,24 @@
         "version" : "1.7.18"
       }
     },
+    {
+      "identity" : "kituracontracts",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Kitura/KituraContracts.git",
+      "state" : {
+        "revision" : "6edf7ac3dd2b3a2c61284778d430bbad7d8a6f23",
+        "version" : "2.0.1"
+      }
+    },
+    {
+      "identity" : "loggerapi",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Kitura/LoggerAPI.git",
+      "state" : {
+        "revision" : "4e6b45e850ffa275e8e26a24c6454fd709d5b6ac",
+        "version" : "2.0.0"
+      }
+    },
     {
       "identity" : "lottie-ios",
       "kind" : "remoteSourceControl",
@@ -50,17 +95,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-analytics-events",
       "state" : {
-        "revision" : "2f5fa5f1e2f6c6ae1a47c33d953a3ce289167eb0",
-        "version" : "0.5.0"
+        "revision" : "de0cac487e5e7f607ee17045882204c91585461f",
+        "version" : "0.23.1"
       }
     },
     {
-      "identity" : "matrix-wysiwyg-composer-swift",
+      "identity" : "matrix-rich-text-editor-swift",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/matrix-org/matrix-wysiwyg-composer-swift",
+      "location" : "https://github.com/matrix-org/matrix-rich-text-editor-swift",
       "state" : {
-        "revision" : "1100b217c04d096dfe072afb4484660ff794d805",
-        "version" : "2.2.2"
+        "revision" : "21c0dd6e9c0b38d19d97af8e3e99fe01df56825d",
+        "version" : "2.37.3"
       }
     },
     {
@@ -86,14 +131,32 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections",
       "state" : {
-        "revision" : "937e904258d22af6e447a0b72c0bc67583ef64a2",
-        "version" : "1.0.4"
+        "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
+        "version" : "1.1.0"
+      }
+    },
+    {
+      "identity" : "swift-jwt",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Kitura/Swift-JWT",
+      "state" : {
+        "revision" : "08e02ff214c41df49bdd189ff837d68ba11c437b",
+        "version" : "4.0.0"
+      }
+    },
+    {
+      "identity" : "swift-log",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-log.git",
+      "state" : {
+        "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
+        "version" : "1.6.1"
       }
     },
     {
       "identity" : "swift-ogg",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/vector-im/swift-ogg",
+      "location" : "https://github.com/element-hq/swift-ogg",
       "state" : {
         "branch" : "0.0.1",
         "revision" : "e9a9e7601da662fd8b97d93781ff5c60b4becf88"

Riot/Assets/Images.xcassets/BWI/birthday_cake.imageset/20221027_BwM_Bday_scaled.svg

@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   data-name="Layer 1"
-   width="297mm"
-   height="210mm"
-   viewBox="0 0 1122.5197 793.70082"
-   version="1.1"
-   id="svg129"
-   sodipodi:docname="20221027_BwM_Bday_scaled.svg"
-   inkscape:export-filename="/Users/masterb/Desktop/20220922_BwM_Bday.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.1.1 (c3084ef, 2021-09-22)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs133" />
-  <sodipodi:namedview
-     id="namedview131"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="false"
-     showgrid="false"
-     units="mm"
-     inkscape:zoom="0.58854462"
-     inkscape:cx="496.1391"
-     inkscape:cy="459.60831"
-     inkscape:window-width="1698"
-     inkscape:window-height="969"
-     inkscape:window-x="36"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg129"
-     inkscape:document-units="mm" />
-  <path
-     d="M 272.19319,415.40121 C 219.37506,351.85165 197.06717,285.55351 209.3771,228.72127 225.17468,155.78911 295.35551,105.36267 401.92444,90.371865 l 0.39359,4.183519 C 297.23266,109.33651 228.12242,158.63122 212.70752,229.79849 c -11.98024,55.30893 10.00384,120.15875 61.90272,182.6033 z"
-     fill="#f0f0f0"
-     id="path42"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 781.79896,520.30565 c -65.92027,0 -137.55436,-11.9729 -208.70745,-34.99568 C 485.1014,456.83937 404.4239,413.8662 339.78108,361.03451 l 1.91422,-3.49896 c 64.33158,52.57576 144.65166,95.35259 232.27762,123.70396 79.18639,25.62335 158.96654,37.49557 230.68641,34.36249 l 0.12454,4.2062 q -11.3612,0.49949 -22.98485,0.49745 z"
-     fill="#f0f0f0"
-     id="path44"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 933.02817,614.50633 -1.1034,-3.98819 C 990.88145,586.15498 1027.7565,546.90898 1038.5635,497.0191 1052.3007,433.59703 1022.4564,359.9998 954.52782,289.78437 886.25273,219.21226 787.79873,160.65518 677.29807,124.90194 l 0.88138,-4.07046 c 110.98343,35.91051 209.91677,94.77082 278.57201,165.73866 69.00174,71.32351 99.23954,146.44509 85.14244,211.52621 -11.1165,51.32065 -48.7619,91.57399 -108.86573,116.40998 z"
-     fill="#f0f0f0"
-     id="path46"
-     style="stroke-width:1.7606" />
-  <path
-     d="M 391.66829,642.74256 C 262.13887,572.52918 162.32665,481.43612 110.61949,386.2419 l 2.86955,-2.3292 c 51.34971,94.5354 150.638,185.08875 279.57533,254.98143 z"
-     fill="#f0f0f0"
-     id="path48"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 847.0834,764.38149 q -20.0405,0 -40.76558,-1.09367 l 0.14811,-4.20618 c 103.10983,5.45604 194.08557,-9.62521 263.10917,-43.62178 l 1.2884,3.90601 c -60.2115,29.65272 -136.95563,45.01562 -223.7801,45.01562 z"
-     fill="#f0f0f0"
-     id="path50"
-     style="stroke-width:1.7606" />
-  <path
-     d="M 771.92884,94.147329 C 750.52,85.628145 728.49894,77.695872 706.47785,70.570512 579.7549,29.56782 455.18494,15.00977 346.23003,28.478264 l -0.34649,-4.189706 c 109.36108,-13.512689 234.35745,1.080256 361.47567,42.211497 22.08331,7.145909 44.16662,15.100791 65.63599,23.644647 z"
-     fill="#f0f0f0"
-     id="path52"
-     style="stroke-width:1.7606" />
-  <path
-     d="M 191.24068,421.71657 C 138.42255,358.16703 116.11466,291.86889 128.42459,235.03663 144.22217,162.10447 214.40301,111.67805 320.97193,96.687252 l 0.39359,4.183518 c -105.08537,14.78113 -174.19561,64.07584 -189.61051,135.2431 -11.98023,55.30894 10.00384,120.15875 61.90274,182.60331 z"
-     fill="#f0f0f0"
-     id="path54"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 700.84642,526.62104 c -65.92024,0 -137.55434,-11.97291 -208.70743,-34.99568 C 404.14887,463.15473 323.47136,420.18158 258.82856,367.34988 l 1.91422,-3.49894 c 64.33159,52.57575 144.65166,95.35258 232.27762,123.70396 79.18639,25.62333 158.96654,37.49556 230.68641,34.36249 l 0.12454,4.20619 q -11.3612,0.4995 -22.98485,0.49746 z"
-     fill="#f0f0f0"
-     id="path56"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 852.07567,620.82175 -1.10342,-3.98819 C 909.92892,592.47041 946.80397,553.2244 957.61097,503.33455 971.34814,439.91246 941.5039,366.31524 873.5753,296.0998 805.3002,225.5276 706.84617,166.9705 596.34556,131.21729 l 0.88137,-4.07046 c 110.9834,35.91051 209.91679,94.77071 278.57202,165.73862 69.00173,71.32351 99.2395,146.44509 85.14244,211.52618 -11.11653,51.32074 -48.76193,91.57409 -108.86572,116.41012 z"
-     fill="#f0f0f0"
-     id="path58"
-     style="stroke-width:1.7606" />
-  <path
-     d="M 310.71576,649.05795 C 181.18635,578.84457 81.374123,487.75151 29.666982,392.55728 l 2.869532,-2.32921 C 83.886229,484.76349 183.1745,575.31684 312.11184,645.20952 Z"
-     fill="#f0f0f0"
-     id="path60"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 766.13087,770.69695 q -20.04047,0 -40.76557,-1.09368 l 0.14793,-4.20619 c 103.10985,5.45606 194.08556,-9.62519 263.10917,-43.62176 l 1.28835,3.90599 c -60.2113,29.65266 -136.95538,45.01564 -223.77988,45.01564 z"
-     fill="#f0f0f0"
-     id="path62"
-     style="stroke-width:1.7606" />
-  <path
-     d="M 690.9763,100.46269 C 669.56748,91.943506 647.54642,84.011259 625.52533,76.885872 498.80238,35.883181 374.23241,21.325118 265.27751,34.793625 l -0.3465,-4.189693 c 109.36109,-13.512715 234.35743,1.080255 361.47565,42.211484 22.08332,7.145921 44.16663,15.100779 65.636,23.644647 z"
-     fill="#f0f0f0"
-     id="path64"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 348.75867,292.40691 a 26.727034,32.666043 0 0 0 -26.69718,32.62954 1254.4728,1533.2289 0 0 0 -10.12832,275.70174 c 0.20268,5.87955 0.42724,11.25749 0.68798,16.4463 0.37846,8.56852 0.85952,17.61399 1.42889,26.8897 0.32715,5.47252 0.67195,10.96147 1.04958,16.43191 0.63245,8.90979 1.32712,17.96348 2.06638,26.90823 0.46423,5.46428 0.94613,10.95529 1.46166,16.42377 0.98989,10.74149 2.1101,21.75229 3.42631,33.66148 a 26.763216,32.710266 0 0 0 26.7047,32.77111 h 447.82245 a 26.727034,32.666043 0 0 0 26.69717,-32.62956 l 0.0203,-0.22612 c 1.99488,-11.10743 3.85268,-22.42649 5.52289,-33.64503 0.89316,-5.91451 1.66437,-11.28627 2.35736,-16.42164 1.25651,-9.34973 2.37419,-18.39937 3.31948,-26.89588 0.64674,-5.7048 1.23208,-11.22881 1.73838,-16.42572 0.83344,-8.5048 1.58783,-17.29535 2.30521,-26.8753 0.39276,-5.20732 0.75271,-10.58526 1.10174,-16.44015 v -0.003 a 783.09975,957.1122 0 0 0 -16.3453,-275.44578 l -0.0203,-0.22613 a 26.727034,32.666043 0 0 0 -26.69717,-32.62955 z"
-     fill="#3f3d56"
-     id="path66"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 590.05614,432.09565 c -97.03268,0 -199.85152,-10.77643 -334.41856,-32.33548 h -0.0143 a 28.319628,34.612527 0 0 1 -28.11589,-30.88616 26.010651,31.790472 0 0 1 -0.17747,-3.84026 v -98.94093 a 4.1084728,5.0214157 0 0 1 0.0236,-0.63319 28.481254,34.810068 0 0 1 28.39597,-34.10139 c 234.11775,-38.90579 376.33636,-38.9017 633.94697,0.008 h 0.0111 a 28.476237,34.803937 0 0 1 28.28492,34.20628 3.1402623,3.8380594 0 0 1 0.0169,0.52009 v 98.94098 a 26.075052,31.869185 0 0 1 -0.17836,3.85049 28.358183,34.659649 0 0 1 -28.24059,30.88457 C 778.29083,421.317 687.06542,432.09556 590.05621,432.09556 Z"
-     fill="#f29100"
-     id="path68"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 605.62078,500.81449 h -58.87343 a 28.295517,34.583059 0 0 1 -28.26307,-34.54343 v -261.4181 a 28.295533,34.583078 0 0 1 28.26307,-34.54341 h 58.87343 a 28.295709,34.583292 0 0 1 28.2639,34.54341 v 261.4181 a 28.295693,34.583273 0 0 1 -28.2639,34.54343 z"
-     fill="#3f3d56"
-     id="path70"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 732.41981,123.08369 a 74.643477,91.22999 0 0 0 -2.24497,-14.50424 76.93954,94.03626 0 0 0 -4.3638,-13.884909 66.862376,81.719851 0 0 0 -30.10479,-38.205413 c -16.42173,-9.880366 -35.2068,-10.688944 -52.86334,-5.928507 a 104.47741,127.69332 0 0 0 -40.83852,23.36814 106.20032,129.79908 0 0 0 -17.0323,19.633553 c -5.23145,7.671936 -14.96328,28.750046 -15.6647,30.701516 a 104.56307,127.79801 0 0 0 -23.23937,-40.630907 109.25959,133.53813 0 0 0 -40.02984,-29.567619 100.85823,123.26991 0 0 0 -24.53466,-6.095155 78.084202,95.435278 0 0 0 -26.31759,2.806413 66.299225,81.031562 0 0 0 -37.52639,33.527191 69.198522,84.575112 0 0 0 -11.72035,51.587167 70.996663,86.772818 0 0 0 4.8272,26.93673 84.028751,102.70076 0 0 0 5.27505,13.52479 86.082509,105.21089 0 0 0 7.01257,12.28049 79.434158,97.085207 0 0 0 39.02446,31.76077 c 16.36275,6.18074 33.71957,6.38272 50.54532,3.48097 17.2785,-2.97994 33.91015,-9.81612 50.1838,-17.30292 2.17098,-0.99872 4.3328,-2.02651 6.49787,-3.04419 14.46732,6.80222 29.05731,13.36275 44.20143,17.52662 a 133.098,162.67368 0 0 0 52.03146,2.55034 83.493167,102.04617 0 0 0 43.14764,-25.75955 77.479598,94.696325 0 0 0 22.35305,-47.4427 67.008331,81.898239 0 0 0 1.38077,-27.31858 z m -224.28958,80.45388 a 116.00956,141.78802 0 0 1 -28.14,0.20122 87.336722,106.7438 0 0 1 -19.56848,-6.36574 61.522623,75.193552 0 0 1 -32.97117,-40.00975 65.856868,80.490909 0 0 1 -3.98997,-17.72707 60.046346,73.389233 0 0 1 -0.005,-16.26771 62.646836,76.567578 0 0 1 3.74178,-16.59932 64.003561,78.22578 0 0 1 7.02466,-14.698374 60.362926,73.776159 0 0 1 9.0617,-11.124118 55.163889,67.421845 0 0 1 10.1505,-7.269513 62.034652,75.81936 0 0 1 13.27508,-4.340162 78.569972,96.028991 0 0 1 18.50816,0.176729 95.709784,116.97744 0 0 1 21.31726,7.181777 100.60614,122.96182 0 0 1 20.52712,14.627455 98.539279,120.43567 0 0 1 15.86244,19.329016 97.199022,118.7976 0 0 1 11.54994,24.30829 100.75511,123.14388 0 0 1 6.20235,28.01449 l 0.0127,0.14053 a 104.46997,127.68423 0 0 0 -0.67649,14.53545 c 0.004,1.87104 0.07,3.73974 0.147,5.60742 a 9.1517129,11.185313 0 0 0 -1.79452,2.95199 289.40644,353.7154 0 0 1 -36.81323,14.26896 q -6.65519,1.87778 -13.42335,3.05849 z m 207.05808,-63.90184 a 65.84599,80.477616 0 0 1 -3.99061,17.72925 61.182569,74.777936 0 0 1 -32.97054,40.00811 87.338442,106.7459 0 0 1 -19.56868,6.36574 116.03873,141.82367 0 0 1 -28.19117,-0.20865 c -16.61715,-2.9042 -32.64706,-9.31492 -48.32691,-16.46943 -0.64558,-0.29464 -1.28613,-0.60518 -1.93098,-0.90211 a 8.987348,10.984425 0 0 0 -1.71703,-2.91961 103.12795,126.04399 0 0 0 -0.51448,-20.31697 100.76234,123.15272 0 0 1 6.19585,-27.9618 97.199214,118.79783 0 0 1 11.54931,-24.30738 98.534183,120.42945 0 0 1 15.86306,-19.329924 100.60614,122.96182 0 0 1 20.52713,-14.627455 95.71851,116.9881 0 0 1 21.31746,-7.181777 78.572488,96.032065 0 0 1 18.50775,-0.176729 62.042727,75.829229 0 0 1 13.27533,4.340161 55.162327,67.419938 0 0 1 10.15123,7.270154 60.354263,73.765572 0 0 1 9.06129,11.124118 64.012256,78.236407 0 0 1 7.02435,14.697732 62.647697,76.56863 0 0 1 3.74176,16.59932 60.047382,73.390499 0 0 1 -0.005,16.26717 z"
-     fill="#3f3d56"
-     id="path72"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="396.98572"
-     cy="499.76193"
-     fill="#f29100"
-     id="circle74"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="471.04865"
-     cy="468.185"
-     fill="#f29100"
-     id="circle76"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="438.32315"
-     cy="567.12598"
-     fill="#f29100"
-     id="circle78"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="744.90936"
-     cy="499.76193"
-     fill="#f29100"
-     id="circle80"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="742.47461"
-     cy="522.05872"
-     fill="#f29100"
-     id="circle82"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="703.57196"
-     cy="567.12598"
-     fill="#f29100"
-     id="circle84"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="753.5213"
-     cy="720.80023"
-     fill="#f29100"
-     id="circle86"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="779.35724"
-     cy="630.27985"
-     fill="#f29100"
-     id="circle88"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="698.40479"
-     cy="670.27716"
-     fill="#f29100"
-     id="circle90"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="457.26947"
-     cy="720.80023"
-     fill="#f29100"
-     id="circle92"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="483.10544"
-     cy="630.27985"
-     fill="#f29100"
-     id="circle94"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="402.15286"
-     cy="670.27716"
-     fill="#f29100"
-     id="circle96"
-     rx="10.334358"
-     ry="12.630754"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="332.57251"
-     cy="71.152756"
-     fill="#fd6584"
-     id="circle101"
-     rx="13.77916"
-     ry="16.841024"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="159.05939"
-     cy="327.4451"
-     fill="#fd6584"
-     id="circle103"
-     rx="13.77916"
-     ry="16.841024"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="1041.161"
-     cy="473.08023"
-     fill="#fd6584"
-     id="circle105"
-     rx="13.77916"
-     ry="16.841024"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="932.65021"
-     cy="666.75189"
-     fill="#e6e6e6"
-     id="circle109"
-     rx="13.77916"
-     ry="16.841024"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="797.74304"
-     cy="137.02742"
-     fill="#e6e6e6"
-     id="circle111"
-     rx="13.77916"
-     ry="16.841024"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 356.0393,319.21837 c -1.19108,2.30279 -4.0791,1.96815 -5.70082,0.52851 -2.25128,-1.99857 -1.52245,-5.8481 0.0279,-8.12262 4.92716,-7.22921 13.07613,0.40314 14.17532,7.58252 a 14.777692,18.06144 0 0 1 -6.95339,17.9847 c -5.62163,4.07142 -12.92366,2.02962 -17.75698,-2.84337 -10.08231,-10.16513 -7.33719,-30.5177 3.86179,-37.8718 7.14707,-4.69328 16.18262,-2.63338 23.22322,1.29808 7.92542,4.42555 14.74045,11.20881 22.06962,16.86297 a 123.0537,150.39744 0 0 0 53.15227,22.18268 c 3.30508,0.41194 3.28156,-5.9064 0,-6.31539 a 118.20176,144.46735 0 0 1 -30.54118,-8.988 134.21843,164.04309 0 0 1 -27.44338,-18.40996 c -8.62964,-7.22953 -17.64523,-14.25242 -28.32489,-15.44705 a 24.57215,30.032323 0 0 0 -22.65164,12.04644 25.093384,30.669381 0 0 0 -3.77124,26.90323 23.239074,28.403026 0 0 0 17.71492,18.64119 18.998088,23.219649 0 0 0 20.02862,-11.30979 c 3.93086,-8.30901 3.80298,-19.47025 -2.13416,-26.35912 a 13.706603,16.752346 0 0 0 -13.32788,-4.43035 11.725273,14.330744 0 0 0 -7.92845,12.33299 c -0.57287,10.78541 11.95381,16.17909 16.74199,6.92177 1.78204,-3.44542 -2.68751,-6.61778 -4.46172,-3.18749 z"
-     fill="#3f3d56"
-     id="path113"
-     style="stroke-width:1.7606" />
-  <path
-     d="m 797.91245,319.21837 c 1.19107,2.30279 4.07912,1.96815 5.70082,0.52851 2.2513,-1.99857 1.52246,-5.8481 -0.0279,-8.12262 -4.92717,-7.22921 -13.07613,0.40314 -14.17531,7.58252 a 14.777676,18.06142 0 0 0 6.95337,17.9847 c 5.62164,4.07142 12.92368,2.02962 17.75699,-2.84337 10.0823,-10.16513 7.33718,-30.5177 -3.86179,-37.8718 -7.14709,-4.69328 -16.18264,-2.63338 -23.22321,1.29808 -7.92543,4.42555 -14.74047,11.20881 -22.06962,16.86297 a 123.0537,150.39744 0 0 1 -53.15229,22.18268 c -3.30506,0.41194 -3.28154,-5.9064 0,-6.31539 a 118.20203,144.46768 0 0 0 30.54121,-8.988 134.21881,164.04356 0 0 0 27.44337,-18.40996 c 8.62963,-7.22953 17.64524,-14.25242 28.32487,-15.44705 a 24.572118,30.032284 0 0 1 22.65166,12.04644 25.093384,30.669381 0 0 1 3.77125,26.90323 23.239107,28.403064 0 0 1 -17.71493,18.64119 18.998104,23.219668 0 0 1 -20.02864,-11.30979 c -3.93086,-8.30901 -3.80296,-19.47025 2.13416,-26.35912 a 13.706619,16.752365 0 0 1 13.32789,-4.43035 11.725289,14.330764 0 0 1 7.92845,12.33299 c 0.57287,10.78541 -11.95381,16.17909 -16.74197,6.92177 -1.78205,-3.44542 2.68748,-6.61778 4.4617,-3.18749 z"
-     fill="#3f3d56"
-     id="path115"
-     style="stroke-width:1.7606" />
-  <ellipse
-     cx="214.2404"
-     cy="597.08728"
-     fill="#e6e6e6"
-     id="circle2791"
-     rx="13.77916"
-     ry="16.841024"
-     style="stroke-width:1.7606" />
-</svg>

Riot/Assets/Images.xcassets/BWI/birthday_cake.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "20221027_BwM_Bday_scaled.svg",
+      "filename" : "web_dark.svg",
       "idiom" : "universal"
     }
   ],

Riot/Assets/Images.xcassets/BWI/birthday_cake.imageset/web_dark.svg

@@ -0,0 +1,29 @@
+<svg width="387" height="254" viewBox="0 0 387 254" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3878_1251)">
+<path d="M383.487 253.614H0.412795C0.303315 253.614 0.198319 253.571 0.120905 253.493C0.0434905 253.416 0 253.311 0 253.201C0 253.092 0.0434905 252.987 0.120905 252.909C0.198319 252.832 0.303315 252.788 0.412795 252.788H383.487C383.596 252.788 383.701 252.832 383.779 252.909C383.856 252.987 383.9 253.092 383.9 253.201C383.9 253.311 383.856 253.416 383.779 253.493C383.701 253.571 383.596 253.614 383.487 253.614Z" fill="#C1C6CD"/>
+<path d="M141.672 62.1213C135.55 53.9289 124.346 51.9517 118.778 56.1121C113.21 60.2726 111.931 71.5779 118.053 79.7703C123.72 87.3534 133.986 89.4215 139.64 86.5805C139.622 86.6692 139.621 86.7605 139.637 86.8497L139.956 88.4258C139.98 88.5459 140.035 88.6578 140.114 88.7509C140.194 88.844 140.296 88.9152 140.411 88.9577C140.526 89.0002 140.65 89.0126 140.771 88.9937C140.893 88.9749 141.007 88.9253 141.103 88.8499L143.803 86.7408C143.9 86.6654 143.975 86.5665 144.023 86.4535C144.071 86.3406 144.089 86.2173 144.075 86.0955C144.062 85.9736 144.017 85.8572 143.946 85.7573C143.875 85.6574 143.78 85.5773 143.669 85.5247L142.217 84.834C142.166 84.8111 142.112 84.7942 142.057 84.7838C146.416 80.1759 147.35 69.7208 141.672 62.1213Z" fill="#C1C6CD"/>
+<path d="M128.281 59.0282C131.276 59.5039 133.973 61.1111 135.817 63.5181C137.661 65.9252 138.511 68.9483 138.19 71.9634C138.124 72.6541 139.204 72.6496 139.269 71.9634C139.578 68.7136 138.646 65.4672 136.662 62.8753C134.677 60.2834 131.786 58.5376 128.568 57.9881C127.889 57.8726 127.597 58.9119 128.281 59.0282Z" fill="white"/>
+<path d="M311.466 138.378C316.818 129.663 314.517 118.521 308.595 114.883C302.672 111.246 291.694 114.233 286.341 122.948C281.387 131.014 283.257 141.319 287.986 145.524C287.897 145.54 287.811 145.572 287.735 145.62L286.388 146.499C286.285 146.566 286.201 146.658 286.144 146.766C286.087 146.875 286.059 146.996 286.062 147.119C286.065 147.241 286.099 147.361 286.161 147.466C286.223 147.572 286.312 147.66 286.417 147.722L289.374 149.452C289.48 149.513 289.6 149.547 289.723 149.55C289.845 149.552 289.966 149.524 290.075 149.466C290.183 149.409 290.275 149.324 290.341 149.222C290.408 149.119 290.447 149 290.455 148.878L290.561 147.273C290.563 147.218 290.559 147.161 290.548 147.106C296.44 149.455 306.501 146.462 311.466 138.378Z" fill="#C1C6CD"/>
+<path d="M307.912 125.348C308.576 128.306 308.079 131.407 306.523 134.009C304.967 136.612 302.472 138.518 299.551 139.333C298.885 139.527 299.288 140.529 299.95 140.336C303.084 139.422 305.757 137.358 307.432 134.556C309.108 131.755 309.662 128.423 308.985 125.23C308.841 124.556 307.767 124.669 307.912 125.348Z" fill="white"/>
+<path d="M266.278 72.0433C268.068 61.974 261.847 52.448 255.003 51.232C248.16 50.016 239.038 56.8154 237.249 66.8847C235.592 76.205 241.106 85.1089 247.046 87.2908C246.969 87.3381 246.901 87.3998 246.847 87.4725L245.915 88.7831C245.844 88.883 245.8 88.9994 245.787 89.1212C245.773 89.2431 245.791 89.3663 245.839 89.4793C245.887 89.5922 245.962 89.6911 246.059 89.7665C246.155 89.842 246.27 89.8915 246.391 89.9103L249.776 90.4372C249.897 90.4561 250.021 90.4436 250.136 90.4011C250.251 90.3586 250.353 90.2874 250.433 90.1943C250.513 90.1012 250.567 89.9892 250.591 89.8691C250.616 89.7489 250.609 89.6246 250.572 89.5078L250.082 87.976C250.064 87.9231 250.04 87.8724 250.009 87.8251C256.352 87.8531 264.618 81.3839 266.278 72.0433Z" fill="#DEBB6B"/>
+<path d="M266.278 72.0433C268.068 61.974 261.847 52.448 255.003 51.232C248.16 50.016 239.038 56.8154 237.249 66.8847C235.593 76.205 241.106 85.1089 247.046 87.2908C246.969 87.3381 246.901 87.3998 246.847 87.4725L245.915 88.7831C245.844 88.883 245.8 88.9994 245.787 89.1212C245.773 89.2431 245.791 89.3663 245.839 89.4793C245.887 89.5922 245.962 89.6911 246.059 89.7665C246.156 89.842 246.27 89.8915 246.391 89.9103L249.776 90.4372C249.897 90.4561 250.021 90.4436 250.136 90.4011C250.251 90.3586 250.353 90.2874 250.433 90.1943C250.513 90.1012 250.567 89.9892 250.592 89.8691C250.616 89.7489 250.609 89.6246 250.572 89.5078L250.082 87.976C250.064 87.9231 250.04 87.8724 250.01 87.8251C256.352 87.8531 264.619 81.3839 266.278 72.0433Z" fill="#DEBB6B"/>
+<path d="M259.376 60.1592C261.077 62.6691 261.75 65.7364 261.255 68.7278C260.761 71.7193 259.136 74.4067 256.717 76.2352C256.169 76.6596 256.91 77.4437 257.455 77.0221C260.037 75.0245 261.768 72.1246 262.302 68.904C262.835 65.6835 262.131 62.3803 260.331 59.6569C259.951 59.0827 258.993 59.5807 259.376 60.1592Z" fill="white"/>
+<path d="M91.8384 118.755C87.131 109.676 90.2323 98.7291 96.4026 95.5299C102.573 92.3307 113.306 96.1044 118.014 105.184C122.371 113.588 119.76 123.729 114.74 127.582C114.827 127.604 114.91 127.643 114.983 127.696L116.263 128.67C116.361 128.744 116.438 128.842 116.487 128.954C116.536 129.066 116.555 129.189 116.544 129.311C116.532 129.433 116.489 129.55 116.419 129.651C116.349 129.752 116.255 129.833 116.145 129.887L113.071 131.398C112.961 131.453 112.839 131.478 112.716 131.471C112.594 131.465 112.475 131.427 112.371 131.362C112.267 131.297 112.182 131.207 112.123 131.099C112.064 130.992 112.033 130.871 112.034 130.748L112.045 129.14C112.047 129.084 112.055 129.029 112.07 128.975C106.023 130.89 96.2051 127.177 91.8384 118.755Z" fill="#DEBB6B"/>
+<path d="M94.8873 105.354C94.011 108.257 94.2825 111.386 95.6459 114.094C97.0093 116.802 99.3604 118.884 102.214 119.909C102.864 120.15 102.39 121.12 101.744 120.88C98.6844 119.742 96.1679 117.489 94.6994 114.574C93.231 111.658 92.919 108.295 93.8261 105.159C94.018 104.498 95.0807 104.688 94.8873 105.354Z" fill="white"/>
+<path d="M326.919 64.6996C324.928 66.4962 322.54 67.7954 319.95 68.4906C317.359 69.1858 314.641 69.2573 312.018 68.6992C311.278 68.5377 310.406 68.4195 310.035 67.6679C309.886 67.3867 309.837 67.0632 309.895 66.7503C309.954 66.4374 310.117 66.1536 310.357 65.9453C311.002 65.4284 311.946 65.6106 312.566 66.0756C313.27 66.6031 313.33 67.5217 313.031 68.2915C312.3 70.1727 310.116 70.6571 308.361 71.0561C304.361 71.9653 300.273 73.2694 297.174 76.0783C294.307 78.6772 292.495 82.6985 293.389 86.5763C293.546 87.2547 294.586 86.9656 294.43 86.2905C293.543 82.4447 295.7 78.5298 298.685 76.2097C300.496 74.8594 302.526 73.8292 304.685 73.1638C305.787 72.8009 306.908 72.5006 308.037 72.236C309.152 72.0241 310.247 71.7137 311.307 71.3083C313.013 70.5721 314.565 68.9057 314.241 66.9103C313.939 65.0488 311.527 63.9031 309.913 64.9454C309.567 65.1828 309.286 65.5022 309.095 65.8748C308.904 66.2475 308.808 66.6619 308.816 67.0808C308.824 67.4997 308.936 67.9101 309.141 68.2751C309.347 68.6401 309.64 68.9483 309.994 69.1722C310.764 69.6628 311.859 69.7926 312.745 69.9304C315.413 70.3495 318.14 70.1648 320.727 69.39C323.313 68.6152 325.693 67.27 327.691 65.4534C328.201 64.9811 327.428 64.2285 326.919 64.6996Z" fill="#C1C6CD"/>
+<path d="M154.844 110.73C154.892 108.048 155.574 105.416 156.836 103.05C158.097 100.683 159.901 98.6488 162.101 97.1141C162.724 96.6837 163.406 96.1278 164.209 96.37C164.516 96.4532 164.786 96.6381 164.974 96.8946C165.163 97.1511 165.259 97.4639 165.247 97.782C165.184 98.6059 164.406 99.1709 163.643 99.3065C162.776 99.4603 162.065 98.8765 161.707 98.1322C160.832 96.3135 161.97 94.3873 162.878 92.8327C164.945 89.2905 166.785 85.4139 166.85 81.2318C166.91 77.3623 165.211 73.2926 161.768 71.2972C161.165 70.9481 160.666 71.9049 161.266 72.2523C164.68 74.2312 166.067 78.4806 165.722 82.2454C165.471 84.491 164.837 86.677 163.848 88.7087C163.361 89.7612 162.815 90.7853 162.237 91.7906C161.63 92.7499 161.109 93.761 160.681 94.8123C160.053 96.5617 160.211 98.8329 161.889 99.9593C163.455 101.01 165.939 100.031 166.281 98.1401C166.343 97.7258 166.302 97.3025 166.16 96.9081C166.019 96.5137 165.782 96.1606 165.47 95.8804C165.159 95.6001 164.783 95.4016 164.376 95.3025C163.968 95.2035 163.543 95.207 163.138 95.3127C162.254 95.5398 161.411 96.2512 160.705 96.8043C158.577 98.4663 156.849 100.585 155.648 103.003C154.447 105.421 153.804 108.078 153.766 110.778C153.763 111.473 154.841 111.423 154.844 110.73Z" fill="#C1C6CD"/>
+<path d="M106.185 145.781C104.802 146.668 103.228 147.215 101.593 147.376C99.9575 147.538 98.3072 147.31 96.7773 146.71C96.3458 146.539 95.8307 146.38 95.6814 145.889C95.6193 145.704 95.6218 145.503 95.6885 145.32C95.7551 145.137 95.8819 144.982 96.0483 144.88C96.4896 144.632 97.042 144.836 97.3707 145.179C97.7435 145.568 97.6879 146.13 97.4302 146.565C96.8004 147.629 95.4317 147.704 94.3307 147.77C91.8221 147.92 89.2207 148.3 87.0667 149.689C85.0738 150.973 83.5771 153.223 83.7305 155.657C83.7573 156.082 84.4146 156.011 84.3879 155.588C84.2358 153.174 85.9307 151.023 87.9667 149.919C89.1968 149.283 90.5266 148.863 91.8985 148.677C92.6006 148.567 93.3085 148.498 94.0174 148.451C94.7127 148.434 95.4051 148.356 96.0865 148.216C97.1918 147.942 98.2959 147.089 98.2995 145.851C98.3028 144.695 96.9594 143.762 95.8793 144.231C95.6468 144.34 95.4451 144.505 95.2922 144.711C95.1392 144.917 95.0398 145.158 95.0029 145.412C94.9659 145.666 94.9926 145.925 95.0805 146.167C95.1684 146.408 95.3148 146.623 95.5065 146.794C95.9227 147.168 96.572 147.355 97.0939 147.527C98.6645 148.047 100.332 148.208 101.973 147.998C103.614 147.788 105.187 147.212 106.576 146.314C106.931 146.079 106.539 145.547 106.185 145.781Z" fill="#C1C6CD"/>
+<path d="M243.835 158.611V247.974C243.833 249.152 243.364 250.28 242.531 251.113C241.699 251.945 240.57 252.414 239.393 252.416H143.236C142.059 252.414 140.931 251.945 140.098 251.113C139.266 250.28 138.797 249.152 138.794 247.974V158.611C138.795 157.433 139.263 156.304 140.096 155.471C140.929 154.638 142.058 154.17 143.236 154.169H239.393C240.571 154.17 241.7 154.638 242.533 155.471C243.366 156.304 243.834 157.433 243.835 158.611Z" fill="#DEBB6B"/>
+<path d="M198.108 252.866H184.521C183.358 252.88 182.238 252.432 181.405 251.62C180.572 250.809 180.095 249.701 180.079 248.539V155.84C180.095 154.677 180.572 153.569 181.405 152.758C182.238 151.947 183.358 151.499 184.521 151.513H198.108C199.271 151.499 200.391 151.947 201.224 152.758C202.056 153.569 202.533 154.677 202.55 155.84V248.539C202.533 249.701 202.056 250.809 201.224 251.62C200.391 252.432 199.271 252.88 198.108 252.866Z" fill="#6F7882"/>
+<path d="M188.517 126.197C195.5 132.242 193.295 146.23 193.295 146.23C193.295 146.23 179.768 150.418 172.785 144.374C165.801 138.329 168.007 124.341 168.007 124.341C168.007 124.341 181.534 120.153 188.517 126.197Z" fill="#6F7882"/>
+<path d="M211.712 143.215C205.689 150.217 191.694 148.056 191.694 148.056C191.694 148.056 187.464 134.542 193.486 127.54C199.509 120.538 213.504 122.699 213.504 122.699C213.504 122.699 217.734 136.213 211.712 143.215Z" fill="#6F7882"/>
+<path opacity="0.2" d="M243.835 158.611V173.657L138.794 173.212V158.611C138.795 157.433 139.263 156.304 140.096 155.471C140.929 154.638 142.058 154.17 143.236 154.169H239.393C240.571 154.17 241.7 154.638 242.533 155.471C243.366 156.304 243.834 157.433 243.835 158.611Z" fill="black"/>
+<path d="M255.146 167.758C254.73 168.305 254.193 168.747 253.577 169.051C252.961 169.355 252.283 169.511 251.597 169.508L134.537 169.017C133.954 169.015 133.377 168.897 132.839 168.672C132.301 168.446 131.812 168.117 131.402 167.703C130.991 167.289 130.666 166.798 130.445 166.258C130.224 165.718 130.111 165.14 130.114 164.556L130.169 151.492C130.173 150.314 130.646 149.186 131.482 148.357C132.319 147.527 133.45 147.064 134.628 147.069H134.629L251.689 147.559C252.272 147.562 252.849 147.679 253.387 147.905C253.925 148.13 254.413 148.459 254.824 148.874C255.235 149.288 255.56 149.779 255.781 150.319C256.002 150.859 256.114 151.437 256.112 152.02L256.057 165.085C256.054 166.052 255.734 166.991 255.146 167.758Z" fill="#DEBB6B"/>
+<path d="M180.36 146.217L180.266 169.734L202.737 169.824L202.831 146.307L180.36 146.217Z" fill="#6F7882"/>
+</g>
+<defs>
+<clipPath id="clip0_3878_1251">
+<rect width="387" height="253.786" fill="white"/>
+</clipPath>
+</defs>
+</svg>

Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Button_BuM_Dark.svg

@@ -0,0 +1,17 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_790_1087)">
+<circle cx="32" cy="28" r="28" fill="white"/>
+</g>
+<path d="M23.9447 38.5279C23.3789 38.5279 22.9 38.3319 22.508 37.9399C22.116 37.5479 21.92 37.069 21.92 36.5033V21.5126C21.92 20.9468 22.116 20.468 22.508 20.076C22.9 19.684 23.3789 19.488 23.9447 19.488H33.5099L31.8299 21.1679H23.9447C23.8585 21.1679 23.7795 21.2038 23.7077 21.2756C23.6359 21.3474 23.6 21.4264 23.6 21.5126V36.5033C23.6 36.5895 23.6359 36.6684 23.7077 36.7403C23.7795 36.812 23.8585 36.8479 23.9447 36.8479H38.9354C39.0215 36.8479 39.1005 36.812 39.1723 36.7403C39.2441 36.6684 39.28 36.5895 39.28 36.5033V28.6008L40.96 26.9209V36.5033C40.96 37.069 40.764 37.5479 40.372 37.9399C39.98 38.3319 39.5011 38.5279 38.9354 38.5279H23.9447ZM36.5145 19.9597L37.7228 21.1399L30.32 28.5319V30.1279H31.888L39.3295 22.7079L40.5163 23.8774L32.6138 31.8079H28.64V27.8341L36.5145 19.9597ZM40.5163 23.8774L36.5145 19.9597L39.0776 17.3966C39.4753 16.9989 39.9581 16.8 40.526 16.8C41.0939 16.8 41.571 17.0025 41.9572 17.4074L43.0514 18.5079C43.4376 18.9014 43.6307 19.3756 43.6307 19.9306C43.6307 20.4855 43.434 20.9597 43.0406 21.3532L40.5163 23.8774Z" fill="#108194"/>
+<defs>
+<filter id="filter0_d_790_1087" x="0" y="0" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_790_1087"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_790_1087" result="shape"/>
+</filter>
+</defs>
+</svg>

Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Contents.json

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

Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Button_BuM_Light.svg

@@ -0,0 +1,17 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_790_1079)">
+<circle cx="32" cy="28" r="28" fill="#108194"/>
+</g>
+<path d="M23.9447 38.5279C23.3789 38.5279 22.9 38.3319 22.508 37.9399C22.116 37.5479 21.92 37.069 21.92 36.5033V21.5126C21.92 20.9468 22.116 20.468 22.508 20.076C22.9 19.684 23.3789 19.488 23.9447 19.488H33.5099L31.8299 21.1679H23.9447C23.8585 21.1679 23.7795 21.2038 23.7077 21.2756C23.6359 21.3474 23.6 21.4264 23.6 21.5126V36.5033C23.6 36.5895 23.6359 36.6684 23.7077 36.7403C23.7795 36.812 23.8585 36.8479 23.9447 36.8479H38.9354C39.0215 36.8479 39.1005 36.812 39.1723 36.7403C39.2441 36.6684 39.28 36.5895 39.28 36.5033V28.6008L40.96 26.9209V36.5033C40.96 37.069 40.764 37.5479 40.372 37.9399C39.98 38.3319 39.5011 38.5279 38.9354 38.5279H23.9447ZM36.5145 19.9597L37.7228 21.1399L30.32 28.5319V30.1279H31.888L39.3295 22.7079L40.5163 23.8774L32.6138 31.8079H28.64V27.8341L36.5145 19.9597ZM40.5163 23.8774L36.5145 19.9597L39.0776 17.3966C39.4753 16.9989 39.9581 16.8 40.526 16.8C41.0939 16.8 41.571 17.0025 41.9572 17.4074L43.0514 18.5079C43.4376 18.9014 43.6307 19.3756 43.6307 19.9306C43.6307 20.4855 43.434 20.9597 43.0406 21.3532L40.5163 23.8774Z" fill="white"/>
+<defs>
+<filter id="filter0_d_790_1079" x="0" y="0" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_790_1079"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_790_1079" result="shape"/>
+</filter>
+</defs>
+</svg>

Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Contents.json

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

Riot/Assets/Images.xcassets/BWI/bwi_settings_filled.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "settings-filled.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Assets/Images.xcassets/BWI/bwi_settings_filled.imageset/settings-filled.svg

@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_674_1214" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="24">
+<rect width="24" height="24" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_674_1214)">
+<path d="M13.875 22H10.125C9.87497 22 9.6583 21.9167 9.47497 21.75C9.29164 21.5833 9.1833 21.375 9.14997 21.125L8.84997 18.8C8.6333 18.7167 8.42914 18.6167 8.23747 18.5C8.0458 18.3833 7.8583 18.2583 7.67497 18.125L5.49997 19.025C5.26664 19.1083 5.0333 19.1167 4.79997 19.05C4.56664 18.9833 4.3833 18.8417 4.24997 18.625L2.39997 15.4C2.26664 15.1833 2.22497 14.95 2.27497 14.7C2.32497 14.45 2.44997 14.25 2.64997 14.1L4.52497 12.675C4.5083 12.5583 4.49997 12.4458 4.49997 12.3375V11.6625C4.49997 11.5542 4.5083 11.4417 4.52497 11.325L2.64997 9.9C2.44997 9.75 2.32497 9.55 2.27497 9.3C2.22497 9.05 2.26664 8.81667 2.39997 8.6L4.24997 5.375C4.36664 5.14167 4.5458 4.99583 4.78747 4.9375C5.02914 4.87917 5.26664 4.89167 5.49997 4.975L7.67497 5.875C7.8583 5.74167 8.04997 5.61667 8.24997 5.5C8.44997 5.38333 8.64997 5.28333 8.84997 5.2L9.14997 2.875C9.1833 2.625 9.29164 2.41667 9.47497 2.25C9.6583 2.08333 9.87497 2 10.125 2H13.875C14.125 2 14.3416 2.08333 14.525 2.25C14.7083 2.41667 14.8166 2.625 14.85 2.875L15.15 5.2C15.3666 5.28333 15.5708 5.38333 15.7625 5.5C15.9541 5.61667 16.1416 5.74167 16.325 5.875L18.5 4.975C18.7333 4.89167 18.9666 4.88333 19.2 4.95C19.4333 5.01667 19.6166 5.15833 19.75 5.375L21.6 8.6C21.7333 8.81667 21.775 9.05 21.725 9.3C21.675 9.55 21.55 9.75 21.35 9.9L19.475 11.325C19.4916 11.4417 19.5 11.5542 19.5 11.6625V12.3375C19.5 12.4458 19.4833 12.5583 19.45 12.675L21.325 14.1C21.525 14.25 21.65 14.45 21.7 14.7C21.75 14.95 21.7083 15.1833 21.575 15.4L19.725 18.6C19.5916 18.8167 19.4041 18.9625 19.1625 19.0375C18.9208 19.1125 18.6833 19.1083 18.45 19.025L16.325 18.125C16.1416 18.2583 15.95 18.3833 15.75 18.5C15.55 18.6167 15.35 18.7167 15.15 18.8L14.85 21.125C14.8166 21.375 14.7083 21.5833 14.525 21.75C14.3416 21.9167 14.125 22 13.875 22ZM12.05 15.5C13.0166 15.5 13.8416 15.1583 14.525 14.475C15.2083 13.7917 15.55 12.9667 15.55 12C15.55 11.0333 15.2083 10.2083 14.525 9.525C13.8416 8.84167 13.0166 8.5 12.05 8.5C11.0666 8.5 10.2375 8.84167 9.56247 9.525C8.88747 10.2083 8.54997 11.0333 8.54997 12C8.54997 12.9667 8.88747 13.7917 9.56247 14.475C10.2375 15.1583 11.0666 15.5 12.05 15.5Z" fill="#13293D"/>
+</g>
+</svg>

Riot/Assets/Images.xcassets/BWI/federation_exclamation_mark_dark.imageset/!-dark.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 fill-rule="evenodd" clip-rule="evenodd" d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM10.4709 7.16895C10.3959 6.31395 11.0259 5.56395 11.8809 5.50395C12.7209 5.44395 13.4709 6.07395 13.5609 6.92895V7.16895L13.0809 13.169C13.0359 13.724 12.5709 14.144 12.0159 14.144H11.9259C11.4009 14.099 10.9959 13.694 10.9509 13.169L10.4709 7.16895ZM13.3202 17.0842C13.3202 17.8132 12.7292 18.4042 12.0002 18.4042C11.2712 18.4042 10.6802 17.8132 10.6802 17.0842C10.6802 16.3551 11.2712 15.7642 12.0002 15.7642C12.7292 15.7642 13.3202 16.3551 13.3202 17.0842Z" fill="#A9B2BC"/>
+</svg>

Riot/Assets/Images.xcassets/BWI/federation_exclamation_mark_dark.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "!-dark.svg",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/BWI/federation_exclamation_mark_light.imageset/Contents.json

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

Riot/Assets/Images.xcassets/BWI/federation_exclamation_mark_light.imageset/Warning.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 fill-rule="evenodd" clip-rule="evenodd" d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM10.4709 7.16895C10.3959 6.31395 11.0259 5.56395 11.8809 5.50395C12.7209 5.44395 13.4709 6.07395 13.5609 6.92895V7.16895L13.0809 13.169C13.0359 13.724 12.5709 14.144 12.0159 14.144H11.9259C11.4009 14.099 10.9959 13.694 10.9509 13.169L10.4709 7.16895ZM13.3202 17.0842C13.3202 17.8132 12.7292 18.4042 12.0002 18.4042C11.2712 18.4042 10.6802 17.8132 10.6802 17.0842C10.6802 16.3551 11.2712 15.7642 12.0002 15.7642C12.7292 15.7642 13.3202 16.3551 13.3202 17.0842Z" fill="#737D8C"/>
+</svg>

Riot/Assets/Images.xcassets/BWI/federation_pill_de_bum_dark.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "App=BUM, platform=iOS, Theme=dark, Outline=background, Language=german.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/federation_pill_de_bum_light.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "App=BUM, platform=iOS, Theme=light, Outline=background, Language=german.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/federation_pill_en_bum_dark.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "App=BUM, platform=iOS, Theme=dark, Outline=background, Language=english.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/federation_pill_en_bum_light.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "App=BUM, platform=iOS, Theme=light, Outline=background, Language=english.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/introduce_federation_1_dark.imageset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/BWI/introduce_federation_1_light.imageset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/BWI/introduce_federation_2_dark.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Kennzeichnung_BuM_dark_mobile.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/introduce_federation_2_dark.imageset/Kennzeichnung_BuM_dark_mobile.svg

@@ -0,0 +1,12 @@
+<svg width="110" height="108" viewBox="0 0 110 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-inside-1_2287_4246" fill="white">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.6759 95.0462C73.7757 100.383 64.2518 103.5 54 103.5C42.8565 103.5 32.573 99.8177 24.3 93.6036C12.277 84.5728 4.5 70.1946 4.5 54C4.5 26.6619 26.6619 4.5 54 4.5C81.3381 4.5 103.5 26.6619 103.5 54C103.5 71.0863 94.843 86.1507 81.6759 95.0462ZM54 56.475C62.2014 56.475 68.85 49.2724 68.85 40.3875C68.85 31.5026 62.2014 24.3 54 24.3C45.7986 24.3 39.15 31.5026 39.15 40.3875C39.15 49.2724 45.7986 56.475 54 56.475ZM54 93.6C64.7018 93.6 74.4121 89.3548 81.5387 82.4566C77.1314 71.5753 66.462 63.9 54 63.9C41.538 63.9 30.8686 71.5753 26.4613 82.4566C33.5879 89.3548 43.2982 93.6 54 93.6Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.6759 95.0462C73.7757 100.383 64.2518 103.5 54 103.5C42.8565 103.5 32.573 99.8177 24.3 93.6036C12.277 84.5728 4.5 70.1946 4.5 54C4.5 26.6619 26.6619 4.5 54 4.5C81.3381 4.5 103.5 26.6619 103.5 54C103.5 71.0863 94.843 86.1507 81.6759 95.0462ZM54 56.475C62.2014 56.475 68.85 49.2724 68.85 40.3875C68.85 31.5026 62.2014 24.3 54 24.3C45.7986 24.3 39.15 31.5026 39.15 40.3875C39.15 49.2724 45.7986 56.475 54 56.475ZM54 93.6C64.7018 93.6 74.4121 89.3548 81.5387 82.4566C77.1314 71.5753 66.462 63.9 54 63.9C41.538 63.9 30.8686 71.5753 26.4613 82.4566C33.5879 89.3548 43.2982 93.6 54 93.6Z" fill="#26282D"/>
+<path d="M81.6759 95.0462L82.4596 96.2062L82.4596 96.2062L81.6759 95.0462ZM24.3 93.6036L23.4592 94.723L23.4592 94.723L24.3 93.6036ZM81.5387 82.4566L82.5124 83.4626L83.1907 82.806L82.8363 81.9311L81.5387 82.4566ZM26.4613 82.4566L25.1637 81.9311L24.8093 82.806L25.4876 83.4626L26.4613 82.4566ZM54 104.9C64.5398 104.9 74.3352 101.695 82.4596 96.2062L80.8922 93.8861C73.2161 99.072 63.9638 102.1 54 102.1V104.9ZM23.4592 94.723C31.9663 101.113 42.5429 104.9 54 104.9V102.1C43.1701 102.1 33.1797 98.5225 25.1408 92.4842L23.4592 94.723ZM3.1 54C3.1 70.6535 11.0993 85.4391 23.4592 94.723L25.1408 92.4842C13.4547 83.7064 5.9 69.7357 5.9 54H3.1ZM54 3.1C25.8887 3.1 3.1 25.8887 3.1 54H5.9C5.9 27.4351 27.4351 5.9 54 5.9V3.1ZM104.9 54C104.9 25.8887 82.1113 3.1 54 3.1V5.9C80.5649 5.9 102.1 27.4351 102.1 54H104.9ZM82.4596 96.2062C95.9956 87.0615 104.9 71.5709 104.9 54H102.1C102.1 70.6018 93.6904 85.2398 80.8922 93.8861L82.4596 96.2062ZM67.45 40.3875C67.45 48.6068 61.3248 55.075 54 55.075V57.875C63.078 57.875 70.25 49.938 70.25 40.3875H67.45ZM54 25.7C61.3248 25.7 67.45 32.1682 67.45 40.3875H70.25C70.25 30.837 63.078 22.9 54 22.9V25.7ZM40.55 40.3875C40.55 32.1682 46.6752 25.7 54 25.7V22.9C44.922 22.9 37.75 30.837 37.75 40.3875H40.55ZM54 55.075C46.6752 55.075 40.55 48.6068 40.55 40.3875H37.75C37.75 49.938 44.922 57.875 54 57.875V55.075ZM80.565 81.4507C73.689 88.1063 64.324 92.2 54 92.2V95C65.0796 95 75.1352 90.6033 82.5124 83.4626L80.565 81.4507ZM54 65.3C65.8724 65.3 76.0405 72.6112 80.2411 82.9822L82.8363 81.9311C78.2223 70.5394 67.0517 62.5 54 62.5V65.3ZM27.7589 82.9822C31.9595 72.6112 42.1276 65.3 54 65.3V62.5C40.9483 62.5 29.7777 70.5394 25.1637 81.9311L27.7589 82.9822ZM54 92.2C43.676 92.2 34.311 88.1063 27.4349 81.4507L25.4876 83.4626C32.8648 90.6033 42.9204 95 54 95V92.2Z" fill="#26282D" mask="url(#path-1-inside-1_2287_4246)"/>
+<ellipse cx="75.648" cy="83.52" rx="20.648" ry="20.52" fill="#101317"/>
+<ellipse cx="88.6128" cy="83.52" rx="20.648" ry="20.52" fill="#101317"/>
+<ellipse cx="88.6126" cy="83.5256" rx="14.4056" ry="14.3163" fill="white"/>
+<ellipse cx="75.6484" cy="83.5181" rx="18.2471" ry="18.134" fill="#101317"/>
+<ellipse cx="75.6478" cy="83.5256" rx="14.4056" ry="14.3163" fill="white"/>
+</svg>

Riot/Assets/Images.xcassets/BWI/introduce_federation_2_light.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Kennzeichnung_BuM_light_mobile.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/introduce_federation_2_light.imageset/Kennzeichnung_BuM_light_mobile.svg

@@ -0,0 +1,12 @@
+<svg width="110" height="108" viewBox="0 0 110 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-inside-1_2287_4245" fill="white">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.6759 95.0462C73.7757 100.383 64.2518 103.5 54 103.5C42.8565 103.5 32.573 99.8177 24.3 93.6036C12.277 84.5728 4.5 70.1946 4.5 54C4.5 26.6619 26.6619 4.5 54 4.5C81.3381 4.5 103.5 26.6619 103.5 54C103.5 71.0863 94.843 86.1507 81.6759 95.0462ZM54 56.475C62.2014 56.475 68.85 49.2724 68.85 40.3875C68.85 31.5026 62.2014 24.3 54 24.3C45.7986 24.3 39.15 31.5026 39.15 40.3875C39.15 49.2724 45.7986 56.475 54 56.475ZM54 93.6C64.7018 93.6 74.4121 89.3548 81.5387 82.4566C77.1314 71.5753 66.462 63.9 54 63.9C41.538 63.9 30.8686 71.5753 26.4613 82.4566C33.5879 89.3548 43.2982 93.6 54 93.6Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.6759 95.0462C73.7757 100.383 64.2518 103.5 54 103.5C42.8565 103.5 32.573 99.8177 24.3 93.6036C12.277 84.5728 4.5 70.1946 4.5 54C4.5 26.6619 26.6619 4.5 54 4.5C81.3381 4.5 103.5 26.6619 103.5 54C103.5 71.0863 94.843 86.1507 81.6759 95.0462ZM54 56.475C62.2014 56.475 68.85 49.2724 68.85 40.3875C68.85 31.5026 62.2014 24.3 54 24.3C45.7986 24.3 39.15 31.5026 39.15 40.3875C39.15 49.2724 45.7986 56.475 54 56.475ZM54 93.6C64.7018 93.6 74.4121 89.3548 81.5387 82.4566C77.1314 71.5753 66.462 63.9 54 63.9C41.538 63.9 30.8686 71.5753 26.4613 82.4566C33.5879 89.3548 43.2982 93.6 54 93.6Z" fill="#E3E8F0"/>
+<path d="M81.6759 95.0462L82.4596 96.2062L82.4596 96.2062L81.6759 95.0462ZM24.3 93.6036L23.4592 94.723L23.4592 94.723L24.3 93.6036ZM81.5387 82.4566L82.5124 83.4626L83.1907 82.806L82.8363 81.9311L81.5387 82.4566ZM26.4613 82.4566L25.1637 81.9311L24.8093 82.806L25.4876 83.4626L26.4613 82.4566ZM54 104.9C64.5398 104.9 74.3352 101.695 82.4596 96.2062L80.8922 93.8861C73.2161 99.072 63.9638 102.1 54 102.1V104.9ZM23.4592 94.723C31.9663 101.113 42.5429 104.9 54 104.9V102.1C43.1701 102.1 33.1797 98.5225 25.1408 92.4842L23.4592 94.723ZM3.1 54C3.1 70.6535 11.0993 85.4391 23.4592 94.723L25.1408 92.4842C13.4547 83.7064 5.9 69.7357 5.9 54H3.1ZM54 3.1C25.8887 3.1 3.1 25.8887 3.1 54H5.9C5.9 27.4351 27.4351 5.9 54 5.9V3.1ZM104.9 54C104.9 25.8887 82.1113 3.1 54 3.1V5.9C80.5649 5.9 102.1 27.4351 102.1 54H104.9ZM82.4596 96.2062C95.9956 87.0615 104.9 71.5709 104.9 54H102.1C102.1 70.6018 93.6904 85.2398 80.8922 93.8861L82.4596 96.2062ZM67.45 40.3875C67.45 48.6068 61.3248 55.075 54 55.075V57.875C63.078 57.875 70.25 49.938 70.25 40.3875H67.45ZM54 25.7C61.3248 25.7 67.45 32.1682 67.45 40.3875H70.25C70.25 30.837 63.078 22.9 54 22.9V25.7ZM40.55 40.3875C40.55 32.1682 46.6752 25.7 54 25.7V22.9C44.922 22.9 37.75 30.837 37.75 40.3875H40.55ZM54 55.075C46.6752 55.075 40.55 48.6068 40.55 40.3875H37.75C37.75 49.938 44.922 57.875 54 57.875V55.075ZM80.565 81.4507C73.689 88.1063 64.324 92.2 54 92.2V95C65.0796 95 75.1352 90.6033 82.5124 83.4626L80.565 81.4507ZM54 65.3C65.8724 65.3 76.0405 72.6112 80.2411 82.9822L82.8363 81.9311C78.2223 70.5394 67.0517 62.5 54 62.5V65.3ZM27.7589 82.9822C31.9595 72.6112 42.1276 65.3 54 65.3V62.5C40.9483 62.5 29.7777 70.5394 25.1637 81.9311L27.7589 82.9822ZM54 92.2C43.676 92.2 34.311 88.1063 27.4349 81.4507L25.4876 83.4626C32.8648 90.6033 42.9204 95 54 95V92.2Z" fill="#E3E8F0" mask="url(#path-1-inside-1_2287_4245)"/>
+<ellipse cx="75.648" cy="83.52" rx="20.648" ry="20.52" fill="white"/>
+<ellipse cx="88.6128" cy="83.52" rx="20.648" ry="20.52" fill="white"/>
+<ellipse cx="88.6131" cy="83.5256" rx="14.4056" ry="14.3163" fill="#17191C"/>
+<ellipse cx="75.6477" cy="83.52" rx="17.7669" ry="17.6567" fill="white"/>
+<ellipse cx="75.6483" cy="83.5256" rx="14.4056" ry="14.3163" fill="#17191C"/>
+</svg>

Riot/Assets/Images.xcassets/BWI/introduce_federation_3.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Apple iPhone 11 White (1).png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/media_file_unavailable.imageset/Contents.json

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