Merge branch 'release/v2.28.0'

chore: update changelog (MESSENGER-8137)

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

.github/workflows/ci-build.yml

@@ -15,22 +15,24 @@ env:
 jobs:
   build:
     name: Build
-    runs-on: macos-12
+    runs-on: macos-15
     
     # 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
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: Pods
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-pods-
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -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-15
     
     concurrency:
       # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
@@ -25,17 +25,19 @@ 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
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: Pods
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-pods-
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -54,14 +56,16 @@ 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
+          
+      - name: Xcodegen
+        run: mint run yonaskolb/XcodeGen@2.39.0
 
       # 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-15
     
     concurrency:
       # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
@@ -20,17 +20,19 @@ 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
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: Pods
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-pods-
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -49,15 +51,16 @@ 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
+          
+      - name: Xcodegen
+        run: mint run yonaskolb/XcodeGen@2.39.0
 
       # 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-15
     
     concurrency:
       # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
@@ -25,12 +25,14 @@ 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
       - name: Cache CocoaPods libraries
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: Pods
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
@@ -38,7 +40,7 @@ jobs:
             ${{ runner.os }}-pods-
 
       - name: Cache Ruby gems
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -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 == 'element-hq/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/element-hq/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
@@ -68,64 +57,3 @@ jobs:
         with:
           project-url: https://github.com/orgs/element-hq/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/element-hq/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/element-hq/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/element-hq/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/element-hq/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/element-hq/projects/41
-          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']
-            })

.gitmodules

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

Brewfile

@@ -1,3 +1,2 @@
-brew "xcodegen"
 brew "mint"
 brew "getsentry/tools/sentry-cli"

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>

CHANGES.md

