From d4d29ecc62c730afeb599c36d8e01fefd4550bb5 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Wed, 6 Nov 2024 15:39:32 +0100 Subject: [PATCH 1/3] Resolve conflicts on Rebase/Element-v1.11.19 into Tchap --- Btchap/Generated/InfoPlist.swift | 1 + Config/AppVersion.xcconfig | 5 - DevTchap/Generated/InfoPlist.swift | 1 + Podfile | 29 +---- Podfile.lock | 79 +++++------- Riot/Modules/Application/LegacyAppDelegate.m | 7 -- .../SegmentedViewController.m | 18 --- .../Room/Files/RoomFilesViewController.m | 18 --- .../LocationView/LocationMarkerView.swift | 4 - .../LocationWithoutSenderInfoPlainCell.swift | 4 - .../Modules/Settings/SettingsViewController.m | 2 - RiotNSE/BuildSettings.swift | 3 + RiotShareExtension/BuildSettings.swift | 3 + .../Shared/View/FallbackViewController.h | 16 --- .../Shared/View/FallbackViewController.m | 17 --- .../Shared/View/RoomsListViewController.h | 16 --- .../Shared/View/RoomsListViewController.m | 17 --- .../ShareExtensionRootViewController.h | 16 --- Tchap/Generated/Images.swift | 1 + Tchap/Generated/InfoPlist.swift | 1 + Tchap/Generated/Storyboards.swift | 17 +-- Tchap/Generated/Storyboards_Riot.swift | 114 +++++++++--------- Tchap/Generated/Strings.swift | 44 ++++++- .../Models/ClientConfiguration.swift | 16 --- ...rusScanStatusWithoutSenderInfoBubbleCell.h | 4 - Tchap/Utils/Tools.h | 5 - Tchap/Utils/Tools.m | 5 - 27 files changed, 143 insertions(+), 320 deletions(-) diff --git a/Btchap/Generated/InfoPlist.swift b/Btchap/Generated/InfoPlist.swift index fd4913b7c..b4c7e620a 100644 --- a/Btchap/Generated/InfoPlist.swift +++ b/Btchap/Generated/InfoPlist.swift @@ -21,6 +21,7 @@ internal enum InfoPlist { internal static let cfBundlePackageType: String = _document["CFBundlePackageType"] internal static let cfBundleShortVersionString: String = _document["CFBundleShortVersionString"] internal static let cfBundleSignature: String = _document["CFBundleSignature"] + internal static let cfBundleURLTypes: [[String: Any]] = _document["CFBundleURLTypes"] internal static let cfBundleVersion: String = _document["CFBundleVersion"] internal static let itsAppUsesNonExemptEncryption: Bool = _document["ITSAppUsesNonExemptEncryption"] internal static let itsEncryptionExportComplianceCode: String = _document["ITSEncryptionExportComplianceCode"] diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 74af2fa59..f19a72c66 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,10 +15,5 @@ // // Version -<<<<<<< HEAD MARKETING_VERSION = 2.8.2 CURRENT_PROJECT_VERSION = 1 -======= -MARKETING_VERSION = 1.11.19 -CURRENT_PROJECT_VERSION = 1.11.19 ->>>>>>> v1.11.19 diff --git a/DevTchap/Generated/InfoPlist.swift b/DevTchap/Generated/InfoPlist.swift index 2306b5b8c..fbcea157f 100644 --- a/DevTchap/Generated/InfoPlist.swift +++ b/DevTchap/Generated/InfoPlist.swift @@ -21,6 +21,7 @@ internal enum InfoPlist { internal static let cfBundlePackageType: String = _document["CFBundlePackageType"] internal static let cfBundleShortVersionString: String = _document["CFBundleShortVersionString"] internal static let cfBundleSignature: String = _document["CFBundleSignature"] + internal static let cfBundleURLTypes: [[String: Any]] = _document["CFBundleURLTypes"] internal static let cfBundleVersion: String = _document["CFBundleVersion"] internal static let itsAppUsesNonExemptEncryption: Bool = _document["ITSAppUsesNonExemptEncryption"] internal static let lsRequiresIPhoneOS: Bool = _document["LSRequiresIPhoneOS"] diff --git a/Podfile b/Podfile index e5b4956ba..2966e5b2c 100644 --- a/Podfile +++ b/Podfile @@ -28,32 +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 'zxcvbn-ios' - - # Tools - pod 'SwiftGen' - pod 'SwiftLint' - pod 'SwiftFormat/CLI' - - target "Riot" do - import_MatrixSDK - import_MatrixKit_pods - - import_SwiftUI_pods - ->>>>>>> v1.11.19 pod 'UICollectionViewRightAlignedLayout', '~> 0.0.3' pod 'UICollectionViewLeftAlignedLayout', '~> 1.0.2' pod 'KTCenterFlowLayout', '~> 1.3.1' @@ -84,8 +59,8 @@ abstract_target 'TchapPods' do pod 'zxcvbn-ios' # Tools - pod 'SwiftGen', '~> 6.3' - pod 'SwiftLint', '~> 0.49.1' + pod 'SwiftGen' + pod 'SwiftLint' pod 'SwiftFormat/CLI' target "Tchap" do diff --git a/Podfile.lock b/Podfile.lock index e6f8e4d89..f874dc4e1 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -20,12 +20,12 @@ PODS: - Down (0.11.0) - DSBottomSheet (0.3.0) - DSWaveformImage (6.1.1) - - FLEX (4.5.0) + - FLEX (5.22.10) - FlowCommoniOS (1.12.2) - GBDeviceInfo (7.1.0): - GBDeviceInfo/Core (= 7.1.0) - GBDeviceInfo/Core (7.1.0) - - GZIP (1.3.0) + - GZIP (1.3.2) - Introspect (0.12.0) - JitsiMeetSDKLite (8.1.2-lite): - JitsiWebRTC (~> 111.0) @@ -39,34 +39,25 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) - - MatrixSDK (0.27.2): - - MatrixSDK/Core (= 0.27.2) - - MatrixSDK/Core (0.27.2): + - MatrixSDK (0.27.15): + - MatrixSDK/Core (= 0.27.15) + - MatrixSDK/Core (0.27.15): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) -<<<<<<< HEAD - - MatrixSDKCrypto (= 0.3.12) - - OLMKit (~> 3.2.5) -======= - MatrixSDKCrypto (= 0.4.3) ->>>>>>> v1.11.19 - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.27.2): + - MatrixSDK/JingleCallStack (0.27.15): - JitsiMeetSDKLite (= 8.1.2-lite) - MatrixSDK/Core -<<<<<<< HEAD - - MatrixSDKCrypto (0.3.12) + - MatrixSDKCrypto (0.4.3) - 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.2) -======= - - MatrixSDKCrypto (0.4.3) ->>>>>>> v1.11.19 - ReadMoreTextView (3.0.1) - Realm (10.27.0): - Realm/Headers (= 10.27.0) @@ -82,6 +73,7 @@ PODS: - Sentry/Core (7.15.0) - SideMenu (6.5.0) - SwiftBase32 (0.9.0) + - SwiftFormat/CLI (0.54.5) - SwiftGen (6.6.2) - SwiftJWT (3.6.200): - BlueCryptor (~> 1.0) @@ -95,44 +87,40 @@ PODS: - UICollectionViewRightAlignedLayout (0.0.3) - WeakDictionary (2.0.2) - zxcvbn-ios (1.0.4) - - ZXingObjC (3.6.5): - - ZXingObjC/All (= 3.6.5) - - ZXingObjC/All (3.6.5) + - ZXingObjC (3.6.9): + - ZXingObjC/All (= 3.6.9) + - ZXingObjC/All (3.6.9) DEPENDENCIES: - Down (~> 0.11.0) - DSBottomSheet (~> 0.3) - DSWaveformImage (~> 6.1.1) - - FLEX (~> 4.5.0) + - FLEX (~> 5.22.10) - FlowCommoniOS (~> 1.12.0) - GBDeviceInfo (~> 7.1.0) - Introspect (~> 0.1) - KeychainAccess (~> 4.2.2) - KTCenterFlowLayout (~> 1.3.1) - libPhoneNumber-iOS (~> 0.9.13) -<<<<<<< HEAD - - MatrixSDK (= 0.27.2) - - MatrixSDK/JingleCallStack (= 0.27.2) - - OLMKit - - PostHog (~> 2.0.0) -======= - MatrixSDK (from `matrix-ios-sdk/MatrixSDK.podspec`) - MatrixSDK/JingleCallStack (from `matrix-ios-sdk/MatrixSDK.podspec`) ->>>>>>> v1.11.19 + - 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) - - SwiftGen (~> 6.3) + - SwiftFormat/CLI + - SwiftGen - SwiftJWT (~> 3.6.200) - - SwiftLint (~> 0.49.1) + - SwiftLint - UICollectionViewLeftAlignedLayout (~> 1.0.2) - UICollectionViewRightAlignedLayout (~> 0.0.3) - WeakDictionary (~> 2.0) - zxcvbn-ios - - ZXingObjC (~> 3.6.5) + - ZXingObjC (~> 3.6.9) SPEC REPOS: trunk: @@ -157,13 +145,9 @@ SPEC REPOS: - libPhoneNumber-iOS - LoggerAPI - Logging - - MatrixSDK - MatrixSDKCrypto -<<<<<<< HEAD - OLMKit - PostHog -======= ->>>>>>> v1.11.19 - ReadMoreTextView - Realm - Reusable @@ -171,6 +155,7 @@ SPEC REPOS: - Sentry - SideMenu - SwiftBase32 + - SwiftFormat - SwiftGen - SwiftJWT - SwiftLint @@ -181,6 +166,10 @@ SPEC REPOS: - zxcvbn-ios - ZXingObjC +EXTERNAL SOURCES: + MatrixSDK: + :path: matrix-ios-sdk/MatrixSDK.podspec + SPEC CHECKSUMS: AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58 BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24 @@ -189,10 +178,10 @@ SPEC CHECKSUMS: Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612 DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce - FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b + FLEX: f21ee4f498eed3f8a1eded66b21939fd3b7a22ce FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2 GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376 - GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3 + GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868 Introspect: b66b675de8a85d9ef832f3a710d8e3c7db186884 JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7 JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b @@ -203,15 +192,10 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b -<<<<<<< HEAD - MatrixSDK: c1e61a8ee3e5ccb8a18070b7dde088dee6e59f19 - MatrixSDKCrypto: 25929a40733b4ab54f659aaf6a730552a0a06504 + MatrixSDK: 12b379749b84ab5b3662042acb1914b9f9bb692b + MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e OLMKit: da115f16582e47626616874e20f7bb92222c7a51 PostHog: f9e5c13ceea86bb5314218c85d16125b797eb332 -======= - MatrixSDK: b5756a518af19296b94e3ad9b6f16648f9eb17c3 - MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e ->>>>>>> v1.11.19 ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2 Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136 @@ -219,6 +203,7 @@ SPEC CHECKSUMS: Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7 SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2 SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17 + SwiftFormat: 543a7b1ab4a6ce2d88bd5616a17903446ca3dc5c SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5 @@ -227,12 +212,8 @@ SPEC CHECKSUMS: UICollectionViewRightAlignedLayout: 823eef8c567eba4a44c21bc2ffcb0d0d5f361e2d WeakDictionary: 8cd038acd77e5d54ca4ebaec3d20853d732b45e0 zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c - ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb + ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 -<<<<<<< HEAD -PODFILE CHECKSUM: bdd98ddb1a6b2f5d45b1fc00ccfbf2dbaeeb0ff0 -======= -PODFILE CHECKSUM: 484a1cdf04951cc82156f29de196efd76d3ad893 ->>>>>>> v1.11.19 +PODFILE CHECKSUM: 71717d585bff57965402647a1ac31c47351d3cc7 COCOAPODS: 1.15.2 diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m index 505d54590..2bfd6e919 100644 --- a/Riot/Modules/Application/LegacyAppDelegate.m +++ b/Riot/Modules/Application/LegacyAppDelegate.m @@ -2454,13 +2454,6 @@ - (void)handleAppState case MXSessionStateSyncInProgress: // Stay in launching during the first server sync if the store is empty. isLaunching = (mainSession.rooms.count == 0 && launchAnimationContainerView); -// 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 break; case MXSessionStateRunning: self.clearingCache = NO; diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m index 2d6e2c957..924a361bd 100644 --- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m +++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m @@ -1,28 +1,10 @@ /* -<<<<<<< HEAD - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2018 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -======= Copyright 2024 New Vector Ltd. Copyright 2017 Vector Creations Ltd Copyright 2015 OpenMarket Ltd SPDX-License-Identifier: AGPL-3.0-only Please see LICENSE in the repository root for full details. ->>>>>>> v1.11.19 */ #import "SegmentedViewController.h" diff --git a/Riot/Modules/Room/Files/RoomFilesViewController.m b/Riot/Modules/Room/Files/RoomFilesViewController.m index a78b24a27..be72e6744 100644 --- a/Riot/Modules/Room/Files/RoomFilesViewController.m +++ b/Riot/Modules/Room/Files/RoomFilesViewController.m @@ -1,28 +1,10 @@ /* -<<<<<<< HEAD - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -======= Copyright 2024 New Vector Ltd. Copyright 2017 Vector Creations Ltd Copyright 2016 OpenMarket Ltd SPDX-License-Identifier: AGPL-3.0-only Please see LICENSE in the repository root for full details. ->>>>>>> v1.11.19 */ #import "RoomFilesViewController.h" diff --git a/Riot/Modules/Room/TimelineCells/LocationView/LocationMarkerView.swift b/Riot/Modules/Room/TimelineCells/LocationView/LocationMarkerView.swift index 4cf9ffb30..db89f4fc5 100644 --- a/Riot/Modules/Room/TimelineCells/LocationView/LocationMarkerView.swift +++ b/Riot/Modules/Room/TimelineCells/LocationView/LocationMarkerView.swift @@ -1,9 +1,5 @@ // -<<<<<<< HEAD -// Copyright 2020 Vector Creations Ltd -======= // Copyright 2021-2024 New Vector Ltd. ->>>>>>> v1.11.19 // // SPDX-License-Identifier: AGPL-3.0-only // Please see LICENSE in the repository root for full details. diff --git a/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Location/LocationWithoutSenderInfoPlainCell.swift b/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Location/LocationWithoutSenderInfoPlainCell.swift index 49f986f4d..ec4fd15b0 100644 --- a/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Location/LocationWithoutSenderInfoPlainCell.swift +++ b/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Location/LocationWithoutSenderInfoPlainCell.swift @@ -1,9 +1,5 @@ // -<<<<<<< HEAD -// Copyright 2020 Vector Creations Ltd -======= // Copyright 2021-2024 New Vector Ltd. ->>>>>>> v1.11.19 // // SPDX-License-Identifier: AGPL-3.0-only // Please see LICENSE in the repository root for full details. diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m index efc9d5f66..1f33dcf7c 100644 --- a/Riot/Modules/Settings/SettingsViewController.m +++ b/Riot/Modules/Settings/SettingsViewController.m @@ -1542,8 +1542,6 @@ - (NSString*)buildAboutSectionFooterTitleWithAccount:(MXKAccount*)account NSString *sdkVersionInfo = [NSString stringWithFormat:@"Matrix SDK %@", MatrixSDKVersion]; - NSString *olmVersionInfo = [NSString stringWithFormat:@"OLM %@", [OLMKit versionString]]; - // Tchap: Hide user and homeserver infos // [footerText appendFormat:@"%@\n", loggedUserInfo]; // [footerText appendFormat:@"%@\n", homeserverInfo]; diff --git a/RiotNSE/BuildSettings.swift b/RiotNSE/BuildSettings.swift index 4b07a2611..4acd6065d 100644 --- a/RiotNSE/BuildSettings.swift +++ b/RiotNSE/BuildSettings.swift @@ -301,6 +301,9 @@ final class BuildSettings: NSObject { ] ] + // Tchap: handle SSO feature flag. Presents SSO button on Onboarding screen and give priority to SSO on UIA. + static let tchapFeatureHandleSSO = false + // MARK: - Side Menu static let enableSideMenu: Bool = true && !newAppLayoutEnabled static let sideMenuShowInviteFriends: Bool = true diff --git a/RiotShareExtension/BuildSettings.swift b/RiotShareExtension/BuildSettings.swift index 4b07a2611..4acd6065d 100644 --- a/RiotShareExtension/BuildSettings.swift +++ b/RiotShareExtension/BuildSettings.swift @@ -301,6 +301,9 @@ final class BuildSettings: NSObject { ] ] + // Tchap: handle SSO feature flag. Presents SSO button on Onboarding screen and give priority to SSO on UIA. + static let tchapFeatureHandleSSO = false + // MARK: - Side Menu static let enableSideMenu: Bool = true && !newAppLayoutEnabled static let sideMenuShowInviteFriends: Bool = true diff --git a/RiotShareExtension/Shared/View/FallbackViewController.h b/RiotShareExtension/Shared/View/FallbackViewController.h index 9abfdf5ac..c68cae654 100644 --- a/RiotShareExtension/Shared/View/FallbackViewController.h +++ b/RiotShareExtension/Shared/View/FallbackViewController.h @@ -1,25 +1,9 @@ /* -<<<<<<< HEAD - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -======= Copyright 2024 New Vector Ltd. Copyright 2017 Aram Sargsyan SPDX-License-Identifier: AGPL-3.0-only Please see LICENSE in the repository root for full details. ->>>>>>> v1.11.19 */ @import UIKit; diff --git a/RiotShareExtension/Shared/View/FallbackViewController.m b/RiotShareExtension/Shared/View/FallbackViewController.m index e226cc5c8..de97bcac6 100644 --- a/RiotShareExtension/Shared/View/FallbackViewController.m +++ b/RiotShareExtension/Shared/View/FallbackViewController.m @@ -1,26 +1,9 @@ /* -<<<<<<< HEAD - Copyright 2017 Vector Creations Ltd - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -======= Copyright 2024 New Vector Ltd. Copyright 2017 Aram Sargsyan SPDX-License-Identifier: AGPL-3.0-only Please see LICENSE in the repository root for full details. ->>>>>>> v1.11.19 */ #import "FallbackViewController.h" diff --git a/RiotShareExtension/Shared/View/RoomsListViewController.h b/RiotShareExtension/Shared/View/RoomsListViewController.h index 5d20ae0ea..d0c1b7b1b 100644 --- a/RiotShareExtension/Shared/View/RoomsListViewController.h +++ b/RiotShareExtension/Shared/View/RoomsListViewController.h @@ -1,25 +1,9 @@ /* -<<<<<<< HEAD - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -======= Copyright 2024 New Vector Ltd. Copyright 2017 Aram Sargsyan SPDX-License-Identifier: AGPL-3.0-only Please see LICENSE in the repository root for full details. ->>>>>>> v1.11.19 */ #import diff --git a/RiotShareExtension/Shared/View/RoomsListViewController.m b/RiotShareExtension/Shared/View/RoomsListViewController.m index 25ef61a9f..b6f14ff52 100644 --- a/RiotShareExtension/Shared/View/RoomsListViewController.m +++ b/RiotShareExtension/Shared/View/RoomsListViewController.m @@ -1,26 +1,9 @@ /* -<<<<<<< HEAD - Copyright 2017 Vector Creations Ltd - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -======= Copyright 2024 New Vector Ltd. Copyright 2017 Aram Sargsyan SPDX-License-Identifier: AGPL-3.0-only Please see LICENSE in the repository root for full details. ->>>>>>> v1.11.19 */ #import "RoomsListViewController.h" diff --git a/RiotShareExtension/Sources/ShareExtensionRootViewController.h b/RiotShareExtension/Sources/ShareExtensionRootViewController.h index d2c333c2e..ac733153c 100644 --- a/RiotShareExtension/Sources/ShareExtensionRootViewController.h +++ b/RiotShareExtension/Sources/ShareExtensionRootViewController.h @@ -1,25 +1,9 @@ /* -<<<<<<< HEAD - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -======= Copyright 2024 New Vector Ltd. Copyright 2017 Aram Sargsyan SPDX-License-Identifier: AGPL-3.0-only Please see LICENSE in the repository root for full details. ->>>>>>> v1.11.19 */ #import diff --git a/Tchap/Generated/Images.swift b/Tchap/Generated/Images.swift index 2738bcb05..99fb1d08c 100644 --- a/Tchap/Generated/Images.swift +++ b/Tchap/Generated/Images.swift @@ -34,6 +34,7 @@ internal class Asset_tchap: NSObject { internal static let cameraCapture = ImageAsset(name: "camera_capture") internal static let cameraVideoCapture = ImageAsset(name: "camera_video_capture") internal static let videoIcon = ImageAsset(name: "video_icon") + internal static let proConnectIcon = ImageAsset(name: "pro_connect_icon") internal static let error = ImageAsset(name: "error") internal static let newmessages = ImageAsset(name: "newmessages") internal static let scrolldown = ImageAsset(name: "scrolldown") diff --git a/Tchap/Generated/InfoPlist.swift b/Tchap/Generated/InfoPlist.swift index fd4913b7c..b4c7e620a 100644 --- a/Tchap/Generated/InfoPlist.swift +++ b/Tchap/Generated/InfoPlist.swift @@ -21,6 +21,7 @@ internal enum InfoPlist { internal static let cfBundlePackageType: String = _document["CFBundlePackageType"] internal static let cfBundleShortVersionString: String = _document["CFBundleShortVersionString"] internal static let cfBundleSignature: String = _document["CFBundleSignature"] + internal static let cfBundleURLTypes: [[String: Any]] = _document["CFBundleURLTypes"] internal static let cfBundleVersion: String = _document["CFBundleVersion"] internal static let itsAppUsesNonExemptEncryption: Bool = _document["ITSAppUsesNonExemptEncryption"] internal static let itsEncryptionExportComplianceCode: String = _document["ITSEncryptionExportComplianceCode"] diff --git a/Tchap/Generated/Storyboards.swift b/Tchap/Generated/Storyboards.swift index c458e8581..96ef5145e 100644 --- a/Tchap/Generated/Storyboards.swift +++ b/Tchap/Generated/Storyboards.swift @@ -16,37 +16,32 @@ internal enum StoryboardScene { internal enum AppVersionUpdateViewController: StoryboardType { internal static let storyboardName = "AppVersionUpdateViewController" - internal static let initialScene = InitialSceneType(storyboard: AppVersionUpdateViewController.self) + internal static let initialScene = InitialSceneType(storyboard: AppVersionUpdateViewController.self) } internal enum ChangePasswordCurrentPasswordViewController: StoryboardType { internal static let storyboardName = "ChangePasswordCurrentPasswordViewController" - internal static let initialScene = InitialSceneType(storyboard: ChangePasswordCurrentPasswordViewController.self) + internal static let initialScene = InitialSceneType(storyboard: ChangePasswordCurrentPasswordViewController.self) } internal enum ChangePasswordNewPasswordViewController: StoryboardType { internal static let storyboardName = "ChangePasswordNewPasswordViewController" - internal static let initialScene = InitialSceneType(storyboard: ChangePasswordNewPasswordViewController.self) + internal static let initialScene = InitialSceneType(storyboard: ChangePasswordNewPasswordViewController.self) } internal enum PublicRoomsViewController: StoryboardType { internal static let storyboardName = "PublicRoomsViewController" - internal static let initialScene = InitialSceneType(storyboard: PublicRoomsViewController.self) + internal static let initialScene = InitialSceneType(storyboard: PublicRoomsViewController.self) } internal enum RoomAccessByLinkViewController: StoryboardType { internal static let storyboardName = "RoomAccessByLinkViewController" - internal static let initialScene = InitialSceneType(storyboard: RoomAccessByLinkViewController.self) + internal static let initialScene = InitialSceneType(storyboard: RoomAccessByLinkViewController.self) } internal enum RoomCreationViewController: StoryboardType { internal static let storyboardName = "RoomCreationViewController" - internal static let initialScene = InitialSceneType(storyboard: RoomCreationViewController.self) - } - internal enum WelcomeViewController: StoryboardType { - internal static let storyboardName = "WelcomeViewController" - - internal static let initialScene = InitialSceneType(storyboard: WelcomeViewController.self) + internal static let initialScene = InitialSceneType(storyboard: RoomCreationViewController.self) } } // swiftlint:enable explicit_type_interface identifier_name line_length prefer_self_in_static_references diff --git a/Tchap/Generated/Storyboards_Riot.swift b/Tchap/Generated/Storyboards_Riot.swift index 313c5270b..2d3d14c7f 100644 --- a/Tchap/Generated/Storyboards_Riot.swift +++ b/Tchap/Generated/Storyboards_Riot.swift @@ -15,117 +15,117 @@ internal extension StoryboardScene { enum DeviceVerificationIncomingViewController: StoryboardType { internal static let storyboardName = "DeviceVerificationIncomingViewController" - internal static let initialScene = InitialSceneType(storyboard: DeviceVerificationIncomingViewController.self) + internal static let initialScene = InitialSceneType(storyboard: DeviceVerificationIncomingViewController.self) } enum DeviceVerificationStartViewController: StoryboardType { internal static let storyboardName = "DeviceVerificationStartViewController" - internal static let initialScene = InitialSceneType(storyboard: DeviceVerificationStartViewController.self) + internal static let initialScene = InitialSceneType(storyboard: DeviceVerificationStartViewController.self) } enum EditHistoryViewController: StoryboardType { internal static let storyboardName = "EditHistoryViewController" - internal static let initialScene = InitialSceneType(storyboard: EditHistoryViewController.self) + internal static let initialScene = InitialSceneType(storyboard: EditHistoryViewController.self) } enum EmojiPickerViewController: StoryboardType { internal static let storyboardName = "EmojiPickerViewController" - internal static let initialScene = InitialSceneType(storyboard: EmojiPickerViewController.self) + internal static let initialScene = InitialSceneType(storyboard: EmojiPickerViewController.self) } enum EnterNewRoomDetailsViewController: StoryboardType { internal static let storyboardName = "EnterNewRoomDetailsViewController" - internal static let initialScene = InitialSceneType(storyboard: EnterNewRoomDetailsViewController.self) + internal static let initialScene = InitialSceneType(storyboard: EnterNewRoomDetailsViewController.self) } enum EnterPinCodeViewController: StoryboardType { internal static let storyboardName = "EnterPinCodeViewController" - internal static let initialScene = InitialSceneType(storyboard: EnterPinCodeViewController.self) + internal static let initialScene = InitialSceneType(storyboard: EnterPinCodeViewController.self) } enum KeyBackupRecoverFromPassphraseViewController: StoryboardType { internal static let storyboardName = "KeyBackupRecoverFromPassphraseViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyBackupRecoverFromPassphraseViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyBackupRecoverFromPassphraseViewController.self) } enum KeyBackupRecoverFromPrivateKeyViewController: StoryboardType { internal static let storyboardName = "KeyBackupRecoverFromPrivateKeyViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyBackupRecoverFromPrivateKeyViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyBackupRecoverFromPrivateKeyViewController.self) } enum KeyBackupRecoverFromRecoveryKeyViewController: StoryboardType { internal static let storyboardName = "KeyBackupRecoverFromRecoveryKeyViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyBackupRecoverFromRecoveryKeyViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyBackupRecoverFromRecoveryKeyViewController.self) } enum KeyBackupRecoverSuccessViewController: StoryboardType { internal static let storyboardName = "KeyBackupRecoverSuccessViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyBackupRecoverSuccessViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyBackupRecoverSuccessViewController.self) } enum KeyBackupSetupIntroViewController: StoryboardType { internal static let storyboardName = "KeyBackupSetupIntroViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyBackupSetupIntroViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyBackupSetupIntroViewController.self) } enum KeyBackupSetupPassphraseViewController: StoryboardType { internal static let storyboardName = "KeyBackupSetupPassphraseViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyBackupSetupPassphraseViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyBackupSetupPassphraseViewController.self) } enum KeyBackupSetupSuccessFromPassphraseViewController: StoryboardType { internal static let storyboardName = "KeyBackupSetupSuccessFromPassphraseViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyBackupSetupSuccessFromPassphraseViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyBackupSetupSuccessFromPassphraseViewController.self) } enum KeyBackupSetupSuccessFromRecoveryKeyViewController: StoryboardType { internal static let storyboardName = "KeyBackupSetupSuccessFromRecoveryKeyViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyBackupSetupSuccessFromRecoveryKeyViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyBackupSetupSuccessFromRecoveryKeyViewController.self) } enum KeyBackupSetupSuccessFromSecureBackupViewController: StoryboardType { internal static let storyboardName = "KeyBackupSetupSuccessFromSecureBackupViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyBackupSetupSuccessFromSecureBackupViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyBackupSetupSuccessFromSecureBackupViewController.self) } enum KeyVerificationDataLoadingViewController: StoryboardType { internal static let storyboardName = "KeyVerificationDataLoadingViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyVerificationDataLoadingViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyVerificationDataLoadingViewController.self) } enum KeyVerificationManuallyVerifyViewController: StoryboardType { internal static let storyboardName = "KeyVerificationManuallyVerifyViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyVerificationManuallyVerifyViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyVerificationManuallyVerifyViewController.self) } enum KeyVerificationScanConfirmationViewController: StoryboardType { internal static let storyboardName = "KeyVerificationScanConfirmationViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyVerificationScanConfirmationViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyVerificationScanConfirmationViewController.self) } enum KeyVerificationSelfVerifyStartViewController: StoryboardType { internal static let storyboardName = "KeyVerificationSelfVerifyStartViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyVerificationSelfVerifyStartViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyVerificationSelfVerifyStartViewController.self) } enum KeyVerificationSelfVerifyWaitViewController: StoryboardType { internal static let storyboardName = "KeyVerificationSelfVerifyWaitViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyVerificationSelfVerifyWaitViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyVerificationSelfVerifyWaitViewController.self) } enum KeyVerificationVerifiedViewController: StoryboardType { internal static let storyboardName = "KeyVerificationVerifiedViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyVerificationVerifiedViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyVerificationVerifiedViewController.self) } enum KeyVerificationVerifyBySASViewController: StoryboardType { internal static let storyboardName = "KeyVerificationVerifyBySASViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyVerificationVerifyBySASViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyVerificationVerifyBySASViewController.self) } enum KeyVerificationVerifyByScanningViewController: StoryboardType { internal static let storyboardName = "KeyVerificationVerifyByScanningViewController" - internal static let initialScene = InitialSceneType(storyboard: KeyVerificationVerifyByScanningViewController.self) + internal static let initialScene = InitialSceneType(storyboard: KeyVerificationVerifyByScanningViewController.self) } enum ManageSession: StoryboardType { internal static let storyboardName = "ManageSession" @@ -135,72 +135,72 @@ internal extension StoryboardScene { enum OptionListViewController: StoryboardType { internal static let storyboardName = "OptionListViewController" - internal static let initialScene = InitialSceneType(storyboard: OptionListViewController.self) + internal static let initialScene = InitialSceneType(storyboard: OptionListViewController.self) } enum QRCodeReaderViewController: StoryboardType { internal static let storyboardName = "QRCodeReaderViewController" - internal static let initialScene = InitialSceneType(storyboard: QRCodeReaderViewController.self) + internal static let initialScene = InitialSceneType(storyboard: QRCodeReaderViewController.self) } enum ReactionHistoryViewController: StoryboardType { internal static let storyboardName = "ReactionHistoryViewController" - internal static let initialScene = InitialSceneType(storyboard: ReactionHistoryViewController.self) + internal static let initialScene = InitialSceneType(storyboard: ReactionHistoryViewController.self) } enum RoomContextPreviewViewController: StoryboardType { internal static let storyboardName = "RoomContextPreviewViewController" - internal static let initialScene = InitialSceneType(storyboard: RoomContextPreviewViewController.self) + internal static let initialScene = InitialSceneType(storyboard: RoomContextPreviewViewController.self) } enum RoomContextualMenuViewController: StoryboardType { internal static let storyboardName = "RoomContextualMenuViewController" - internal static let initialScene = InitialSceneType(storyboard: RoomContextualMenuViewController.self) + internal static let initialScene = InitialSceneType(storyboard: RoomContextualMenuViewController.self) } enum RoomCreationEventsModalViewController: StoryboardType { internal static let storyboardName = "RoomCreationEventsModalViewController" - internal static let initialScene = InitialSceneType(storyboard: RoomCreationEventsModalViewController.self) + internal static let initialScene = InitialSceneType(storyboard: RoomCreationEventsModalViewController.self) } enum RoomInfoListViewController: StoryboardType { internal static let storyboardName = "RoomInfoListViewController" - internal static let initialScene = InitialSceneType(storyboard: RoomInfoListViewController.self) + internal static let initialScene = InitialSceneType(storyboard: RoomInfoListViewController.self) } enum RoomNotificationSettingsViewController: StoryboardType { internal static let storyboardName = "RoomNotificationSettingsViewController" - internal static let initialScene = InitialSceneType(storyboard: RoomNotificationSettingsViewController.self) + internal static let initialScene = InitialSceneType(storyboard: RoomNotificationSettingsViewController.self) } enum SecretsRecoveryWithKeyViewController: StoryboardType { internal static let storyboardName = "SecretsRecoveryWithKeyViewController" - internal static let initialScene = InitialSceneType(storyboard: SecretsRecoveryWithKeyViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SecretsRecoveryWithKeyViewController.self) } enum SecretsRecoveryWithPassphraseViewController: StoryboardType { internal static let storyboardName = "SecretsRecoveryWithPassphraseViewController" - internal static let initialScene = InitialSceneType(storyboard: SecretsRecoveryWithPassphraseViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SecretsRecoveryWithPassphraseViewController.self) } enum SecretsResetViewController: StoryboardType { internal static let storyboardName = "SecretsResetViewController" - internal static let initialScene = InitialSceneType(storyboard: SecretsResetViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SecretsResetViewController.self) } enum SecretsSetupRecoveryKeyViewController: StoryboardType { internal static let storyboardName = "SecretsSetupRecoveryKeyViewController" - internal static let initialScene = InitialSceneType(storyboard: SecretsSetupRecoveryKeyViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SecretsSetupRecoveryKeyViewController.self) } enum SecretsSetupRecoveryPassphraseViewController: StoryboardType { internal static let storyboardName = "SecretsSetupRecoveryPassphraseViewController" - internal static let initialScene = InitialSceneType(storyboard: SecretsSetupRecoveryPassphraseViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SecretsSetupRecoveryPassphraseViewController.self) } enum SecureBackupSetupIntroViewController: StoryboardType { internal static let storyboardName = "SecureBackupSetupIntroViewController" - internal static let initialScene = InitialSceneType(storyboard: SecureBackupSetupIntroViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SecureBackupSetupIntroViewController.self) } enum Security: StoryboardType { internal static let storyboardName = "Security" @@ -210,99 +210,99 @@ internal extension StoryboardScene { enum ServiceTermsModalScreenViewController: StoryboardType { internal static let storyboardName = "ServiceTermsModalScreenViewController" - internal static let initialScene = InitialSceneType(storyboard: ServiceTermsModalScreenViewController.self) + internal static let initialScene = InitialSceneType(storyboard: ServiceTermsModalScreenViewController.self) } enum SettingsDiscoveryThreePidDetailsViewController: StoryboardType { internal static let storyboardName = "SettingsDiscoveryThreePidDetailsViewController" - internal static let initialScene = InitialSceneType(storyboard: SettingsDiscoveryThreePidDetailsViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SettingsDiscoveryThreePidDetailsViewController.self) } enum SettingsIdentityServerViewController: StoryboardType { internal static let storyboardName = "SettingsIdentityServerViewController" - internal static let initialScene = InitialSceneType(storyboard: SettingsIdentityServerViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SettingsIdentityServerViewController.self) } enum SetupBiometricsViewController: StoryboardType { internal static let storyboardName = "SetupBiometricsViewController" - internal static let initialScene = InitialSceneType(storyboard: SetupBiometricsViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SetupBiometricsViewController.self) } enum ShowDirectoryViewController: StoryboardType { internal static let storyboardName = "ShowDirectoryViewController" - internal static let initialScene = InitialSceneType(storyboard: ShowDirectoryViewController.self) + internal static let initialScene = InitialSceneType(storyboard: ShowDirectoryViewController.self) - internal static let searchableDirectoryViewController = SceneType(storyboard: ShowDirectoryViewController.self, identifier: "SearchableDirectoryViewController") + internal static let searchableDirectoryViewController = SceneType(storyboard: ShowDirectoryViewController.self, identifier: "SearchableDirectoryViewController") } enum SideMenuViewController: StoryboardType { internal static let storyboardName = "SideMenuViewController" - internal static let initialScene = InitialSceneType(storyboard: SideMenuViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SideMenuViewController.self) } enum SpaceChildRoomDetailViewController: StoryboardType { internal static let storyboardName = "SpaceChildRoomDetailViewController" - internal static let initialScene = InitialSceneType(storyboard: SpaceChildRoomDetailViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SpaceChildRoomDetailViewController.self) } enum SpaceDetailViewController: StoryboardType { internal static let storyboardName = "SpaceDetailViewController" - internal static let initialScene = InitialSceneType(storyboard: SpaceDetailViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SpaceDetailViewController.self) } enum SpaceExploreRoomViewController: StoryboardType { internal static let storyboardName = "SpaceExploreRoomViewController" - internal static let initialScene = InitialSceneType(storyboard: SpaceExploreRoomViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SpaceExploreRoomViewController.self) } enum SpaceFeatureUnaivableViewController: StoryboardType { internal static let storyboardName = "SpaceFeatureUnaivableViewController" - internal static let initialScene = InitialSceneType(storyboard: SpaceFeatureUnaivableViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SpaceFeatureUnaivableViewController.self) } enum SpaceListViewController: StoryboardType { internal static let storyboardName = "SpaceListViewController" - internal static let initialScene = InitialSceneType(storyboard: SpaceListViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SpaceListViewController.self) } enum SpaceMenuViewController: StoryboardType { internal static let storyboardName = "SpaceMenuViewController" - internal static let initialScene = InitialSceneType(storyboard: SpaceMenuViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SpaceMenuViewController.self) } enum ThreadListViewController: StoryboardType { internal static let storyboardName = "ThreadListViewController" - internal static let initialScene = InitialSceneType(storyboard: ThreadListViewController.self) + internal static let initialScene = InitialSceneType(storyboard: ThreadListViewController.self) } enum ThreadsBetaViewController: StoryboardType { internal static let storyboardName = "ThreadsBetaViewController" - internal static let initialScene = InitialSceneType(storyboard: ThreadsBetaViewController.self) + internal static let initialScene = InitialSceneType(storyboard: ThreadsBetaViewController.self) } enum ThreadsNoticeViewController: StoryboardType { internal static let storyboardName = "ThreadsNoticeViewController" - internal static let initialScene = InitialSceneType(storyboard: ThreadsNoticeViewController.self) + internal static let initialScene = InitialSceneType(storyboard: ThreadsNoticeViewController.self) } enum UserVerificationSessionStatusViewController: StoryboardType { internal static let storyboardName = "UserVerificationSessionStatusViewController" - internal static let initialScene = InitialSceneType(storyboard: UserVerificationSessionStatusViewController.self) + internal static let initialScene = InitialSceneType(storyboard: UserVerificationSessionStatusViewController.self) } enum UserVerificationSessionsStatusViewController: StoryboardType { internal static let storyboardName = "UserVerificationSessionsStatusViewController" - internal static let initialScene = InitialSceneType(storyboard: UserVerificationSessionsStatusViewController.self) + internal static let initialScene = InitialSceneType(storyboard: UserVerificationSessionsStatusViewController.self) } enum UserVerificationStartViewController: StoryboardType { internal static let storyboardName = "UserVerificationStartViewController" - internal static let initialScene = InitialSceneType(storyboard: UserVerificationStartViewController.self) + internal static let initialScene = InitialSceneType(storyboard: UserVerificationStartViewController.self) } enum WidgetPermissionViewController: StoryboardType { internal static let storyboardName = "WidgetPermissionViewController" - internal static let initialScene = InitialSceneType(storyboard: WidgetPermissionViewController.self) + internal static let initialScene = InitialSceneType(storyboard: WidgetPermissionViewController.self) } } // swiftlint:enable explicit_type_interface identifier_name line_length type_body_length type_name diff --git a/Tchap/Generated/Strings.swift b/Tchap/Generated/Strings.swift index 0377110b3..8b38a694a 100644 --- a/Tchap/Generated/Strings.swift +++ b/Tchap/Generated/Strings.swift @@ -91,7 +91,7 @@ public class TchapL10n: NSObject { public static var authenticationForgotPassword: String { return TchapL10n.tr("Tchap", "authentication_forgot_password") } - /// Adresse email + /// Adresse mail professionnelle public static var authenticationMailPlaceholder: String { return TchapL10n.tr("Tchap", "authentication_mail_placeholder") } @@ -99,9 +99,17 @@ public class TchapL10n: NSObject { public static var authenticationPasswordPlaceholder: String { return TchapL10n.tr("Tchap", "authentication_password_placeholder") } - /// Connexion Tchap - public static var authenticationTitle: String { - return TchapL10n.tr("Tchap", "authentication_title") + /// Se connecter à Tchap + public static var authenticationPasswordTitle: String { + return TchapL10n.tr("Tchap", "authentication_password_title") + } + /// **Continuer avec ProConnect** + public static var authenticationSsoConnectTitle: String { + return TchapL10n.tr("Tchap", "authentication_sso_connect_title") + } + /// Se connecter avec ProConnect + public static var authenticationSsoTitle: String { + return TchapL10n.tr("Tchap", "authentication_sso_title") } /// Veuillez saisir votre mot de passe actuel. public static var changePasswordCurrentPasswordInstructions: String { @@ -251,6 +259,10 @@ public class TchapL10n: NSObject { public static var createNewDiscussionTitle: String { return TchapL10n.tr("Tchap", "create_new_discussion_title") } + /// Obtenir de l'aide + public static var deviceVerificationHelpLabel: String { + return TchapL10n.tr("Tchap", "device_verification_help_label") + } /// Si vous n'avez accès à aucun autre appareil, vous pouvez essayer d'activer la signature croisée dans vos paramètres. public static var deviceVerificationSelfVerifyNoOtherVerifiedSessionAvailable: String { return TchapL10n.tr("Tchap", "device_verification_self_verify_no_other_verified_session_available") @@ -651,7 +663,7 @@ public class TchapL10n: NSObject { public static var roomSettingsEnableRoomAccessByLink: String { return TchapL10n.tr("Tchap", "room_settings_enable_room_access_by_link") } - /// Les autres utilisateurs seront autorisés à rejoindre ce salon à partir d’un lien + /// Les utilisateurs pourront rejoindre ce salon à partir d'un lien puis le partager à d'autres utilisateurs. public static var roomSettingsEnableRoomAccessByLinkInfoOff: String { return TchapL10n.tr("Tchap", "room_settings_enable_room_access_by_link_info_off") } @@ -823,7 +835,11 @@ public class TchapL10n: NSObject { public static var settingsEnableEmailNotifText: String { return TchapL10n.tr("Tchap", "settings_enable_email_notif_text") } - /// Sans cette autorisation, les appels entrants ne seront pas notifiés. + /// Le compte correspond à tous vos appareils connectés à Tchap. + public static var settingsEnableInappNotificationsDescription: String { + return TchapL10n.tr("Tchap", "settings_enable_inapp_notifications_description") + } + /// Sans cette autorisation, les messages et appels entrants ne seront pas notifiés. public static var settingsEnablePushNotifText: String { return TchapL10n.tr("Tchap", "settings_enable_push_notif_text") } @@ -907,10 +923,26 @@ public class TchapL10n: NSObject { public static var welcomeLoginAction: String { return TchapL10n.tr("Tchap", "welcome_login_action") } + /// Se connecter par mot de passe + public static var welcomePasswordTitle: String { + return TchapL10n.tr("Tchap", "welcome_password_title") + } + /// → Qu'est-ce que ProConnect ? + public static var welcomeProConnectInfo: String { + return TchapL10n.tr("Tchap", "welcome_pro_connect_info") + } + /// Se connecter avec\n**ProConnect** + public static var welcomeProConnectTitle: String { + return TchapL10n.tr("Tchap", "welcome_pro_connect_title") + } /// Je n'ai pas de compte public static var welcomeRegisterAction: String { return TchapL10n.tr("Tchap", "welcome_register_action") } + /// La messagerie instantanée du secteur public + public static var welcomeSubtitle: String { + return TchapL10n.tr("Tchap", "welcome_subtitle") + } /// Bienvenue dans Tchap public static var welcomeTitle: String { return TchapL10n.tr("Tchap", "welcome_title") diff --git a/Tchap/Managers/ClientConfigurationService/Models/ClientConfiguration.swift b/Tchap/Managers/ClientConfigurationService/Models/ClientConfiguration.swift index b5d6e9607..7c794892c 100644 --- a/Tchap/Managers/ClientConfigurationService/Models/ClientConfiguration.swift +++ b/Tchap/Managers/ClientConfigurationService/Models/ClientConfiguration.swift @@ -1,25 +1,9 @@ /* -<<<<<<< HEAD:Tchap/Managers/ClientConfigurationService/Models/ClientConfiguration.swift - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -======= Copyright 2024 New Vector Ltd. Copyright 2016 OpenMarket Ltd SPDX-License-Identifier: AGPL-3.0-only Please see LICENSE in the repository root for full details. ->>>>>>> v1.11.19:Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.h */ import Foundation diff --git a/Tchap/Modules/Room/Views/BubbleCells/Antivirus/Clear/RoomAttachmentAntivirusScanStatusWithoutSenderInfoBubbleCell.h b/Tchap/Modules/Room/Views/BubbleCells/Antivirus/Clear/RoomAttachmentAntivirusScanStatusWithoutSenderInfoBubbleCell.h index a652a304a..1d5cdb998 100644 --- a/Tchap/Modules/Room/Views/BubbleCells/Antivirus/Clear/RoomAttachmentAntivirusScanStatusWithoutSenderInfoBubbleCell.h +++ b/Tchap/Modules/Room/Views/BubbleCells/Antivirus/Clear/RoomAttachmentAntivirusScanStatusWithoutSenderInfoBubbleCell.h @@ -1,10 +1,6 @@ /* -<<<<<<< HEAD:Tchap/Modules/Room/Views/BubbleCells/Antivirus/Clear/RoomAttachmentAntivirusScanStatusWithoutSenderInfoBubbleCell.h - Copyright 2015 OpenMarket Ltd -======= Copyright 2024 New Vector Ltd. Copyright 2017 Vector Creations Ltd ->>>>>>> v1.11.19:Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.h SPDX-License-Identifier: AGPL-3.0-only Please see LICENSE in the repository root for full details. diff --git a/Tchap/Utils/Tools.h b/Tchap/Utils/Tools.h index 671b14770..97a3c4da5 100644 --- a/Tchap/Utils/Tools.h +++ b/Tchap/Utils/Tools.h @@ -1,11 +1,6 @@ /* -<<<<<<< HEAD:Tchap/Utils/Tools.h - Copyright 2016 OpenMarket Ltd - Copyright 2020 New Vector Ltd -======= Copyright 2024 New Vector Ltd. Copyright 2016 OpenMarket Ltd ->>>>>>> v1.11.19:Riot/Utils/Tools.h SPDX-License-Identifier: AGPL-3.0-only Please see LICENSE in the repository root for full details. diff --git a/Tchap/Utils/Tools.m b/Tchap/Utils/Tools.m index 6fec39439..6c5e50f25 100644 --- a/Tchap/Utils/Tools.m +++ b/Tchap/Utils/Tools.m @@ -1,11 +1,6 @@ /* -<<<<<<< HEAD:Tchap/Utils/Tools.m - Copyright 2016 OpenMarket Ltd - Copyright 2020 New Vector Ltd -======= Copyright 2024 New Vector Ltd. Copyright 2016 OpenMarket Ltd ->>>>>>> v1.11.19:Riot/Utils/Tools.m SPDX-License-Identifier: AGPL-3.0-only Please see LICENSE in the repository root for full details. From 88f24930557e0e5727bd7ad5778b4c15943f8102 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Wed, 6 Nov 2024 15:40:13 +0100 Subject: [PATCH 2/3] Update matrix submodule --- matrix-ios-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-ios-sdk b/matrix-ios-sdk index 36e240932..1c7b9fc21 160000 --- a/matrix-ios-sdk +++ b/matrix-ios-sdk @@ -1 +1 @@ -Subproject commit 36e2409322d66ee7c7fb2f5b72a01065d6dedb9b +Subproject commit 1c7b9fc217f46e3b544c5722f4fe1145e4db3b85 From 6ea74b87818ba1803afb96cdf065656b68217e95 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Wed, 6 Nov 2024 15:40:19 +0100 Subject: [PATCH 3/3] Add changelog --- changelog.d/1114.change | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/1114.change diff --git a/changelog.d/1114.change b/changelog.d/1114.change new file mode 100644 index 000000000..3629493a4 --- /dev/null +++ b/changelog.d/1114.change @@ -0,0 +1 @@ +Rebase to Element 1.11.19 and Matrix SDK 0.27.15 \ No newline at end of file