Rebase/element ios 1.11.1

Btchap/Config/BuildSettings.swift

@@ -111,7 +111,9 @@ final class BuildSettings: NSObject {
     // MARK: - Server configuration
     // Tchap sygnal server url
     static let serverConfigSygnalAPIUrlString = "https://sygnal.tchap.gouv.fr/_matrix/push/v1/notify"
-
+    /// Force the user to set a homeserver instead of using the default one
+    static let forceHomeserverSelection = false
+
 
     // MARK: - Legal URLs
 

Config/AppIdentifiers.xcconfig

@@ -24,16 +24,5 @@ TCHAP_PROVISIONING_PROFILE = ab6bd8d7-4490-470d-b76d-2b3744150e5a
 NSE_PROVISIONING_PROFILE_SPECIFIER = Tchap NSE App Store
 NSE_PROVISIONING_PROFILE = fbf70dfb-92e7-4eee-9098-d6c798074fff
 
-<<<<<<< HEAD
 SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = Tchap Share Extension App Store
 SHARE_EXTENSION_PROVISIONING_PROFILE = 9419786e-8533-468d-99fe-5e46101af01a
-=======
-SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = "Vector Share Extension: App Store"
-SHARE_EXTENSION_PROVISIONING_PROFILE = 8c797ca0-0440-49bd-be8d-11d761152995
-
-SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER = "Vector Siri Intents: App Store"
-SIRI_INTENTS_PROVISIONING_PROFILE = 1690e81a-5ad3-4d99-b578-02693579be71
-
-BROADCAST_UPLOAD_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = "Vector Broadcast Upload Extension: App Store"
-BROADCAST_UPLOAD_EXTENSION_PROVISIONING_PROFILE = c86239f4-0d3a-47f4-a5f2-9f4763c42b5d
->>>>>>> v1.11.1

Config/AppVersion.xcconfig

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

DevTchap/Config/BuildSettings.swift

@@ -112,7 +112,9 @@ final class BuildSettings: NSObject {
     // MARK: - Server configuration
     // Tchap sygnal server url
     static let serverConfigSygnalAPIUrlString = "https://sygnal.tchap.incubateur.net/_matrix/push/v1/notify"
-
+    /// Force the user to set a homeserver instead of using the default one
+    static let forceHomeserverSelection = false
+
     // MARK: - Legal URLs
 
     // Note: Set empty strings to hide the related entry in application settings

Podfile

@@ -109,7 +109,6 @@ abstract_target 'TchapPods' do
     end
   end
 
-<<<<<<< HEAD
   target "Btchap" do
     import_MatrixSDK
     import_MatrixKit_pods
@@ -133,8 +132,6 @@ abstract_target 'TchapPods' do
     import_MatrixKit_pods
   end
 
-=======
->>>>>>> v1.11.1
   target "RiotSwiftUI" do
     import_SwiftUI_pods
   end
@@ -148,10 +145,6 @@ abstract_target 'TchapPods' do
     import_MatrixKit_pods
   end
 
-  target "BroadcastUploadExtension" do
-    import_MatrixSDK
-  end
-
   # Disabled due to crypto corruption issues.
   # https://github.com/vector-im/element-ios/issues/7618
   # target "RiotShareExtension" do

Podfile.lock

@@ -26,17 +26,10 @@ PODS:
     - GBDeviceInfo/Core (= 7.1.0)
   - GBDeviceInfo/Core (7.1.0)
   - GZIP (1.3.0)
-<<<<<<< HEAD
-  - Introspect (0.2.3)
-  - JitsiMeetSDKLite (7.0.1-lite):
-    - JitsiWebRTC (~> 106.0)
-  - JitsiWebRTC (106.0.0)
-=======
   - Introspect (0.11.0)
   - JitsiMeetSDKLite (8.1.2-lite):
     - JitsiWebRTC (~> 111.0)
   - JitsiWebRTC (111.0.2)
->>>>>>> v1.11.1
   - KeychainAccess (4.2.2)
   - KituraContracts (1.2.1):
     - LoggerAPI (~> 1.7)
@@ -65,7 +58,7 @@ PODS:
     - OLMKit/olmcpp (= 3.2.12)
   - OLMKit/olmc (3.2.12)
   - OLMKit/olmcpp (3.2.12)
-  - PostHog (2.0.2)
+  - PostHog (2.0.0)
   - ReadMoreTextView (3.0.1)
   - Realm (10.27.0):
     - Realm/Headers (= 10.27.0)
@@ -184,15 +177,9 @@ SPEC CHECKSUMS:
   FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376
   GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
-<<<<<<< HEAD
-  Introspect: 6917895ed34004271bc8d75a75db6c07839fa971
-  JitsiMeetSDKLite: d59573336ce887ec52327a9927aa8443f560d0b9
-  JitsiWebRTC: f441eb0e2d67f0588bf24e21c5162e97342714fb
-=======
   Introspect: 4cc1e4c34dd016540c8d86a591c231c09dafbee3
   JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7
   JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b
->>>>>>> v1.11.1
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
   KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b
   KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97
@@ -203,7 +190,7 @@ SPEC CHECKSUMS:
   MatrixSDK: f6c197ca06aab29ff69d1105965a57d277dfcd9d
   MatrixSDKCrypto: 25929a40733b4ab54f659aaf6a730552a0a06504
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
-  PostHog: f9e5c13ceea86bb5314218c85d16125b797eb332
+  PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
   Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
@@ -221,10 +208,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-<<<<<<< HEAD
-PODFILE CHECKSUM: 84e6b6e14d0e13fa547bd28b5b31e2ebaaa52d72
-=======
-PODFILE CHECKSUM: ce6afe3dea7ea9b073a7ad0406b2cc5615646746
->>>>>>> v1.11.1
+PODFILE CHECKSUM: 192fb60d741b1abb1c74dc2c261f9dd07a9dca8a
 
 COCOAPODS: 1.11.3

Riot/Generated/Vector_Strings.swift

@@ -6399,15 +6399,13 @@ public class VectorL10n: NSObject {
   public static var roomParticipantsInviteAnotherUser: String { 
     return VectorL10n.tr("Vector", "room_participants_invite_another_user") 
   }
-<<<<<<< HEAD:Riot/Generated/Vector_Strings.swift
   /// Search / invite by Name or email
-  public static var roomParticipantsInviteAnotherUserWithoutId: String { 
-    return VectorL10n.tr("Vector", "room_participants_invite_another_user_without_id") 
-=======
+  public static var roomParticipantsInviteAnotherUserWithoutId: String {
+      return VectorL10n.tr("Vector", "room_participants_invite_another_user_without_id")
+  }
   /// Invite anyway
   public static var roomParticipantsInviteAnyway: String { 
     return VectorL10n.tr("Vector", "room_participants_invite_anyway") 
->>>>>>> v1.11.1:Riot/Generated/Strings.swift
   }
   /// Malformed ID. Should be an email address or a Matrix ID like '@localpart:domain'
   public static var roomParticipantsInviteMalformedId: String { 

Riot/Modules/Application/LegacyAppDelegate.m

@@ -2464,16 +2464,13 @@ - (void)handleAppState
                 case MXSessionStateSyncInProgress:
                     // Stay in launching during the first server sync if the store is empty.
                     isLaunching = (mainSession.rooms.count == 0 && launchAnimationContainerView);
-<<<<<<< HEAD
 // Tchap: Disable Cross Signing Managment.
 #ifdef CROSS_SIGNING
                     if (mainSession.crypto.crossSigning && mainSession.crypto.crossSigning.state == MXCrossSigningStateCrossSigningExists && [mainSession.crypto isKindOfClass:[MXLegacyCrypto class]])
                     {
                         [(MXLegacyCrypto *)mainSession.crypto setOutgoingKeyRequestsEnabled:NO onComplete:nil];
                     }
 #endif
-=======
->>>>>>> v1.11.1
                     break;
                 case MXSessionStateRunning:
                     self.clearingCache = NO;
@@ -2560,7 +2557,6 @@ - (void)handleAppState
 
 - (void)showLaunchAnimation
 {
-<<<<<<< HEAD
     // Tchap: Don't show Element Launch animation.
 //    UIWindow *window = [[UIApplication sharedApplication] keyWindow];
 //
@@ -2589,27 +2585,6 @@ - (void)showLaunchAnimation
 //
 //        [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:MXTaskProfileNameStartupLaunchScreen];
 //    }
-=======
-    UIWindow *window = [[UIApplication sharedApplication] keyWindow];
-
-    if (!launchAnimationContainerView && window)
-    {
-        MXLogDebug(@"[AppDelegate] showLaunchAnimation");
-
-        MXSession *mainSession = self.mxSessions.firstObject;
-        LaunchLoadingView *launchLoadingView  = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress];
-
-        launchLoadingView.frame = window.bounds;
-        [launchLoadingView updateWithTheme:ThemeService.shared.theme];
-        launchLoadingView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-
-        [window addSubview:launchLoadingView];
-
-        launchAnimationContainerView = launchLoadingView;
-
-        [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:MXTaskProfileNameStartupLaunchScreen];
-    }
->>>>>>> v1.11.1
 }
 
 - (void)hideLaunchAnimation

Riot/Modules/Room/RoomViewController.m

@@ -96,11 +96,7 @@
 @interface RoomViewController () <UISearchBarDelegate, UIGestureRecognizerDelegate, UIScrollViewAccessibilityDelegate, RoomTitleViewTapGestureDelegate, RoomParticipantsViewControllerDelegate, MXKRoomMemberDetailsViewControllerDelegate, MXServerNoticesDelegate, RoomContextualMenuViewControllerDelegate,
     ReactionsMenuViewModelCoordinatorDelegate, EditHistoryCoordinatorBridgePresenterDelegate, MXKDocumentPickerPresenterDelegate, EmojiPickerCoordinatorBridgePresenterDelegate,
     ReactionHistoryCoordinatorBridgePresenterDelegate, CameraPresenterDelegate, MediaPickerCoordinatorBridgePresenterDelegate,
-<<<<<<< HEAD
-    RoomDataSourceDelegate/*, RoomCreationModalCoordinatorBridgePresenterDelegate*/, RoomInfoCoordinatorBridgePresenterDelegate/*, DialpadViewControllerDelegate, RemoveJitsiWidgetViewDelegate*/, VoiceMessageControllerDelegate /*, SpaceDetailPresenterDelegate*/, UserSuggestionCoordinatorBridgeDelegate/*, ThreadsCoordinatorBridgePresenterDelegate, ThreadsBetaCoordinatorBridgePresenterDelegate, MXThreadingServiceDelegate, RoomParticipantsInviteCoordinatorBridgePresenterDelegate*/, RoomInputToolbarViewDelegate/*, ComposerCreateActionListBridgePresenterDelegate*/>
-=======
-    RoomDataSourceDelegate, RoomCreationModalCoordinatorBridgePresenterDelegate, RoomInfoCoordinatorBridgePresenterDelegate, DialpadViewControllerDelegate, RemoveJitsiWidgetViewDelegate, VoiceMessageControllerDelegate, SpaceDetailPresenterDelegate, CompletionSuggestionCoordinatorBridgeDelegate, ThreadsCoordinatorBridgePresenterDelegate, ThreadsBetaCoordinatorBridgePresenterDelegate, MXThreadingServiceDelegate, RoomParticipantsInviteCoordinatorBridgePresenterDelegate, RoomInputToolbarViewDelegate, ComposerCreateActionListBridgePresenterDelegate>
->>>>>>> v1.11.1
+    RoomDataSourceDelegate/*, RoomCreationModalCoordinatorBridgePresenterDelegate*/, RoomInfoCoordinatorBridgePresenterDelegate/*, DialpadViewControllerDelegate, RemoveJitsiWidgetViewDelegate*/, VoiceMessageControllerDelegate /*, SpaceDetailPresenterDelegate*/, CompletionSuggestionCoordinatorBridgeDelegate/*, ThreadsCoordinatorBridgePresenterDelegate, ThreadsBetaCoordinatorBridgePresenterDelegate, MXThreadingServiceDelegate, RoomParticipantsInviteCoordinatorBridgePresenterDelegate*/, RoomInputToolbarViewDelegate/*, ComposerCreateActionListBridgePresenterDelegate*/>
 {
 
     // The preview header
@@ -1089,13 +1085,8 @@ - (void)displayRoom:(MXKRoomDataSource *)dataSource
 
     [VoiceMessageMediaServiceProvider.sharedProvider setCurrentRoomSummary:dataSource.room.summary];
     _voiceMessageController.roomId = dataSource.roomId;
-<<<<<<< HEAD
-
-    _userSuggestionCoordinator = [[UserSuggestionCoordinatorBridge alloc] initWithMediaManager:self.roomDataSource.mxSession.mediaManager
-=======
 
     _completionSuggestionCoordinator = [[CompletionSuggestionCoordinatorBridge alloc] initWithMediaManager:self.roomDataSource.mxSession.mediaManager
->>>>>>> v1.11.1
                                                                                           room:dataSource.room
                                                                                         userID:self.roomDataSource.mxSession.myUserId];
     _completionSuggestionCoordinator.delegate = self;
@@ -2763,13 +2754,8 @@ - (void)setupCompletionSuggestionViewIfNeeded
         return;
     }
 
-<<<<<<< HEAD
-    UIViewController *suggestionsViewController = self.userSuggestionCoordinator.toPresentable;
-
-=======
     UIViewController *suggestionsViewController = self.completionSuggestionCoordinator.toPresentable;
 
->>>>>>> v1.11.1
     if (!suggestionsViewController)
     {
         return;
@@ -2778,23 +2764,13 @@ - (void)setupCompletionSuggestionViewIfNeeded
     [suggestionsViewController.view setTranslatesAutoresizingMaskIntoConstraints:NO];
 
     [self addChildViewController:suggestionsViewController];
-<<<<<<< HEAD
-    [self.userSuggestionContainerView addSubview:suggestionsViewController.view];
-
-    [NSLayoutConstraint activateConstraints:@[[suggestionsViewController.view.topAnchor constraintEqualToAnchor:self.userSuggestionContainerView.topAnchor],
-                                              [suggestionsViewController.view.leadingAnchor constraintEqualToAnchor:self.userSuggestionContainerView.leadingAnchor],
-                                              [suggestionsViewController.view.trailingAnchor constraintEqualToAnchor:self.userSuggestionContainerView.trailingAnchor],
-                                              [suggestionsViewController.view.bottomAnchor constraintEqualToAnchor:self.userSuggestionContainerView.bottomAnchor],]];
-
-=======
     [self.completionSuggestionContainerView addSubview:suggestionsViewController.view];
 
     [NSLayoutConstraint activateConstraints:@[[suggestionsViewController.view.topAnchor constraintEqualToAnchor:self.completionSuggestionContainerView.topAnchor],
                                               [suggestionsViewController.view.leadingAnchor constraintEqualToAnchor:self.completionSuggestionContainerView.leadingAnchor],
                                               [suggestionsViewController.view.trailingAnchor constraintEqualToAnchor:self.completionSuggestionContainerView.trailingAnchor],
                                               [suggestionsViewController.view.bottomAnchor constraintEqualToAnchor:self.completionSuggestionContainerView.bottomAnchor],]];
 
->>>>>>> v1.11.1
     [suggestionsViewController didMoveToParentViewController:self];
 }
 
@@ -5251,7 +5227,6 @@ - (void)roomInputToolbarViewDidOpenActionMenu:(RoomInputToolbarView*)toolbarView
 //    }];
 //}
 
-<<<<<<< HEAD
 //- (void)roomInputToolbarViewShowSendMediaActions:(MXKRoomInputToolbarView *)toolbarView
 //{
 //    NSMutableArray *actionItems = [NSMutableArray new];
@@ -5290,67 +5265,6 @@ - (void)roomInputToolbarViewDidOpenActionMenu:(RoomInputToolbarView*)toolbarView
 //    self.composerCreateActionListBridgePresenter.delegate = self;
 //    [self.composerCreateActionListBridgePresenter presentFrom:self animated:YES];
 //}
-=======
-- (void)roomInputToolbarView:(MXKRoomInputToolbarView *)toolbarView sendCommand:(NSString *)commandText
-{
-    // Create before sending the message in case of a discussion (direct chat)
-    MXWeakify(self);
-    [self createDiscussionIfNeeded:^(BOOL readyToSend) {
-        MXStrongifyAndReturnIfNil(self);
-
-        if (readyToSend) {
-            if (![self sendAsIRCStyleCommandIfPossible:commandText])
-            {
-                // Display an error for unknown command
-                UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil
-                                                                               message:[VectorL10n roomCommandErrorUnknownCommand]
-                                                                        preferredStyle:UIAlertControllerStyleAlert];
-                [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n ok] style:UIAlertActionStyleDefault handler:nil]];
-                [self presentViewController:alert animated:YES completion:nil];
-            }
-        }
-    }];
-}
-
-- (void)roomInputToolbarViewShowSendMediaActions:(MXKRoomInputToolbarView *)toolbarView
-{
-    NSMutableArray *actionItems = [NSMutableArray new];
-    if (RiotSettings.shared.roomScreenAllowMediaLibraryAction)
-    {
-        [actionItems addObject:@(ComposerCreateActionPhotoLibrary)];
-    }
-    if (RiotSettings.shared.roomScreenAllowStickerAction && !self.isNewDirectChat)
-    {
-        [actionItems addObject:@(ComposerCreateActionStickers)];
-    }
-    if (RiotSettings.shared.roomScreenAllowFilesAction)
-    {
-        [actionItems addObject:@(ComposerCreateActionAttachments)];
-    }
-    if (RiotSettings.shared.enableVoiceBroadcast && !self.isNewDirectChat)
-    {
-        [actionItems addObject:@(ComposerCreateActionVoiceBroadcast)];
-    }
-    if (BuildSettings.pollsEnabled && self.displayConfiguration.sendingPollsEnabled && !self.isNewDirectChat)
-    {
-        [actionItems addObject:@(ComposerCreateActionPolls)];
-    }
-    if (BuildSettings.locationSharingEnabled && !self.isNewDirectChat)
-    {
-        [actionItems addObject:@(ComposerCreateActionLocation)];
-    }
-    if (RiotSettings.shared.roomScreenAllowCameraAction)
-    {
-        [actionItems addObject:@(ComposerCreateActionCamera)];
-    }
-
-    self.composerCreateActionListBridgePresenter = [[ComposerCreateActionListBridgePresenter alloc] initWithActions:actionItems
-                                                                                                     wysiwygEnabled:RiotSettings.shared.enableWysiwygComposer
-                                                                                              textFormattingEnabled:RiotSettings.shared.enableWysiwygTextFormatting];
-    self.composerCreateActionListBridgePresenter.delegate = self;
-    [self.composerCreateActionListBridgePresenter presentFrom:self animated:YES];
-}
->>>>>>> v1.11.1
 
 - (void)roomInputToolbarView:(RoomInputToolbarView *)toolbarView sendAttributedTextMessage:(NSAttributedString *)attributedTextMessage
 {