@@ -1,3 +1,182 @@
+## Changes in 1.11.31 (2025-07-28)
+
+✨ Features
+
+- Support for MSC 4289. ([#7950](https://github.com/element-hq/element-ios/pull/7950))
+
+🙌 Improvements
+
+- PL 150 users will be displayed as Owners. ([#7951](https://github.com/element-hq/element-ios/issues/7951))
+- Owners can't leave the room if they are the last owners while also not being the last member. ([#7952](https://github.com/element-hq/element-ios/issues/7952))
+
+🐛 Bugfixes
+
+- Room continuity fix for room version 12. ([#7953](https://github.com/element-hq/element-ios/pull/7953))
+
+
+## Changes in 1.11.30 (2025-06-10)
+
+No significant changes.
+
+
+## Changes in 1.11.29 (2025-05-29)
+
+No significant changes.
+
+
+## Changes in 1.11.28 (2025-05-28)
+
+🙌 Improvements
+
+- Support for experimental MSC4286 during event rendering. ([#7927](https://github.com/element-hq/element-ios/pull/7927))
+
+
+## Changes in 1.11.27 (2025-03-28)
+
+No significant changes.
+
+
+## Changes in 1.11.26 (2025-03-28)
+
+No significant changes.
+
+
+## Changes in 1.11.25 (2025-02-04)
+
+No significant changes.
+
+
+## Changes in 1.11.24 (2025-02-04)
+
+No significant changes.
+
+
+## Changes in 1.11.23 (2025-01-10)
+
+🙌 Improvements
+
+- Show sunset banners, guiding users to install Element X when registering a new account against a server with MAS. ([#7889](https://github.com/element-hq/element-ios/issues/7889))
+
+⚠️ API Changes
+
+- Adds a BuildSettings.replacementApp setting, used to control the sunset banners. ([#7889](https://github.com/element-hq/element-ios/issues/7889))
+
+## Changes in 1.11.22 (2024-12-10)
+
+🐛 Bugfixes
+
+- Fix a crash when restoring from a backup and a bug where you couldn't reset cross-signing. ([#7883](https://github.com/element-hq/element-ios/pull/7883))
+- Fix display of incoming call for group calls when receiving VOIP notification. ([#7858](https://github.com/element-hq/element-ios/issues/7858))
+
+
+## Changes in 1.11.21 (2024-11-14)
+
+No significant changes.
+
+
+## Changes in 1.11.20 (2024-11-12)
+
+No significant changes.
+
+
+## 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

CHANGES_BWI.md

@@ -1,3 +1,330 @@
+Changes in BWI project 2.28.0 (2026-03-27)
+===================================================
+
+Improvements 🙌:
+- MESSENGER-7555 add migration level 3
+- MESSENGER-7555 add migration with mdm
+
+Bugfix 🙌:
+- MESSENGER-8170 fix login via full matrix id
+
+Changes in BWI project 2.27.3 (2026-02-09)
+===================================================
+
+Improvements 🙌:
+- MESSENGER-8082 Use latest version of wysiwyg editor to fix crashes on fast tipping
+
+Bugfix 🙌:
+- MESSENGER-8116 Fix freeze caused by recursion in view height change caused by the wysiwyg editor
+
+Changes in BWI project 2.27.0 (2025-12-09)
+===================================================
+
+Improvements 🙌:
+- MESSENGER-7554 prepare for upcoming migration announcement
+- MESSENGER-7861 add reset recovery key to MAS screen
+
+Changes in BWI project 2.26.1 (2025-10-13)
+===================================================
+
+Upstream merge ✨:
+- v1.11.31
+
+Improvements 🙌:
+- MESSENGER-7564 text changes migration banner
+
+Bugfix 🐛:
+- MESSENGER-7665 fix pipeline
+
+Changes in BWI project 2.26.0 (2025-10-02)
+===================================================
+
+Upstream merge ✨:
+- v1.11.31
+
+Improvements 🙌:
+- MESSENGER-7564 add migration banner - part one
+- MESSENGER-7565 transfer mechanism for server and username to new app
+
+Bugfix 🐛:
+- MESSENGER-7561 fix room version 12 issues
+
+Changes in BWI project 2.25.0 (2025-06-12)
+===================================================
+
+Upstream merge ✨:
+- v1.27.11
+
+Improvements 🙌:
+- MESSENGER-6759 remove hash based server vailidation
+
+Bugfix 🐛:
+- MESSENGER-7257 Fix for pushes with sound
+- MESSENGER-7295 fix passphrase reset for newer synapse
+- MESSENGER-7295 fix JWT library for XCode 16
+
+Build 🧱:
+- Update shared pipelines
+- Build with XCode 16.2
+
+Changes in BWI project 2.24.0 (2025-02-17)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+- MESSENGER-6856 add link to the learning portal
+- MESSNEGER-6854 show happy birthday popup
+- MESSENGER-6879 add support for authenticated media
+- MESSENGER-6790 add handling of expired jwt
+
+Improvements 🙌:
+- MESSENGER-6777 use baseURL from wellknown for jwt handling
+
+Bugfix 🐛:
+
+Translations 🗣   :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Documentation 📄:
+
+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)
 ===================================================
 

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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files in the repository root for full details.
 //
 
 import Foundation

Config/AppIdentifiers.xcconfig

@@ -21,6 +21,10 @@ BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-beta
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger-beta
 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,6 +16,6 @@
 //
 
 // Version
-MARKETING_VERSION = 2.15.0
-CURRENT_PROJECT_VERSION = 20220714163152
 
+MARKETING_VERSION = 2.28.0
+CURRENT_PROJECT_VERSION = 20220714163152

Config/BWIBuildSettings.swift

@@ -36,7 +36,10 @@ class BWIBuildSettings: NSObject {
     
     private enum UserDefaultsKeys {
         static let additionalBwiHeaderKey = "bwiHeader"
-        static let isFederationEnabled = "isFederationEnabled"
+        static let isWellknownFederationEnabled = "isWellknownFederationEnabled"
+        static let isLabsFederationEnabled = "isLabsFederationEnabled"
+        static let BuMXMigrationInfoLevelKey = "BuMXMigrationInfoLevel"
+        static let didBuMXMigrationInfoLevelKey = "didBuMXMigrationInfoLevel"
     }
     
     private struct BwiSettingsConstants {
@@ -169,54 +172,14 @@ class BWIBuildSettings: NSObject {
     
     var bwiEnableLoginProtection = true
 
-    var bwiHashes = [ "a3f65e35a7476799afe8d80282fb3c45b39dab06d1d8c70dc98e45ab7d8e93a9",
-                      "2fda1a831655c22a5e6096d7cfbff4429fbf27891141e191b46adbf168142a11",
-                      "4f8cbb3fef885f7284d0477d797d7007f0e1ba76221834132752f4d645796e28",
-                      "24c2ec541e61e8e68944b96dc45ed5df12f6bdbda283cb0b3a522742aa970256",
-                      "1be0b314a6c915d4475290522baef5b642db1b6d68937792b8e0eb5b7b0d6666",
-                      "3deb73db8cafcd1d5a59e25e251c35816162e1f6ee67b5d7d011da0e8d6ef931",
-                      "42e57985d61202c2c7dd87d898cef9bdce020877a4c7a8c7cd699f6a28f58c0c",
-                      "e1c3c7cac12bd65bd48de79a2677187d2e768d2769377627534023588b8d7a33",
-                      "300f100961520d2909686f405bf97f53273f8ea82fa5359d981af8bf755f56ea",
-                      "642e9a5b1276d65cd12f913b96a3d05fe022489f5481e0c888dfd0654b25177d",
-                      "f7b8efdec2f424dbc912f4592d2489cc26232a621feecade73c33205a0a5cd8a",
-                      "7cfd1c9b9405146681e43f6339ea487f083a3a12cea7cf669810ea160407781a",
-                      "72d9a018893555073840bd90d80301417d2caa8b6ada7973d3365bcf929d6321",
-                      "28e0940e355717de28a9b48add20ebb7ed178875937015033d394129d9356cb3",
-                      "58077bffe53341e53ad18363dafc09498c314dd05a4fbaa2150c48dbd5d35e09",
-                      "74c038bb4e26fb1d0fcc14474ec9ff6fe3ec158e13286a787b90a22ee638ac18",
-                      "3740163f98aeda7dba285d2af1bfc351db395868268e2759ca701f926a6605a5",
-                      "240b05d9a54999140d23f21d104109fbc5e5179366ba3a7e58c8fad763aa88bd",
-                      "4d5b6dcf02396274be58a69c4bbeba175b529f6b19c504fc99a37892ee1cf0b5",
-                      "0d157119821bd9d76ac4f24c7f14f56e6bb5b766a6d5ee7dad6634420e79271a",
-                      "e3573fe09d518cce80cececedf80f8e0020cbc150f22db8b64827bff2e27abd9",
-                      "b76a62ccd8ea70d01c3a35ec3839e49ed2c83c8e3276f40a1b2c2cdf7cd77d01",
-                      "4a610a4d5fd3d8a1e1fd5669abdf1e0c5f7f5ff0c6b559e0f360cfa092ecb115",
-                      "32752f6d21f3005587941415cd64812ee28c19e6e01ed307edf9ddf4f6a91583",
-                      "704c6eaa107b13ef0694eb7ddd041bb6f595b53670a2e0c3c16e199947a9e013",
-                      "6921f031357cf63fb8538d9a1d1971efae95899907fdbf05a05082b6d1a6d0fb",
-                      "9f960fc663f5eaae67eecff75b131dea130b3ab1cf889c45fc74c688a48aea30",
-                      "160c35279484a027031b131183f3f203b1166306bab214355b00cf28502bce11",
-                      "d5a7298dde23aa0269c4cbd3b2a543e6ede94ce78fc20e4bfb888eb6057b5c52",
-                      "00136d830dd2acd5047efcf8419e939ef7ef97a84bef1930df86aace3f855265",
-                      "64cbbeea37237814445b35c941d010b9d5d024e4c584a476864b00c7c9909bce",
-                      "e79f4ce0f3c2772b45fd492a9c11e4e10e869ca21af68f13ff48c9c3bbd446ea",
-                      "2d582bed323f226a0e18b6b7104c0d28ccc36423833220a7b5fd2854262ab27e",
-                      "c56904235e283557626c327f8013c3b1c654eae86a5e314531e3a6fcb200ff92",
-                      "202bbbaa7c5cd665106d14012c29bcda8217a4b3606cce83e6e6ea0d30733229",
-                      "cca10f6b4b583da69bbd3815ee0fccd193cf0cfd046aee1aeffaa7b5245e8f83",
-                      "36a9ec7368bddedd9deb1e2d1c627bd7304865135c9be30b1979659e3ac9ad07",
-                      "dbaf8618e8a2f8d681591dfbcc73243c921c10dec69a2e5ee50bc91ca7dedcda",
-                      "ed1af0fd873ec749f17c3b61ce4e481ab1644c132003f97a9c4e36516325788a",
-                      "081e6ef90ba86102d678756fd13b07ca744340ad4d58a340e1956dca992f18e3",
-                      "40b22592f2417c8031a0c38098c83dd0bfd28dee4c77ed1e9a022556c6ec0ded"
-    ]
+    // 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
@@ -405,7 +368,6 @@ class BWIBuildSettings: NSObject {
 
     var settingsScreenShowNotificationDecodedContentOption = false
     var settingsScreenShowSystemSettingsOption = false
-    var settingsScreenShowNsfwRoomsOption = false
     var settingsScreenShowSupportSetting = true
     var settingsScreenSupportSettingHTML = "support"
 
@@ -519,7 +481,7 @@ class BWIBuildSettings: NSObject {
     var passwordIndicatorOnLogin = true
     
     // MARK: Displays the element base version on the settings screen
-    var elementBaseVersion = "1.11.6"
+    var elementBaseVersion = "1.11.31"
     
     var showElementBaseVersion = true
 
@@ -528,7 +490,7 @@ class BWIBuildSettings: NSObject {
     var forgotPasswordInformationAlert = true
     
     // MARK: Promote new feature within a banner below the navigation view
-    var showTopBanner = false
+    var showTopBanner = true
 
     var showCustomServerDisplayName = true
     var customServerDisplayName = ""
@@ -569,7 +531,7 @@ class BWIBuildSettings: NSObject {
     var bwiEnableRegisterInfo = false
     
     var bwiShowHappyBirthdayCampaign = false
-    var bwiHappyBirthdayCampaignIdentifier: String = "2022"
+    var bwiHappyBirthdayCampaignIdentifier: String = "2025"
     var bwiDisableSecuritySettingsUntrustedDevices = true
     
     
@@ -627,7 +589,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 = ""
@@ -672,7 +634,7 @@ class BWIBuildSettings: NSObject {
     var enableFeatureVoiceBroadcastsByDefault = false
     
     // MARK: WYSIWYG
-    var enableFeatureWYSIWYGByDefault = true
+    var enableFeatureWYSIWYGByDefault = false
     var bwiWYSIWYGVisibilityInSettings = true 
     var enableWYSIWYGCommands = false
     
@@ -701,8 +663,36 @@ class BWIBuildSettings: NSObject {
     var showContentScannerStatusWithFilename = true
     
     // MARK: Federation
-    @UserDefault(key: UserDefaultsKeys.isFederationEnabled, defaultValue: false, storage: RiotSettings.defaults)
-    var isFederationEnabled
+    // 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
+    
+    // Migration status from wellknown config
+    @UserDefault(key: UserDefaultsKeys.BuMXMigrationInfoLevelKey, defaultValue: 0, storage: RiotSettings.defaults)
+    var BuMXMigrationInfoLevel
+    
+    // Migration level already shown
+    @UserDefault(key: UserDefaultsKeys.didBuMXMigrationInfoLevelKey, defaultValue: 0, storage: RiotSettings.defaults)
+    var didShowBuMXMigrationInfoLevel
+    
+    // Migration level already shown (BWI #8123)
+    var isManagedViaMDM: Bool {
+        guard let managedConfig = UserDefaults.standard.dictionary(forKey: "com.apple.configuration.managed"),
+              let value = managedConfig["install_bumx_via_mdm"] as? Bool else {
+            return false
+        }
+        
+        return value
+    }
     
     // shows the grey/green/red shield for the room avatar / user avatar
     var showEncryptionStatusBadgeOnAvatar = false
@@ -713,10 +703,37 @@ class BWIBuildSettings: NSObject {
     // 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
+    
+    // MARK: homeserver selection via full qualified matrix id
+    var allowMatrixIDForHomeserverSelection = false
 }

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

@@ -21,6 +21,10 @@ 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
 

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

@@ -30,6 +30,7 @@ extension BWIBuildSettings {
         bwiUseWellKnownPrivacyPolicyLink = true
         itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger/id1616866351"
         avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
     }
     
 }

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

@@ -21,6 +21,10 @@ BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-beta
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger-beta
 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

@@ -37,8 +37,13 @@ extension BWIBuildSettings {
         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
+        bwiShowHappyBirthdayCampaign = false
     }
 }

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

@@ -21,6 +21,10 @@ BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-open
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger-open
 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

@@ -32,6 +32,7 @@ extension BWIBuildSettings {
         
         itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger-open/id6450672686"
         avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
     }
     
 }

Config/BuM/AppIdentifiers-bum.xcconfig

@@ -21,6 +21,10 @@ BASE_BUNDLE_IDENTIFIER = de.bwi.messenger
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger
 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

@@ -30,6 +30,9 @@ extension BWIBuildSettings {
         bwiUseWellKnownPrivacyPolicyLink = true
         itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger/id1616866351"
         avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
+        bwiEnableTokenizedLoginProtection = true
+        bwiShowHappyBirthdayCampaign = false
     }
     
 }

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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files in the repository root for full details.
 //
 
 import Foundation
@@ -297,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
@@ -450,4 +441,25 @@ final class BuildSettings: NSObject {
     
     // MARK: - Alerts
     static let showUnverifiedSessionsAlert = true
+    
+    // MARK: - Sunset
+    
+    /// Meta data about the app that will replaces this one with Matrix 2.0 support.
+    struct ReplacementApp {
+        /// The app's display name, used in marketing banners.
+        let name = "Element X"
+        /// A link that will be opened to tell the user more about the new app, Matrix 2.0 and the migration.
+        let learnMoreURL = URL(string: "https://element.io/app-for-productivity")!
+        /// The app's iTunes/product ID, used to show the App Store page in-app.
+        let productID = "1631335820"
+        /// A fallback URL that will be opened if there are any issues showing the App Store page in-app.
+        let appStoreURL = URL(string: "https://apps.apple.com/app/element-x-secure-chat-call/id1631335820")!
+    }
+    
+    /// Information about the Matrix 2.0 compatible app that will replace this one in the future.
+    ///
+    /// The presence of this setting acts as a feature flag to show marketing banners for the app
+    /// when it is detected that the homeserver is running Matrix 2.0. Set this to `nil` until you
+    /// are ready to migrate your users.
+    static let replacementApp: ReplacementApp? = .init()
 }

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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files in the repository root for full details.
 //
 
 import Foundation

Config/MDMSettings.swift

@@ -1,17 +1,8 @@
 // 
-// Copyright 2023 New Vector Ltd
+// Copyright 2023, 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files in the repository root for full details.
 //
 
 import Foundation

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

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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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 OR LicenseRef-Element-Commercial
+// Please see LICENSE files 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.14.3'
+gem "cocoapods", '~>1.16.2'
 gem "slather"
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')

Gemfile.lock

@@ -1,50 +1,58 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
-      rexml
-    activesupport (7.1.2)
+    CFPropertyList (3.0.7)
       base64
+      nkf
+      rexml
+    activesupport (7.1.5.1)
+      base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
       mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
-    addressable (2.8.5)
-      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.3.0)
-    aws-partitions (1.859.0)
-    aws-sdk-core (3.188.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+    aws-eventstream (1.3.2)
+    aws-partitions (1.1107.0)
+    aws-sdk-core (3.224.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.73.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.140.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+      logger
+    aws-sdk-kms (1.101.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.186.1)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.7.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
-    bigdecimal (3.1.4)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     claide (1.1.0)
     clamp (1.3.2)
-    cocoapods (1.14.3)
+    cocoapods (1.16.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.14.3)
+      cocoapods-core (= 1.16.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -58,8 +66,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.14.3)
+      xcodeproj (>= 1.27.0, < 2.0)
+    cocoapods-core (1.16.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -82,21 +90,20 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     declarative (0.0.20)
-    digest-crc (0.6.5)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.6.20231109)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.3)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.104.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,24 +122,24 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
+    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.217.0)
+    fastimage (2.4.0)
+    fastlane (2.227.2)
       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)
@@ -141,9 +148,11 @@ 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)
@@ -152,10 +161,10 @@ GEM
       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 (~> 3)
@@ -163,21 +172,23 @@ GEM
       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 (~> 0.4.1)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-brew (0.1.1)
-    fastlane-plugin-sentry (1.16.0)
+    fastlane-plugin-sentry (1.29.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-versioning (0.5.2)
+    fastlane-plugin-versioning (0.7.1)
     fastlane-plugin-xcodegen (1.1.0)
       fastlane-plugin-brew (~> 0.1.1)
-    ffi (1.16.3)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
+    ffi (1.17.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.53.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.2)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -185,24 +196,23 @@ 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.29.0)
+    google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    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.45.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.29.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -213,47 +223,52 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
-    i18n (1.14.1)
+    httpclient (2.9.0)
+      mutex_m
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.1)
-    mini_magick (4.12.0)
+    json (2.12.2)
+    jwt (2.10.1)
+      base64
+    logger (1.7.0)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
-    mutex_m (0.2.0)
-    nanaimo (0.3.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.15.5)
+    nkf (0.2.0)
+    nokogiri (1.15.7)
       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.2)
     public_suffix (4.0.7)
-    racc (1.7.3)
-    rake (13.1.0)
+    racc (1.8.1)
+    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.6)
-    rouge (2.0.7)
+    rexml (3.4.1)
+    rouge (3.28.0)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.18.0)
+    rubyzip (2.4.1)
+    securerandom (0.3.2)
+    security (0.1.5)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -261,18 +276,19 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    slather (2.8.0)
+    slather (2.8.5)
       CFPropertyList (>= 2.2, < 4)
       activesupport
       clamp (~> 1.3)
       nokogiri (>= 1.14.3)
-      xcodeproj (~> 1.21)
+      xcodeproj (~> 1.27)
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
     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.1)
@@ -280,21 +296,20 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (2.5.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.23.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)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
@@ -302,7 +317,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.14.3)
+  cocoapods (~> 1.16.2)
   fastlane
   fastlane-plugin-sentry
   fastlane-plugin-versioning

IDETemplateMacros.plist

@@ -5,7 +5,7 @@
     <key>FILEHEADER</key>
     <string>
 /*
- * Copyright (c) 2022 BWI GmbH
+ * Copyright (c) 2025 BWI GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,5 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */</string>
+
 </dict>
 </plist>

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/>.

LICENSE-COMMERCIAL

@@ -0,0 +1,6 @@
+Licensees holding a valid commercial license with Element may use this
+software in accordance with the terms contained in a written agreement
+between you and Element.
+
+To purchase a commercial license please contact our sales team at 
+licensing@element.io

Podfile

@@ -16,7 +16,7 @@ use_frameworks!
 # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixSDKVersion = '= 0.27.5'
+$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 => 'v2.15.0' }
-
-# 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.26.0' }
 
 ########################################
 
@@ -57,13 +51,12 @@ def import_MatrixKit_pods
   pod 'libPhoneNumber-iOS', '~> 0.9.13'  
   pod 'DTCoreText', '1.6.26'
   #pod 'DTCoreText/Extension', '~> 1.6.25'
-  pod 'Down', '~> 0.11.0'
+  pod 'Down', :git => 'https://github.com/vvorlov/Down.git', :branch => 'master'
 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 +69,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 +77,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 +88,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 +101,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 +112,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 +128,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,16 +144,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-BWI-MDM" do
-      import_MatrixSDK
+      pod 'MatrixSDK', $matrixSDKVersionSpec, :inhibit_warnings => false
       import_MatrixKit_pods
 
       import_SwiftUI_pods
@@ -188,12 +160,8 @@ 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 "RiotSwiftUI" do
@@ -205,12 +173,12 @@ abstract_target 'RiotPods' do
   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.

Podfile.lock

@@ -14,51 +14,49 @@ PODS:
   - AFNetworking/Serialization (4.0.1)
   - AFNetworking/UIKit (4.0.1):
     - AFNetworking/NSURLSession
-  - BlueCryptor (1.0.32)
-  - BlueECC (1.2.5)
-  - BlueRSA (1.0.200)
   - Down (0.11.0)
-  - DSBottomSheet (0.3.0)
   - DSWaveformImage (6.1.1)
-  - FLEX (4.5.0)
+  - DTCoreText (1.6.26):
+    - DTCoreText/Core (= 1.6.26)
+    - DTFoundation/Core (~> 1.7.5)
+    - DTFoundation/DTAnimatedGIF (~> 1.7.5)
+    - DTFoundation/DTHTMLParser (~> 1.7.5)
+    - DTFoundation/UIKit (~> 1.7.5)
+  - DTCoreText/Core (1.6.26):
+    - DTFoundation/Core (~> 1.7.5)
+    - DTFoundation/DTAnimatedGIF (~> 1.7.5)
+    - DTFoundation/DTHTMLParser (~> 1.7.5)
+    - DTFoundation/UIKit (~> 1.7.5)
+  - DTFoundation/Core (1.7.19)
+  - DTFoundation/DTAnimatedGIF (1.7.19)
+  - DTFoundation/DTHTMLParser (1.7.19):
+    - DTFoundation/Core
+  - DTFoundation/UIKit (1.7.19):
+    - DTFoundation/Core
+  - DTTJailbreakDetection (0.4.0)
   - FlowCommoniOS (1.12.2)
   - GBDeviceInfo (7.1.0):
     - GBDeviceInfo/Core (= 7.1.0)
   - GBDeviceInfo/Core (7.1.0)
-  - GZIP (1.3.1)
-  - Introspect (0.11.0)
-  - JitsiMeetSDKLite (8.1.2-lite):
-    - JitsiWebRTC (~> 111.0)
-  - JitsiWebRTC (111.0.2)
+  - GZIP (1.3.2)
+  - Introspect (0.12.0)
   - KeychainAccess (4.2.2)
-  - KituraContracts (1.2.1):
-    - LoggerAPI (~> 1.7)
   - KTCenterFlowLayout (1.3.1)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.15)
-  - LoggerAPI (1.9.200):
-    - Logging (~> 1.1)
-  - Logging (1.4.0)
-  - MatrixSDK (0.27.5):
-    - MatrixSDK/Core (= 0.27.5)
-  - MatrixSDK/Core (0.27.5):
+  - MatomoTracker (7.5.2):
+    - MatomoTracker/Core (= 7.5.2)
+  - MatomoTracker/Core (7.5.2)
+  - MatrixSDK (0.27.17):
+    - MatrixSDK/Core (= 0.27.17)
+  - MatrixSDK/Core (0.27.17):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
-    - MatrixSDKCrypto (= 0.3.13)
-    - OLMKit (~> 3.2.5)
+    - MatrixSDKCrypto (= 0.11.1)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.27.5):
-    - JitsiMeetSDKLite (= 8.1.2-lite)
-    - MatrixSDK/Core
-  - MatrixSDKCrypto (0.3.13)
-  - 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.11.1)
   - ReadMoreTextView (3.0.1)
   - Realm (10.27.0):
     - Realm/Headers (= 10.27.0)
@@ -68,95 +66,67 @@ PODS:
     - Reusable/View (= 4.1.2)
   - Reusable/Storyboard (4.1.2)
   - Reusable/View (4.1.2)
-  - Sentry (7.15.0):
-    - Sentry/Core (= 7.15.0)
-  - Sentry/Core (7.15.0)
   - SideMenu (6.5.0)
-  - SwiftBase32 (0.9.0)
-  - SwiftFormat/CLI (0.50.2)
-  - SwiftGen (6.6.2)
-  - SwiftJWT (3.6.200):
-    - BlueCryptor (~> 1.0)
-    - BlueECC (~> 1.1)
-    - BlueRSA (~> 1.0)
-    - KituraContracts (~> 1.2)
-    - LoggerAPI (~> 1.7)
-  - SwiftLint (0.49.1)
+  - SwiftFormat/CLI (0.54.5)
+  - SwiftGen (6.6.3)
+  - 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)
+  - Down (from `https://github.com/vvorlov/Down.git`, branch `master`)
   - DSWaveformImage (~> 6.1.1)
-  - FLEX (~> 4.5.0)
+  - DTCoreText (= 1.6.26)
+  - DTTJailbreakDetection (~> 0.4.0)
   - 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.27.5)
-  - MatrixSDK/JingleCallStack (= 0.27.5)
-  - OLMKit
-  - PostHog (~> 2.0.0)
+  - MatomoTracker (~> 7.5.2)
+  - MatrixSDK (from `https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk`, tag `v2.26.0`)
   - ReadMoreTextView (~> 3.0.1)
   - Reusable (~> 4.1)
-  - Sentry (~> 7.15.0)
   - SideMenu (~> 6.5)
-  - SwiftBase32 (~> 0.9.0)
   - SwiftFormat/CLI
   - SwiftGen
-  - SwiftJWT (~> 3.6.200)
   - SwiftLint
   - UICollectionViewLeftAlignedLayout (~> 1.0.2)
   - UICollectionViewRightAlignedLayout (~> 0.0.3)
   - WeakDictionary (~> 2.0)
   - zxcvbn-ios
-  - ZXingObjC (~> 3.6.5)
+  - ZXingObjC (~> 3.6.9)
 
 SPEC REPOS:
-  trunk:
+  https://github.com/CocoaPods/Specs.git:
     - AFNetworking
-    - BlueCryptor
-    - BlueECC
-    - BlueRSA
-    - Down
-    - DSBottomSheet
     - DSWaveformImage
-    - FLEX
+    - DTCoreText
+    - DTFoundation
+    - DTTJailbreakDetection
     - FlowCommoniOS
     - GBDeviceInfo
     - GZIP
     - Introspect
-    - JitsiMeetSDKLite
-    - JitsiWebRTC
     - KeychainAccess
-    - KituraContracts
     - KTCenterFlowLayout
     - libbase58
     - libPhoneNumber-iOS
-    - LoggerAPI
-    - Logging
-    - MatrixSDK
+    - MatomoTracker
     - MatrixSDKCrypto
-    - OLMKit
-    - PostHog
     - ReadMoreTextView
     - Realm
     - Reusable
-    - Sentry
     - SideMenu
-    - SwiftBase32
     - SwiftFormat
     - SwiftGen
-    - SwiftJWT
     - SwiftLint
     - SwiftyBeaver
     - UICollectionViewLeftAlignedLayout
@@ -165,49 +135,54 @@ SPEC REPOS:
     - zxcvbn-ios
     - ZXingObjC
 
+EXTERNAL SOURCES:
+  Down:
+    :branch: master
+    :git: https://github.com/vvorlov/Down.git
+  MatrixSDK:
+    :git: https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk
+    :tag: v2.26.0
+
+CHECKOUT OPTIONS:
+  Down:
+    :commit: dbb02cc9d16363874b7a0c6c48b9efe09bd5b006
+    :git: https://github.com/vvorlov/Down.git
+  MatrixSDK:
+    :git: https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk
+    :tag: v2.26.0
+
 SPEC CHECKSUMS:
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
-  BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
-  BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc
-  BlueRSA: dfeef51db96bcc4edec654956c1581adbda4e6a3
-  Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
-  DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a
+  Down: 10462c9cb3a6ef28e0996739329c4976b13870f7
   DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
-  FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
+  DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce
+  DTFoundation: 76b624967cf5bcaae6bb057d622c536c36ef36d0
+  DTTJailbreakDetection: 5e356c5badc17995f65a83ed9483f787a0057b71
   FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376
-  GZIP: e6922ed5bdd1d77d84589d50821ac34ea0c38d4b
-  Introspect: 4cc1e4c34dd016540c8d86a591c231c09dafbee3
-  JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7
-  JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b
+  GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868
+  Introspect: b66b675de8a85d9ef832f3a710d8e3c7db186884
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
-  KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b
   KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97
-  libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
+  libbase58: 8abc2a53ac38cd37720c0acbc53ef3660e9016c2
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
-  LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
-  Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: f92ffead50eda83c99786afefed9be739987f338
-  MatrixSDKCrypto: bf08b72f2cd015d8749420a2b8b92fc0536bedf4
-  OLMKit: da115f16582e47626616874e20f7bb92222c7a51
-  PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
+  MatomoTracker: 1d98ddc58322fd9d65e1a6886b8e41363047bd13
+  MatrixSDK: 45f9f97e7424e5d8731bf6b207c728a71caa8eb1
+  MatrixSDKCrypto: e44608012cae9befc52f13cd8e56c6f51ac83702
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
   Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
-  Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7
   SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
-  SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
-  SwiftFormat: 710117321c55c82675c0dc03055128efbb13c38f
-  SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c
-  SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae
-  SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
+  SwiftFormat: 543a7b1ab4a6ce2d88bd5616a17903446ca3dc5c
+  SwiftGen: 4993cbf71cbc4886f775e26f8d5c3a1188ec9f99
+  SwiftLint: eb47480d47c982481592c195c221d11013a679cc
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
   UICollectionViewLeftAlignedLayout: 830bf6fa5bab9f9b464f62e3384f9d2e00b3c0f6
   UICollectionViewRightAlignedLayout: 823eef8c567eba4a44c21bc2ffcb0d0d5f361e2d
   WeakDictionary: 8cd038acd77e5d54ca4ebaec3d20853d732b45e0
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
-  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
+  ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-PODFILE CHECKSUM: dd877be9e7d8dbc03dfcb3372d76e2eb0bdfbc34
+PODFILE CHECKSUM: 92b7ae8a330216932c5a690e48743b4d7b1bdea8
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.16.2

README.md

@@ -13,14 +13,14 @@ Wir freuen uns, dass Du Dich für den BundesMessenger interessierst.
 Fangen wir mit dem Wichtigsten an. Hier findest Du die offizielle App für iOS:
 
 <p align="center">  
-  <a href=https://apps.apple.com/de/app/bundesmessenger/id1616866351>
-  <img alt="Download Apple App Store" src="https://linkmaker.itunes.apple.com/images/badges/en-us/badge_appstore-lrg.svg" width=160>
-  </a>
+    <a href="https://apps.apple.com/de/app/bundesmessenger/id1616866351" style="display: inline-block;">
+    <img src="https://toolbox.marketingtools.apple.com/api/v2/badges/download-on-the-app-store/black/de-de?releaseDate=1671408000" alt="Im App Store laden" style="width: 245px; height: 82px; vertical-align: middle; object-fit: contain;" />
+    </a>
 </p>
 
 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-2025 New Vector Ltd
+
+This software is dual licensed by New Vector Ltd (Element). It can be used either:
+
 ## Kontakt
 
 Für den Austausch zum BundesMessenger haben wir einen [Matrix Raum](https://matrix.to/#/#opencodebum:matrix.org) erstellt.
@@ -96,3 +131,4 @@ Für den Austausch zum BundesMessenger haben wir einen [Matrix Raum](https://mat
 Kein Matrix Client zur Hand, dann auch gerne über unser [Email Postfach](mailto:bundesmessenger@bwi.de).
 
 Wir freuen uns auf den Austausch.
+

Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForTesting = "YES"
+            buildForTesting = "NO"
             buildForRunning = "YES"
             buildForProfiling = "YES"
             buildForArchiving = "YES"
@@ -26,10 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      disableMainThreadChecker = "YES"
-      codeCoverageEnabled = "YES"
-      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -39,26 +36,7 @@
             ReferencedContainer = "container:Riot.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <CodeCoverageTargets>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "57B13CC4586E9D43ED24DE1E"
-            BuildableName = "Element.app"
-            BlueprintName = "Riot"
-            ReferencedContainer = "container:Riot.xcodeproj">
-         </BuildableReference>
-      </CodeCoverageTargets>
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "287703423C2C302524E92C03"
-               BuildableName = "RiotTests.xctest"
-               BlueprintName = "RiotTests"
-               ReferencedContainer = "container:Riot.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,33 @@
 {
+  "originHash" : "a076b2f8f5d584ca7d9da77481d329ef792da391832f42c6e04caa42c69f5631",
   "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" : "f40325520344a966523b214394aa350132a6af68",
+        "version" : "1.0.203"
+      }
+    },
     {
       "identity" : "devicekit",
       "kind" : "remoteSourceControl",
@@ -27,6 +55,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 +96,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/element-hq/matrix-rich-text-editor-swift",
       "state" : {
-        "revision" : "0aa1308c43451fd077e332f72d6a32135f258834",
-        "version" : "2.19.0"
+        "revision" : "5f703d05bbf39f3026cc3c0697aab753a71fd83b",
+        "version" : "2.41.0"
       }
     },
     {
@@ -86,19 +132,37 @@
       "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" : "2cf7ef3eeb0df84318c75662c257651285f8289f",
+        "version" : "4.0.2"
+      }
+    },
+    {
+      "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"
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

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" : "undraw_Birthday_cake_BwM.svg",
       "idiom" : "universal"
     }
   ],

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

@@ -0,0 +1,758 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="b1da7443-2b43-4a55-9b6b-835488f8f109"
+   data-name="Layer 1"
+   width="1077.87045"
+   height="818.13939"
+   viewBox="0 0 1077.87045 818.13939"
+   version="1.1"
+   sodipodi:docname="undraw_Birthday_cake_BwM.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata373">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Birthday cake</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs371" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview369"
+     showgrid="false"
+     inkscape:zoom="0.69142914"
+     inkscape:cx="781.85579"
+     inkscape:cy="344.59674"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="b1da7443-2b43-4a55-9b6b-835488f8f109" />
+  <title
+     id="title2">Birthday cake</title>
+  <path
+     d="M724.88913,132.77315C678.637,165.15693,618.64686,163.06077,566.0755,146.21272S465.2185,99.36712,413.9902,78.0458A494.18659,494.18659,0,0,0,280.38075,43.2116c-65.27725-7.46816-138.17815,1.629-183.6634,53.98071C46.06687,155.489,49.9558,260.63994,104.74175,314.16073c27.86523,27.22173,64.3542,40.58007,96.17591,61.83552s61.27768,56.54522,58.56766,97.56983c-2.50884,37.97919-31.67671,67.1203-61.86034,85.4044-23.33,14.13247-52.06519,29.56582-54.877,58.83474-2.72081,28.32129,21.43765,50.51207,44.50822,63.13276,75.26244,41.17208,167.99042,40.7761,242.96352-1.03754,26.75083-14.91935,51.33838-34.75613,79.39114-46.38368,73.6499-30.52707,154.80787.20352,232.79573,11.43993A465.4391,465.4391,0,0,0,940.40967,630.544c38.62329-11.40826,77.38928-28.84831,104.52167-61.3378,19.56546-23.42852,31.75437-53.07661,43.19758-82.35738q18.30444-46.83727,35.18876-94.3336c6.75709-19.00815,13.40626-38.38513,15.15148-58.71982,3.16313-36.85563-10.159-73.28074-28.30108-104.38505C1067.09817,155.56778,994.559,103.64386,916.0413,90.45336s-161.71258,12.571-222.64322,68.9421"
+     transform="translate(-61.06478 -40.93031)"
+     fill="#ff0000"
+     opacity="0.1"
+     id="path4" />
+  <path
+     d="m 850.13864,538.05009 -2.78768,-1.6121 c 2.606,-4.50561 -4.388,-23.6855 -10.16161,-33.34366 -4.00573,-6.70054 -6.51846,-12.79214 -7.68236,-18.62319 -1.85316,-9.28413 -0.0928,-17.33381 5.23238,-23.92538 11.04722,-13.6744 10.95161,-39.778 10.94925,-40.03985 l 3.22,-0.0288 c 0.0102,1.11657 0.11332,27.51363 -11.66457,42.0925 -7.82879,9.69069 -6.91723,22.76927 2.709,38.87274 4.53651,7.58822 14.22699,29.62004 10.18559,36.60779 z"
+     fill="#d4d5e0"
+     id="path6" />
+  <path
+     d="m 885.41237,392.72961 c 0.73072,-26.15292 -16.46834,-47.85115 -38.41521,-48.46435 -21.94687,-0.6132 -40.33063,20.09086 -41.06134,46.24379 -0.70948,25.39283 15.48424,46.58433 36.51445,48.356 a 13.88746,13.88746 0 0 1 -3.25839,7.15025 c -3.18843,3.25617 10.02792,0.28018 10.02792,0.28018 a 23.47942,23.47942 0 0 1 -1.4247,-7.4045 c 20.39429,-1.50966 36.92512,-21.38943 37.61727,-46.16137 z"
+     fill="#ff0000"
+     id="path8" />
+  <path
+     d="m 817.50885,410.18998 c -3.2502,-9.95233 -0.25316,-19.94507 6.68944,-22.9455 -0.32111,0.073 -0.64062,0.15961 -0.95767,0.26315 -7.59894,2.48164 -11.00956,12.91264 -7.61784,23.2983 3.29314,10.0838 11.78807,16.41654 19.23453,14.50467 0.15121,0.79026 -14.06082,-5.05367 -17.34846,-15.12062 z"
+     fill="#ffffff"
+     opacity="0.2"
+     id="path10" />
+  <path
+     d="m 866.63555,574.28524 3.21738,0.13587 c 0.2192,-5.20037 16.41432,-17.63033 26.46937,-22.68106 6.97606,-3.50395 12.36555,-7.29537 16.4771,-11.59083 6.54635,-6.83918 9.38122,-14.57609 8.42553,-22.9959 -1.9825,-17.46712 12.10769,-39.44145 12.25024,-39.66117 l -2.70147,-1.75247 c -0.60785,0.93668 -14.86191,23.15462 -12.7483,41.77705 1.40487,12.37844 -6.38342,22.92464 -23.14841,31.34612 -7.90035,3.96808 -27.90124,17.35729 -28.24144,25.42239 z"
+     fill="#d4d5e0"
+     id="path12" />
+  <path
+     d="m 914.86434,432.73574 c 13.41945,-22.45947 39.57686,-31.53743 58.42426,-20.27616 18.8474,11.26127 23.2476,38.5973 9.8282,61.05677 -13.0294,21.80671 -38.0667,30.99666 -56.76236,21.20489 a 13.88742,13.88742 0 0 0 -1.08811,7.782 c 0.94278,4.45868 -8.61172,-5.14548 -8.61172,-5.14548 a 23.47928,23.47928 0 0 0 5.17605,-5.48314 c -16.39805,-12.21928 -19.67717,-37.86537 -6.96632,-59.13888 z"
+     fill="#ff0000"
+     id="path14" />
+  <path
+     d="m 962.7891,483.91158 c 8.0838,-6.65322 10.918,-16.69337 6.6702,-22.9511 0.2318,0.23389 0.4549,0.47849 0.6669,0.736 5.08,6.17223 2.3595,16.80415 -6.0762,23.747 -8.1906,6.74111 -18.7571,7.5254 -24.01423,1.91576 -0.55171,0.58572 14.57643,3.28218 22.75333,-3.44766 z"
+     fill="#ffffff"
+     opacity="0.2"
+     id="path16" />
+  <path
+     d="m 294.69734,704.07757 -3.21738,0.13586 c -0.21921,-5.20037 -16.41432,-17.63032 -26.46938,-22.68106 -6.97606,-3.50394 -12.36555,-7.29536 -16.47709,-11.59082 -6.54636,-6.83918 -9.38122,-14.57609 -8.42554,-22.99591 1.9825,-17.46712 -12.10768,-39.44145 -12.25023,-39.66116 l 2.70146,-1.75248 c 0.60785,0.93668 14.86191,23.15462 12.74831,41.77705 -1.40487,12.37844 6.38342,22.92465 23.14841,31.34613 7.90032,3.96808 27.90123,17.35728 28.24144,25.42239 z"
+     fill="#d4d5e0"
+     id="path18" />
+  <path
+     d="m 246.46855,562.52807 c -13.41945,-22.45947 -39.57689,-31.53743 -58.4243,-20.27617 -18.84741,11.26126 -23.2476,38.5973 -9.82815,61.05677 13.02944,21.80672 38.06663,30.99667 56.76235,21.2049 a 13.8874,13.8874 0 0 1 1.08811,7.782 c -0.94278,4.45868 8.61172,-5.14547 8.61172,-5.14547 a 23.47942,23.47942 0 0 1 -5.17605,-5.48315 c 16.39805,-12.21926 19.67717,-37.86538 6.96632,-59.13888 z"
+     fill="#ff0000"
+     id="path20" />
+  <path
+     d="m 198.54375,613.7039 c -8.08377,-6.65321 -10.91793,-16.69336 -6.67021,-22.95109 -0.23179,0.23389 -0.45488,0.47849 -0.66683,0.736 -5.08,6.17223 -2.35956,16.80415 6.07618,23.74705 8.19057,6.74111 18.75713,7.5254 24.01422,1.91576 0.55172,0.58566 -14.57648,3.28213 -22.75336,-3.44772 z"
+     fill="#ffffff"
+     opacity="0.2"
+     id="path22" />
+  <path
+     d="m 400.69734,366.07757 -3.21738,0.13586 c -0.21921,-5.20037 -16.41432,-17.63032 -26.46938,-22.68106 -6.97606,-3.50394 -12.36555,-7.29536 -16.47709,-11.59082 -6.54636,-6.83918 -9.38122,-14.57609 -8.42554,-22.99591 1.9825,-17.46712 -12.10768,-39.44145 -12.25023,-39.66116 l 2.70146,-1.75248 c 0.60785,0.93668 14.86191,23.15462 12.74831,41.777 -1.40487,12.37844 6.38342,22.92465 23.14841,31.34613 7.90032,3.96813 27.90123,17.35733 28.24144,25.42244 z"
+     fill="#d4d5e0"
+     id="path24" />
+  <path
+     d="m 352.46855,224.52807 c -13.41945,-22.45947 -39.57689,-31.53743 -58.4243,-20.27617 -18.84741,11.26126 -23.2476,38.5973 -9.82815,61.05677 13.02944,21.80672 38.06663,30.99667 56.76235,21.2049 a 13.8874,13.8874 0 0 1 1.08811,7.782 c -0.94278,4.45868 8.61172,-5.14547 8.61172,-5.14547 a 23.47942,23.47942 0 0 1 -5.17605,-5.48315 c 16.39805,-12.21926 19.67717,-37.86538 6.96632,-59.13888 z"
+     fill="#ff0000"
+     id="path26" />
+  <path
+     d="m 304.54375,275.7039 c -8.08377,-6.65321 -10.91793,-16.69336 -6.67021,-22.95109 -0.23179,0.23389 -0.45488,0.47849 -0.66683,0.736 -5.08,6.17223 -2.35956,16.80415 6.07618,23.74705 8.19057,6.74111 18.75713,7.5254 24.01422,1.91576 0.55172,0.58566 -14.57648,3.28213 -22.75336,-3.44772 z"
+     fill="#ffffff"
+     opacity="0.2"
+     id="path28" />
+  <path
+     d="m 363.69734,509.07757 -3.21738,0.13586 c -0.21921,-5.20037 -16.41432,-17.63032 -26.46938,-22.68106 -6.97606,-3.50394 -12.36555,-7.29536 -16.47709,-11.59082 -6.54636,-6.83918 -9.38122,-14.57609 -8.42554,-22.99591 1.9825,-17.46712 -12.10768,-39.44145 -12.25023,-39.66116 l 2.70146,-1.75248 c 0.60785,0.93668 14.86191,23.15462 12.74831,41.777 -1.40487,12.37844 6.38342,22.92465 23.14841,31.34613 7.90032,3.96813 27.90123,17.35733 28.24144,25.42244 z"
+     fill="#d4d5e0"
+     id="path30" />
+  <path
+     d="m 315.46855,367.52807 c -13.41945,-22.45947 -39.57689,-31.53743 -58.4243,-20.27617 -18.84741,11.26126 -23.2476,38.5973 -9.82815,61.05677 13.02944,21.80672 38.06663,30.99667 56.76235,21.2049 a 13.8874,13.8874 0 0 1 1.08811,7.782 c -0.94278,4.45868 8.61172,-5.14547 8.61172,-5.14547 a 23.47942,23.47942 0 0 1 -5.17605,-5.48315 c 16.39805,-12.21926 19.67717,-37.86538 6.96632,-59.13888 z"
+     fill="#ff0000"
+     id="path32" />
+  <path
+     d="m 267.54375,418.7039 c -8.08377,-6.65321 -10.91793,-16.69336 -6.67021,-22.95109 -0.23179,0.23389 -0.45488,0.47849 -0.66683,0.736 -5.08,6.17223 -2.35956,16.80415 6.07618,23.74705 8.19057,6.74111 18.75713,7.5254 24.01422,1.91576 0.55172,0.58566 -14.57648,3.28213 -22.75336,-3.44772 z"
+     fill="#ffffff"
+     opacity="0.2"
+     id="path34" />
+  <path
+     d="m 807.62983,698.32458 -2.04355,-2.48874 c 4.0229,-3.30276 4.21344,-23.7172 2.20127,-34.78811 -1.39615,-7.68075 -1.60844,-14.26682 -0.64945,-20.135 1.52689,-9.34333 6.00319,-16.26135 13.30481,-20.5617 15.14731,-8.92134 24.22911,-33.39427 24.31892,-33.64034 l 3.02483,1.10431 c -0.38277,1.049 -9.56062,25.79936 -25.70982,35.31071 -10.73443,6.32229 -14.476,18.88733 -11.12136,37.34627 1.58124,8.69836 2.9132,32.73026 -3.32565,37.8526 z"
+     fill="#d4d5e0"
+     id="path36" />
+  <path
+     d="m 891.71207,574.66192 c 9.87277,-24.22886 1.39373,-50.58653 -18.93851,-58.8715 -20.33224,-8.28497 -44.81821,4.64011 -54.691,28.869 -9.58584,23.52469 -1.87,49.05471 17.197,58.10228 a 13.88748,13.88748 0 0 1 -5.56285,5.54959 c -4.12919,1.92835 9.29017,3.78556 9.29017,3.78556 a 23.47942,23.47942 0 0 1 1.26765,-7.433 c 19.62452,5.75192 42.0861,-7.05246 51.43754,-30.00193 z"
+     fill="#ff0000"
+     id="path38" />
+  <path
+     d="m 822.00304,567.15169 c 0.45369,-10.45977 6.77053,-18.76245 14.32471,-19.13236 -0.32627,-0.0445 -0.65586,-0.0756 -0.98908,-0.0901 -7.98639,-0.3464 -14.84443,8.22129 -15.31787,19.13648 -0.45968,10.598 5.26871,19.5116 12.91216,20.33787 -0.13608,0.79304 -11.38883,-9.67162 -10.92992,-20.25189 z"
+     fill="#ffffff"
+     opacity="0.2"
+     id="path40" />
+  <ellipse
+     cx="547.48303"
+     cy="706.71136"
+     rx="302.44354"
+     ry="22.4762"
+     fill="#ff0000"
+     opacity="0.1"
+     id="ellipse42" />
+  <polygon
+     points="580.006,156.496 583.71,156.496 583.71,119.458 580.006,121.167 "
+     fill="#53425a"
+     id="polygon44"
+     transform="translate(-58)" />
+  <path
+     d="m 543.66246,230.85469 -27.924,3.41892 v -83.19083 h 17.66724 c -0.11962,0.94018 -0.19657,2.00859 -0.23929,3.19668 a 140.553,140.553 0 0 0 1.10258,18.77838 c 0.59832,5.419 1.38466,11.23971 2.24794,17.02625 0.66672,4.48733 1.38466,8.949 2.0941,13.197 2.56419,15.23981 5.05143,27.5736 5.05143,27.5736 z"
+     fill="#ff0000"
+     id="path52" />
+  <path
+     d="m 529.03566,38.85702 c 0,0 2.07871,8.31482 -19.74771,31.18059 -21.82642,22.86577 -13.16514,68.94375 10.04708,67.55795 0,0 21.70014,3.57941 29.50612,-11.19363 a 19.78166,19.78166 0 0 0 -1.385,-20.27 C 540.28321,95.56868 526.44854,73.36947 529.03569,62.76214 Z"
+     fill="#ffc13d"
+     id="path64" />
+  <path
+     d="m 526.74691,80.12829 c 0,0 1.15975,4.639 -11.01769,17.39635 -12.17744,12.75735 -7.34513,38.46526 5.60549,37.69209 0,0 12.107,1.997 16.46212,-6.24517 a 11.03664,11.03664 0 0 0 -0.77274,-11.30909 c -4.00194,-5.89348 -11.72062,-18.27891 -10.27718,-24.197 z"
+     fill="#ffffff"
+     opacity="0.5"
+     id="path66" />
+  <path
+     d="m 534.26899,173.05784 a 199.17332,199.17332 0 0 0 -18.53053,16.85529 v -21.5563 a 99.76217,99.76217 0 0 1 17.428,-14.07737 140.553,140.553 0 0 0 1.10253,18.77838 z"
+     fill="#ffffff"
+     opacity="0.5"
+     id="path70" />
+  <path
+     d="m 538.61103,203.28111 c -6.8635,6.01728 -16.30825,14.57313 -22.87257,20.53913 v -15.42786 c 6.855,-6.30791 15.23984,-13.57311 20.77847,-18.30829 0.66672,4.48733 1.38466,8.94899 2.0941,13.19702 z"
+     fill="#ff0000"
+     id="path72" />
+  <rect
+     x="395.79425"
+     y="246.23978"
+     width="278.92389"
+     height="127.64532"
+     fill="#c99398"
+     id="rect76" />
+  <path
+     d="m 674.71814,246.23978 v 19.21435 c -5.3335,1.03419 -12.32518,-0.56415 -18.18011,-2.52146 a 24.1701,24.1701 0 0 0 -20.90665,2.63258 c -16.06895,10.5046 -28.61638,8.28233 -37.3688,3.05989 a 32.191,32.191 0 0 0 -29.12919,-2.24789 31.62676,31.62676 0 0 1 -12.91495,2.36757 27.26651,27.26651 0 0 0 -14.65858,4.0429 c -13.197,7.9917 -26.35133,3.36759 -34.61655,-1.4616 a 24.40043,24.40043 0 0 0 -17.898,-2.5813 25.785,25.785 0 0 1 -7.949,0.6496 29.82535,29.82535 0 0 0 -17.55613,3.78645 c -21.787,12.72693 -28.98385,-2.72659 -33.27461,-5.00015 -4.8463,-2.56419 -5.41045,6.26513 -6.83783,6.26513 -1.42738,0 -6.26519,-11.67558 -7.41049,-7.69257 -0.52993,1.87186 -5.01726,4.11981 -9.63282,5.98311 a 19.218,19.218 0 0 1 -10.59011,1.09408 v -27.59069 z"
+     opacity="0.1"
+     id="path78" />
+  <path
+     d="m 406.90784,220.79181 c 0,0 -45.71376,20.40038 -21.32,45.891 a 18.99689,18.99689 0 0 0 20.79823,4.34267 c 4.61229,-1.8591 9.09915,-4.10715 9.63391,-5.9788 1.13964,-3.98874 5.98311,7.69257 7.40766,7.69257 1.42455,0 1.99437,-8.83221 6.83783,-6.268 4.29018,2.27127 11.48632,17.73112 33.27042,4.99755 a 29.88085,29.88085 0 0 1 17.5643,-3.784 25.57433,25.57433 0 0 0 7.94279,-0.65068 24.42806,24.42806 0 0 1 17.9011,2.57955 c 8.26488,4.83 21.42127,9.45336 34.61417,1.4682 a 27.26077,27.26077 0 0 1 14.66319,-4.0486 31.46519,31.46519 0 0 0 12.90972,-2.36943 32.23663,32.23663 0 0 1 29.13319,2.24885 c 8.75173,5.2288 21.30162,7.44766 37.36683,-3.05448 a 24.1437,24.1437 0 0 1 20.90269,-2.63919 c 11.68411,3.91417 27.91865,6.40973 26.44662,-10.70267 -2.27927,-26.49666 -33.61932,-34.18922 -46.72517,-34.47413 -13.10585,-0.28491 -34.759,-2.56419 -59.26125,0 -24.50225,2.56419 -74.36146,2.27928 -74.36146,2.27928 0,0 -83.72051,-3.32416 -95.72477,2.47031 z"
+     fill="#f8f8fa"
+     id="path80" />
+  <rect
+     x="338.80945"
+     y="373.8851"
+     width="397.87659"
+     height="156.2702"
+     fill="#c99398"
+     id="rect82" />
+  <path
+     d="m 674.71814,347.22608 v 26.659 H 519.61041 q -0.39753,-0.0513 -0.79494,-0.077 a 20.86814,20.86814 0 0 0 -3.94029,0.077 H 395.79422 v -23.77 c 12.97478,1.58123 26.06069,3.58988 38.95858,3.5386 17.12026,-0.077 34.03534,-3.6326 51.18976,-2.67531 59.97636,3.33341 121.04679,4.32493 180.78385,-2.77787 2.65823,-0.31626 5.32498,-0.64961 7.99173,-0.97442 z"
+     opacity="0.1"
+     id="path84" />
+  <path
+     d="m 736.68603,373.8851 v 14.09448 c -4.32493,-0.547 -8.48745,-2.27356 -12.66709,-3.64116 -3.76934,-1.23081 -7.84641,-2.1881 -11.67559,-1.171 -2.0172,0.53848 -3.85483,1.59834 -5.84637,2.21377 -8.32506,2.59836 -17.00908,-2.81209 -25.73589,-2.84626 -8.64986,-0.0342 -16.38515,5.17966 -24.82988,7.07718 -13.05174,2.93172 -26.394,-2.21377 -38.89875,-6.98317 -5.06,-1.92315 -10.92347,-3.76078 -15.65009,-1.12825 -2.077,1.15391 -3.64116,3.05139 -5.66687,4.29931 -5.92326,3.65827 -13.67567,0.80345 -19.58188,-2.889 -3.73516,-2.33339 -8.25666,-5.07709 -12.197,-3.11123 -2.03426,1.00858 -3.3078,3.05139 -4.99164,4.56428 -5.33351,4.77791 -13.727,3.49582 -20.26561,0.58977 -6.53014,-2.9061 -12.73549,-7.19681 -19.86395,-7.72679 -10.05158,-0.76067 -18.85533,6.01733 -27.62482,10.9833 -8.76949,4.96597 -20.93236,7.90625 -28.08645,0.7949 -2.36756,-2.35051 -4.1198,-5.75232 -7.3592,-6.56432 -5.35917,-1.33338 -9.38492,5.29933 -14.78681,6.46175 -6.65838,1.43594 -12.07734,-5.64975 -18.75277,-7.043 -6.90623,-1.44449 -13.33381,3.35908 -19.428,6.90618 -6.09419,3.5471 -14.94926,5.54723 -19.36819,0.0513 -1.41028,-1.75224 -2.17955,-4.1113 -4.11125,-5.27372 a 8.23976,8.23976 0 0 0 -4.7523,-0.76072 48.28961,48.28961 0 0 0 -16.76123,4.00868 c -6.08567,2.68387 -11.97477,6.70966 -18.616,6.58143 -0.11962,0 -0.2393,-0.009 -0.359,-0.0171 V 373.8851 Z"
+     opacity="0.1"
+     id="path86" />
+  <path
+     d="m 434.74956,355.36259 c -30.52022,0.12919 -62.04306,-11.3139 -90.817,-1.13741 -10.4405,3.6925 -21.029,12.42945 -19.92809,23.44882 a 16.08175,16.08175 0 0 0 15.16183,13.99129 c 6.64583,0.12838 12.53348,-3.90136 18.61606,-6.582 a 48.23892,48.23892 0 0 1 16.76677,-4.01339 8.28854,8.28854 0 0 1 4.753,0.76727 c 1.928,1.15674 2.70008,3.52168 4.10938,5.27352 4.42088,5.49545 13.26969,3.49469 19.3653,-0.0532 6.09561,-3.54791 12.52636,-8.35316 19.43022,-6.91063 6.67,1.39365 12.08971,8.48267 18.75064,7.04643 5.39973,-1.1643 9.42524,-7.79193 14.78555,-6.45783 3.24447,0.8075 4.99258,4.20694 7.36357,6.56428 7.14781,7.10667 19.31229,4.16878 28.08228,-0.79943 8.76999,-4.96821 17.57221,-11.74161 27.62338,-10.98672 7.13314,0.53573 13.33311,4.828 19.87015,7.73241 6.53704,2.90441 14.93261,4.18424 20.26041,-0.58893 1.68926,-1.5134 2.96278,-3.56046 4.99346,-4.57057 3.93911,-1.9594 8.46274,0.78428 12.19394,3.11537 5.90792,3.691 13.66249,6.5482 19.5889,2.887 2.01867,-1.24709 3.588,-3.14367 5.661,-4.29821 4.72765,-2.633 10.59585,-0.79551 15.65211,1.13266 12.50125,4.76725 25.84952,9.9135 38.90289,6.97792 8.43711,-1.89742 16.17949,-7.106 24.82727,-7.07412 8.72291,0.0321 17.40825,5.44354 25.73608,2.84788 1.98918,-0.62 3.82748,-1.677 5.84081,-2.21343 3.83579,-1.022 7.90741,-0.0656 11.68031,1.16845 5.00614,1.63742 9.99053,3.7923 15.25762,3.80752 5.26709,0.0152 11.02793,-2.86 12.288,-7.97416 0.9646,-3.9149 -0.91453,-7.9726 -3.25943,-11.2526 -8.51489,-11.91046 -23.27858,-18.03985 -37.82877,-19.6692 -14.55019,-1.62935 -29.21245,0.64422 -43.75131,2.37166 -59.73875,7.09789 -120.8111,6.10982 -180.78208,2.77458 -17.15392,-0.95398 -34.07119,2.60231 -51.19425,2.67479 z"
+     fill="#f8f8fa"
+     id="path88" />
+  <rect
+     x="311.88547"
+     y="516.05225"
+     width="439.93784"
+     height="181.20265"
+     fill="#c99398"
+     id="rect90" />
+  <path
+     d="m 753.77207,511.08629 a 519.32412,519.32412 0 0 1 -66.72874,9.91484 45.84426,45.84426 0 0 0 -22.51355,1.718 c -0.13678,0.0427 -0.27352,0.0855 -0.4103,0.13673 -13.86369,4.90619 -25.79573,16.539 -40.49709,16.351 -11.73542,-0.15384 -21.88105,-7.90625 -33.15494,-11.15421 a 42.23114,42.23114 0 0 0 -9.89778,-1.61545 43.4249,43.4249 0 0 0 -6.82928,0.18807 c -13.63294,0.359 -27.26584,0.50426 -40.89878,0.22224 -20.00069,-0.40175 -39.95861,-1.72657 -59.91657,-3.04284 q -32.001,-2.11548 -64.0021,-4.23092 -30.10362,-1.98723 -60.2157,-3.97451 -7.38487,-0.4872 -14.78681,-0.98291 c -5.30789,-0.35047 -9.24818,0.79489 -11.39356,-3.94885 -2.54713,-5.67541 -0.29919,-11.32516 2.8206,-16.26552 2.68386,0.0513 5.37623,0.23935 8.05153,0.42736 q 60.97641,4.295 121.92719,8.88921 l -6.24807,1.10258 a 682.06118,682.06118 0 0 1 128.36326,-7.94042 c 20.04342,0.65811 40.1979,2.19666 60.096,-0.359 13.98336,-1.79491 27.6847,-5.58991 41.73646,-6.778 19.29975,-1.63251 38.64228,1.7009 57.737,5.02581 a 116.104,116.104 0 0 1 11.93205,2.53 c 1.01712,4.88903 2.15387,9.76955 4.82918,13.78679 z"
+     opacity="0.1"
+     id="path92" />
+  <path
+     d="m 751.82331,516.05227 v 17.03475 c -5.4874,-0.812 -10.86363,-1.61545 -14.1971,2.28211 -1.56411,1.83769 -2.171,4.33349 -3.69238,6.2139 -3.1369,3.8719 -9.26529,3.8634 -13.74407,1.66674 -4.47027,-2.19666 -7.88063,-6.043 -11.73547,-9.20546 a 46.66119,46.66119 0 0 0 -44.33481,-7.76951 c -13.86369,4.90619 -25.79573,16.539 -40.49709,16.351 -11.73542,-0.15385 -21.88105,-7.90625 -33.15494,-11.15421 a 44.78974,44.78974 0 0 0 -37.779,6.419 c -7.98314,5.66686 -15.52186,14.462 -25.24013,13.34231 -5.09421,-0.58976 -9.37641,-3.90612 -13.70134,-6.66688 A 72.89966,72.89966 0 0 0 485.0537,533.93319 c -4.45311,-0.6325 -9.17979,-0.82056 -13.28248,1.02568 -5.1711,2.3334 -8.51312,7.48744 -13.3167,10.51316 -11.15421,7.01735 -25.61621,0.68378 -37.11234,-5.75231 -11.50467,-6.43614 -25.73589,-13.02607 -37.12945,-6.41047 -2.68386,1.55561 -4.98308,3.77789 -7.82079,5.02581 -16.02623,7.03442 -31.76178,-20.06907 -48.20672,-14.07737 -3.70955,1.35049 -6.66688,4.26509 -10.3166,5.76943 a 12.36821,12.36821 0 0 1 -5.9831,0.83761 v -14.81246 z"
+     opacity="0.1"
+     id="path94" />
+  <path
+     d="m 455.33042,505.42518 q -60.95452,-4.58713 -121.93034,-8.885 c -7.05844,-0.49751 -14.29773,-0.97386 -21.08084,1.04075 -6.78311,2.01461 -13.12151,7.08092 -14.57243,14.00653 -2.19351,10.47014 10.23123,20.79764 20.124,16.72713 3.65133,-1.50239 6.60662,-4.41991 10.31685,-5.7703 16.44216,-5.98439 32.18,21.11323 48.20052,14.07749 2.84064,-1.24753 5.13753,-3.46238 7.82058,-5.02021 11.39733,-6.61752 25.6285,-0.0238 37.12917,6.41247 11.50067,6.43625 25.96162,12.76192 37.118,5.74583 4.80482,-3.02169 8.1408,-8.17553 13.31563,-10.50751 4.10424,-1.84954 8.82484,-1.663 13.28113,-1.02493 a 72.77513,72.77513 0 0 1 28.69594,10.63272 c 4.32394,2.75614 8.60687,6.07051 13.70048,6.66035 9.719,1.12546 17.25985,-7.676 25.23738,-13.34036 a 44.82021,44.82021 0 0 1 37.78062,-6.42169 c 11.27221,3.25 21.42144,11.00426 33.15182,11.157 14.70313,0.19145 26.63606,-11.44248 40.49649,-16.35242 a 46.685,46.685 0 0 1 44.34037,7.77212 c 3.85411,3.16471 7.25985,7.00548 11.73593,9.20416 4.47608,2.19868 10.60421,2.20775 13.74426,-1.66647 1.52069,-1.87624 2.12239,-4.37738 3.6922,-6.21272 6.41716,-7.50261 20.39158,2.41224 28.17191,-3.66523 a 10.65272,10.65272 0 0 0 3.5614,-5.86348 c 1.95046,-7.77429 -2.93317,-15.96775 -9.622,-20.384 -6.68883,-4.41625 -14.83663,-5.88933 -22.73286,-7.26531 -19.087,-3.32605 -38.429,-6.66492 -57.7346,-5.03172 -14.05,1.18858 -27.75122,4.98941 -41.73679,6.78385 -19.89389,2.55253 -40.04886,1.01561 -60.09508,0.35892 a 682.05255,682.05255 0 0 0 -128.36461,7.93591"
+     fill="#f8f8fa"
+     id="path96" />
+  <path
+     d="m 751.82331,647.91991 v 42.57407 q -25.25727,1.29494 -50.5231,2.57274 c -27.19745,1.38466 -54.42061,2.76932 -81.64372,2.23939 -23.00936,-0.453 -45.96738,-2.265 -68.96813,-2.983 -48.36061,-1.50433 -96.858,1.87186 -145.08177,-2 -15.43642,-1.23937 -30.82155,-3.21379 -46.28363,-4.09419 a 340.601,340.601 0 0 0 -47.43748,0.68377 v -40.11248 a 37.31411,37.31411 0 0 1 4.36765,-0.10256 55.84923,55.84923 0 0 1 22.0264,5.32495 c 5.39334,2.55568 10.50461,6.02588 16.38515,7.043 15.29968,2.64109 28.59071,-11.81236 44.0784,-12.96628 12.47053,-0.92307 23.676,6.81222 34.37725,13.28253 2.05988,1.23937 4.35055,2.48724 6.71816,2.13682 1.983,-0.29063 3.61549,-1.64962 5.23094,-2.83771 15.26546,-11.26532 38.52267,-9.89778 52.35218,3.08557 1.50434,1.40176 3.00011,2.983 4.98309,3.50437 3.92318,1.04279 7.44466,-2.359 10.55589,-4.97448 16.85524,-14.21416 42.83048,-9.94051 62.173,0.6581 3.58132,1.95737 7.54728,4.1882 11.50468,3.16251 2.64964,-0.68377 4.69246,-2.718 6.81217,-4.45316 16.47065,-13.51327 41.2407,-11.00036 60.51484,-1.91458 1.86335,0.88039 3.82922,1.82913 5.872,1.59834 2.45307,-0.29058 4.33343,-2.17955 6.2224,-3.76078 a 31.73577,31.73577 0 0 1 33.37718,-4.13692 c 3.04283,1.46161 5.86348,3.436 9.09433,4.4275 9.20545,2.81209 18.5562,-2.90605 27.74454,-5.8036 a 47.66956,47.66956 0 0 1 15.54758,-2.15392 z"
+     opacity="0.1"
+     id="path98" />
+  <path
+     d="m 798.18383,689.84438 q -48.43756,2.47451 -96.88362,4.9318 c -27.19745,1.38466 -54.42061,2.76932 -81.64372,2.23939 -23.00936,-0.453 -45.96738,-2.265 -68.96813,-2.983 -48.36061,-1.50433 -96.858,1.87186 -145.08177,-2 -15.43642,-1.23937 -30.82155,-3.2138 -46.28363,-4.09419 a 344.33108,344.33108 0 0 0 -52.18978,1.10263 c -3.70954,0.35042 -9.41913,2.20517 -13.009,1.47867 -3.87189,-0.78634 -2.39323,-1.23081 -1.12819,-4.89759 a 32.43645,32.43645 0 0 0 0.95729,-3.32491 c 1.05986,-4.48733 1.25643,-9.01738 1.69235,-13.67567 0.5641,-5.94893 1.43594,-12.49614 6.35919,-16.539 3.8719,-3.18813 9.23107,-3.83773 14.24832,-3.67533 a 55.84906,55.84906 0 0 1 22.0264,5.325 c 5.39334,2.55568 10.50461,6.02588 16.38515,7.043 15.29968,2.64109 28.59071,-11.81237 44.0784,-12.96628 12.47053,-0.92307 23.676,6.81222 34.37725,13.28253 2.05988,1.23937 4.35055,2.48724 6.71816,2.13682 1.983,-0.29063 3.61549,-1.64962 5.23094,-2.83771 15.26546,-11.26533 38.52267,-9.89778 52.35218,3.08556 1.50434,1.40177 3.00011,2.983 4.98309,3.50437 3.92318,1.0428 7.44466,-2.359 10.55589,-4.97448 16.85524,-14.21415 42.83048,-9.9405 62.173,0.65811 3.58132,1.95736 7.54728,4.1882 11.50468,3.16251 2.64964,-0.68377 4.69246,-2.718 6.81217,-4.45316 16.47065,-13.51327 41.2407,-11.00036 60.51484,-1.91458 1.86335,0.88039 3.82922,1.82913 5.872,1.59834 2.45307,-0.29058 4.33343,-2.17955 6.2224,-3.76078 a 31.73577,31.73577 0 0 1 33.37718,-4.13692 c 3.04283,1.46161 5.86348,3.436 9.09433,4.4275 9.20545,2.81209 18.5562,-2.906 27.74454,-5.8036 a 48.03718,48.03718 0 0 1 60.002,30.51385 45.82008,45.82008 0 0 1 1.90609,7.54712 z"
+     fill="#f8f8fa"
+     id="path100" />
+  <path
+     d="m 798.18383,689.84438 q -48.43756,2.47451 -96.88362,4.9318 c -27.19745,1.38466 -54.42061,2.76932 -81.64372,2.23939 -23.00936,-0.453 -45.96738,-2.265 -68.96813,-2.983 -48.36061,-1.50433 -96.858,1.87186 -145.08177,-2 -15.43642,-1.23937 -30.82155,-3.2138 -46.28363,-4.09419 a 344.33108,344.33108 0 0 0 -52.18978,1.10263 c -3.70954,0.35042 -9.41913,2.20517 -13.009,1.47867 -3.87189,-0.78634 -2.39323,-1.23081 -1.12819,-4.89759 a 32.43645,32.43645 0 0 0 0.95729,-3.32491 h 502.32447 a 45.82008,45.82008 0 0 1 1.90608,7.5472 z"
+     opacity="0.1"
+     id="path102" />
+  <path
+     d="m 281.48168,683.15189 h 522.36153 a 17.03368,17.03368 0 0 1 17.03368,17.03368 v 2.19773 H 264.448 v -2.19773 a 17.03368,17.03368 0 0 1 17.03368,-17.03368 z"
+     fill="#d4d5e0"
+     id="path104" />
+  <rect
+     x="458.60144"
+     y="107.35271"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71337)"
+     fill="#ff0000"
+     id="rect106" />
+  <rect
+     x="451.04474"
+     y="240.62312"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.7134)"
+     fill="#ff0000"
+     id="rect108" />
+  <rect
+     x="446.08771"
+     y="393.80121"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.7134)"
+     fill="#ff0000"
+     id="rect110" />
+  <rect
+     x="565.72491"
+     y="367.95346"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71339)"
+     fill="#ff0000"
+     id="rect112" />
+  <rect
+     x="633.54791"
+     y="341.91098"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71339)"
+     fill="#ff0000"
+     id="rect114" />
+  <rect
+     x="734.52704"
+     y="323.09839"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71336)"
+     fill="#ff0000"
+     id="rect116" />
+  <rect
+     x="796.78986"
+     y="287.58524"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71341)"
+     fill="#ff0000"
+     id="rect118" />
+  <rect
+     x="504.96783"
+     y="382.38846"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71339)"
+     fill="#ff0000"
+     id="rect120" />
+  <rect
+     x="651.00446"
+     y="353.8197"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71336)"
+     fill="#ff0000"
+     id="rect122" />
+  <rect
+     x="704.80426"
+     y="320.51514"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71337)"
+     fill="#ff0000"
+     id="rect124" />
+  <rect
+     x="826.94171"
+     y="278.53192"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71338)"
+     fill="#ff0000"
+     id="rect126" />
+  <rect
+     x="143.97374"
+     y="594.66351"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67407)"
+     fill="#ff0000"
+     id="rect128" />
+  <rect
+     x="123.72319"
+     y="562.32275"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67411)"
+     fill="#ff0000"
+     id="rect130" />
+  <rect
+     x="87.124039"
+     y="512.54572"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67408)"
+     fill="#ff0000"
+     id="rect132" />
+  <rect
+     x="-63.003796"
+     y="520.77222"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67407)"
+     fill="#ff0000"
+     id="rect134" />
+  <rect
+     x="-70.465736"
+     y="532.08289"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67409)"
+     fill="#ff0000"
+     id="rect136" />
+  <rect
+     x="-0.87182206"
+     y="606.97858"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67407)"
+     fill="#ff0000"
+     id="rect138" />
+  <rect
+     x="-158.01865"
+     y="672.51807"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67409)"
+     fill="#ff0000"
+     id="rect140" />
+  <rect
+     x="59.01112"
+     y="699.48578"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67408)"
+     fill="#ff0000"
+     id="rect142" />
+  <rect
+     x="80.974785"
+     y="739.49146"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67409)"
+     fill="#ff0000"
+     id="rect144" />
+  <rect
+     x="-35.942822"
+     y="808.46613"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67402)"
+     fill="#ff0000"
+     id="rect146" />
+  <rect
+     x="6.3373632"
+     y="893.10767"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67405)"
+     fill="#ff0000"
+     id="rect148" />
+  <rect
+     x="-173.57845"
+     y="632.88159"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67407)"
+     fill="#ff0000"
+     id="rect150" />
+  <rect
+     x="-208.95927"
+     y="574.62866"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67404)"
+     fill="#ff0000"
+     id="rect152" />
+  <rect
+     x="-137.61473"
+     y="689.3941"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67406)"
+     fill="#ff0000"
+     id="rect154" />
+  <rect
+     x="-90.925537"
+     y="745.29285"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(-53.67405)"
+     fill="#ff0000"
+     id="rect156" />
+  <rect
+     x="566.99335"
+     y="-389.09595"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(54.67721)"
+     fill="#ff0000"
+     id="rect158" />
+  <rect
+     x="530.26068"
+     y="-316.85919"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(54.67719)"
+     fill="#ff0000"
+     id="rect160" />
+  <rect
+     x="548.32477"
+     y="-141.5455"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(54.67721)"
+     fill="#ff0000"
+     id="rect162" />
+  <rect
+     x="574.7215"
+     y="-171.97626"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(54.6772)"
+     fill="#ff0000"
+     id="rect164" />
+  <rect
+     x="619.52966"
+     y="-235.20763"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(54.67718)"
+     fill="#ff0000"
+     id="rect166" />
+  <rect
+     x="626.82996"
+     y="-259.72891"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(54.67719)"
+     fill="#ff0000"
+     id="rect168" />
+  <rect
+     x="662.49255"
+     y="-304.74033"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(54.67719)"
+     fill="#ff0000"
+     id="rect170" />
+  <rect
+     x="681.33765"
+     y="-342.66898"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(54.67719)"
+     fill="#ff0000"
+     id="rect172" />
+  <rect
+     x="717.02673"
+     y="-387.01089"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(54.67719)"
+     fill="#ff0000"
+     id="rect174" />
+  <rect
+     x="595.41364"
+     y="59.630775"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71337)"
+     fill="#ff0000"
+     id="rect176" />
+  <rect
+     x="639.8175"
+     y="44.12019"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71339)"
+     fill="#ff0000"
+     id="rect178" />
+  <rect
+     x="583.4975"
+     y="80.867691"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71339)"
+     fill="#ff0000"
+     id="rect180" />
+  <rect
+     x="496.44278"
+     y="110.52627"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71337)"
+     fill="#ff0000"
+     id="rect182" />
+  <rect
+     x="650.97314"
+     y="56.208157"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.7134)"
+     fill="#ff0000"
+     id="rect184" />
+  <rect
+     x="483.25769"
+     y="93.30764"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71338)"
+     fill="#ff0000"
+     id="rect186" />
+  <rect
+     x="531.93488"
+     y="87.553413"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71337)"
+     fill="#ff0000"
+     id="rect188" />
+  <rect
+     x="539.16327"
+     y="214.1637"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71339)"
+     fill="#ff0000"
+     id="rect190" />
+  <rect
+     x="608.24188"
+     y="193.4239"
+     width="3.1340203"
+     height="8.6578474"
+     rx="1.3879346"
+     transform="rotate(16.713074)"
+     fill="#ff0000"
+     id="rect192"
+     style="stroke-width:1" />
+  <rect
+     x="769.59155"
+     y="148.47212"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71335)"
+     fill="#ff0000"
+     id="rect194" />
+  <rect
+     x="786.37939"
+     y="143.43382"
+     width="3.1340203"
+     height="8.6578474"
+     rx="1.3879346"
+     transform="rotate(16.713074)"
+     fill="#ff0000"
+     id="rect196"
+     style="stroke-width:1" />
+  <rect
+     x="553.78607"
+     y="93.307686"
+     width="3.1340101"
+     height="8.6578197"
+     rx="1.38793"
+     transform="rotate(16.71338)"
+     fill="#ff0000"
+     id="rect198" />
+  <ellipse
+     cx="140.97244"
+     cy="702.9892"
+     rx="28.598101"
+     ry="2.8970201"
+     fill="#ff0000"
+     opacity="0.1"
+     id="ellipse202" />
+  <ellipse
+     cx="64"
+     cy="775.50677"
+     rx="28.598101"
+     ry="2.8970201"
+     fill="#ff0000"
+     opacity="0.1"
+     id="ellipse204" />
+  <ellipse
+     cx="849.92664"
+     cy="766.80573"
+     rx="28.598101"
+     ry="2.8970201"
+     fill="#ff0000"
+     opacity="0.1"
+     id="ellipse206" />
+  <ellipse
+     cx="838.42141"
+     cy="797.49528"
+     rx="28.5981"
+     ry="2.89702"
+     fill="#ff0000"
+     opacity="0.1"
+     id="ellipse208" />
+  <ellipse
+     cx="698.20782"
+     cy="747.95856"
+     rx="28.598101"
+     ry="2.8970201"
+     fill="#ff0000"
+     opacity="0.1"
+     id="ellipse210" />
+  <ellipse
+     cx="626.7996"
+     cy="815.24236"
+     rx="28.5981"
+     ry="2.89702"
+     fill="#ff0000"
+     opacity="0.1"
+     id="ellipse212" />
+  <path
+     d="m 273.47467,742.52714 c 0,0 -0.0322,0.29995 -0.0535,0.79282 v 0.375 l -3.09636,5.2606 -9.8461,-1.36069 -5.08915,-3.4606 a 16.50825,16.50825 0 0 0 1.10358,-2.1 c 2.47486,-0.7071 8.14248,1.29642 8.14248,1.29642 0,0 6.11778,1.16778 8.68916,-0.70716 a 0.589,0.589 0 0 0 0.14989,-0.0964 z"
+     opacity="0.1"
+     id="path258" />
+  <path
+     d="m 424.7403,543.91642 c 0,0 -13.12465,6.86986 -15.66923,7.23194 -2.54458,0.36208 11.11578,-1.47317 11.11578,-1.47317 z"
+     opacity="0.1"
+     id="path320" />
+  <path
+     d="m 435.45429,549.27341 c 0,0 -17.41024,5.8927 -25.044,4.8213 3e-5,-2e-5 19.01738,3.61598 25.044,-4.8213 z"
+     opacity="0.1"
+     id="path322" />
+  <path
+     d="m 591.62983,509.32458 -2.04355,-2.48874 c 4.0229,-3.30276 4.21344,-23.7172 2.20127,-34.78811 -1.39615,-7.68075 -1.60844,-14.26682 -0.64945,-20.135 1.52689,-9.34333 6.00319,-16.26135 13.30481,-20.5617 15.14731,-8.92134 24.22911,-33.39427 24.31892,-33.64034 l 3.02483,1.10431 c -0.38277,1.049 -9.56062,25.79936 -25.70982,35.31071 -10.73443,6.32229 -14.476,18.88733 -11.12136,37.34627 1.58124,8.69836 2.9132,32.73026 -3.32565,37.8526 z"
+     fill="#d4d5e0"
+     id="path350" />
+  <path
+     d="m 675.71207,385.66192 c 9.87277,-24.22886 1.39373,-50.58653 -18.93851,-58.8715 -20.33224,-8.28497 -44.81821,4.64011 -54.691,28.869 -9.58584,23.52469 -1.87,49.05471 17.197,58.10228 a 13.88748,13.88748 0 0 1 -5.56285,5.54959 c -4.12919,1.92835 9.29017,3.78556 9.29017,3.78556 a 23.47942,23.47942 0 0 1 1.26765,-7.433 c 19.62452,5.75192 42.0861,-7.05246 51.43754,-30.00193 z"
+     fill="#ff0000"
+     id="path352" />
+  <path
+     d="m 606.00304,378.15169 c 0.45369,-10.45977 6.77053,-18.76245 14.32471,-19.13236 -0.32627,-0.0445 -0.65586,-0.0757 -0.98908,-0.0901 -7.98639,-0.3464 -14.84443,8.22129 -15.31787,19.13648 -0.45968,10.598 5.26871,19.5116 12.91216,20.33787 -0.13608,0.79304 -11.38883,-9.67162 -10.92992,-20.25189 z"
+     fill="#ffffff"
+     opacity="0.2"
+     id="path354" />
+  <path
+     d="m 714.62983,673.32458 -2.04355,-2.48874 c 4.0229,-3.30276 4.21344,-23.7172 2.20127,-34.78811 -1.39615,-7.68075 -1.60844,-14.26682 -0.64945,-20.135 1.52689,-9.34333 6.00319,-16.26135 13.30481,-20.5617 15.14731,-8.92134 24.22911,-33.39427 24.31892,-33.64034 l 3.02483,1.10431 c -0.38277,1.049 -9.56062,25.79936 -25.70982,35.31071 -10.73443,6.32229 -14.476,18.88733 -11.12136,37.34627 1.58124,8.69836 2.9132,32.73026 -3.32565,37.8526 z"
+     fill="#d4d5e0"
+     id="path356" />
+  <path
+     d="m 798.71207,549.66192 c 9.87277,-24.22886 1.39373,-50.58653 -18.93851,-58.8715 -20.33224,-8.28497 -44.81821,4.64011 -54.691,28.869 -9.58584,23.52469 -1.87,49.05471 17.197,58.10228 a 13.88748,13.88748 0 0 1 -5.56285,5.54959 c -4.12919,1.92835 9.29017,3.78556 9.29017,3.78556 a 23.47942,23.47942 0 0 1 1.26765,-7.433 c 19.62452,5.75192 42.0861,-7.05246 51.43754,-30.00193 z"
+     fill="#ff0000"
+     id="path358" />
+  <path
+     d="m 729.00304,542.15169 c 0.45369,-10.45977 6.77053,-18.76245 14.32471,-19.13236 -0.32627,-0.0445 -0.65586,-0.0756 -0.98908,-0.0901 -7.98639,-0.3464 -14.84443,8.22129 -15.31787,19.13648 -0.45968,10.598 5.26871,19.5116 12.91216,20.33787 -0.13608,0.79304 -11.38883,-9.67162 -10.92992,-20.25189 z"
+     fill="#ffffff"
+     opacity="0.2"
+     id="path360" />
+  <path
+     d="m 541.00304,225.15169 c 0.45369,-10.45977 6.77053,-18.76245 14.32471,-19.13236 -0.32627,-0.0445 -0.65586,-0.0756 -0.98908,-0.0901 -7.98639,-0.3464 -14.84443,8.22129 -15.31787,19.13648 -0.45968,10.598 5.26871,19.5116 12.91216,20.33787 -0.13608,0.79304 -11.38883,-9.67162 -10.92992,-20.25189 z"
+     fill="#ffffff"
+     opacity="0.2"
+     id="path366" />
+</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/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
+  }
+}

