Resolve conflicts on Rebase/Element-v1.11.15 into Tchap

.github/workflows/ci-build.yml

@@ -20,9 +20,7 @@ jobs:
     # Concurrency group not needed as this workflow only runs on develop which we always want to test.
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-            submodules: 'true'
+      - uses: actions/checkout@v2
 
       # Common cache
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
@@ -51,13 +49,10 @@ jobs:
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
-<<<<<<< HEAD
 
       # Disabled for Tchap to avoid MatrixSDK version reset on the main branch (develop), instead of using the DINUM specific one.
       # - name: Use right MatrixSDK versions
       #   run: bundle exec fastlane point_dependencies_to_related_branches
-=======
->>>>>>> v1.11.15
 
       # Main step
       - name: Build iOS simulator

.github/workflows/ci-tests.yml

@@ -25,9 +25,7 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-            submodules: 'true'
+      - uses: actions/checkout@v2
 
       # Common cache
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
@@ -56,13 +54,10 @@ jobs:
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
-<<<<<<< HEAD
 
       # Disabled for Tchap to avoid MatrixSDK version reset on the main branch (develop), instead of using the DINUM specific one.
 #      - name: Use right MatrixSDK versions
 #        run: bundle exec fastlane point_dependencies_to_related_branches
-=======
->>>>>>> v1.11.15
 
       # Main step
       - name: Unit tests

Config/AppVersion.xcconfig

@@ -15,10 +15,5 @@
 //
 
 // Version
-<<<<<<< HEAD
 MARKETING_VERSION = 2.7.9
 CURRENT_PROJECT_VERSION = 1
-=======
-MARKETING_VERSION = 1.11.15
-CURRENT_PROJECT_VERSION = 1.11.15
->>>>>>> v1.11.15

Config/BuildSettings.swift

