From 7d9fe83b5d5119be34aa88e44801adf3850db0dc Mon Sep 17 00:00:00 2001
From: Frank Rotermund <frank.rotermund@bwi.de>
Date: Thu, 6 Oct 2022 07:51:52 +0200
Subject: [PATCH] MESSENGER-3671 corrected versions

---
 Config/AppVersion.xcconfig                    |  2 +-
 Config/BuM-Beta/BuildSettings.swift           |  2 +-
 Config/BuildSettings.swift                    |  2 +-
 Podfile.lock                                  | 25 ++++++++++---
 .../xcshareddata/xcschemes/Riot.xcscheme      | 37 ++++++++-----------
 5 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index 5dbfb6e35..6afeeb210 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -16,5 +16,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.25.0
+MARKETING_VERSION = 1.26.0
 CURRENT_PROJECT_VERSION = 20220714163152
diff --git a/Config/BuM-Beta/BuildSettings.swift b/Config/BuM-Beta/BuildSettings.swift
index 28b53c29b..944c604c1 100644
--- a/Config/BuM-Beta/BuildSettings.swift
+++ b/Config/BuM-Beta/BuildSettings.swift
@@ -484,7 +484,7 @@ final class BuildSettings: NSObject {
     static let passwordIndicatorOnLogin : Bool = true
     
     // MARK: Displays the element base version on the settings screen
-    static let elementBaseVersion : String = "1.9.5"
+    static let elementBaseVersion : String = "1.9.8"
 
     static let showElementBaseVersion : Bool = true
 
diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index 64cffea0e..1d9ff148f 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -484,7 +484,7 @@ final class BuildSettings: NSObject {
     static let passwordIndicatorOnLogin : Bool = true
     
     // MARK: Displays the element base version on the settings screen
-    static let elementBaseVersion : String = "1.9.5"
+    static let elementBaseVersion : String = "1.9.8"
 
     static let showElementBaseVersion : Bool = true
 
diff --git a/Podfile.lock b/Podfile.lock
index 0f0faf7a8..7b651e674 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -38,6 +38,7 @@ PODS:
     - DTFoundation/Core
   - DTFoundation/UIKit (1.7.18):
     - DTFoundation/Core
+  - DTTJailbreakDetection (0.4.0)
   - ffmpeg-kit-ios-audio (4.5.1)
   - FLEX (4.5.0)
   - FlowCommoniOS (1.12.2)
@@ -56,6 +57,9 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
+  - MatomoTracker (7.4.1):
+    - MatomoTracker/Core (= 7.4.1)
+  - MatomoTracker/Core (7.4.1)
   - MatrixSDK (0.24.0):
     - MatrixSDK/Core (= 0.24.0)
   - MatrixSDK/Core (0.24.0):
@@ -115,6 +119,7 @@ DEPENDENCIES:
   - DSBottomSheet (~> 0.3)
   - DSWaveformImage (~> 6.1.1)
   - DTCoreText (~> 1.6.25)
+  - DTTJailbreakDetection (~> 0.4.0)
   - ffmpeg-kit-ios-audio (= 4.5.1)
   - FLEX (~> 4.5.0)
   - FlowCommoniOS (~> 1.12.0)
@@ -123,8 +128,9 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.24.0)
-  - MatrixSDK/JingleCallStack (= 0.24.0)
+  - MatomoTracker (~> 7.4.1)
+  - MatrixSDK (from `https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk`, tag `v0.24.0_bwi_dev`)
+  - MatrixSDK/JingleCallStack (from `https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk`, tag `v0.24.0_bwi_dev`)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -152,6 +158,7 @@ SPEC REPOS:
     - DSWaveformImage
     - DTCoreText
     - DTFoundation
+    - DTTJailbreakDetection
     - ffmpeg-kit-ios-audio
     - FLEX
     - FlowCommoniOS
@@ -166,7 +173,7 @@ SPEC REPOS:
     - libPhoneNumber-iOS
     - LoggerAPI
     - Logging
-    - MatrixSDK
+    - MatomoTracker
     - MatrixSDKCrypto
     - OLMKit
     - PostHog
@@ -190,11 +197,17 @@ EXTERNAL SOURCES:
   AnalyticsEvents:
     :branch: release/swift
     :git: https://github.com/matrix-org/matrix-analytics-events.git
+  MatrixSDK:
+    :git: https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk
+    :tag: v0.24.0_bwi_dev
 
 CHECKOUT OPTIONS:
   AnalyticsEvents:
     :commit: 53ad46ba1ea1ee8f21139dda3c351890846a202f
     :git: https://github.com/matrix-org/matrix-analytics-events.git
+  MatrixSDK:
+    :git: https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk
+    :tag: v0.24.0_bwi_dev
 
 SPEC CHECKSUMS:
   AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
@@ -207,6 +220,7 @@ SPEC CHECKSUMS:
   DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
   DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce
   DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536
+  DTTJailbreakDetection: 5e356c5badc17995f65a83ed9483f787a0057b71
   ffmpeg-kit-ios-audio: 662ce2064e56733ca7d8216705efbc38d9e1c3fe
   FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
   FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
@@ -221,6 +235,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
+  MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
   MatrixSDK: 196ae670143c5169ca9d02ff4d4a87f1e4dd8f08
   MatrixSDKCrypto: 4b9146d5ef484550341be056a164c6930038028e
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
@@ -241,6 +256,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: f8957c6eb2617c1f8a9174c1c5eac5f2bd67a599
+PODFILE CHECKSUM: 76f4286f10bb28fa143ae00ccb47a2bdd09e95a4
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
index 012a5a109..e1775adc4 100644
--- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
+++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1200"
-   version = "1.7">
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      runPostActionsOnFailure = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -16,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "57B13CC4586E9D43ED24DE1E"
-               BuildableName = "Riot.app"
+               BuildableName = "Element.app"
                BlueprintName = "Riot"
                ReferencedContainer = "container:Riot.xcodeproj">
             </BuildableReference>
@@ -35,11 +34,20 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "57B13CC4586E9D43ED24DE1E"
-            BuildableName = "Riot.app"
+            BuildableName = "Element.app"
             BlueprintName = "Riot"
             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">
@@ -52,17 +60,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <CommandLineArguments>
-      </CommandLineArguments>
-      <CodeCoverageTargets>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "57B13CC4586E9D43ED24DE1E"
-            BuildableName = "Riot.app"
-            BlueprintName = "Riot"
-            ReferencedContainer = "container:Riot.xcodeproj">
-         </BuildableReference>
-      </CodeCoverageTargets>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -80,13 +77,11 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "57B13CC4586E9D43ED24DE1E"
-            BuildableName = "Riot.app"
+            BuildableName = "Element.app"
             BlueprintName = "Riot"
             ReferencedContainer = "container:Riot.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <CommandLineArguments>
-      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -99,13 +94,11 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "57B13CC4586E9D43ED24DE1E"
-            BuildableName = "Riot.app"
+            BuildableName = "Element.app"
             BlueprintName = "Riot"
             ReferencedContainer = "container:Riot.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <CommandLineArguments>
-      </CommandLineArguments>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">