Riot/Assets/Images.xcassets/BWI/media_file_unavailable.imageset/media_file_unavailable.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.47012 20.9997H19.5301C21.0701 20.9997 22.0301 19.3297 21.2601 17.9997L13.7301 4.98969C12.9601 3.65969 11.0401 3.65969 10.2701 4.98969L2.74012 17.9997C1.97012 19.3297 2.93012 20.9997 4.47012 20.9997V20.9997ZM12.0001 13.9997C11.4501 13.9997 11.0001 13.5497 11.0001 12.9997V10.9997C11.0001 10.4497 11.4501 9.99969 12.0001 9.99969C12.5501 9.99969 13.0001 10.4497 13.0001 10.9997V12.9997C13.0001 13.5497 12.5501 13.9997 12.0001 13.9997ZM13.0001 17.9997H11.0001V15.9997H13.0001V17.9997Z" fill="#BE7A00"/>
+</svg>

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

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

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

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

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

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

Riot/Assets/Images.xcassets/sunset_banner_icon.imageset/Contents.json

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

Riot/Assets/SharedImages.xcassets/bumx_logo.imageset/Contents.json

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

Riot/Assets/ar.lproj/Localizable.strings

@@ -167,3 +167,5 @@
 /** General **/
 
 "Notification" = "إشعار";