@@ -304,7 +304,6 @@ final class BuildSettings: NSObject {
     static let settingsScreenShowChangePassword: Bool = true
     static let settingsScreenShowEnableStunServerFallback: Bool = true
     static let settingsScreenShowNotificationDecodedContentOption: Bool = true
-<<<<<<< HEAD
     static let settingsScreenShowNsfwRoomsOption: Bool = false
     static let settingsSecurityScreenShowSessions: Bool = true
     static let settingsSecurityScreenShowSetupBackup: Bool = true
@@ -313,15 +312,6 @@ final class BuildSettings: NSObject {
     static let settingsSecurityScreenShowCryptographyInfo: Bool = true
     static let settingsSecurityScreenShowCryptographyExport: Bool = true
     static let settingsSecurityScreenShowAdvancedUnverifiedDevices: Bool = false
-=======
-    static let settingsSecurityScreenShowSessions:Bool = true
-    static let settingsSecurityScreenShowSetupBackup:Bool = true
-    static let settingsSecurityScreenShowRestoreBackup:Bool = true
-    static let settingsSecurityScreenShowDeleteBackup:Bool = true
-    static let settingsSecurityScreenShowCryptographyInfo:Bool = true
-    static let settingsSecurityScreenShowCryptographyExport:Bool = true
-    static let settingsSecurityScreenShowAdvancedUnverifiedDevices:Bool = true
->>>>>>> v1.11.15
     /// A setting to enable the presence configuration settings section.
     static let settingsScreenPresenceAllowConfiguration: Bool = false
 

Podfile

@@ -28,33 +28,7 @@ def import_SwiftUI_pods
     pod 'ZXingObjC', '~> 3.6.9'
 end
 
-<<<<<<< HEAD
 def import_Common_pods
-=======
-abstract_target 'RiotPods' do
-
-  pod 'GBDeviceInfo', '~> 7.1.0'
-  pod 'Reusable', '~> 4.1'
-  pod 'KeychainAccess', '~> 4.2.2'
-  pod 'WeakDictionary', '~> 2.0'
-
-  pod 'Sentry', '~> 7.15.0'
-
-  pod 'OLMKit'
-  pod 'zxcvbn-ios'
-
-  # Tools
-  pod 'SwiftGen'
-  pod 'SwiftLint'
-  pod 'SwiftFormat/CLI'
-
-  target "Riot" do
-    import_MatrixSDK
-    import_MatrixKit_pods
-
-    import_SwiftUI_pods
-
->>>>>>> v1.11.15
     pod 'UICollectionViewRightAlignedLayout', '~> 0.0.3'
     pod 'UICollectionViewLeftAlignedLayout', '~> 1.0.2'
     pod 'KTCenterFlowLayout', '~> 1.3.1'
@@ -87,6 +61,7 @@ abstract_target 'TchapPods' do
   # Tools
   pod 'SwiftGen', '~> 6.3'
   pod 'SwiftLint', '~> 0.49.1'
+  pod 'SwiftFormat/CLI'
 
   target "Tchap" do
     import_MatrixSDK

Podfile.lock

@@ -39,35 +39,26 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-<<<<<<< HEAD
-  - MatrixSDK (0.27.7):
-    - MatrixSDK/Core (= 0.27.7)
-  - MatrixSDK/Core (0.27.7):
-=======
   - MatrixSDK (0.27.10):
     - MatrixSDK/Core (= 0.27.10)
   - MatrixSDK/Core (0.27.10):
->>>>>>> v1.11.15
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
-    - MatrixSDKCrypto (= 0.3.13)
+    - MatrixSDKCrypto (= 0.4.2)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-<<<<<<< HEAD
-  - MatrixSDK/JingleCallStack (0.27.7):
-=======
   - MatrixSDK/JingleCallStack (0.27.10):
->>>>>>> v1.11.15
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
-  - MatrixSDKCrypto (0.3.13)
+  - MatrixSDKCrypto (0.4.2)
   - 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)
   - ReadMoreTextView (3.0.1)
   - Realm (10.27.0):
     - Realm/Headers (= 10.27.0)
@@ -83,6 +74,7 @@ PODS:
   - Sentry/Core (7.15.0)
   - SideMenu (6.5.0)
   - SwiftBase32 (0.9.0)
+  - SwiftFormat/CLI (0.54.0)
   - SwiftGen (6.6.2)
   - SwiftJWT (3.6.200):
     - BlueCryptor (~> 1.0)
@@ -111,20 +103,17 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-<<<<<<< HEAD
-  - MatrixSDK (= 0.27.7)
-  - MatrixSDK/JingleCallStack (= 0.27.7)
-=======
   - MatrixSDK (from `matrix-ios-sdk/MatrixSDK.podspec`)
   - MatrixSDK/JingleCallStack (from `matrix-ios-sdk/MatrixSDK.podspec`)
->>>>>>> v1.11.15
   - OLMKit
+  - PostHog (~> 2.0.0)
   - ReadMoreTextView (~> 3.0.1)
   - Reusable (~> 4.1)
   - RxSwift (~> 5.1.1)
   - Sentry (~> 7.15.0)
   - SideMenu (~> 6.5)
   - SwiftBase32 (~> 0.9.0)
+  - SwiftFormat/CLI
   - SwiftGen (~> 6.3)
   - SwiftJWT (~> 3.6.200)
   - SwiftLint (~> 0.49.1)
@@ -159,13 +148,15 @@ SPEC REPOS:
     - Logging
     - MatrixSDKCrypto
     - OLMKit
+    - PostHog
     - ReadMoreTextView
     - Realm
     - Reusable
     - RxSwift
     - Sentry
     - SideMenu
     - SwiftBase32
+    - SwiftFormat
     - SwiftGen
     - SwiftJWT
     - SwiftLint
@@ -202,21 +193,18 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-<<<<<<< HEAD
-  MatrixSDK: e07b2309f3c6498c1df987441da7006d099c47a4
-  MatrixSDKCrypto: bf08b72f2cd015d8749420a2b8b92fc0536bedf4
-=======
   MatrixSDK: c805f9306d60955215f4b15043ed0f96fd4867b3
   MatrixSDKCrypto: 736069ee0a5ec12852ab3498bf2242acecc443fc
->>>>>>> v1.11.15
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
+  PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
   Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
   RxSwift: 915abbdfb62214aa89ccd0b194d44fb478019b27
   Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7
   SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
   SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
+  SwiftFormat: 0e0b577434e6aa63bc82a8905b40d9597b8452d4
   SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c
   SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae
   SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
@@ -227,10 +215,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-<<<<<<< HEAD
-PODFILE CHECKSUM: 3db384be27ed06c11b15ee9abc4616afd45428c1
-=======
-PODFILE CHECKSUM: b622ffadc1a0fe5442787bd9023ca3d110384814
->>>>>>> v1.11.15
+PODFILE CHECKSUM: 971cd7529e2d127b237469afa2c18e6dced151ec
 
 COCOAPODS: 1.14.3

Riot/Managers/Settings/RiotSettings.swift

@@ -97,11 +97,6 @@ final class RiotSettings: NSObject {
     @UserDefault(key: UserDefaultsKeys.pinRoomsWithUnreadMessagesOnHome, defaultValue: false, storage: defaults)
     var pinRoomsWithUnreadMessagesOnHome
 
-<<<<<<< HEAD
-    /// Indicate to show Not Safe For Work public rooms.
-    @UserDefault(key: "showNSFWPublicRooms", defaultValue: false, storage: defaults)
-    var showNSFWPublicRooms
-
     /// Indicate if the user wants to display the join and leave events in the room history.
     /// (No by default)
     @UserDefault(key: "showJoinLeaveEvents", defaultValue: false, storage: defaults)
@@ -112,8 +107,6 @@ final class RiotSettings: NSObject {
     @UserDefault(key: "showProfileUpdateEvents", defaultValue: false, storage: defaults)
     var showProfileUpdateEvents
 
-=======
->>>>>>> v1.11.15
     // MARK: User interface
 
     @UserDefault<String?>(key: "userInterfaceTheme", defaultValue: nil, storage: defaults)

Riot/Utils/EventFormatter.m

@@ -659,12 +659,6 @@ - (MXEvent *)voiceBroadcastInfoStartedEventWithEvent:(MXEvent *)voiceBroadcastIn
 - (BOOL)session:(MXSession *)session updateRoomSummary:(MXRoomSummary *)summary withStateEvents:(NSArray<MXEvent *> *)stateEvents roomState:(MXRoomState *)roomState
 {
     BOOL updated = [super session:session updateRoomSummary:summary withStateEvents:stateEvents roomState:roomState];
-<<<<<<< HEAD
-
-    // Store in the room summary some additional information
-    updated |= [summary tc_updateWithStateEvents:stateEvents];
-
-=======
 
     MXEvent* lastRoomRetentionEvent = [self roomRetentionEventFromStateEvents:stateEvents];
     if (lastRoomRetentionEvent)
@@ -673,7 +667,9 @@ - (BOOL)session:(MXSession *)session updateRoomSummary:(MXRoomSummary *)summary
         updated = YES;
     }
 
->>>>>>> v1.11.15
+    // Store in the room summary some additional information
+    updated |= [summary tc_updateWithStateEvents:stateEvents];
+
     // Customisation for EMS Functional Members in direct rooms
     if (BuildSettings.supportFunctionalMembers && summary.room.isDirect)
     {

RiotNSE/BuildSettings.swift

@@ -272,8 +272,25 @@ final class BuildSettings: NSObject {
         tchapFeatureNotificationByEmail: [
             tchapFeatureAnyHomeServer
         ],
+        // Audio calls for all except Finances in Tchap Production.
         tchapFeatureVoiceOverIP: [
-            "agent.dinum.tchap.gouv.fr"
+            "agent.externe.tchap.gouv.fr",
+            "agent.collectivites.tchap.gouv.fr",
+            "agent.tchap.gouv.fr",
+            "agent.elysee.tchap.gouv.fr",
+            "agent.pm.tchap.gouv.fr",
+            "agent.ssi.tchap.gouv.fr",
+//            "agent.finances.tchap.gouv.fr",
+            "agent.social.tchap.gouv.fr",
+            "agent.interieur.tchap.gouv.fr",
+            "agent.agriculture.tchap.gouv.fr",
+            "agent.justice.tchap.gouv.fr",
+            "agent.diplomatie.tchap.gouv.fr",
+            "agent.intradef.tchap.gouv.fr",
+            "agent.dinum.tchap.gouv.fr",
+            "agent.culture.tchap.gouv.fr",
+            "agent.dev-durable.tchap.gouv.fr",
+            "agent.education.tchap.gouv.fr"
         ],
         // No activation of video calls actually in Tchap Production.
 //        tchapFeatureVideoOverIP: [

RiotShareExtension/BuildSettings.swift

@@ -272,8 +272,25 @@ final class BuildSettings: NSObject {
         tchapFeatureNotificationByEmail: [
             tchapFeatureAnyHomeServer
         ],
+        // Audio calls for all except Finances in Tchap Production.
         tchapFeatureVoiceOverIP: [
-            "agent.dinum.tchap.gouv.fr"
+            "agent.externe.tchap.gouv.fr",
+            "agent.collectivites.tchap.gouv.fr",
+            "agent.tchap.gouv.fr",
+            "agent.elysee.tchap.gouv.fr",
+            "agent.pm.tchap.gouv.fr",
+            "agent.ssi.tchap.gouv.fr",
+//            "agent.finances.tchap.gouv.fr",
+            "agent.social.tchap.gouv.fr",
+            "agent.interieur.tchap.gouv.fr",
+            "agent.agriculture.tchap.gouv.fr",
+            "agent.justice.tchap.gouv.fr",
+            "agent.diplomatie.tchap.gouv.fr",
+            "agent.intradef.tchap.gouv.fr",
+            "agent.dinum.tchap.gouv.fr",
+            "agent.culture.tchap.gouv.fr",
+            "agent.dev-durable.tchap.gouv.fr",
+            "agent.education.tchap.gouv.fr"
         ],
         // No activation of video calls actually in Tchap Production.
 //        tchapFeatureVideoOverIP: [

RiotShareExtension/target.yml

@@ -35,6 +35,7 @@ targets:
     - package: AnalyticsEvents
     - package: DeviceKit
     - package: DTCoreText
+    - package: PostHog
 
     configFiles:
       Debug: Debug.xcconfig