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

Config/AppVersion.xcconfig

@@ -15,10 +15,5 @@
 //
 
 // Version
-<<<<<<< HEAD
 MARKETING_VERSION = 2.4.8
 CURRENT_PROJECT_VERSION = 1
-=======
-MARKETING_VERSION = 1.11.2
-CURRENT_PROJECT_VERSION = 1.11.2
->>>>>>> v1.11.2

Podfile.lock

@@ -26,7 +26,7 @@ PODS:
     - GBDeviceInfo/Core (= 7.1.0)
   - GBDeviceInfo/Core (7.1.0)
   - GZIP (1.3.0)
-  - Introspect (0.11.0)
+  - Introspect (0.12.0)
   - JitsiMeetSDKLite (8.1.2-lite):
     - JitsiWebRTC (~> 111.0)
   - JitsiWebRTC (111.0.2)
@@ -58,7 +58,7 @@ PODS:
     - OLMKit/olmcpp (= 3.2.12)
   - OLMKit/olmc (3.2.12)
   - OLMKit/olmcpp (3.2.12)
-  - PostHog (2.0.0)
+  - PostHog (2.0.2)
   - ReadMoreTextView (3.0.1)
   - Realm (10.27.0):
     - Realm/Headers (= 10.27.0)
@@ -177,7 +177,7 @@ SPEC CHECKSUMS:
   FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376
   GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
-  Introspect: 4cc1e4c34dd016540c8d86a591c231c09dafbee3
+  Introspect: b66b675de8a85d9ef832f3a710d8e3c7db186884
   JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7
   JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
@@ -190,7 +190,7 @@ SPEC CHECKSUMS:
   MatrixSDK: a39e229a03a00394e055ffa7490e9602d45f8a44
   MatrixSDKCrypto: 25929a40733b4ab54f659aaf6a730552a0a06504
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
-  PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
+  PostHog: f9e5c13ceea86bb5314218c85d16125b797eb332
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
   Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
@@ -208,10 +208,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-<<<<<<< HEAD
-PODFILE CHECKSUM: 192fb60d741b1abb1c74dc2c261f9dd07a9dca8a
-=======
-PODFILE CHECKSUM: b926e281576aabcdbc2bdcb40ef3ad3e0991abe8
->>>>>>> v1.11.2
+PODFILE CHECKSUM: bdd98ddb1a6b2f5d45b1fc00ccfbf2dbaeeb0ff0
 
 COCOAPODS: 1.11.3

RiotNSE/target.yml

@@ -43,11 +43,7 @@ targets:
     sources: 
     - path: .
     - path: ../Riot/Managers/Settings/RiotSettings.swift
-<<<<<<< HEAD
-=======
-    - path: ../Config/BuildSettings.swift
     - path: ../Config/MDMSettings.swift
->>>>>>> v1.11.2
     - path: ../Riot/Utils/DataProtectionHelper.swift
     - path: ../Config/CommonConfiguration.swift
     - path: ../Riot/Experiments/

RiotShareExtension/Sources/ShareExtensionRootViewController.m

@@ -64,7 +64,8 @@ - (void)viewDidLoad
                                                                          shareItemProvider:shareItemProvider];
 
     _shareManager = [[ShareManager alloc] initWithShareItemSender:shareItemSender
-                                                             type:ShareManagerTypeSend];
+                                                             type:ShareManagerTypeSend
+                                                          session:nil]; // Tchap : pass nil session to force 'checkUserAccount' as before
 
     MXWeakify(self);
     [_shareManager setCompletionCallback:^(ShareManagerResult result) {

RiotShareExtension/target.yml

@@ -48,11 +48,7 @@ targets:
     - path: ../Riot/Categories/MXEvent.swift
     - path: ../Riot/Managers/Theme/
     - path: ../Riot/Utils/AvatarGenerator.m
-<<<<<<< HEAD
-=======
-    - path: ../Config/BuildSettings.swift
     - path: ../Config/MDMSettings.swift
->>>>>>> v1.11.2
     - path: ../Riot/Categories/Character.swift
     - path: ../Riot/Categories/MXKImageView.swift
     - path: ../Riot/Categories/MXRoom+Riot.m