+"VOICE_BROADCAST_FROM_USER" = "%@ بدأ بثًا صوتيًا";
+"UNSUPPORTED_CALL" = "مكالمة غير مدعومة";

Riot/Assets/be.lproj/Vector.strings

@@ -1 +1,9 @@
 
+
+
+// Titles
+"title_home" = "Галоўная";
+"people_empty_view_title" = "Удзельнікі";
+"group_details_home" = "Галоўная";
+"spaces_home_space_title" = "Галоўная";
+"title_people" = "Удзельнікі";

Riot/Assets/bs.lproj/Vector.strings

@@ -0,0 +1 @@
+

Riot/Assets/de.lproj/Bwi.strings

@@ -16,7 +16,7 @@
 
 // MARK: - Content Scanner
 
-"content_scan_status_failed" = "Fehler beim Laden";
+"content_scan_status_failed" = "Datei steht nicht mehr zur Verfügung";
 "content_scan_status_in_progress" = "Scanne...";
 "content_scan_status_infected" = "Blockiert";
 "content_scan_status_trusted" = "✓ Sicher";
@@ -51,9 +51,17 @@
 "bwi_settings_developer_restrict_user" = "Nutzer einschränken";
 "bwi_settings_developer_unrestrict_user" = "Nutzereinschränkung aufheben";
 "bwi_settings_developer_unmark_banner" = "Banner als nicht gelesen markieren";
