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

Config/AppVersion.xcconfig

@@ -15,10 +15,5 @@
 //
 
 // Version
-<<<<<<< HEAD
 MARKETING_VERSION = 2.5.1
 CURRENT_PROJECT_VERSION = 1
-=======
-MARKETING_VERSION = 1.11.4
-CURRENT_PROJECT_VERSION = 1.11.4
->>>>>>> v1.11.4

Gemfile

@@ -2,11 +2,7 @@ source "https://rubygems.org"
 
 gem "xcode-install"
 gem "fastlane"
-<<<<<<< HEAD
-gem "cocoapods", '~>1.11.3'
-=======
 gem "cocoapods", '~>1.13.0'
->>>>>>> v1.11.4
 gem "slather"
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')

Gemfile.lock

@@ -301,11 +301,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-<<<<<<< HEAD
-  cocoapods (~> 1.11.3)
-=======
   cocoapods (~> 1.13.0)
->>>>>>> v1.11.4
   fastlane
   fastlane-plugin-diawi!
   fastlane-plugin-sentry

Podfile.lock

@@ -25,13 +25,8 @@ PODS:
   - GBDeviceInfo (7.1.0):
     - GBDeviceInfo/Core (= 7.1.0)
   - GBDeviceInfo/Core (7.1.0)
-<<<<<<< HEAD
   - GZIP (1.3.0)
   - Introspect (0.12.0)
-=======
-  - GZIP (1.3.1)
-  - Introspect (0.11.0)
->>>>>>> v1.11.4
   - JitsiMeetSDKLite (8.1.2-lite):
     - JitsiWebRTC (~> 111.0)
   - JitsiWebRTC (111.0.2)
@@ -181,13 +176,8 @@ SPEC CHECKSUMS:
   FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
   FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376
-<<<<<<< HEAD
   GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
   Introspect: b66b675de8a85d9ef832f3a710d8e3c7db186884
-=======
-  GZIP: e6922ed5bdd1d77d84589d50821ac34ea0c38d4b
-  Introspect: 4cc1e4c34dd016540c8d86a591c231c09dafbee3
->>>>>>> v1.11.4
   JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7
   JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
@@ -218,10 +208,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-<<<<<<< HEAD
-PODFILE CHECKSUM: bdd98ddb1a6b2f5d45b1fc00ccfbf2dbaeeb0ff0
-=======
-PODFILE CHECKSUM: 20f5e721c3f48c117b9610409e79661637454aa1
->>>>>>> v1.11.4
+PODFILE CHECKSUM: a4e43a5e1f4f68b92afbb208b6d9d3c80297aadb
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.13.0

Riot/Modules/Settings/SettingsViewController.m

@@ -221,14 +221,9 @@ @interface SettingsViewController () <UITextFieldDelegate, MXKCountryPickerViewC
 SettingsIdentityServerCoordinatorBridgePresenterDelegate,
 ServiceTermsModalCoordinatorBridgePresenterDelegate,
 TableViewSectionsDelegate,
-<<<<<<< HEAD
 /*ThreadsBetaCoordinatorBridgePresenterDelegate,*/
-ChangePasswordCoordinatorBridgePresenterDelegate>
-=======
-ThreadsBetaCoordinatorBridgePresenterDelegate,
-ChangePasswordCoordinatorBridgePresenterDelegate,
-SSOAuthenticationPresenterDelegate>
->>>>>>> v1.11.4
+ChangePasswordCoordinatorBridgePresenterDelegate/*,
+SSOAuthenticationPresenterDelegate*/>
 {
     // Current alert (if any).
     __weak UIAlertController *currentAlert;
@@ -4157,7 +4152,6 @@ - (void)onProfileAvatarTap:(UITapGestureRecognizer *)recognizer
 // Tchap: Add import keys feature
 - (void)importEncryptionKeys:(UITapGestureRecognizer *)recognizer
 {
-<<<<<<< HEAD
     self->currentAlert = nil;
 
     MXKDocumentPickerPresenter *documentPickerPresenter = [MXKDocumentPickerPresenter new];
@@ -4229,16 +4223,6 @@ - (void)deleteKeyExportFile
     if (keyExportsFile && [[NSFileManager defaultManager] fileExistsAtPath:keyExportsFile.path])
     {
         [[NSFileManager defaultManager] removeItemAtPath:keyExportsFile.path error:nil];
-=======
-    NSURL *url = [NSURL URLWithString: self.mainSession.homeserverWellknown.authentication.account];
-    if (url) {
-        SSOAccountService *service = [[SSOAccountService alloc] initWithAccountURL:url];
-        SSOAuthenticationPresenter *presenter = [[SSOAuthenticationPresenter alloc] initWithSsoAuthenticationService:service];
-        presenter.delegate = self;
-        self.ssoAuthenticationPresenter = presenter;
-
-        [presenter presentForIdentityProvider:nil with:@"" from:self animated:YES];
->>>>>>> v1.11.4
     }
 }