+"bwi_settings_developer_introduce_federation" = "Föderation";
+"bwi_settings_developer_introduce_federation_preview" = "Introduction zeigen";
+"bwi_settings_developer_introduce_federation_reset" = "Account Data Flag für Introduction zurücksetzen";
+"bwi_settings_developer_announcement_federation_preview" = "Announcement zeigen";
+"bwi_settings_developer_announcement_federation_reset" = "Account Data Flag für Announcement zurücksetzen";
 "bwi_settings_developer_well_known" = "Well-Known";
 "bwi_settings_developer_capabilities" = "Capabilities";
 "bwi_settings_developer_maintenance" = "Maintenance";
+"bwi_settings_developer_maintenance_reload" = "Aktualisieren";
+"bwi_settings_developer_maintenance_server_data" = "Daten vom Server";
+"bwi_settings_developer_maintenance_local_data" = "UserDefaults / lokale Daten";
 "bwi_settings_developer_user_account_data" = "Account Data";
 "bwi_settings_developer_user_account_data_type" = "Type";
 "bwi_settings_developer_key_backup" = "Key Backup";
@@ -63,6 +71,7 @@
 "bwi_settings_developer_key_backup_version" = "Version";
 
 // MARK: Labor
+"bwi_activate_labs_alert_title" = "Labor ist jetzt verfügbar";
 "bwi_settings_labs_federation_feature" = "Föderation";
 
 // MARK: - MDM
@@ -169,7 +178,8 @@
 
 "room_participants_leave_prompt_title_for_dm" = "Verlassen";
 "room_participants_leave_prompt_msg_for_dm" = "Bist du sicher, dass du die Konversation verlassen möchtest?";
-"room_participants_cant_leave_prompt_message" = "Du kannst den Raum nicht verlassen, da es keine weiteren Admins im Raum gibt.";
+"room_participants_cant_leave_prompt_message" = "Als letzter Admin kannst du diesen Raum nicht verlassen, da entweder noch Mitglieder vorhanden sind oder es noch ausstehende Einladungen gibt.";
+"room_participants_leave_and_delete_prompt_msg" = "Raum wirklich verlassen und endgültig löschen?";
 "room_participants_invite_prompt_to_msg" = "Bist du sicher, dass du %@ zu %@ einladen möchtest";
 "room_participants_filter_room_members" = "Filtere Raum-Mitglieder";
 "room_participants_filter_room_members_for_dm" = "Mitglieder filtern";
@@ -220,6 +230,11 @@
 "settings_about" = "Erweitert";
 "bwi_settings_ignored_users_text" = "Ignorierte Nutzer";
 "settings_imprint" = "Impressum";
+"settings_change_profile_avatar_hint" = "Auch Nutzer aus föderierten Organisationen können dein Profilbild sehen.";
+"settings_custom_back_button" = "Zurück";
+"settings_save_changes_alert_title" = "Möchtest du die Änderungen speichern?";
+"settings_save_changes_alert_save_button" = "Ja";
+"settings_save_changes_alert_do_not_save_button" = "Nein";
 
 // MARK: - Room Details
 
@@ -350,10 +365,10 @@
 "secrets_setup_recovery_passphrase_confirm_information" = "Gib deinen Wiederherstellungsschlüssel zur Bestätigung erneut ein.";
 "secrets_setup_recovery_passphrase_confirm_passphrase_title" = "";
 "secrets_setup_recovery_passphrase_confirm_passphrase_placeholder" = "Wiederherstellungsschlüssel";
-"secrets_reset_title" = "Verschlüsselung zurücksetzen";
+"secrets_reset_title" = "Zurücksetzen";
 "secrets_reset_information" = "Bitte fahre nur fort, wenn Du kein anderes Gerät hast um diesen Login zu verifizieren.";
-"secrets_reset_warning_title" = "Wenn Du die Verschlüsselung zurücksetzt:";
-"secrets_reset_warning_message" = "Du verlierst dadurch deinen gesamten bisherigen Nachrichtenverlauf, sowie verfizierte Geräte oder Nutzer!";
+"secrets_reset_warning_title" = "Willst du deinen Wiederherstellungsschlüssel wirklich zurücksetzen?";
+"secrets_reset_warning_message" = "Das Zurücksetzen deines Wiederherstellungsschlüssels kann nicht rückgängig gemacht werden. Nach dem Zurücksetzen wirst du alte Nachrichten nicht mehr lesen können.";
 "secrets_reset_reset_action" = "Zurücksetzen";
 "secrets_reset_authentication_message" = "Bestätige mit deinem Passwort!";
 "secrets_recovery_verification_alert_title" = "Anmeldung verifizieren";
@@ -543,9 +558,9 @@
 
 "bwi_settings_new_features_header" = "Neue Funktionen";
 "bwi_settings_new_features_show_features" = "Neue Funktionen anzeigen";
-"bwi_feature_banner_header" = "Neue Funktionen";
-"bwi_feature_banner_show_more_button" = "Erfahre mehr";
-"bwi_feature_banner_advertisement_text" = "Beim Schreiben von Nachrichten kannst Du jetzt sehr einfach Textformatierungen verwenden.";
+"bwi_feature_banner_header" = "Föderation jetzt möglich";
+"bwi_feature_banner_show_more_button" = "";
+"bwi_feature_banner_advertisement_text" = "Übergreifende sichere Kommunikation zwischen verschiedenen Organisationen";
 
 // MARK: - Onboarding
 "onboarding_splash_login_button_title" = "Loslegen";
@@ -554,6 +569,13 @@
 "authentication_server_selection_qr_missing_authorization_title" = "Scannen nicht möglich";
 "authentication_server_selection_qr_missing_authorization_message" = "Gehe in die Einstellungen deines iPhones, um der App den Zugriff auf die Kamera zu erlauben.";
 
+// MARK: - Simplified Login
+"authentication_qr_login_scan_title" = "Anmelden mit QR-Code";
+"authentication_qr_login_start_title" = "Anmelden mit QR-Code";
+"authentication_qr_login_start_button_title" = "QR-Code scannen";
+"authentication_qr_login_failure_title" = "Verbindung fehlgeschlagen";
+"authenticationQrLoginFailureRequestTimedOut" = "Die Verbindung konnte nicht in der erforderlichen Zeit hergestellt werden. Versuche es erneut.";
+
 // MARK: - Login Protection
 "bwi_login_protection_error_message" = "Der angegebene Server ist nicht für die Nutzung mit dem %@ vorgesehen";
 "bwi_login_protection_info_message" = "Dein Server ist leider noch nicht für den %@ eingerichtet. Wenn du aus der Öffentlichen Verwaltung bist und Fragen hast, wie Du den %@ nutzen kannst, besuche unsere Website.";
@@ -627,6 +649,7 @@
 "settings_permalink_prefix_picker_title" = "Permalink Prefix";
 "bwi_error_room_not_available_title" =  "Link ungültig";
 "bwi_error_room_not_available_message" =  "Der Raum wurde bereits geschlossen, daher kannst Du nicht mehr beitreten.";
+"bwi_error_room_history_not_available" = "Nachrichten können erst nach Einladung gelesen werden.";
 
 // MARK: - Notification Settings
 "settings_notify_me_for" = "Benachrichtige mich für";
@@ -689,14 +712,84 @@
 
 "room_admin_federation_decision_sheet_title" = "\"%@\" für eine Föderation zulassen?";
 "room_admin_federation_decision_sheet_text" = "Hierdurch kann der Raum von externen Organisationen mitgenutzt werden. Dies kann nachträglich in den Einstellungen geändert werden.";
-"room_admin_federation_decision_sheet_remind_later_button" = "Später erinnern";
 "room_admin_federation_decision_sheet_activate_federation_button" = "Raum föderieren";
 "room_admin_federation_decision_sheet_deactivate_federation_button" = "Raum intern behalten";
 
-"room_admin_federation_decision_set_federation_error_alert_title" = "Aktualisierung fehlgeschlagen";
-"room_admin_federation_decision_set_federation_error_alert_text" = "Aktualisierung der Föderations-Einstellung fehlgeschlagen, bitte versuche es später erneut.";
+"room_admin_federation_decision_set_federation_error_alert_title" = "Aktion fehlgeschlagen";
+"room_admin_federation_decision_set_federation_error_alert_text" = "Der Server ist aktuell nicht erreichbar. Versuche es später erneut.";
+
+"room_admin_federation_decision_set_federation_success_alert_title" = "Dieser Raum ist jetzt föderiert.";
+"room_admin_federation_decision_set_federation_alert_ok_button" = "Ok";
 
 "room_participants_invite_prompt_federation_for_room_not_allowed_text" = "Du kannst diese Person nicht einladen, da die Föderation für diesen Raum durch den Admin nicht gewünscht ist.";
 "room_participants_invite_prompt_server_acl_for_room_not_configured_text" = "Du kannst noch keine Personen aus einer föderierten Organisation einladen, da die Freigabe hierfür noch nicht erteilt wurde. Gib dem Admin Bescheid, dass die Einstellung getroffen werden muss.";
 
 "room_participants_invite_prompt_server_acl_loading_error_text" = "Die Person kann aktuell nicht eingeladen werden, bitte versuche es später erneut.";
+
+"event_formatter_acl_allow_federation" = "Dieser Raum wurde vom Administrator für eine Föderation zugelassen.";
+"event_formatter_acl_disallow_federation" = "Die Föderation für diesen Raum wurde aufgehoben. Alle föderierten Mitglieder werden automatisch entfernt.";
+"event_formatter_acl_disallow_at_start" = "Die Föderation für diesen Raum wurde nicht zugelassen.";
+"event_formatter_acl_collapsed" = "%tu Föderationseinstellungen wurden geändert.";
+"event_formatter_acl_and_other_collapsed" = "%tu Föderations und weitere Einstellungen geändert.";
+
+"federation_announcement_title" = "Ankündigung";
+"federation_announcement_text" = "Ab Mai 2024 ist die **Föderation** zwischen verschiedenen Organisationen möglich. Dies bietet eine übergreifende sichere Kommunikation.\n\nDetails findest du in der Datenschutzerklärung.";
+"federation_announcement_sub_text" = "Wenn du dein Profilbild vorweg ändern möchtest, gehe zu den Einstellungen.";
+"federation_announcement_button" = "Verstanden";
+
+"introduce_federation_screen1_title" = "Föderation";
+"introduce_federation_screen1_description" = "Übergreifende sichere Kommunikation zwischen verschiedenen Organisationen";
+"introduce_federation_screen2_title" = "Kennzeichnung";
+"introduce_federation_screen2_description" = "Föderierte Personen und Räume erkennst du am Symbol mit den zwei sich überschneidenden Kreisen.";
+"introduce_federation_screen3_title" = "Individuelle Einstellung";
+"introduce_federation_screen3_description" = "Bestimme als Admin, welche Räume für eine Föderation zugelassen sind.";
+"introduce_federation_start" = "Verstanden";
+
+"room_error_join_failed_federation_disabled_message" = "Du kannst den Raum nicht beitreten. Grund: Die Föderation wurde für diesen Raum aufgehoben.";
+
+// MARK: migration to new client
+// Banner
+"bwi_mobile_dialog_m_banner_title" = "Wechsel zum BundesMessengerX";
+"bwi_mobile_dialog_m1_banner_text_prefix" = "Das ist eine neue, technisch optimierte App vom BuM. Du kannst sie jetzt schon ausprobieren, bevor bald alle wechseln müssen.";
+"bwi_mobile_dialog_m1_banner_text_bold" = " Alle deine Kontakte und Nachrichten bleiben dabei erhalten.";
+"bwi_mobile_dialog_m2_banner_text_prefix" = "Das ist eine neue, technisch optimierte App vom BuM. Du hast nur noch";
+"bwi_mobile_dialog_m2_banner_text_bold" = " wenige Tage";
+"bwi_mobile_dialog_m2_banner_text_suffix" = " Zeit zu wechseln. Alle deine Kontakte und Nachrichten bleiben dabei erhalten.";
+"bwi_mobile_dialog_mdm_banner_text_prefix" = "Das ist eine neue, technisch optimierte App vom BuM, welche dir bald von deinem Admin zur Verfügung gestellt wird.";
+"bwi_mobile_dialog_mdm_banner_text_bold" = " Alle deine Kontakte und Nachrichten bleiben dabei bestehen, halte dafür deine Login Daten bereit.";
+"bwi_mobile_dialog_m_banner_button2" = "Erfahre mehr";
+"bwi_mobile_dialog_m_banner_button1" = "Später erinnern";
+
+// Sheet page 1
+"bwi_mobile_dialog_m_more_title" = "BundesMessengerX";
+
+"bwi_mobile_dialog_m1_more_text_1" = "Der BuM wird bald abgeschaltet und durch den BuMX ersetzt. Dies ist eine neue, technisch optimierte App ";
+"bwi_mobile_dialog_m3_more_text_1" = "Der BuM wurde nun abgeschaltet und durch den BuMX ersetzt. Dies ist eine neue, technisch optimierte App ";
+"bwi_mobile_dialog_m3_more_text_1_mdm" = "Der BuM wurde nun abgeschaltet und durch den BuMX ersetzt. Dies ist eine neue, technisch optimierte App, welche dir von deinem Admin zur Verfügung gestellt wird ";
+"bwi_mobile_dialog_m1_more_text_2" = "(alle deine Kontakte und Nachrichten bleiben erhalten).";
+"bwi_mobile_dialog_m1_more_text_3" = "\n\nDich erwartet u.a.:";
+"bwi_mobile_dialog_m1_more_text_bullet_1" = "schnellere Performance";
+"bwi_mobile_dialog_m1_more_text_bullet_2" = "verbessertes Design";
+"bwi_mobile_dialog_m1_more_text_bullet_3" = "neue Funktionen, wie Nachrichten anheften";
+"bwi_mobile_dialog_m1_more_text_bullet_4" = "optimierte Barrierefreiheit";
+
+// Sheet page 2
+"bwi_mobile_dialog_m_more2_title" = "Wechsel jetzt:";
+"bwi_mobile_dialog_m_more2_text_1" = "Benutzername hier kopieren";
+"bwi_mobile_dialog_m_more2_text_2" = "App über den Button herunterladen";
+"bwi_mobile_dialog_m_more2_text_3" = "Mit deinen Anmeldedaten einloggen";
+"bwi_mobile_dialog_m_more_button" = "Neue App herunterladen";
+"bwi_mobile_dialog_m_more_success" = "Benutzername kopiert";
+
+// Migration Success
+"bwi_mobile_dialog_m3_success_change_title" = "Wechsel erfolgreich 🎉";
+"bwi_mobile_dialog_m3_success_text" = "Diese App kannst du nun löschen.";
+"bwi_all_common_close" = "Schließen";
+"bwi_all_common_got_it" = "Verstanden";
+
+// MARK: owner handling
+"room_member_power_level_owner_in" = "Inhaber von %@";
+"room_member_power_level_short_owner" = "Inhaber";
+
+// MARK: call event
+"bwi_call_event_not_supported" = "Videomeetings werden in dieser App noch nicht unterstützt. Verwende den Webclient.";

Riot/Assets/de.lproj/Localizable.strings

@@ -119,8 +119,8 @@
 
 //
 /* BWI: Happy Birthday Campaign*/
-"HAPPY_BIRTHDAY" = "🎈 HAPPY BIRTHDAY 2.0 🎈";
-"HAPPY_BIRTHDAY_BODY" = "Schon wieder ist ein Jahr vorbei, der BwMessenger wird 2.\nDanke für Deine Treue - jetzt und in Zukunft.\nGratuliere uns zum 2.0 mit Deiner Sterne-Bewertung im App Store.";
+"HAPPY_BIRTHDAY" = "🥳 HAPPY BIRTHDAY 🥳";
+"HAPPY_BIRTHDAY_BODY" = "Wir feiern 1 Jahr BundesMessenger. Möchtest du uns auch gratulieren? Schenke dem BundesMessenger deine Sterne Bewertung im App Store.";
 "HAPPY_BIRTHDAY_BUTTON_GIVE_STARS" = "Sterne schenken";
 "HAPPY_BIRTHDAY_BUTTON_DISMISS" = "X";
 

Riot/Assets/de.lproj/Vector.strings

@@ -2544,7 +2544,7 @@
 "all_chats_user_menu_accessibility_label" = "Benutzermenü";
 "settings_labs_enable_new_client_info_feature" = "Bezeichnung, Version und URL der Anwendung registrieren, damit diese Sitzung in der Sitzungsverwaltung besser erkennbar ist";
 "settings_labs_enable_new_session_manager" = "Neue Sitzungsverwaltung";
-"authentication_qr_login_start_step2" = "Gehe zu Einstellungen -> Sicherheit und Privatsphäre";
+"authentication_qr_login_start_step2" = "Gehe zu Alle Einstellungen > Sitzungen";
 "authentication_qr_login_scan_subtitle" = "Positioniere den QR-Code innerhalb des Quadrats";
 "authentication_qr_login_display_step2" = "Wähle „Anmelden mit QR-Code“";
 "authentication_qr_login_scan_title" = "QR-Code einlesen";
@@ -2553,8 +2553,8 @@
 "authentication_qr_login_start_display_qr" = "QR-Code auf diesem Gerät anzeigen";
 "authentication_qr_login_start_step4" = "Wähle „Zeige QR-Code auf diesem Gerät“";
 "authentication_qr_login_display_title" = "Verbinde ein Gerät";
-"authentication_qr_login_start_step3" = "Wähle „Verbinde ein Gerät“";
-"authentication_qr_login_start_title" = "QR-Code einlesen";
+"authentication_qr_login_start_step3" = "Wähle \"Mit QR-Code anmelden\"";
+"authentication_qr_login_start_title" = "QR-Code scannen";
 "authentication_login_with_qr" = "Anmelden mit QR-Code";
 "device_type_name_unknown" = "Unbekannt";
 "device_type_name_mobile" = "Mobil";
@@ -2583,11 +2583,11 @@
 "authentication_qr_login_loading_signed_in" = "Du bist nun mit deinem anderen Gerät angemeldet.";
 "authentication_qr_login_loading_waiting_signin" = "Warte auf Geräteanmeldung.";
 "authentication_qr_login_loading_connecting_device" = "Verbinde mit Gerät";
-"authentication_qr_login_confirm_alert" = "Bitte stelle sicher, dass du die Quelle dieses Codes kennst. Durch das Verbinden des Gerätes wirst du jemandem vollen Zugriff auf dein Konto gewähren.";
+"authentication_qr_login_confirm_alert" = "Keine Übereinstimmung?";
 "authentication_qr_login_confirm_subtitle" = "Bestätige, dass der folgende Code mit dem auf deinem anderen Gerät übereinstimmt:";
 "authentication_qr_login_confirm_title" = "Sichere Verbindung aufgebaut";
 "authentication_qr_login_display_step1" = "Öffne Element auf deinem anderen Gerät";
-"authentication_qr_login_start_step1" = "Öffne Element auf deinem anderen Gerät";
+"authentication_qr_login_start_step1" = "Öffne die Webapp auf deinem dienstlichen Computer";
 "authentication_qr_login_start_subtitle" = "Nutze die Kamera dieses Gerätes, um den auf deinem anderen Gerät angezeigten QR-Code einzulesen:";
 "wysiwyg_composer_start_action_text_formatting" = "Textformatierung";
 "wysiwyg_composer_start_action_camera" = "Kamera";
@@ -2616,8 +2616,8 @@
 "manage_session_name_info" = "Sei dir bitte bewusst, dass Sitzungsnamen auch für Personen, mit denen du kommunizierst, sichtbar sind. %@";
 "manage_session_name_hint" = "Individuelle Sitzungsnamen können dir helfen, deine Geräte einfacher zu erkennen.";
 "user_other_session_filter" = "Filtern";
-"wysiwyg_composer_format_action_strikethrough" = "Unterstrichen formatieren";
-"wysiwyg_composer_format_action_underline" = "Durchgestrichen formatieren";
+"wysiwyg_composer_format_action_strikethrough" = "Durchgestrichen formatieren";
+"wysiwyg_composer_format_action_underline" = "Unterstrichen formatieren";
 "wysiwyg_composer_format_action_italic" = "Kursiv formatieren";
 
 // Formatting Actions