From 216a8734405085ac63ed1ad0fa0be13db5ebf8c9 Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Thu, 28 Dec 2023 13:04:25 +0530 Subject: [PATCH 01/22] NMC 2015 - NMC 2157 move copy configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 7651daabfd..30166db9ac 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566EB7C62B3D59B900FB7CAD /* MoveAndCopyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7C52B3D59B900FB7CAD /* MoveAndCopyTests.swift */; }; 8491B1CD273BBA82001C8C5B /* UIViewController+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8491B1CC273BBA82001C8C5B /* UIViewController+Menu.swift */; }; AF1A9B6427D0CA1E00F17A9E /* UIAlertController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1A9B6327D0CA1E00F17A9E /* UIAlertController+Extension.swift */; }; AF1A9B6527D0CC0500F17A9E /* UIAlertController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1A9B6327D0CA1E00F17A9E /* UIAlertController+Extension.swift */; }; @@ -1089,6 +1090,7 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566EB7C52B3D59B900FB7CAD /* MoveAndCopyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoveAndCopyTests.swift; sourceTree = ""; }; 8491B1CC273BBA82001C8C5B /* UIViewController+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Menu.swift"; sourceTree = ""; }; AF1A9B6327D0CA1E00F17A9E /* UIAlertController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Extension.swift"; sourceTree = ""; }; AF22B20B277C6F4D00DAB0CC /* NCShareCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareCell.swift; sourceTree = ""; }; @@ -1921,6 +1923,7 @@ AF8ED1FA2757821000B8DBC4 /* NextcloudUnitTests */ = { isa = PBXGroup; children = ( + 566EB7C52B3D59B900FB7CAD /* MoveAndCopyTests.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -3878,6 +3881,7 @@ AF8ED1FC2757821000B8DBC4 /* NextcloudUnitTests.swift in Sources */, F37208792BAB4C09006B5430 /* BaseXCTestCase.swift in Sources */, F372087D2BAB4C0F006B5430 /* TestConstants.swift in Sources */, + 566EB7C62B3D59B900FB7CAD /* MoveAndCopyTests.swift in Sources */, F78E2D6C29AF02DB0024D4F3 /* Database.swift in Sources */, F7817CFE29801A3500FFBC65 /* Data+Extension.swift in Sources */, ); From ee67c94dc241ee3cd75b01f1b6514d348103fcc0 Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Thu, 28 Dec 2023 15:04:31 +0530 Subject: [PATCH 02/22] NMC 2015 - NMC 1992 Sharing configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 55 +++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 30166db9ac..ed9cc85561 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,19 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566EB7C82B3D6FAB00FB7CAD /* SharingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7C72B3D6FAB00FB7CAD /* SharingTest.swift */; }; + 566EB7CA2B3D6FE500FB7CAD /* UIButton+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7C92B3D6FE500FB7CAD /* UIButton+Extension.swift */; }; + 566EB7CF2B3D712200FB7CAD /* NCFilePermissionEditCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7CB2B3D712200FB7CAD /* NCFilePermissionEditCell.swift */; }; + 566EB7D02B3D712200FB7CAD /* NCFilePermissionEditCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7CC2B3D712200FB7CAD /* NCFilePermissionEditCell.xib */; }; + 566EB7D12B3D712200FB7CAD /* NCFilePermissionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7CD2B3D712200FB7CAD /* NCFilePermissionCell.swift */; }; + 566EB7D22B3D712200FB7CAD /* NCFilePermissionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7CE2B3D712200FB7CAD /* NCFilePermissionCell.xib */; }; + 566EB7D52B3D71F800FB7CAD /* NCShareHeaderCustomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7D32B3D71F700FB7CAD /* NCShareHeaderCustomCell.xib */; }; + 566EB7D62B3D71F800FB7CAD /* NCShareHeaderCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7D42B3D71F700FB7CAD /* NCShareHeaderCustomCell.swift */; }; + 566EB7D92B3D721700FB7CAD /* NCShareTextInputCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7D72B3D721700FB7CAD /* NCShareTextInputCell.xib */; }; + 566EB7DA2B3D721700FB7CAD /* NCShareTextInputCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7D82B3D721700FB7CAD /* NCShareTextInputCell.swift */; }; + 566EB7DD2B3D72CA00FB7CAD /* NCShareEmailFieldCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7DB2B3D72CA00FB7CAD /* NCShareEmailFieldCell.xib */; }; + 566EB7DE2B3D72CA00FB7CAD /* NCShareEmailFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7DC2B3D72CA00FB7CAD /* NCShareEmailFieldCell.swift */; }; + 566EB7E42B3D733900FB7CAD /* ShareDownloadLimitNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7E32B3D733900FB7CAD /* ShareDownloadLimitNetwork.swift */; }; 566EB7C62B3D59B900FB7CAD /* MoveAndCopyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7C52B3D59B900FB7CAD /* MoveAndCopyTests.swift */; }; 8491B1CD273BBA82001C8C5B /* UIViewController+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8491B1CC273BBA82001C8C5B /* UIViewController+Menu.swift */; }; AF1A9B6427D0CA1E00F17A9E /* UIAlertController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1A9B6327D0CA1E00F17A9E /* UIAlertController+Extension.swift */; }; @@ -1090,6 +1103,19 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566EB7C72B3D6FAB00FB7CAD /* SharingTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SharingTest.swift; sourceTree = ""; }; + 566EB7C92B3D6FE500FB7CAD /* UIButton+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIButton+Extension.swift"; sourceTree = ""; }; + 566EB7CB2B3D712200FB7CAD /* NCFilePermissionEditCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCFilePermissionEditCell.swift; sourceTree = ""; }; + 566EB7CC2B3D712200FB7CAD /* NCFilePermissionEditCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCFilePermissionEditCell.xib; sourceTree = ""; }; + 566EB7CD2B3D712200FB7CAD /* NCFilePermissionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCFilePermissionCell.swift; sourceTree = ""; }; + 566EB7CE2B3D712200FB7CAD /* NCFilePermissionCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCFilePermissionCell.xib; sourceTree = ""; }; + 566EB7D32B3D71F700FB7CAD /* NCShareHeaderCustomCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareHeaderCustomCell.xib; sourceTree = ""; }; + 566EB7D42B3D71F700FB7CAD /* NCShareHeaderCustomCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareHeaderCustomCell.swift; sourceTree = ""; }; + 566EB7D72B3D721700FB7CAD /* NCShareTextInputCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareTextInputCell.xib; sourceTree = ""; }; + 566EB7D82B3D721700FB7CAD /* NCShareTextInputCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareTextInputCell.swift; sourceTree = ""; }; + 566EB7DB2B3D72CA00FB7CAD /* NCShareEmailFieldCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareEmailFieldCell.xib; sourceTree = ""; }; + 566EB7DC2B3D72CA00FB7CAD /* NCShareEmailFieldCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareEmailFieldCell.swift; sourceTree = ""; }; + 566EB7E32B3D733900FB7CAD /* ShareDownloadLimitNetwork.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareDownloadLimitNetwork.swift; sourceTree = ""; }; 566EB7C52B3D59B900FB7CAD /* MoveAndCopyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoveAndCopyTests.swift; sourceTree = ""; }; 8491B1CC273BBA82001C8C5B /* UIViewController+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Menu.swift"; sourceTree = ""; }; AF1A9B6327D0CA1E00F17A9E /* UIAlertController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Extension.swift"; sourceTree = ""; }; @@ -1924,6 +1950,7 @@ isa = PBXGroup; children = ( 566EB7C52B3D59B900FB7CAD /* MoveAndCopyTests.swift */, + 566EB7C72B3D6FAB00FB7CAD /* SharingTest.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -1932,6 +1959,14 @@ AF93471327E235EB002537EE /* Advanced */ = { isa = PBXGroup; children = ( + 566EB7D82B3D721700FB7CAD /* NCShareTextInputCell.swift */, + 566EB7D72B3D721700FB7CAD /* NCShareTextInputCell.xib */, + 566EB7D42B3D71F700FB7CAD /* NCShareHeaderCustomCell.swift */, + 566EB7D32B3D71F700FB7CAD /* NCShareHeaderCustomCell.xib */, + 566EB7CD2B3D712200FB7CAD /* NCFilePermissionCell.swift */, + 566EB7CE2B3D712200FB7CAD /* NCFilePermissionCell.xib */, + 566EB7CB2B3D712200FB7CAD /* NCFilePermissionEditCell.swift */, + 566EB7CC2B3D712200FB7CAD /* NCFilePermissionEditCell.xib */, AF93471627E2361E002537EE /* NCShareAdvancePermission.swift */, AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */, AF93471427E2361E002537EE /* NCShareAdvancePermissionFooter.xib */, @@ -2143,6 +2178,9 @@ F728CE741BF6322C00E69702 /* Share */ = { isa = PBXGroup; children = ( + 566EB7E32B3D733900FB7CAD /* ShareDownloadLimitNetwork.swift */, + 566EB7DC2B3D72CA00FB7CAD /* NCShareEmailFieldCell.swift */, + 566EB7DB2B3D72CA00FB7CAD /* NCShareEmailFieldCell.xib */, AF93471327E235EB002537EE /* Advanced */, F724377A2C10B83E00C7C68D /* NCPermissions.swift */, F700510022DF63AC003A3356 /* NCShare.storyboard */, @@ -2602,6 +2640,7 @@ F7A0D14E259229FA008F8A13 /* Extensions */ = { isa = PBXGroup; children = ( + 566EB7C92B3D6FE500FB7CAD /* UIButton+Extension.swift */, F7AC1CAF28AB94490032D99F /* Array+Extension.swift */, F7817CF729801A3500FFBC65 /* Data+Extension.swift */, F70460512499061800BB98A7 /* NotificationCenter+MainThread.swift */, @@ -3702,6 +3741,8 @@ buildActionMask = 2147483647; files = ( F7362A1F220C853A005101B5 /* LaunchScreen.storyboard in Resources */, + 566EB7D02B3D712200FB7CAD /* NCFilePermissionEditCell.xib in Resources */, + 566EB7DD2B3D72CA00FB7CAD /* NCShareEmailFieldCell.xib in Resources */, F77444F622281649000D5EB0 /* NCGridMediaCell.xib in Resources */, F78ACD4421903CF20088454D /* NCListCell.xib in Resources */, F3BB464D2A39ADCC00461F6E /* NCMoreAppSuggestionsCell.xib in Resources */, @@ -3710,6 +3751,7 @@ F78ACD4621903D010088454D /* NCGridCell.xib in Resources */, F7F4F10827ECDBDB008676F9 /* Inconsolata-ExtraLight.ttf in Resources */, F72685E727C78E490019EF5E /* InfoPlist.strings in Resources */, + 566EB7D52B3D71F800FB7CAD /* NCShareHeaderCustomCell.xib in Resources */, F769453C22E9CFFF000A798A /* NCShareUserCell.xib in Resources */, F7F4F10927ECDBDB008676F9 /* Inconsolata-Bold.ttf in Resources */, F76D3CF52428D0C1005DFA87 /* NCViewerPDF.storyboard in Resources */, @@ -3724,7 +3766,11 @@ F757CC8C29E82D0500F31428 /* NCGroupfolders.storyboard in Resources */, F79A65C32191D90F00FF6DCC /* NCSelect.storyboard in Resources */, F7226EDC1EE4089300EBECB1 /* Main.storyboard in Resources */, + F31F69612A2F907800162F76 /* __Snapshots__ in Resources */, + F702F2E725EE5C86008F8E80 /* NCAudioRecorderViewController.storyboard in Resources */, + 566EB7D22B3D712200FB7CAD /* NCFilePermissionCell.xib in Resources */, AF56C1DC2784856200D8BAE2 /* NCActivityCommentView.xib in Resources */, + 566EB7D92B3D721700FB7CAD /* NCShareTextInputCell.xib in Resources */, F7F4F10B27ECDBDB008676F9 /* Inconsolata-Light.ttf in Resources */, F7CEE6002BA9A5C9003EFD89 /* NCTrashGridCell.xib in Resources */, 3704EB2A23D5A58400455C5B /* NCMenu.storyboard in Resources */, @@ -3878,6 +3924,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 566EB7C82B3D6FAB00FB7CAD /* SharingTest.swift in Sources */, AF8ED1FC2757821000B8DBC4 /* NextcloudUnitTests.swift in Sources */, F37208792BAB4C09006B5430 /* BaseXCTestCase.swift in Sources */, F372087D2BAB4C0F006B5430 /* TestConstants.swift in Sources */, @@ -4240,6 +4287,7 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */, F70D87D025EE6E58008CBBBD /* NCRenameFile.swift in Sources */, F768822C2C0DD1E7001CF441 /* NCKeychain.swift in Sources */, + 566EB7E42B3D733900FB7CAD /* ShareDownloadLimitNetwork.swift in Sources */, F71CD6CA2930D7B1006C95C1 /* NCApplicationHandle.swift in Sources */, F73EF7D72B0226080087E6E9 /* NCManageDatabase+Tip.swift in Sources */, F76882402C0DD30B001CF441 /* ViewOnAppear.swift in Sources */, @@ -4340,7 +4388,9 @@ F70460522499061800BB98A7 /* NotificationCenter+MainThread.swift in Sources */, F78F74362163781100C2ADAD /* NCTrash.swift in Sources */, AF817EF1274BC781009ED85B /* NCUserBaseUrl.swift in Sources */, + 566EB7D62B3D71F800FB7CAD /* NCShareHeaderCustomCell.swift in Sources */, F39298972A3B12CB00509762 /* BaseNCMoreCell.swift in Sources */, + 566EB7CA2B3D6FE500FB7CAD /* UIButton+Extension.swift in Sources */, AF2D7C7C2742556F00ADF566 /* NCShareLinkCell.swift in Sources */, F73EF7C72B0225610087E6E9 /* NCManageDatabase+PhotoLibrary.swift in Sources */, F7E41316294A19B300839300 /* UIView+Extension.swift in Sources */, @@ -4426,6 +4476,7 @@ F70CAE3A1F8CF31A008125FD /* NCEndToEndEncryption.m in Sources */, AF93471B27E2361E002537EE /* NCShareAdvancePermission.swift in Sources */, F77BC3ED293E528A005F2B08 /* NCConfigServer.swift in Sources */, + 566EB7D12B3D712200FB7CAD /* NCFilePermissionCell.swift in Sources */, F7A560422AE1593700BE8FD6 /* NCOperationSaveLivePhoto.swift in Sources */, F7E402312BA891EB007E5609 /* NCTrash+SelectTabBarDelegate.swift in Sources */, F70753EB2542A99800972D44 /* NCViewerMediaPage.swift in Sources */, @@ -4448,6 +4499,10 @@ F73EF7AF2B0224350087E6E9 /* NCManageDatabase+DirectEditing.swift in Sources */, D5B6AA7827200C7200D49C24 /* NCActivityTableViewCell.swift in Sources */, F745B253222D88AE00346520 /* NCLoginQRCode.swift in Sources */, + 566EB7DE2B3D72CA00FB7CAD /* NCShareEmailFieldCell.swift in Sources */, + F7CBC31C24F78E79004D3812 /* NCSortMenu.swift in Sources */, + 566EB7CF2B3D712200FB7CAD /* NCFilePermissionEditCell.swift in Sources */, + 566EB7DA2B3D721700FB7CAD /* NCShareTextInputCell.swift in Sources */, F769454822E9F20D000A798A /* NCShareNetworking.swift in Sources */, F7AEEAA82C11DBFD00011412 /* NCAccountSettingsModel.swift in Sources */, F749B64A297B0CBB00087535 /* NCManageDatabase+Share.swift in Sources */, From 5a84cd7f0fbe49c618926a1fdc062835e9dfb3a0 Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Thu, 28 Dec 2023 15:43:43 +0530 Subject: [PATCH 03/22] NMC 2015 - NMC 1988 Scan customisation changes --- Nextcloud.xcodeproj/project.pbxproj | 97 +++++++++++++++++++ .../File Provider Extension UI.xcscheme | 1 - .../WidgetDashboardIntentHandler.xcscheme | 1 - 3 files changed, 97 insertions(+), 2 deletions(-) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index ed9cc85561..59d02c12ba 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,26 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566EB7E62B3D7AE900FB7CAD /* ScanTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7E52B3D7AE900FB7CAD /* ScanTests.swift */; }; + 566EB7E82B3D7B3500FB7CAD /* NCCreateFormUploadScanDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7E72B3D7B3500FB7CAD /* NCCreateFormUploadScanDocument.swift */; }; + 566EB7FC2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7EA2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.swift */; }; + 566EB7FD2B3D7B5F00FB7CAD /* ScanDocumentPathView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7EB2B3D7B5F00FB7CAD /* ScanDocumentPathView.xib */; }; + 566EB7FE2B3D7B5F00FB7CAD /* SetPDFPasswordSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7EC2B3D7B5F00FB7CAD /* SetPDFPasswordSwitchView.swift */; }; + 566EB7FF2B3D7B5F00FB7CAD /* SetPDFPasswordSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7ED2B3D7B5F00FB7CAD /* SetPDFPasswordSwitchView.xib */; }; + 566EB8002B3D7B5F00FB7CAD /* JPGImageSaveSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7EE2B3D7B5F00FB7CAD /* JPGImageSaveSwitchView.swift */; }; + 566EB8012B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7EF2B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.xib */; }; + 566EB8022B3D7B5F00FB7CAD /* JPGImageSaveSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7F02B3D7B5F00FB7CAD /* JPGImageSaveSwitchView.xib */; }; + 566EB8032B3D7B5F00FB7CAD /* PasswordInputField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7F12B3D7B5F00FB7CAD /* PasswordInputField.swift */; }; + 566EB8042B3D7B5F00FB7CAD /* ScanDocumentPathView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7F22B3D7B5F00FB7CAD /* ScanDocumentPathView.swift */; }; + 566EB8052B3D7B5F00FB7CAD /* FileNameInputTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7F32B3D7B5F00FB7CAD /* FileNameInputTextField.swift */; }; + 566EB8062B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7F42B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.swift */; }; + 566EB8072B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7F52B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.xib */; }; + 566EB8082B3D7B5F00FB7CAD /* FileNameInputTextField.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7F62B3D7B5F00FB7CAD /* FileNameInputTextField.xib */; }; + 566EB8092B3D7B5F00FB7CAD /* PdfWithoutOcrSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7F72B3D7B5F00FB7CAD /* PdfWithoutOcrSwitchView.swift */; }; + 566EB80A2B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7F82B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.swift */; }; + 566EB80B2B3D7B5F00FB7CAD /* PasswordInputField.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7F92B3D7B5F00FB7CAD /* PasswordInputField.xib */; }; + 566EB80C2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7FA2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.xib */; }; + 566EB80D2B3D7B5F00FB7CAD /* PdfWithoutOcrSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB7FB2B3D7B5F00FB7CAD /* PdfWithoutOcrSwitchView.xib */; }; 566EB7C82B3D6FAB00FB7CAD /* SharingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7C72B3D6FAB00FB7CAD /* SharingTest.swift */; }; 566EB7CA2B3D6FE500FB7CAD /* UIButton+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7C92B3D6FE500FB7CAD /* UIButton+Extension.swift */; }; 566EB7CF2B3D712200FB7CAD /* NCFilePermissionEditCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7CB2B3D712200FB7CAD /* NCFilePermissionEditCell.swift */; }; @@ -1103,6 +1123,26 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566EB7E52B3D7AE900FB7CAD /* ScanTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScanTests.swift; sourceTree = ""; }; + 566EB7E72B3D7B3500FB7CAD /* NCCreateFormUploadScanDocument.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadScanDocument.swift; sourceTree = ""; }; + 566EB7EA2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PNGImageSaveSwitchView.swift; sourceTree = ""; }; + 566EB7EB2B3D7B5F00FB7CAD /* ScanDocumentPathView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ScanDocumentPathView.xib; sourceTree = ""; }; + 566EB7EC2B3D7B5F00FB7CAD /* SetPDFPasswordSwitchView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetPDFPasswordSwitchView.swift; sourceTree = ""; }; + 566EB7ED2B3D7B5F00FB7CAD /* SetPDFPasswordSwitchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SetPDFPasswordSwitchView.xib; sourceTree = ""; }; + 566EB7EE2B3D7B5F00FB7CAD /* JPGImageSaveSwitchView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JPGImageSaveSwitchView.swift; sourceTree = ""; }; + 566EB7EF2B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TextFileWithOcrSwitchView.xib; sourceTree = ""; }; + 566EB7F02B3D7B5F00FB7CAD /* JPGImageSaveSwitchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = JPGImageSaveSwitchView.xib; sourceTree = ""; }; + 566EB7F12B3D7B5F00FB7CAD /* PasswordInputField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordInputField.swift; sourceTree = ""; }; + 566EB7F22B3D7B5F00FB7CAD /* ScanDocumentPathView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScanDocumentPathView.swift; sourceTree = ""; }; + 566EB7F32B3D7B5F00FB7CAD /* FileNameInputTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileNameInputTextField.swift; sourceTree = ""; }; + 566EB7F42B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PdfWithOcrSwitchView.swift; sourceTree = ""; }; + 566EB7F52B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PdfWithOcrSwitchView.xib; sourceTree = ""; }; + 566EB7F62B3D7B5F00FB7CAD /* FileNameInputTextField.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FileNameInputTextField.xib; sourceTree = ""; }; + 566EB7F72B3D7B5F00FB7CAD /* PdfWithoutOcrSwitchView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PdfWithoutOcrSwitchView.swift; sourceTree = ""; }; + 566EB7F82B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFileWithOcrSwitchView.swift; sourceTree = ""; }; + 566EB7F92B3D7B5F00FB7CAD /* PasswordInputField.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordInputField.xib; sourceTree = ""; }; + 566EB7FA2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PNGImageSaveSwitchView.xib; sourceTree = ""; }; + 566EB7FB2B3D7B5F00FB7CAD /* PdfWithoutOcrSwitchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PdfWithoutOcrSwitchView.xib; sourceTree = ""; }; 566EB7C72B3D6FAB00FB7CAD /* SharingTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SharingTest.swift; sourceTree = ""; }; 566EB7C92B3D6FE500FB7CAD /* UIButton+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIButton+Extension.swift"; sourceTree = ""; }; 566EB7CB2B3D712200FB7CAD /* NCFilePermissionEditCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCFilePermissionEditCell.swift; sourceTree = ""; }; @@ -1946,9 +1986,35 @@ path = Menu; sourceTree = ""; }; + 566EB7E92B3D7B5F00FB7CAD /* NMC Views */ = { + isa = PBXGroup; + children = ( + 566EB7F32B3D7B5F00FB7CAD /* FileNameInputTextField.swift */, + 566EB7F62B3D7B5F00FB7CAD /* FileNameInputTextField.xib */, + 566EB7EE2B3D7B5F00FB7CAD /* JPGImageSaveSwitchView.swift */, + 566EB7F02B3D7B5F00FB7CAD /* JPGImageSaveSwitchView.xib */, + 566EB7EA2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.swift */, + 566EB7FA2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.xib */, + 566EB7F12B3D7B5F00FB7CAD /* PasswordInputField.swift */, + 566EB7F92B3D7B5F00FB7CAD /* PasswordInputField.xib */, + 566EB7F42B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.swift */, + 566EB7F52B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.xib */, + 566EB7F72B3D7B5F00FB7CAD /* PdfWithoutOcrSwitchView.swift */, + 566EB7FB2B3D7B5F00FB7CAD /* PdfWithoutOcrSwitchView.xib */, + 566EB7F22B3D7B5F00FB7CAD /* ScanDocumentPathView.swift */, + 566EB7EB2B3D7B5F00FB7CAD /* ScanDocumentPathView.xib */, + 566EB7EC2B3D7B5F00FB7CAD /* SetPDFPasswordSwitchView.swift */, + 566EB7ED2B3D7B5F00FB7CAD /* SetPDFPasswordSwitchView.xib */, + 566EB7F82B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.swift */, + 566EB7EF2B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.xib */, + ); + path = "NMC Views"; + sourceTree = ""; + }; AF8ED1FA2757821000B8DBC4 /* NextcloudUnitTests */ = { isa = PBXGroup; children = ( + 566EB7E52B3D7AE900FB7CAD /* ScanTests.swift */, 566EB7C52B3D59B900FB7CAD /* MoveAndCopyTests.swift */, 566EB7C72B3D6FAB00FB7CAD /* SharingTest.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, @@ -2298,6 +2364,8 @@ F758B41E212C516300515F55 /* Scan document */ = { isa = PBXGroup; children = ( + 566EB7E92B3D7B5F00FB7CAD /* NMC Views */, + 566EB7E72B3D7B3500FB7CAD /* NCCreateFormUploadScanDocument.swift */, F758B457212C564000515F55 /* NCScan.storyboard */, F758B45D212C569C00515F55 /* NCScanCell.swift */, F758B45F212C56A400515F55 /* NCScan.swift */, @@ -3756,6 +3824,8 @@ F7F4F10927ECDBDB008676F9 /* Inconsolata-Bold.ttf in Resources */, F76D3CF52428D0C1005DFA87 /* NCViewerPDF.storyboard in Resources */, F700222C1EC479840080073F /* Custom.xcassets in Resources */, + 566EB8082B3D7B5F00FB7CAD /* FileNameInputTextField.xib in Resources */, + 566EB8022B3D7B5F00FB7CAD /* JPGImageSaveSwitchView.xib in Resources */, F702F2F125EE5CDB008F8E80 /* NCLogin.storyboard in Resources */, F723985C253C95CE00257F49 /* NCViewerRichdocument.storyboard in Resources */, F758B45A212C564000515F55 /* NCScan.storyboard in Resources */, @@ -3768,6 +3838,7 @@ F7226EDC1EE4089300EBECB1 /* Main.storyboard in Resources */, F31F69612A2F907800162F76 /* __Snapshots__ in Resources */, F702F2E725EE5C86008F8E80 /* NCAudioRecorderViewController.storyboard in Resources */, + 566EB80C2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.xib in Resources */, 566EB7D22B3D712200FB7CAD /* NCFilePermissionCell.xib in Resources */, AF56C1DC2784856200D8BAE2 /* NCActivityCommentView.xib in Resources */, 566EB7D92B3D721700FB7CAD /* NCShareTextInputCell.xib in Resources */, @@ -3775,9 +3846,14 @@ F7CEE6002BA9A5C9003EFD89 /* NCTrashGridCell.xib in Resources */, 3704EB2A23D5A58400455C5B /* NCMenu.storyboard in Resources */, AF93471C27E2361E002537EE /* NCShareHeader.xib in Resources */, + AF93471C27E2361E002537EE /* NCShareAdvancePermissionHeader.xib in Resources */, + F7F1E54C2492369A00E42386 /* NCMediaCommandView.xib in Resources */, + 566EB8072B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.xib in Resources */, F76032A0252F0F8E0015A421 /* NCTransferCell.xib in Resources */, F7F4F10527ECDBDB008676F9 /* Inconsolata-SemiBold.ttf in Resources */, + 566EB80B2B3D7B5F00FB7CAD /* PasswordInputField.xib in Resources */, F7A48415297028FC00BD1B49 /* Nextcloud Hub.png in Resources */, + 566EB7FF2B3D7B5F00FB7CAD /* SetPDFPasswordSwitchView.xib in Resources */, F74C0437253F1CDC009762AB /* NCShares.storyboard in Resources */, F7F4F10C27ECDBDB008676F9 /* Inconsolata-Regular.ttf in Resources */, F7B8B83025681C3400967775 /* GoogleService-Info.plist in Resources */, @@ -3786,6 +3862,7 @@ F7E0CDCF265CE8610044854E /* NCUserStatus.storyboard in Resources */, F76D3CF32428B94E005DFA87 /* NCViewerPDFSearchCell.xib in Resources */, F7CA212E25F1333300826ABB /* NCAccountRequest.storyboard in Resources */, + 566EB7FD2B3D7B5F00FB7CAD /* ScanDocumentPathView.xib in Resources */, F717402D24F699A5000C87D5 /* NCFavorite.storyboard in Resources */, F723B3DD22FC6D1D00301EFE /* NCShareCommentsCell.xib in Resources */, F78ACD4B21903F850088454D /* NCTrashListCell.xib in Resources */, @@ -3816,6 +3893,7 @@ F7FF2CB12842159500EBB7A1 /* NCSectionHeader.xib in Resources */, F7D1612023CF19E30039EBBF /* NCViewerRichWorkspace.storyboard in Resources */, F77B0F631D118A16002130FE /* Localizable.strings in Resources */, + 566EB80D2B3D7B5F00FB7CAD /* PdfWithoutOcrSwitchView.xib in Resources */, F774264A22EB4D0000B23912 /* NCSearchUserDropDownCell.xib in Resources */, F7CB689A2541676B0050EC94 /* NCMore.storyboard in Resources */, F77B0F7D1D118A16002130FE /* Images.xcassets in Resources */, @@ -3826,6 +3904,9 @@ F7B398422A6A91D5007538D6 /* NCSectionFirstHeader.xib in Resources */, F7501C322212E57500FB1415 /* NCMedia.storyboard in Resources */, F74DE14425135B6800917068 /* NCTransfers.storyboard in Resources */, + F77910A525DD517B00CEDB9E /* Settings.bundle in Resources */, + 566EB8012B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.xib in Resources */, + F7CB68A0254169530050EC94 /* NCSettings.storyboard in Resources */, F76687082B7D067400779E3F /* NCAudioRecorderViewController.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3930,6 +4011,7 @@ F372087D2BAB4C0F006B5430 /* TestConstants.swift in Sources */, 566EB7C62B3D59B900FB7CAD /* MoveAndCopyTests.swift in Sources */, F78E2D6C29AF02DB0024D4F3 /* Database.swift in Sources */, + 566EB7E62B3D7AE900FB7CAD /* ScanTests.swift in Sources */, F7817CFE29801A3500FFBC65 /* Data+Extension.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -4275,6 +4357,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + F30A96312A27AEBF00D7BCFE /* EnvVars.generated.swift in Sources */, + 566EB7E82B3D7B3500FB7CAD /* NCCreateFormUploadScanDocument.swift in Sources */, F77444F522281649000D5EB0 /* NCGridMediaCell.swift in Sources */, F78C6FDE296D677300C952C3 /* NCContextMenu.swift in Sources */, F7E402332BA89551007E5609 /* NCTrash+Networking.swift in Sources */, @@ -4283,6 +4367,7 @@ F799DF882C4B83CC003410B5 /* NCCollectionViewCommon+EasyTipView.swift in Sources */, F7AE00F8230E81CB007ACF8A /* NCBrowserWeb.swift in Sources */, F702F30825EE5D47008F8E80 /* NCPopupViewController.swift in Sources */, + 566EB8032B3D7B5F00FB7CAD /* PasswordInputField.swift in Sources */, F733598125C1C188002ABA72 /* NCAskAuthorization.swift in Sources */, 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */, F70D87D025EE6E58008CBBBD /* NCRenameFile.swift in Sources */, @@ -4353,6 +4438,7 @@ F765E9CD295C585800A09ED8 /* NCUploadScanDocument.swift in Sources */, F741C2242B6B9FD600E849BB /* NCMediaSelectTabBar.swift in Sources */, F77A697D250A0FBC00FF1708 /* NCCollectionViewCommon+Menu.swift in Sources */, + 566EB7FC2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.swift in Sources */, F7BF9D822934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */, AF7E504E27A2D8FF00B5E4AF /* UIBarButton+Extension.swift in Sources */, F7A846DE2BB01ACB0024816F /* NCTrashCellProtocol.swift in Sources */, @@ -4365,8 +4451,10 @@ AFCE353927E5DE0500FEA6C2 /* NCShare+Helper.swift in Sources */, F77BB746289984CA0090FC19 /* UIViewController+Extension.swift in Sources */, F700510522DF6A89003A3356 /* NCShare.swift in Sources */, + 566EB8042B3D7B5F00FB7CAD /* ScanDocumentPathView.swift in Sources */, F72D1007210B6882009C96B7 /* NCPushNotificationEncryption.m in Sources */, F76882362C0DD1E7001CF441 /* NCAcknowledgementsView.swift in Sources */, + 566EB80A2B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.swift in Sources */, F785EE9D246196DF00B3F945 /* NCNetworkingE2EE.swift in Sources */, F724377B2C10B83E00C7C68D /* NCPermissions.swift in Sources */, F794E13D2BBBFF2E003693D7 /* NCMainTabBarController.swift in Sources */, @@ -4382,6 +4470,8 @@ F7682FE023C36B0500983A04 /* NCMainTabBar.swift in Sources */, F7A0D1352591FBC5008F8A13 /* String+Extension.swift in Sources */, F7CEE6012BA9A5C9003EFD89 /* NCTrashGridCell.swift in Sources */, + 566EB8062B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.swift in Sources */, + F77B0E5F1D118A16002130FE /* NCSettings.m in Sources */, F7F9D1BB25397CE000D9BFF5 /* NCViewer.swift in Sources */, F7E7AEA52BA32C6500512E52 /* NCCollectionViewDownloadThumbnail.swift in Sources */, AF730AF827834B1400B7520E /* NCShare+NCCellDelegate.swift in Sources */, @@ -4418,6 +4508,7 @@ F7B6B70427C4E7FA00A7F6EB /* NCScan+CollectionView.swift in Sources */, F7816EF22C2C3E1F00A52517 /* NCPushNotification.swift in Sources */, F76882342C0DD1E7001CF441 /* NCDisplayView.swift in Sources */, + 566EB7FE2B3D7B5F00FB7CAD /* SetPDFPasswordSwitchView.swift in Sources */, F7C30DF6291BC0CA0017149B /* NCNetworkingE2EEUpload.swift in Sources */, F7501C332212E57500FB1415 /* NCMedia.swift in Sources */, F72944F22A84246400246839 /* NCEndToEndMetadataV20.swift in Sources */, @@ -4471,7 +4562,12 @@ F3A047992BD2668800658E7B /* NCAssistantTask.swift in Sources */, F76882322C0DD1E7001CF441 /* NCAutoUploadView.swift in Sources */, F36E64F72B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBar.swift in Sources */, + F36E64F72B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBarDelegate.swift in Sources */, + F3BB464F2A39EBE500461F6E /* NCMoreUserCell.swift in Sources */, + F726EEEC1FED1C820030B9C8 /* NCEndToEndInitialize.swift in Sources */, + 566EB8052B3D7B5F00FB7CAD /* FileNameInputTextField.swift in Sources */, F79A65C62191D95E00FF6DCC /* NCSelect.swift in Sources */, + 566EB8002B3D7B5F00FB7CAD /* JPGImageSaveSwitchView.swift in Sources */, F75D19E325EFE09000D74598 /* NCTrash+Menu.swift in Sources */, F70CAE3A1F8CF31A008125FD /* NCEndToEndEncryption.m in Sources */, AF93471B27E2361E002537EE /* NCShareAdvancePermission.swift in Sources */, @@ -4496,6 +4592,7 @@ F7C30DFA291BCF790017149B /* NCNetworkingE2EECreateFolder.swift in Sources */, F7BC288026663F85004D46C5 /* NCViewCertificateDetails.swift in Sources */, F78B87E92B62550800C65ADC /* NCMediaDownloadThumbnaill.swift in Sources */, + 566EB8092B3D7B5F00FB7CAD /* PdfWithoutOcrSwitchView.swift in Sources */, F73EF7AF2B0224350087E6E9 /* NCManageDatabase+DirectEditing.swift in Sources */, D5B6AA7827200C7200D49C24 /* NCActivityTableViewCell.swift in Sources */, F745B253222D88AE00346520 /* NCLoginQRCode.swift in Sources */, diff --git a/Nextcloud.xcodeproj/xcshareddata/xcschemes/File Provider Extension UI.xcscheme b/Nextcloud.xcodeproj/xcshareddata/xcschemes/File Provider Extension UI.xcscheme index c06627e268..e19e0492e1 100644 --- a/Nextcloud.xcodeproj/xcshareddata/xcschemes/File Provider Extension UI.xcscheme +++ b/Nextcloud.xcodeproj/xcshareddata/xcschemes/File Provider Extension UI.xcscheme @@ -73,7 +73,6 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES" - askForAppToLaunch = "Yes" launchAutomaticallySubstyle = "2"> diff --git a/Nextcloud.xcodeproj/xcshareddata/xcschemes/WidgetDashboardIntentHandler.xcscheme b/Nextcloud.xcodeproj/xcshareddata/xcschemes/WidgetDashboardIntentHandler.xcscheme index e7fe4caf7c..0b68bbe8b4 100644 --- a/Nextcloud.xcodeproj/xcshareddata/xcschemes/WidgetDashboardIntentHandler.xcscheme +++ b/Nextcloud.xcodeproj/xcshareddata/xcschemes/WidgetDashboardIntentHandler.xcscheme @@ -73,7 +73,6 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES" - askForAppToLaunch = "Yes" launchAutomaticallySubstyle = "2"> From a5d06cbfbd347ba379a89bc47194958af2f81561 Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Thu, 28 Dec 2023 15:56:32 +0530 Subject: [PATCH 04/22] NMC 2015 - NMC 1931 Auto upload configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 59d02c12ba..8cb3e78226 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566EB80F2B3D833000FB7CAD /* AudioUploadTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB80E2B3D833000FB7CAD /* AudioUploadTests.swift */; }; 566EB7E62B3D7AE900FB7CAD /* ScanTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7E52B3D7AE900FB7CAD /* ScanTests.swift */; }; 566EB7E82B3D7B3500FB7CAD /* NCCreateFormUploadScanDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7E72B3D7B3500FB7CAD /* NCCreateFormUploadScanDocument.swift */; }; 566EB7FC2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7EA2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.swift */; }; @@ -1123,6 +1124,7 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566EB80E2B3D833000FB7CAD /* AudioUploadTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioUploadTests.swift; sourceTree = ""; }; 566EB7E52B3D7AE900FB7CAD /* ScanTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScanTests.swift; sourceTree = ""; }; 566EB7E72B3D7B3500FB7CAD /* NCCreateFormUploadScanDocument.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadScanDocument.swift; sourceTree = ""; }; 566EB7EA2B3D7B5F00FB7CAD /* PNGImageSaveSwitchView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PNGImageSaveSwitchView.swift; sourceTree = ""; }; @@ -2017,6 +2019,7 @@ 566EB7E52B3D7AE900FB7CAD /* ScanTests.swift */, 566EB7C52B3D59B900FB7CAD /* MoveAndCopyTests.swift */, 566EB7C72B3D6FAB00FB7CAD /* SharingTest.swift */, + 566EB80E2B3D833000FB7CAD /* AudioUploadTests.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -4013,6 +4016,7 @@ F78E2D6C29AF02DB0024D4F3 /* Database.swift in Sources */, 566EB7E62B3D7AE900FB7CAD /* ScanTests.swift in Sources */, F7817CFE29801A3500FFBC65 /* Data+Extension.swift in Sources */, + 566EB80F2B3D833000FB7CAD /* AudioUploadTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From 701d21f4bb64add4e16d05951251ea5a5248e601 Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Thu, 28 Dec 2023 16:10:35 +0530 Subject: [PATCH 05/22] NMC 2015 - NMC 1933 Collabora configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 8cb3e78226..7b8492994d 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,11 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566EB8112B3D85DE00FB7CAD /* CollaboraTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8102B3D85DE00FB7CAD /* CollaboraTestCase.swift */; }; + 566EB8172B3D861500FB7CAD /* NCCreateDocumentCustomTextField.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB8132B3D861400FB7CAD /* NCCreateDocumentCustomTextField.xib */; }; + 566EB8182B3D861500FB7CAD /* NCCreateDocumentCustomTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8142B3D861500FB7CAD /* NCCreateDocumentCustomTextField.swift */; }; + 566EB8192B3D861500FB7CAD /* FolderPathCustomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB8152B3D861500FB7CAD /* FolderPathCustomCell.xib */; }; + 566EB81A2B3D861500FB7CAD /* FolderPathCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8162B3D861500FB7CAD /* FolderPathCustomCell.swift */; }; 566EB80F2B3D833000FB7CAD /* AudioUploadTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB80E2B3D833000FB7CAD /* AudioUploadTests.swift */; }; 566EB7E62B3D7AE900FB7CAD /* ScanTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7E52B3D7AE900FB7CAD /* ScanTests.swift */; }; 566EB7E82B3D7B3500FB7CAD /* NCCreateFormUploadScanDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB7E72B3D7B3500FB7CAD /* NCCreateFormUploadScanDocument.swift */; }; @@ -1124,6 +1129,11 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566EB8102B3D85DE00FB7CAD /* CollaboraTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollaboraTestCase.swift; sourceTree = ""; }; + 566EB8132B3D861400FB7CAD /* NCCreateDocumentCustomTextField.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCCreateDocumentCustomTextField.xib; sourceTree = ""; }; + 566EB8142B3D861500FB7CAD /* NCCreateDocumentCustomTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCCreateDocumentCustomTextField.swift; sourceTree = ""; }; + 566EB8152B3D861500FB7CAD /* FolderPathCustomCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FolderPathCustomCell.xib; sourceTree = ""; }; + 566EB8162B3D861500FB7CAD /* FolderPathCustomCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FolderPathCustomCell.swift; sourceTree = ""; }; 566EB80E2B3D833000FB7CAD /* AudioUploadTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioUploadTests.swift; sourceTree = ""; }; 566EB7E52B3D7AE900FB7CAD /* ScanTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScanTests.swift; sourceTree = ""; }; 566EB7E72B3D7B3500FB7CAD /* NCCreateFormUploadScanDocument.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadScanDocument.swift; sourceTree = ""; }; @@ -2012,6 +2022,17 @@ ); path = "NMC Views"; sourceTree = ""; + }; + 566EB8122B3D861400FB7CAD /* NMC Custom Views */ = { + isa = PBXGroup; + children = ( + 566EB8132B3D861400FB7CAD /* NCCreateDocumentCustomTextField.xib */, + 566EB8142B3D861500FB7CAD /* NCCreateDocumentCustomTextField.swift */, + 566EB8152B3D861500FB7CAD /* FolderPathCustomCell.xib */, + 566EB8162B3D861500FB7CAD /* FolderPathCustomCell.swift */, + ); + path = "NMC Custom Views"; + sourceTree = ""; }; AF8ED1FA2757821000B8DBC4 /* NextcloudUnitTests */ = { isa = PBXGroup; @@ -2020,6 +2041,7 @@ 566EB7C52B3D59B900FB7CAD /* MoveAndCopyTests.swift */, 566EB7C72B3D6FAB00FB7CAD /* SharingTest.swift */, 566EB80E2B3D833000FB7CAD /* AudioUploadTests.swift */, + 566EB8102B3D85DE00FB7CAD /* CollaboraTestCase.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -3061,6 +3083,7 @@ F7F67BAA1A24D27800EE80DA /* iOSClient */ = { isa = PBXGroup; children = ( + 566EB8122B3D861400FB7CAD /* NMC Custom Views */, F702F2CC25EE5B4F008F8E80 /* AppDelegate.swift */, F794E13E2BBC0F70003693D7 /* SceneDelegate.swift */, F76B649B2ADFFAED00014640 /* NCImageCache.swift */, @@ -3817,6 +3840,7 @@ F77444F622281649000D5EB0 /* NCGridMediaCell.xib in Resources */, F78ACD4421903CF20088454D /* NCListCell.xib in Resources */, F3BB464D2A39ADCC00461F6E /* NCMoreAppSuggestionsCell.xib in Resources */, + 566EB8172B3D861500FB7CAD /* NCCreateDocumentCustomTextField.xib in Resources */, F7F4F10727ECDBDB008676F9 /* Inconsolata-Black.ttf in Resources */, F761856D29E98543006EB3B0 /* NCIntroCollectionViewCell.xib in Resources */, F78ACD4621903D010088454D /* NCGridCell.xib in Resources */, @@ -3893,6 +3917,7 @@ F73D11FA253C5F4800DF9BEC /* NCViewerNextcloudText.storyboard in Resources */, F7EDE51B262DD0C400414FE6 /* NCSelectCommandViewCopyMove.xib in Resources */, F73B422B2476764F00A30FD3 /* NCNotification.storyboard in Resources */, + 566EB8192B3D861500FB7CAD /* FolderPathCustomCell.xib in Resources */, F7FF2CB12842159500EBB7A1 /* NCSectionHeader.xib in Resources */, F7D1612023CF19E30039EBBF /* NCViewerRichWorkspace.storyboard in Resources */, F77B0F631D118A16002130FE /* Localizable.strings in Resources */, @@ -4012,6 +4037,7 @@ AF8ED1FC2757821000B8DBC4 /* NextcloudUnitTests.swift in Sources */, F37208792BAB4C09006B5430 /* BaseXCTestCase.swift in Sources */, F372087D2BAB4C0F006B5430 /* TestConstants.swift in Sources */, + 566EB8112B3D85DE00FB7CAD /* CollaboraTestCase.swift in Sources */, 566EB7C62B3D59B900FB7CAD /* MoveAndCopyTests.swift in Sources */, F78E2D6C29AF02DB0024D4F3 /* Database.swift in Sources */, 566EB7E62B3D7AE900FB7CAD /* ScanTests.swift in Sources */, @@ -4558,6 +4584,7 @@ F755BD9B20594AC7008C5FBB /* NCService.swift in Sources */, F7E8A391295DC5E0006CB2D0 /* View+Extension.swift in Sources */, F79B869B265E19D40085C0E0 /* NSMutableAttributedString+Extension.swift in Sources */, + 566EB81A2B3D861500FB7CAD /* FolderPathCustomCell.swift in Sources */, F7B7504B2397D38F004E13EC /* UIImage+Extension.swift in Sources */, F7EFC0CD256BF8DD00461AAD /* NCUserStatus.swift in Sources */, AF3FDCC22796ECC300710F60 /* NCTrash+CollectionView.swift in Sources */, @@ -4608,6 +4635,7 @@ F7AEEAA82C11DBFD00011412 /* NCAccountSettingsModel.swift in Sources */, F749B64A297B0CBB00087535 /* NCManageDatabase+Share.swift in Sources */, F7C9555521F0C5470024296E /* NCActivity.swift in Sources */, + 566EB8182B3D861500FB7CAD /* NCCreateDocumentCustomTextField.swift in Sources */, F7725A60251F33BB00D125E0 /* NCFiles.swift in Sources */, F3BB46522A39EC4900461F6E /* NCMoreAppSuggestionsCell.swift in Sources */, F704B5E52430AA8000632F5F /* NCCreateFormUploadConflict.swift in Sources */, From 22360267ab42234a28f3435a137bc1a8e24b461f Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Thu, 28 Dec 2023 16:22:02 +0530 Subject: [PATCH 06/22] NMC 2015 - NMC 1937 E2EE configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 7b8492994d..7ea1f13c1d 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566EB81C2B3D889D00FB7CAD /* E2EETests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB81B2B3D889D00FB7CAD /* E2EETests.swift */; }; 566EB8112B3D85DE00FB7CAD /* CollaboraTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8102B3D85DE00FB7CAD /* CollaboraTestCase.swift */; }; 566EB8172B3D861500FB7CAD /* NCCreateDocumentCustomTextField.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB8132B3D861400FB7CAD /* NCCreateDocumentCustomTextField.xib */; }; 566EB8182B3D861500FB7CAD /* NCCreateDocumentCustomTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8142B3D861500FB7CAD /* NCCreateDocumentCustomTextField.swift */; }; @@ -1129,6 +1130,7 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566EB81B2B3D889D00FB7CAD /* E2EETests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = E2EETests.swift; sourceTree = ""; }; 566EB8102B3D85DE00FB7CAD /* CollaboraTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollaboraTestCase.swift; sourceTree = ""; }; 566EB8132B3D861400FB7CAD /* NCCreateDocumentCustomTextField.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCCreateDocumentCustomTextField.xib; sourceTree = ""; }; 566EB8142B3D861500FB7CAD /* NCCreateDocumentCustomTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCCreateDocumentCustomTextField.swift; sourceTree = ""; }; @@ -2042,6 +2044,7 @@ 566EB7C72B3D6FAB00FB7CAD /* SharingTest.swift */, 566EB80E2B3D833000FB7CAD /* AudioUploadTests.swift */, 566EB8102B3D85DE00FB7CAD /* CollaboraTestCase.swift */, + 566EB81B2B3D889D00FB7CAD /* E2EETests.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -4040,6 +4043,7 @@ 566EB8112B3D85DE00FB7CAD /* CollaboraTestCase.swift in Sources */, 566EB7C62B3D59B900FB7CAD /* MoveAndCopyTests.swift in Sources */, F78E2D6C29AF02DB0024D4F3 /* Database.swift in Sources */, + 566EB81C2B3D889D00FB7CAD /* E2EETests.swift in Sources */, 566EB7E62B3D7AE900FB7CAD /* ScanTests.swift in Sources */, F7817CFE29801A3500FFBC65 /* Data+Extension.swift in Sources */, 566EB80F2B3D833000FB7CAD /* AudioUploadTests.swift in Sources */, From 254787c6a792797887287e2c87cd8ae2911cccce Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:36:11 +0530 Subject: [PATCH 07/22] NMC 2015 - NMC 1990 Settings configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 49 +++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 7ea1f13c1d..02da7144e5 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,12 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566EB81E2B3D8C5500FB7CAD /* SettingsTestCases.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */; }; + 566EB8242B3D8CB300FB7CAD /* MagentaCloudVersionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB81F2B3D8CB300FB7CAD /* MagentaCloudVersionView.xib */; }; + 566EB8252B3D8CB300FB7CAD /* ImprintViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8202B3D8CB300FB7CAD /* ImprintViewController.swift */; }; + 566EB8262B3D8CB300FB7CAD /* HelpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8212B3D8CB300FB7CAD /* HelpViewController.swift */; }; + 566EB8272B3D8CB300FB7CAD /* MagentaCloudVersionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8222B3D8CB300FB7CAD /* MagentaCloudVersionView.swift */; }; + 566EB8282B3D8CB300FB7CAD /* OpenSourceSoftwareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8232B3D8CB300FB7CAD /* OpenSourceSoftwareViewController.swift */; }; 566EB81C2B3D889D00FB7CAD /* E2EETests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB81B2B3D889D00FB7CAD /* E2EETests.swift */; }; 566EB8112B3D85DE00FB7CAD /* CollaboraTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8102B3D85DE00FB7CAD /* CollaboraTestCase.swift */; }; 566EB8172B3D861500FB7CAD /* NCCreateDocumentCustomTextField.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB8132B3D861400FB7CAD /* NCCreateDocumentCustomTextField.xib */; }; @@ -862,6 +868,11 @@ F7CBC1242BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7CBC1212BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib */; }; F7CBC1252BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC1222BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift */; }; F7CBC1262BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC1222BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift */; }; + F7CBC1232BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7CBC1212BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib */; }; + F7CBC1242BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7CBC1212BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib */; }; + F7CBC1252BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC1222BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift */; }; + F7CBC1262BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC1222BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift */; }; + F7CBC31C24F78E79004D3812 /* NCSortMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC31B24F78E79004D3812 /* NCSortMenu.swift */; }; F7CEE6002BA9A5C9003EFD89 /* NCTrashGridCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7CEE5FE2BA9A5C9003EFD89 /* NCTrashGridCell.xib */; }; F7CEE6012BA9A5C9003EFD89 /* NCTrashGridCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CEE5FF2BA9A5C9003EFD89 /* NCTrashGridCell.swift */; }; F7D1612023CF19E30039EBBF /* NCViewerRichWorkspace.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7D1611F23CF19E30039EBBF /* NCViewerRichWorkspace.storyboard */; }; @@ -1130,6 +1141,12 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTestCases.swift; sourceTree = ""; }; + 566EB81F2B3D8CB300FB7CAD /* MagentaCloudVersionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MagentaCloudVersionView.xib; sourceTree = ""; }; + 566EB8202B3D8CB300FB7CAD /* ImprintViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImprintViewController.swift; sourceTree = ""; }; + 566EB8212B3D8CB300FB7CAD /* HelpViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelpViewController.swift; sourceTree = ""; }; + 566EB8222B3D8CB300FB7CAD /* MagentaCloudVersionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MagentaCloudVersionView.swift; sourceTree = ""; }; + 566EB8232B3D8CB300FB7CAD /* OpenSourceSoftwareViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenSourceSoftwareViewController.swift; sourceTree = ""; }; 566EB81B2B3D889D00FB7CAD /* E2EETests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = E2EETests.swift; sourceTree = ""; }; 566EB8102B3D85DE00FB7CAD /* CollaboraTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollaboraTestCase.swift; sourceTree = ""; }; 566EB8132B3D861400FB7CAD /* NCCreateDocumentCustomTextField.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCCreateDocumentCustomTextField.xib; sourceTree = ""; }; @@ -2045,6 +2062,7 @@ 566EB80E2B3D833000FB7CAD /* AudioUploadTests.swift */, 566EB8102B3D85DE00FB7CAD /* CollaboraTestCase.swift */, 566EB81B2B3D889D00FB7CAD /* E2EETests.swift */, + 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -2790,6 +2808,29 @@ isa = PBXGroup; children = ( F7A7FDDB2C2DBD6200E9A93A /* NCDeepLinkHandler.swift */, + 566EB8212B3D8CB300FB7CAD /* HelpViewController.swift */, + 566EB8202B3D8CB300FB7CAD /* ImprintViewController.swift */, + 566EB8222B3D8CB300FB7CAD /* MagentaCloudVersionView.swift */, + 566EB81F2B3D8CB300FB7CAD /* MagentaCloudVersionView.xib */, + 566EB8232B3D8CB300FB7CAD /* OpenSourceSoftwareViewController.swift */, + F7ACE4291BAC0268006C0017 /* Acknowledgements.h */, + F7ACE42A1BAC0268006C0017 /* Acknowledgements.m */, + F7ACE42B1BAC0268006C0017 /* Acknowledgements.rtf */, + F7A321AB1E9E6AD50069AD1B /* CCAdvanced.h */, + F7A321AC1E9E6AD50069AD1B /* CCAdvanced.m */, + F7ACE42C1BAC0268006C0017 /* CCManageAccount.h */, + F7ACE42D1BAC0268006C0017 /* CCManageAccount.m */, + F7ACE42E1BAC0268006C0017 /* CCManageAutoUpload.h */, + F7ACE42F1BAC0268006C0017 /* CCManageAutoUpload.m */, + F726EEEB1FED1C820030B9C8 /* NCEndToEndInitialize.swift */, + F760DE162AE66F350027D78A /* NCKeychain.swift */, + F75AC2421F1F62450073EC19 /* NCManageAutoUploadFileName.swift */, + F7A7FA6229265CF4000603EF /* NCManageE2EE.swift */, + F7ACE4301BAC0268006C0017 /* NCSettings.h */, + F7ACE4311BAC0268006C0017 /* NCSettings.m */, + F7CB689F254169530050EC94 /* NCSettings.storyboard */, + F77910AA25DD53C700CEDB9E /* NCSettingsBundleHelper.swift */, + F77910A425DD517B00CEDB9E /* Settings.bundle */, ); path = DeepLink; sourceTree = ""; @@ -3935,6 +3976,7 @@ F7B398422A6A91D5007538D6 /* NCSectionFirstHeader.xib in Resources */, F7501C322212E57500FB1415 /* NCMedia.storyboard in Resources */, F74DE14425135B6800917068 /* NCTransfers.storyboard in Resources */, + 566EB8242B3D8CB300FB7CAD /* MagentaCloudVersionView.xib in Resources */, F77910A525DD517B00CEDB9E /* Settings.bundle in Resources */, 566EB8012B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.xib in Resources */, F7CB68A0254169530050EC94 /* NCSettings.storyboard in Resources */, @@ -4043,6 +4085,7 @@ 566EB8112B3D85DE00FB7CAD /* CollaboraTestCase.swift in Sources */, 566EB7C62B3D59B900FB7CAD /* MoveAndCopyTests.swift in Sources */, F78E2D6C29AF02DB0024D4F3 /* Database.swift in Sources */, + 566EB81E2B3D8C5500FB7CAD /* SettingsTestCases.swift in Sources */, 566EB81C2B3D889D00FB7CAD /* E2EETests.swift in Sources */, 566EB7E62B3D7AE900FB7CAD /* ScanTests.swift in Sources */, F7817CFE29801A3500FFBC65 /* Data+Extension.swift in Sources */, @@ -4397,6 +4440,8 @@ F78C6FDE296D677300C952C3 /* NCContextMenu.swift in Sources */, F7E402332BA89551007E5609 /* NCTrash+Networking.swift in Sources */, F7E7AEA72BA32D0000512E52 /* NCCollectionViewUnifiedSearch.swift in Sources */, + F769CA172965AB7C00039397 /* NCUploadAssets.swift in Sources */, + 566EB8252B3D8CB300FB7CAD /* ImprintViewController.swift in Sources */, F73EF7A72B0223900087E6E9 /* NCManageDatabase+Comments.swift in Sources */, F799DF882C4B83CC003410B5 /* NCCollectionViewCommon+EasyTipView.swift in Sources */, F7AE00F8230E81CB007ACF8A /* NCBrowserWeb.swift in Sources */, @@ -4488,11 +4533,14 @@ 566EB8042B3D7B5F00FB7CAD /* ScanDocumentPathView.swift in Sources */, F72D1007210B6882009C96B7 /* NCPushNotificationEncryption.m in Sources */, F76882362C0DD1E7001CF441 /* NCAcknowledgementsView.swift in Sources */, + 566EB8272B3D8CB300FB7CAD /* MagentaCloudVersionView.swift in Sources */, 566EB80A2B3D7B5F00FB7CAD /* TextFileWithOcrSwitchView.swift in Sources */, F785EE9D246196DF00B3F945 /* NCNetworkingE2EE.swift in Sources */, F724377B2C10B83E00C7C68D /* NCPermissions.swift in Sources */, F794E13D2BBBFF2E003693D7 /* NCMainTabBarController.swift in Sources */, F7CBC1252BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift in Sources */, + F7CBC1252BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift in Sources */, + 566EB8262B3D8CB300FB7CAD /* HelpViewController.swift in Sources */, F75C0C4823D1FAE300163CC8 /* NCRichWorkspaceCommon.swift in Sources */, F78ACD4A21903F850088454D /* NCTrashListCell.swift in Sources */, F76882352C0DD1E7001CF441 /* NCWebBrowserView.swift in Sources */, @@ -4592,6 +4640,7 @@ F7B7504B2397D38F004E13EC /* UIImage+Extension.swift in Sources */, F7EFC0CD256BF8DD00461AAD /* NCUserStatus.swift in Sources */, AF3FDCC22796ECC300710F60 /* NCTrash+CollectionView.swift in Sources */, + 566EB8282B3D8CB300FB7CAD /* OpenSourceSoftwareViewController.swift in Sources */, F70D7C3725FFBF82002B9E34 /* NCCollectionViewCommon.swift in Sources */, F76D364628A4F8BF00214537 /* NCActivityIndicator.swift in Sources */, F3A047992BD2668800658E7B /* NCAssistantTask.swift in Sources */, From 7aa55b9e4f572e4d145434ae9470ea857033ea3e Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:49:09 +0530 Subject: [PATCH 08/22] NMC 2015 - NMC 2237 More configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 02da7144e5..da7bea10bc 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566EB82A2B3D9CF600FB7CAD /* MoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8292B3D9CF600FB7CAD /* MoreTests.swift */; }; 566EB81E2B3D8C5500FB7CAD /* SettingsTestCases.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */; }; 566EB8242B3D8CB300FB7CAD /* MagentaCloudVersionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB81F2B3D8CB300FB7CAD /* MagentaCloudVersionView.xib */; }; 566EB8252B3D8CB300FB7CAD /* ImprintViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8202B3D8CB300FB7CAD /* ImprintViewController.swift */; }; @@ -1141,6 +1142,7 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566EB8292B3D9CF600FB7CAD /* MoreTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoreTests.swift; sourceTree = ""; }; 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTestCases.swift; sourceTree = ""; }; 566EB81F2B3D8CB300FB7CAD /* MagentaCloudVersionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MagentaCloudVersionView.xib; sourceTree = ""; }; 566EB8202B3D8CB300FB7CAD /* ImprintViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImprintViewController.swift; sourceTree = ""; }; @@ -2063,6 +2065,7 @@ 566EB8102B3D85DE00FB7CAD /* CollaboraTestCase.swift */, 566EB81B2B3D889D00FB7CAD /* E2EETests.swift */, 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */, + 566EB8292B3D9CF600FB7CAD /* MoreTests.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -4079,6 +4082,7 @@ buildActionMask = 2147483647; files = ( 566EB7C82B3D6FAB00FB7CAD /* SharingTest.swift in Sources */, + 566EB82A2B3D9CF600FB7CAD /* MoreTests.swift in Sources */, AF8ED1FC2757821000B8DBC4 /* NextcloudUnitTests.swift in Sources */, F37208792BAB4C09006B5430 /* BaseXCTestCase.swift in Sources */, F372087D2BAB4C0F006B5430 /* TestConstants.swift in Sources */, From e67be155351ee8e33dae253f9535e24e6f63c6f9 Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:56:59 +0530 Subject: [PATCH 09/22] NMC 2015 - NMC 2248 Image video upload configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index da7bea10bc..726f75bfbd 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566EB82C2B3DA07700FB7CAD /* AssetUploadTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB82B2B3DA07700FB7CAD /* AssetUploadTest.swift */; }; 566EB82A2B3D9CF600FB7CAD /* MoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8292B3D9CF600FB7CAD /* MoreTests.swift */; }; 566EB81E2B3D8C5500FB7CAD /* SettingsTestCases.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */; }; 566EB8242B3D8CB300FB7CAD /* MagentaCloudVersionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566EB81F2B3D8CB300FB7CAD /* MagentaCloudVersionView.xib */; }; @@ -1142,6 +1143,7 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566EB82B2B3DA07700FB7CAD /* AssetUploadTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssetUploadTest.swift; sourceTree = ""; }; 566EB8292B3D9CF600FB7CAD /* MoreTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoreTests.swift; sourceTree = ""; }; 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTestCases.swift; sourceTree = ""; }; 566EB81F2B3D8CB300FB7CAD /* MagentaCloudVersionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MagentaCloudVersionView.xib; sourceTree = ""; }; @@ -2066,6 +2068,7 @@ 566EB81B2B3D889D00FB7CAD /* E2EETests.swift */, 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */, 566EB8292B3D9CF600FB7CAD /* MoreTests.swift */, + 566EB82B2B3DA07700FB7CAD /* AssetUploadTest.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -4086,6 +4089,7 @@ AF8ED1FC2757821000B8DBC4 /* NextcloudUnitTests.swift in Sources */, F37208792BAB4C09006B5430 /* BaseXCTestCase.swift in Sources */, F372087D2BAB4C0F006B5430 /* TestConstants.swift in Sources */, + 566EB82C2B3DA07700FB7CAD /* AssetUploadTest.swift in Sources */, 566EB8112B3D85DE00FB7CAD /* CollaboraTestCase.swift in Sources */, 566EB7C62B3D59B900FB7CAD /* MoveAndCopyTests.swift in Sources */, F78E2D6C29AF02DB0024D4F3 /* Database.swift in Sources */, From 4fedc627f8ee5499141c5a1b72f23b9e5bab17d9 Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Fri, 29 Dec 2023 13:19:11 +0530 Subject: [PATCH 10/22] NMC 2015 - NMC 2261 Audio upload configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 726f75bfbd..a15fa112d2 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,10 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566FCF282B3EAD0E00168DEA /* FolderPathCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF262B3EAD0E00168DEA /* FolderPathCustomCell.swift */; }; + 566FCF292B3EAD0E00168DEA /* FolderPathCustomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF272B3EAD0E00168DEA /* FolderPathCustomCell.xib */; }; + 566FCF2C2B3EAD4700168DEA /* TextTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF2A2B3EAD4700168DEA /* TextTableViewCell.swift */; }; + 566FCF2D2B3EAD4700168DEA /* TextTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF2B2B3EAD4700168DEA /* TextTableViewCell.xib */; }; 566EB82C2B3DA07700FB7CAD /* AssetUploadTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB82B2B3DA07700FB7CAD /* AssetUploadTest.swift */; }; 566EB82A2B3D9CF600FB7CAD /* MoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB8292B3D9CF600FB7CAD /* MoreTests.swift */; }; 566EB81E2B3D8C5500FB7CAD /* SettingsTestCases.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */; }; @@ -863,7 +867,8 @@ F7C9B9212B582F550064EA91 /* NCManageDatabase+SecurityGuard.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C9B91C2B582F550064EA91 /* NCManageDatabase+SecurityGuard.swift */; }; F7C9B9222B582F550064EA91 /* NCManageDatabase+SecurityGuard.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C9B91C2B582F550064EA91 /* NCManageDatabase+SecurityGuard.swift */; }; F7C9B9232B582F550064EA91 /* NCManageDatabase+SecurityGuard.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C9B91C2B582F550064EA91 /* NCManageDatabase+SecurityGuard.swift */; }; - F7CA212D25F1333300826ABB /* NCAccountRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CA212B25F1333200826ABB /* NCAccountRequest.swift */; }; + F7CA212D25F1333300826ABB /* + ces */ = {isa = PBXBuildFile; fileRef = F7CA212B25F1333200826ABB /* NCAccountRequest.swift */; }; F7CA212E25F1333300826ABB /* NCAccountRequest.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7CA212C25F1333200826ABB /* NCAccountRequest.storyboard */; }; F7CB689A2541676B0050EC94 /* NCMore.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7CB68992541676B0050EC94 /* NCMore.storyboard */; }; F7CBC1232BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7CBC1212BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib */; }; @@ -1143,6 +1148,10 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566FCF262B3EAD0E00168DEA /* FolderPathCustomCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FolderPathCustomCell.swift; sourceTree = ""; }; + 566FCF272B3EAD0E00168DEA /* FolderPathCustomCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FolderPathCustomCell.xib; sourceTree = ""; }; + 566FCF2A2B3EAD4700168DEA /* TextTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextTableViewCell.swift; sourceTree = ""; }; + 566FCF2B2B3EAD4700168DEA /* TextTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TextTableViewCell.xib; sourceTree = ""; }; 566EB82B2B3DA07700FB7CAD /* AssetUploadTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssetUploadTest.swift; sourceTree = ""; }; 566EB8292B3D9CF600FB7CAD /* MoreTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoreTests.swift; sourceTree = ""; }; 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTestCases.swift; sourceTree = ""; }; @@ -3031,6 +3040,11 @@ children = ( F7FA7FFD2C0F4F3B0072FC60 /* Upload Assets */, F7A509242C26BD5D00326106 /* NCCreateDocument.swift */, + 566FCF2A2B3EAD4700168DEA /* TextTableViewCell.swift */, + 566FCF2B2B3EAD4700168DEA /* TextTableViewCell.xib */, + 566FCF262B3EAD0E00168DEA /* FolderPathCustomCell.swift */, + 566FCF272B3EAD0E00168DEA /* FolderPathCustomCell.xib */, + F769CA162965AB7C00039397 /* NCUploadAssets.swift */, F704B5E22430AA6F00632F5F /* NCCreateFormUploadConflict.storyboard */, F704B5E42430AA8000632F5F /* NCCreateFormUploadConflict.swift */, F704B5E82430C0B800632F5F /* NCCreateFormUploadConflictCell.swift */, @@ -3923,6 +3937,7 @@ F7CEE6002BA9A5C9003EFD89 /* NCTrashGridCell.xib in Resources */, 3704EB2A23D5A58400455C5B /* NCMenu.storyboard in Resources */, AF93471C27E2361E002537EE /* NCShareHeader.xib in Resources */, + 566FCF292B3EAD0E00168DEA /* FolderPathCustomCell.xib in Resources */, AF93471C27E2361E002537EE /* NCShareAdvancePermissionHeader.xib in Resources */, F7F1E54C2492369A00E42386 /* NCMediaCommandView.xib in Resources */, 566EB8072B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.xib in Resources */, @@ -3969,6 +3984,7 @@ F73B422B2476764F00A30FD3 /* NCNotification.storyboard in Resources */, 566EB8192B3D861500FB7CAD /* FolderPathCustomCell.xib in Resources */, F7FF2CB12842159500EBB7A1 /* NCSectionHeader.xib in Resources */, + 566FCF2D2B3EAD4700168DEA /* TextTableViewCell.xib in Resources */, F7D1612023CF19E30039EBBF /* NCViewerRichWorkspace.storyboard in Resources */, F77B0F631D118A16002130FE /* Localizable.strings in Resources */, 566EB80D2B3D7B5F00FB7CAD /* PdfWithoutOcrSwitchView.xib in Resources */, @@ -4553,6 +4569,8 @@ F78ACD4A21903F850088454D /* NCTrashListCell.swift in Sources */, F76882352C0DD1E7001CF441 /* NCWebBrowserView.swift in Sources */, F3A047972BD2668800658E7B /* NCAssistantEmptyView.swift in Sources */, + 566FCF2C2B3EAD4700168DEA /* TextTableViewCell.swift in Sources */, + F78ACD4A21903F850088454D /* NCTrashListCell+NCTrashCellProtocol.swift in Sources */, F757CC8D29E82D0500F31428 /* NCGroupfolders.swift in Sources */, F760329F252F0F8E0015A421 /* NCTransferCell.swift in Sources */, F3BB46542A3A1E9D00461F6E /* CCCellMore.swift in Sources */, @@ -4581,6 +4599,7 @@ F73EF7BF2B02250B0087E6E9 /* NCManageDatabase+GPS.swift in Sources */, F71F6D072B6A6A5E00F1EB15 /* ThreadSafeArray.swift in Sources */, F761856C29E98543006EB3B0 /* NCIntroCollectionViewCell.swift in Sources */, + 566FCF282B3EAD0E00168DEA /* FolderPathCustomCell.swift in Sources */, F75DD765290ABB25002EB562 /* Intent.intentdefinition in Sources */, F74B6D952A7E239A00F03C5F /* NCManageDatabase+Chunk.swift in Sources */, F310B1EF2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift in Sources */, From b46c9847a7eda347b39d456a624103e58c12f48f Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Fri, 29 Dec 2023 13:28:59 +0530 Subject: [PATCH 11/22] NMC 2015 - NMC 1935 Notification configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index a15fa112d2..1a3726d5f2 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566FCF2F2B3EB28D00168DEA /* NCNotificationText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF2E2B3EB28D00168DEA /* NCNotificationText.swift */; }; 566FCF282B3EAD0E00168DEA /* FolderPathCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF262B3EAD0E00168DEA /* FolderPathCustomCell.swift */; }; 566FCF292B3EAD0E00168DEA /* FolderPathCustomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF272B3EAD0E00168DEA /* FolderPathCustomCell.xib */; }; 566FCF2C2B3EAD4700168DEA /* TextTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF2A2B3EAD4700168DEA /* TextTableViewCell.swift */; }; @@ -1148,6 +1149,7 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566FCF2E2B3EB28D00168DEA /* NCNotificationText.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCNotificationText.swift; sourceTree = ""; }; 566FCF262B3EAD0E00168DEA /* FolderPathCustomCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FolderPathCustomCell.swift; sourceTree = ""; }; 566FCF272B3EAD0E00168DEA /* FolderPathCustomCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FolderPathCustomCell.xib; sourceTree = ""; }; 566FCF2A2B3EAD4700168DEA /* TextTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextTableViewCell.swift; sourceTree = ""; }; @@ -2078,6 +2080,7 @@ 566EB81D2B3D8C5400FB7CAD /* SettingsTestCases.swift */, 566EB8292B3D9CF600FB7CAD /* MoreTests.swift */, 566EB82B2B3DA07700FB7CAD /* AssetUploadTest.swift */, + 566FCF2E2B3EB28D00168DEA /* NCNotificationText.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -4102,6 +4105,7 @@ files = ( 566EB7C82B3D6FAB00FB7CAD /* SharingTest.swift in Sources */, 566EB82A2B3D9CF600FB7CAD /* MoreTests.swift in Sources */, + 566FCF2F2B3EB28D00168DEA /* NCNotificationText.swift in Sources */, AF8ED1FC2757821000B8DBC4 /* NextcloudUnitTests.swift in Sources */, F37208792BAB4C09006B5430 /* BaseXCTestCase.swift in Sources */, F372087D2BAB4C0F006B5430 /* TestConstants.swift in Sources */, From 10c26339352f20c57b247dbb2fdb512e275c673e Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Fri, 29 Dec 2023 13:39:58 +0530 Subject: [PATCH 12/22] NMC 2015 - NMC 1984 Privacy policy configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 44 +++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 1a3726d5f2..5197bd7cb1 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,16 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566FCF312B3EB48A00168DEA /* PrivacyPolicyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF302B3EB48A00168DEA /* PrivacyPolicyTest.swift */; }; + 566FCF432B3EB4E800168DEA /* AnalysisDataCollectionSwitch.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF3A2B3EB4E700168DEA /* AnalysisDataCollectionSwitch.xib */; }; + 566FCF442B3EB4E800168DEA /* PrivacyPolicyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF3B2B3EB4E700168DEA /* PrivacyPolicyViewController.swift */; }; + 566FCF452B3EB4E800168DEA /* InitialPrivacySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF3C2B3EB4E700168DEA /* InitialPrivacySettingsViewController.swift */; }; + 566FCF462B3EB4E800168DEA /* AnalysisDataCollectionSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF3D2B3EB4E700168DEA /* AnalysisDataCollectionSwitch.swift */; }; + 566FCF472B3EB4E800168DEA /* PrivacySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF3E2B3EB4E800168DEA /* PrivacySettingsViewController.swift */; }; + 566FCF482B3EB4E800168DEA /* RequiredDataCollectionSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF3F2B3EB4E800168DEA /* RequiredDataCollectionSwitch.swift */; }; + 566FCF492B3EB4E800168DEA /* RequiredDataCollectionSwitch.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF402B3EB4E800168DEA /* RequiredDataCollectionSwitch.xib */; }; + 566FCF4A2B3EB4E800168DEA /* SaveSettingsCustomButtonCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF412B3EB4E800168DEA /* SaveSettingsCustomButtonCell.swift */; }; + 566FCF4B2B3EB4E800168DEA /* SaveSettingsCustomButtonCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF422B3EB4E800168DEA /* SaveSettingsCustomButtonCell.xib */; }; 566FCF2F2B3EB28D00168DEA /* NCNotificationText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF2E2B3EB28D00168DEA /* NCNotificationText.swift */; }; 566FCF282B3EAD0E00168DEA /* FolderPathCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF262B3EAD0E00168DEA /* FolderPathCustomCell.swift */; }; 566FCF292B3EAD0E00168DEA /* FolderPathCustomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF272B3EAD0E00168DEA /* FolderPathCustomCell.xib */; }; @@ -1149,6 +1159,16 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566FCF302B3EB48A00168DEA /* PrivacyPolicyTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrivacyPolicyTest.swift; sourceTree = ""; }; + 566FCF3A2B3EB4E700168DEA /* AnalysisDataCollectionSwitch.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AnalysisDataCollectionSwitch.xib; sourceTree = ""; }; + 566FCF3B2B3EB4E700168DEA /* PrivacyPolicyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrivacyPolicyViewController.swift; sourceTree = ""; }; + 566FCF3C2B3EB4E700168DEA /* InitialPrivacySettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InitialPrivacySettingsViewController.swift; sourceTree = ""; }; + 566FCF3D2B3EB4E700168DEA /* AnalysisDataCollectionSwitch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnalysisDataCollectionSwitch.swift; sourceTree = ""; }; + 566FCF3E2B3EB4E800168DEA /* PrivacySettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrivacySettingsViewController.swift; sourceTree = ""; }; + 566FCF3F2B3EB4E800168DEA /* RequiredDataCollectionSwitch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequiredDataCollectionSwitch.swift; sourceTree = ""; }; + 566FCF402B3EB4E800168DEA /* RequiredDataCollectionSwitch.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RequiredDataCollectionSwitch.xib; sourceTree = ""; }; + 566FCF412B3EB4E800168DEA /* SaveSettingsCustomButtonCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SaveSettingsCustomButtonCell.swift; sourceTree = ""; }; + 566FCF422B3EB4E800168DEA /* SaveSettingsCustomButtonCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SaveSettingsCustomButtonCell.xib; sourceTree = ""; }; 566FCF2E2B3EB28D00168DEA /* NCNotificationText.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCNotificationText.swift; sourceTree = ""; }; 566FCF262B3EAD0E00168DEA /* FolderPathCustomCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FolderPathCustomCell.swift; sourceTree = ""; }; 566FCF272B3EAD0E00168DEA /* FolderPathCustomCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FolderPathCustomCell.xib; sourceTree = ""; }; @@ -2081,6 +2101,7 @@ 566EB8292B3D9CF600FB7CAD /* MoreTests.swift */, 566EB82B2B3DA07700FB7CAD /* AssetUploadTest.swift */, 566FCF2E2B3EB28D00168DEA /* NCNotificationText.swift */, + 566FCF302B3EB48A00168DEA /* PrivacyPolicyTest.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -2831,6 +2852,15 @@ 566EB8222B3D8CB300FB7CAD /* MagentaCloudVersionView.swift */, 566EB81F2B3D8CB300FB7CAD /* MagentaCloudVersionView.xib */, 566EB8232B3D8CB300FB7CAD /* OpenSourceSoftwareViewController.swift */, + 566FCF3D2B3EB4E700168DEA /* AnalysisDataCollectionSwitch.swift */, + 566FCF3A2B3EB4E700168DEA /* AnalysisDataCollectionSwitch.xib */, + 566FCF3C2B3EB4E700168DEA /* InitialPrivacySettingsViewController.swift */, + 566FCF3B2B3EB4E700168DEA /* PrivacyPolicyViewController.swift */, + 566FCF3E2B3EB4E800168DEA /* PrivacySettingsViewController.swift */, + 566FCF3F2B3EB4E800168DEA /* RequiredDataCollectionSwitch.swift */, + 566FCF402B3EB4E800168DEA /* RequiredDataCollectionSwitch.xib */, + 566FCF412B3EB4E800168DEA /* SaveSettingsCustomButtonCell.swift */, + 566FCF422B3EB4E800168DEA /* SaveSettingsCustomButtonCell.xib */, F7ACE4291BAC0268006C0017 /* Acknowledgements.h */, F7ACE42A1BAC0268006C0017 /* Acknowledgements.m */, F7ACE42B1BAC0268006C0017 /* Acknowledgements.rtf */, @@ -3924,6 +3954,8 @@ F723985C253C95CE00257F49 /* NCViewerRichdocument.storyboard in Resources */, F758B45A212C564000515F55 /* NCScan.storyboard in Resources */, F70D87CF25EE6E58008CBBBD /* NCRenameFile.storyboard in Resources */, + F33AAF9A2A60394C006ECCBD /* NCMoreUserCell.xib in Resources */, + 566FCF432B3EB4E800168DEA /* AnalysisDataCollectionSwitch.xib in Resources */, F765F73225237E3F00391DBE /* NCRecent.storyboard in Resources */, F78F74342163757000C2ADAD /* NCTrash.storyboard in Resources */, F702F30225EE5D2C008F8E80 /* english.txt in Resources */, @@ -3971,6 +4003,8 @@ F7AC934A296193050002BC0F /* Reasons to use Nextcloud.pdf in Resources */, F7A60F87292D215000FCE1F2 /* NCShareAccounts.storyboard in Resources */, F761856A29E98543006EB3B0 /* NCIntro.storyboard in Resources */, + F747BA1F22354D2000971601 /* NCCreateFormUploadVoiceNote.storyboard in Resources */, + 566FCF492B3EB4E800168DEA /* RequiredDataCollectionSwitch.xib in Resources */, F719D9E0288D37A300762E33 /* NCColorPicker.storyboard in Resources */, F7F4F10A27ECDBDB008676F9 /* Inconsolata-ExtraBold.ttf in Resources */, F704B5E72430C06700632F5F /* NCCreateFormUploadConflictCell.xib in Resources */, @@ -3984,6 +4018,7 @@ F732D23327CF8AED000B0F1B /* NCPlayerToolBar.xib in Resources */, F73D11FA253C5F4800DF9BEC /* NCViewerNextcloudText.storyboard in Resources */, F7EDE51B262DD0C400414FE6 /* NCSelectCommandViewCopyMove.xib in Resources */, + 566FCF4B2B3EB4E800168DEA /* SaveSettingsCustomButtonCell.xib in Resources */, F73B422B2476764F00A30FD3 /* NCNotification.storyboard in Resources */, 566EB8192B3D861500FB7CAD /* FolderPathCustomCell.xib in Resources */, F7FF2CB12842159500EBB7A1 /* NCSectionHeader.xib in Resources */, @@ -4106,6 +4141,7 @@ 566EB7C82B3D6FAB00FB7CAD /* SharingTest.swift in Sources */, 566EB82A2B3D9CF600FB7CAD /* MoreTests.swift in Sources */, 566FCF2F2B3EB28D00168DEA /* NCNotificationText.swift in Sources */, + 566FCF312B3EB48A00168DEA /* PrivacyPolicyTest.swift in Sources */, AF8ED1FC2757821000B8DBC4 /* NextcloudUnitTests.swift in Sources */, F37208792BAB4C09006B5430 /* BaseXCTestCase.swift in Sources */, F372087D2BAB4C0F006B5430 /* TestConstants.swift in Sources */, @@ -4502,6 +4538,7 @@ F76D3CF12428B40E005DFA87 /* NCViewerPDFSearch.swift in Sources */, F7245924289BB50C00474787 /* ThreadSafeDictionary.swift in Sources */, F73F537F1E929C8500F8678D /* NCMore.swift in Sources */, + 566FCF462B3EB4E800168DEA /* AnalysisDataCollectionSwitch.swift in Sources */, F702F2CF25EE5B5C008F8E80 /* NCGlobal.swift in Sources */, F794E13F2BBC0F70003693D7 /* SceneDelegate.swift in Sources */, F72CD63A25C19EBF00F46F9A /* NCAutoUpload.swift in Sources */, @@ -4534,6 +4571,7 @@ F73EF7E72B0226B90087E6E9 /* NCManageDatabase+UserStatus.swift in Sources */, F78A18B623CDD07D00F681F3 /* NCViewerRichWorkspaceWebView.swift in Sources */, AFA2AC8527849604008E1EA7 /* NCActivityCommentView.swift in Sources */, + 566FCF472B3EB4E800168DEA /* PrivacySettingsViewController.swift in Sources */, AFCE353727E4ED7B00FEA6C2 /* NCShareCells.swift in Sources */, AF36077127BFA4E8001A243D /* ParallelWorker.swift in Sources */, F75A9EE623796C6F0044CFCE /* NCNetworking.swift in Sources */, @@ -4550,6 +4588,7 @@ AF7E504E27A2D8FF00B5E4AF /* UIBarButton+Extension.swift in Sources */, F7A846DE2BB01ACB0024816F /* NCTrashCellProtocol.swift in Sources */, F799DF852C4B7E56003410B5 /* NCSectionHeader.swift in Sources */, + 566FCF442B3EB4E800168DEA /* PrivacyPolicyViewController.swift in Sources */, F78A10BF29322E8A008499B8 /* NCManageDatabase+Directory.swift in Sources */, F7743A122C33F0A20034F670 /* NCCollectionViewCommon+CollectionViewDelegate.swift in Sources */, F704B5E92430C0B800632F5F /* NCCreateFormUploadConflictCell.swift in Sources */, @@ -4578,6 +4617,7 @@ F757CC8D29E82D0500F31428 /* NCGroupfolders.swift in Sources */, F760329F252F0F8E0015A421 /* NCTransferCell.swift in Sources */, F3BB46542A3A1E9D00461F6E /* CCCellMore.swift in Sources */, + 566FCF4A2B3EB4E800168DEA /* SaveSettingsCustomButtonCell.swift in Sources */, AF68326A27BE65A90010BF0B /* NCMenuAction.swift in Sources */, F7682FE023C36B0500983A04 /* NCMainTabBar.swift in Sources */, F7A0D1352591FBC5008F8A13 /* String+Extension.swift in Sources */, @@ -4597,6 +4637,8 @@ F73EF7C72B0225610087E6E9 /* NCManageDatabase+PhotoLibrary.swift in Sources */, F7E41316294A19B300839300 /* UIView+Extension.swift in Sources */, F7C30E00291BD2610017149B /* NCNetworkingE2EERename.swift in Sources */, + F7651A8B23A2A3F2001403D2 /* NCCreateFormUploadDocuments.swift in Sources */, + 566FCF452B3EB4E800168DEA /* InitialPrivacySettingsViewController.swift in Sources */, F74AF3A4247FB6AE00AC767B /* NCUtilityFileSystem.swift in Sources */, AFCE353327E4ED1900FEA6C2 /* UIToolbar+Extension.swift in Sources */, 8491B1CD273BBA82001C8C5B /* UIViewController+Menu.swift in Sources */, @@ -4743,6 +4785,8 @@ F78B87E72B62527100C65ADC /* NCMediaDataSource.swift in Sources */, F76882272C0DD1E7001CF441 /* NCManageE2EEView.swift in Sources */, F7864ACC2A78FE73004870E0 /* NCManageDatabase+LocalFile.swift in Sources */, + 566FCF482B3EB4E800168DEA /* RequiredDataCollectionSwitch.swift in Sources */, + F7F4F11027ECDC4A008676F9 /* UIDevice+Extension.swift in Sources */, F7327E302B73A86700A462C7 /* NCNetworking+WebDAV.swift in Sources */, F79FFB262A97C24A0055EEA4 /* NCNetworkingE2EEMarkFolder.swift in Sources */, F70D8D8124A4A9BF000A5756 /* NCNetworkingProcess.swift in Sources */, From 4a735df532b311b9cb4263c7f097168632c8e65a Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Fri, 29 Dec 2023 13:53:43 +0530 Subject: [PATCH 13/22] NMC 2015 - NMC 1971 Onboarding configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 5197bd7cb1..0d49f1a998 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,8 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566FCF4D2B3EB78F00168DEA /* OnboardingTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF4C2B3EB78F00168DEA /* OnboardingTestCase.swift */; }; + 566FCF4F2B3EB84F00168DEA /* AppUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF4E2B3EB84F00168DEA /* AppUtility.swift */; }; 566FCF312B3EB48A00168DEA /* PrivacyPolicyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF302B3EB48A00168DEA /* PrivacyPolicyTest.swift */; }; 566FCF432B3EB4E800168DEA /* AnalysisDataCollectionSwitch.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF3A2B3EB4E700168DEA /* AnalysisDataCollectionSwitch.xib */; }; 566FCF442B3EB4E800168DEA /* PrivacyPolicyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF3B2B3EB4E700168DEA /* PrivacyPolicyViewController.swift */; }; @@ -1159,6 +1161,8 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566FCF4C2B3EB78F00168DEA /* OnboardingTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingTestCase.swift; sourceTree = ""; }; + 566FCF4E2B3EB84F00168DEA /* AppUtility.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppUtility.swift; sourceTree = ""; }; 566FCF302B3EB48A00168DEA /* PrivacyPolicyTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrivacyPolicyTest.swift; sourceTree = ""; }; 566FCF3A2B3EB4E700168DEA /* AnalysisDataCollectionSwitch.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AnalysisDataCollectionSwitch.xib; sourceTree = ""; }; 566FCF3B2B3EB4E700168DEA /* PrivacyPolicyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrivacyPolicyViewController.swift; sourceTree = ""; }; @@ -2102,6 +2106,7 @@ 566EB82B2B3DA07700FB7CAD /* AssetUploadTest.swift */, 566FCF2E2B3EB28D00168DEA /* NCNotificationText.swift */, 566FCF302B3EB48A00168DEA /* PrivacyPolicyTest.swift */, + 566FCF4C2B3EB78F00168DEA /* OnboardingTestCase.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -3181,6 +3186,7 @@ isa = PBXGroup; children = ( 566EB8122B3D861400FB7CAD /* NMC Custom Views */, + 566FCF4E2B3EB84F00168DEA /* AppUtility.swift */, F702F2CC25EE5B4F008F8E80 /* AppDelegate.swift */, F794E13E2BBC0F70003693D7 /* SceneDelegate.swift */, F76B649B2ADFFAED00014640 /* NCImageCache.swift */, @@ -4149,6 +4155,7 @@ 566EB8112B3D85DE00FB7CAD /* CollaboraTestCase.swift in Sources */, 566EB7C62B3D59B900FB7CAD /* MoveAndCopyTests.swift in Sources */, F78E2D6C29AF02DB0024D4F3 /* Database.swift in Sources */, + 566FCF4D2B3EB78F00168DEA /* OnboardingTestCase.swift in Sources */, 566EB81E2B3D8C5500FB7CAD /* SettingsTestCases.swift in Sources */, 566EB81C2B3D889D00FB7CAD /* E2EETests.swift in Sources */, 566EB7E62B3D7AE900FB7CAD /* ScanTests.swift in Sources */, @@ -4768,6 +4775,7 @@ F765608F23BF813600765969 /* NCContentPresenter.swift in Sources */, F7327E352B73AEDE00A462C7 /* NCNetworking+LivePhoto.swift in Sources */, F76687072B7D067400779E3F /* NCAudioRecorderViewController.swift in Sources */, + 566FCF4F2B3EB84F00168DEA /* AppUtility.swift in Sources */, F343A4BB2A1E734600DDA874 /* Optional+Extension.swift in Sources */, F76882232C0DD1E7001CF441 /* NCCapabilitiesModel.swift in Sources */, F7D68FCC28CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift in Sources */, From 3e0d3e50877e32a93e4d2c6f6cb2d7759cedba6a Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Fri, 29 Dec 2023 14:06:24 +0530 Subject: [PATCH 14/22] NMC 2015 - NMC Trash view configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 0d49f1a998..65b4097d5b 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,8 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566FCF522B3EBADE00168DEA /* NCTrashGridCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF502B3EBADE00168DEA /* NCTrashGridCell.swift */; }; + 566FCF532B3EBADE00168DEA /* NCTrashGridCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF512B3EBADE00168DEA /* NCTrashGridCell.xib */; }; 566FCF4D2B3EB78F00168DEA /* OnboardingTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF4C2B3EB78F00168DEA /* OnboardingTestCase.swift */; }; 566FCF4F2B3EB84F00168DEA /* AppUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF4E2B3EB84F00168DEA /* AppUtility.swift */; }; 566FCF312B3EB48A00168DEA /* PrivacyPolicyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF302B3EB48A00168DEA /* PrivacyPolicyTest.swift */; }; @@ -893,8 +895,6 @@ F7CBC1252BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC1222BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift */; }; F7CBC1262BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC1222BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift */; }; F7CBC31C24F78E79004D3812 /* NCSortMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC31B24F78E79004D3812 /* NCSortMenu.swift */; }; - F7CEE6002BA9A5C9003EFD89 /* NCTrashGridCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7CEE5FE2BA9A5C9003EFD89 /* NCTrashGridCell.xib */; }; - F7CEE6012BA9A5C9003EFD89 /* NCTrashGridCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CEE5FF2BA9A5C9003EFD89 /* NCTrashGridCell.swift */; }; F7D1612023CF19E30039EBBF /* NCViewerRichWorkspace.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7D1611F23CF19E30039EBBF /* NCViewerRichWorkspace.storyboard */; }; F7D56B1A2972405500FA46C4 /* Mantis in Frameworks */ = {isa = PBXBuildFile; productRef = F7D56B192972405500FA46C4 /* Mantis */; }; F7D57C8626317BDA00DE301D /* NCAccountRequest.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7CA212C25F1333200826ABB /* NCAccountRequest.storyboard */; }; @@ -1161,6 +1161,8 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566FCF502B3EBADE00168DEA /* NCTrashGridCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCTrashGridCell.swift; sourceTree = ""; }; + 566FCF512B3EBADE00168DEA /* NCTrashGridCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCTrashGridCell.xib; sourceTree = ""; }; 566FCF4C2B3EB78F00168DEA /* OnboardingTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingTestCase.swift; sourceTree = ""; }; 566FCF4E2B3EB84F00168DEA /* AppUtility.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppUtility.swift; sourceTree = ""; }; 566FCF302B3EB48A00168DEA /* PrivacyPolicyTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrivacyPolicyTest.swift; sourceTree = ""; }; @@ -1796,8 +1798,6 @@ F7CC04E61F5AD50D00378CEF /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; F7CE8AFA1DC1F8D8009CAE48 /* Nextcloud.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Nextcloud.app; sourceTree = BUILT_PRODUCTS_DIR; }; F7CE8AFB1DC1F8D8009CAE48 /* Share.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Share.appex; sourceTree = BUILT_PRODUCTS_DIR; }; - F7CEE5FE2BA9A5C9003EFD89 /* NCTrashGridCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCTrashGridCell.xib; sourceTree = ""; }; - F7CEE5FF2BA9A5C9003EFD89 /* NCTrashGridCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCTrashGridCell.swift; sourceTree = ""; }; F7CF16A22A4D7C7A000FF107 /* NCMoreUserCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCMoreUserCell.xib; sourceTree = ""; }; F7D1611F23CF19E30039EBBF /* NCViewerRichWorkspace.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCViewerRichWorkspace.storyboard; sourceTree = ""; }; F7D2C772246470CA008513AE /* XLForm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XLForm.framework; path = Carthage/Build/iOS/XLForm.framework; sourceTree = ""; }; @@ -2704,6 +2704,7 @@ F7CEE5FF2BA9A5C9003EFD89 /* NCTrashGridCell.swift */, F7CEE5FE2BA9A5C9003EFD89 /* NCTrashGridCell.xib */, F78ACD4821903F850088454D /* NCTrashListCell.swift */, + F78ACD4821903F850088454D /* NCTrashListCell+NCTrashCellProtocol.swift */, F78ACD4921903F850088454D /* NCTrashListCell.xib */, ); path = Cell; @@ -3945,6 +3946,7 @@ F3BB464D2A39ADCC00461F6E /* NCMoreAppSuggestionsCell.xib in Resources */, 566EB8172B3D861500FB7CAD /* NCCreateDocumentCustomTextField.xib in Resources */, F7F4F10727ECDBDB008676F9 /* Inconsolata-Black.ttf in Resources */, + 566FCF532B3EBADE00168DEA /* NCTrashGridCell.xib in Resources */, F761856D29E98543006EB3B0 /* NCIntroCollectionViewCell.xib in Resources */, F78ACD4621903D010088454D /* NCGridCell.xib in Resources */, F7F4F10827ECDBDB008676F9 /* Inconsolata-ExtraLight.ttf in Resources */, @@ -3975,7 +3977,6 @@ AF56C1DC2784856200D8BAE2 /* NCActivityCommentView.xib in Resources */, 566EB7D92B3D721700FB7CAD /* NCShareTextInputCell.xib in Resources */, F7F4F10B27ECDBDB008676F9 /* Inconsolata-Light.ttf in Resources */, - F7CEE6002BA9A5C9003EFD89 /* NCTrashGridCell.xib in Resources */, 3704EB2A23D5A58400455C5B /* NCMenu.storyboard in Resources */, AF93471C27E2361E002537EE /* NCShareHeader.xib in Resources */, 566FCF292B3EAD0E00168DEA /* FolderPathCustomCell.xib in Resources */, From b1974ae6116cd0b1737e097b6d7b1d11af854b3b Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Fri, 29 Dec 2023 15:13:53 +0530 Subject: [PATCH 15/22] NMC 2015 - NMC 2267 Rename configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 65b4097d5b..36bdbcbbe4 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566FCF552B3ECBDE00168DEA /* RenameFileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF542B3ECBDE00168DEA /* RenameFileTests.swift */; }; 566FCF522B3EBADE00168DEA /* NCTrashGridCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF502B3EBADE00168DEA /* NCTrashGridCell.swift */; }; 566FCF532B3EBADE00168DEA /* NCTrashGridCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF512B3EBADE00168DEA /* NCTrashGridCell.xib */; }; 566FCF4D2B3EB78F00168DEA /* OnboardingTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF4C2B3EB78F00168DEA /* OnboardingTestCase.swift */; }; @@ -1161,6 +1162,7 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566FCF542B3ECBDE00168DEA /* RenameFileTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RenameFileTests.swift; sourceTree = ""; }; 566FCF502B3EBADE00168DEA /* NCTrashGridCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCTrashGridCell.swift; sourceTree = ""; }; 566FCF512B3EBADE00168DEA /* NCTrashGridCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCTrashGridCell.xib; sourceTree = ""; }; 566FCF4C2B3EB78F00168DEA /* OnboardingTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingTestCase.swift; sourceTree = ""; }; @@ -2107,6 +2109,7 @@ 566FCF2E2B3EB28D00168DEA /* NCNotificationText.swift */, 566FCF302B3EB48A00168DEA /* PrivacyPolicyTest.swift */, 566FCF4C2B3EB78F00168DEA /* OnboardingTestCase.swift */, + 566FCF542B3ECBDE00168DEA /* RenameFileTests.swift */, AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */, ); path = NextcloudUnitTests; @@ -4161,6 +4164,7 @@ 566EB81C2B3D889D00FB7CAD /* E2EETests.swift in Sources */, 566EB7E62B3D7AE900FB7CAD /* ScanTests.swift in Sources */, F7817CFE29801A3500FFBC65 /* Data+Extension.swift in Sources */, + 566FCF552B3ECBDE00168DEA /* RenameFileTests.swift in Sources */, 566EB80F2B3D833000FB7CAD /* AudioUploadTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; From ddcba899d0992af84e61ea8c7818197ebd23c4e7 Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Fri, 29 Dec 2023 15:21:14 +0530 Subject: [PATCH 16/22] NMC 2015 - NMC 1998 Tracking configuration changes --- Nextcloud.xcodeproj/project.pbxproj | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 36bdbcbbe4..8666871d83 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,8 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 566FCF5A2B3ECD3400168DEA /* TealiumHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF572B3ECD3400168DEA /* TealiumHelper.swift */; }; + 566FCF5B2B3ECD3400168DEA /* AdjustHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF582B3ECD3400168DEA /* AdjustHelper.m */; }; 566FCF552B3ECBDE00168DEA /* RenameFileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF542B3ECBDE00168DEA /* RenameFileTests.swift */; }; 566FCF522B3EBADE00168DEA /* NCTrashGridCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF502B3EBADE00168DEA /* NCTrashGridCell.swift */; }; 566FCF532B3EBADE00168DEA /* NCTrashGridCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF512B3EBADE00168DEA /* NCTrashGridCell.xib */; }; @@ -1162,6 +1164,9 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 566FCF572B3ECD3400168DEA /* TealiumHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TealiumHelper.swift; sourceTree = ""; }; + 566FCF582B3ECD3400168DEA /* AdjustHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdjustHelper.m; sourceTree = ""; }; + 566FCF592B3ECD3400168DEA /* AdjustHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdjustHelper.h; sourceTree = ""; }; 566FCF542B3ECBDE00168DEA /* RenameFileTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RenameFileTests.swift; sourceTree = ""; }; 566FCF502B3EBADE00168DEA /* NCTrashGridCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCTrashGridCell.swift; sourceTree = ""; }; 566FCF512B3EBADE00168DEA /* NCTrashGridCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCTrashGridCell.xib; sourceTree = ""; }; @@ -2093,6 +2098,16 @@ ); path = "NMC Custom Views"; sourceTree = ""; + }; + 566FCF562B3ECD3400168DEA /* Helper */ = { + isa = PBXGroup; + children = ( + 566FCF572B3ECD3400168DEA /* TealiumHelper.swift */, + 566FCF582B3ECD3400168DEA /* AdjustHelper.m */, + 566FCF592B3ECD3400168DEA /* AdjustHelper.h */, + ); + path = Helper; + sourceTree = ""; }; AF8ED1FA2757821000B8DBC4 /* NextcloudUnitTests */ = { isa = PBXGroup; @@ -3191,6 +3206,7 @@ children = ( 566EB8122B3D861400FB7CAD /* NMC Custom Views */, 566FCF4E2B3EB84F00168DEA /* AppUtility.swift */, + 566FCF562B3ECD3400168DEA /* Helper */, F702F2CC25EE5B4F008F8E80 /* AppDelegate.swift */, F794E13E2BBC0F70003693D7 /* SceneDelegate.swift */, F76B649B2ADFFAED00014640 /* NCImageCache.swift */, @@ -4629,6 +4645,7 @@ F757CC8D29E82D0500F31428 /* NCGroupfolders.swift in Sources */, F760329F252F0F8E0015A421 /* NCTransferCell.swift in Sources */, F3BB46542A3A1E9D00461F6E /* CCCellMore.swift in Sources */, + 566FCF5A2B3ECD3400168DEA /* TealiumHelper.swift in Sources */, 566FCF4A2B3EB4E800168DEA /* SaveSettingsCustomButtonCell.swift in Sources */, AF68326A27BE65A90010BF0B /* NCMenuAction.swift in Sources */, F7682FE023C36B0500983A04 /* NCMainTabBar.swift in Sources */, @@ -4678,6 +4695,7 @@ 566EB7FE2B3D7B5F00FB7CAD /* SetPDFPasswordSwitchView.swift in Sources */, F7C30DF6291BC0CA0017149B /* NCNetworkingE2EEUpload.swift in Sources */, F7501C332212E57500FB1415 /* NCMedia.swift in Sources */, + 566FCF5B2B3ECD3400168DEA /* AdjustHelper.m in Sources */, F72944F22A84246400246839 /* NCEndToEndMetadataV20.swift in Sources */, F70BFC7420E0FA7D00C67599 /* NCUtility.swift in Sources */, F79EDAA526B004980007D134 /* NCPlayer.swift in Sources */, From b8f68d224eab0e053e8760cd4b0d02cc0eb0782a Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Fri, 29 Dec 2023 15:49:57 +0530 Subject: [PATCH 17/22] NMC 2015 - User tracking description added in plist --- Brand/iOSClient.plist | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Brand/iOSClient.plist b/Brand/iOSClient.plist index aaffe64cf9..39aed5d426 100755 --- a/Brand/iOSClient.plist +++ b/Brand/iOSClient.plist @@ -18,7 +18,7 @@ CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion - 6.0 + $(MARKETING_VERSION) CFBundleName $(PRODUCT_NAME) CFBundlePackageType @@ -81,6 +81,8 @@ AccountIntent DashboardIntent + NSUserTrackingUsageDescription + App would like to access IDFA for tracking purpose PHPhotoLibraryPreventAutomaticLimitedAccessAlert UIAppFonts From 168818c91b967a1515109927e7341faf01715fda Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Fri, 29 Dec 2023 16:01:40 +0530 Subject: [PATCH 18/22] NMC 2015 - Tealium and Adjust dependency added --- Nextcloud.xcodeproj/project.pbxproj | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 8666871d83..9920aab44a 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -3851,6 +3851,9 @@ F3A0479C2BD268B500658E7B /* XCRemoteSwiftPackageReference "PopupView" */, F33EE6DF2BF4BDA500CA1A51 /* XCRemoteSwiftPackageReference "swift-nio-ssl" */, F33EE6EE2BF4C0FF00CA1A51 /* XCRemoteSwiftPackageReference "swift-nio" */, + F327FA412B8CC0B900E5B743 /* XCRemoteSwiftPackageReference "SwipeCellKit" */, + 566FCF5C2B3ED58900168DEA /* XCRemoteSwiftPackageReference "tealium-swift" */, + 566FCF5D2B3ED64900168DEA /* XCRemoteSwiftPackageReference "ios_sdk" */, ); productRefGroup = F7F67B9F1A24D27800EE80DA; projectDirPath = ""; @@ -5977,6 +5980,22 @@ minimumVersion = 2.26.0; }; }; + 566FCF5C2B3ED58900168DEA /* XCRemoteSwiftPackageReference "tealium-swift" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Tealium/tealium-swift.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 2.0.0; + }; + }; + 566FCF5D2B3ED64900168DEA /* XCRemoteSwiftPackageReference "ios_sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/adjust/ios_sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 4.29.5; + }; + }; F33EE6EE2BF4C0FF00CA1A51 /* XCRemoteSwiftPackageReference "swift-nio" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/apple/swift-nio.git"; From fec86e9bd19fe13104db191659d495ba5bc1ebb2 Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:59:20 +0530 Subject: [PATCH 19/22] NMC 2015 - FolderPathCustomCell duplicate entry removed --- Nextcloud.xcodeproj/project.pbxproj | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 9920aab44a..457c37fc7b 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -33,8 +33,6 @@ 566FCF4A2B3EB4E800168DEA /* SaveSettingsCustomButtonCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF412B3EB4E800168DEA /* SaveSettingsCustomButtonCell.swift */; }; 566FCF4B2B3EB4E800168DEA /* SaveSettingsCustomButtonCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF422B3EB4E800168DEA /* SaveSettingsCustomButtonCell.xib */; }; 566FCF2F2B3EB28D00168DEA /* NCNotificationText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF2E2B3EB28D00168DEA /* NCNotificationText.swift */; }; - 566FCF282B3EAD0E00168DEA /* FolderPathCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF262B3EAD0E00168DEA /* FolderPathCustomCell.swift */; }; - 566FCF292B3EAD0E00168DEA /* FolderPathCustomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF272B3EAD0E00168DEA /* FolderPathCustomCell.xib */; }; 566FCF2C2B3EAD4700168DEA /* TextTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF2A2B3EAD4700168DEA /* TextTableViewCell.swift */; }; 566FCF2D2B3EAD4700168DEA /* TextTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 566FCF2B2B3EAD4700168DEA /* TextTableViewCell.xib */; }; 566EB82C2B3DA07700FB7CAD /* AssetUploadTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566EB82B2B3DA07700FB7CAD /* AssetUploadTest.swift */; }; @@ -1183,8 +1181,6 @@ 566FCF412B3EB4E800168DEA /* SaveSettingsCustomButtonCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SaveSettingsCustomButtonCell.swift; sourceTree = ""; }; 566FCF422B3EB4E800168DEA /* SaveSettingsCustomButtonCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SaveSettingsCustomButtonCell.xib; sourceTree = ""; }; 566FCF2E2B3EB28D00168DEA /* NCNotificationText.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCNotificationText.swift; sourceTree = ""; }; - 566FCF262B3EAD0E00168DEA /* FolderPathCustomCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FolderPathCustomCell.swift; sourceTree = ""; }; - 566FCF272B3EAD0E00168DEA /* FolderPathCustomCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FolderPathCustomCell.xib; sourceTree = ""; }; 566FCF2A2B3EAD4700168DEA /* TextTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextTableViewCell.swift; sourceTree = ""; }; 566FCF2B2B3EAD4700168DEA /* TextTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TextTableViewCell.xib; sourceTree = ""; }; 566EB82B2B3DA07700FB7CAD /* AssetUploadTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssetUploadTest.swift; sourceTree = ""; }; @@ -3099,8 +3095,6 @@ F7A509242C26BD5D00326106 /* NCCreateDocument.swift */, 566FCF2A2B3EAD4700168DEA /* TextTableViewCell.swift */, 566FCF2B2B3EAD4700168DEA /* TextTableViewCell.xib */, - 566FCF262B3EAD0E00168DEA /* FolderPathCustomCell.swift */, - 566FCF272B3EAD0E00168DEA /* FolderPathCustomCell.xib */, F769CA162965AB7C00039397 /* NCUploadAssets.swift */, F704B5E22430AA6F00632F5F /* NCCreateFormUploadConflict.storyboard */, F704B5E42430AA8000632F5F /* NCCreateFormUploadConflict.swift */, @@ -4677,7 +4671,6 @@ F73EF7BF2B02250B0087E6E9 /* NCManageDatabase+GPS.swift in Sources */, F71F6D072B6A6A5E00F1EB15 /* ThreadSafeArray.swift in Sources */, F761856C29E98543006EB3B0 /* NCIntroCollectionViewCell.swift in Sources */, - 566FCF282B3EAD0E00168DEA /* FolderPathCustomCell.swift in Sources */, F75DD765290ABB25002EB562 /* Intent.intentdefinition in Sources */, F74B6D952A7E239A00F03C5F /* NCManageDatabase+Chunk.swift in Sources */, F310B1EF2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift in Sources */, From 202c2e1dddb46945f5468287821b723626c36c9a Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Mon, 19 Feb 2024 13:23:52 +0530 Subject: [PATCH 20/22] NMC 2015 - Adjust SDK framework added to project target --- Nextcloud.xcodeproj/project.pbxproj | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 457c37fc7b..12ad0b04af 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 56AB28942B833E2D0089D373 /* Adjust in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB28932B833E2D0089D373 /* Adjust */; }; 566FCF5A2B3ECD3400168DEA /* TealiumHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF572B3ECD3400168DEA /* TealiumHelper.swift */; }; 566FCF5B2B3ECD3400168DEA /* AdjustHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF582B3ECD3400168DEA /* AdjustHelper.m */; }; 566FCF552B3ECBDE00168DEA /* RenameFileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF542B3ECBDE00168DEA /* RenameFileTests.swift */; }; @@ -2008,6 +2009,8 @@ F76DA969277B77EA0082465B /* DropDown in Frameworks */, F7F623B52A5EF4D30022D3D4 /* Gzip in Frameworks */, F75EAED826D2552E00F4320E /* MarqueeLabel in Frameworks */, + F710FC7A277B7D0000AA9FBF /* Realm in Frameworks */, + 56AB28942B833E2D0089D373 /* Adjust in Frameworks */, F72DA9B425F53E4E00B87DB1 /* SwiftRichString in Frameworks */, F78AF1E72BE938C100F3F060 /* MobileVLCKit.xcframework in Frameworks */, F73ADD1C265546890069EA0D /* SwiftEntryKit in Frameworks */, @@ -3671,6 +3674,8 @@ F7160A812BE933390034DCB3 /* RealmSwift */, F33EE6E02BF4BDA500CA1A51 /* NIOSSL */, F33EE6EF2BF4C0FF00CA1A51 /* NIO */, + F327FA422B8CC0B900E5B743 /* SwipeCellKit */, + 56AB28932B833E2D0089D373 /* Adjust */, ); productName = "Crypto Cloud"; productReference = F7CE8AFA1DC1F8D8009CAE48 /* Nextcloud.app */; @@ -6192,6 +6197,11 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 56AB28932B833E2D0089D373 /* Adjust */ = { + isa = XCSwiftPackageProductDependency; + package = 56AB28922B833DEA0089D373 /* XCRemoteSwiftPackageReference "ios_sdk" */; + productName = Adjust; + }; F3391B072B4C52C5001C0C4B /* FirebaseDatabase */ = { isa = XCSwiftPackageProductDependency; package = F70B86732642CE3B00ED5349 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; From 9c39fdb51bd67523123f199ed80a9b1fd51dbe14 Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Mon, 19 Feb 2024 14:39:59 +0530 Subject: [PATCH 21/22] NMC 2015 - Tealium framework added to project target --- Nextcloud.xcodeproj/project.pbxproj | 54 +++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 12ad0b04af..53a895c784 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,13 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 56AB28972B8351720089D373 /* TealiumAutotracking in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB28962B8351720089D373 /* TealiumAutotracking */; }; + 56AB28992B8351720089D373 /* TealiumCore in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB28982B8351720089D373 /* TealiumCore */; }; + 56AB289B2B8351720089D373 /* TealiumLifecycle in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB289A2B8351720089D373 /* TealiumLifecycle */; }; + 56AB289D2B8351730089D373 /* TealiumLocation in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB289C2B8351730089D373 /* TealiumLocation */; }; + 56AB289F2B8351730089D373 /* TealiumRemoteCommands in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB289E2B8351730089D373 /* TealiumRemoteCommands */; }; + 56AB28A12B8351730089D373 /* TealiumTagManagement in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB28A02B8351730089D373 /* TealiumTagManagement */; }; + 56AB28A32B8351740089D373 /* TealiumVisitorService in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB28A22B8351740089D373 /* TealiumVisitorService */; }; 56AB28942B833E2D0089D373 /* Adjust in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB28932B833E2D0089D373 /* Adjust */; }; 566FCF5A2B3ECD3400168DEA /* TealiumHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF572B3ECD3400168DEA /* TealiumHelper.swift */; }; 566FCF5B2B3ECD3400168DEA /* AdjustHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 566FCF582B3ECD3400168DEA /* AdjustHelper.m */; }; @@ -1988,6 +1995,11 @@ F7D56B1A2972405500FA46C4 /* Mantis in Frameworks */, F7ED547C25EEA65400956C55 /* QRCodeReader in Frameworks */, F788ECC7263AAAFA00ADC67F /* MarkdownKit in Frameworks */, + 56AB28992B8351720089D373 /* TealiumCore in Frameworks */, + 56AB28972B8351720089D373 /* TealiumAutotracking in Frameworks */, + 56AB28A32B8351740089D373 /* TealiumVisitorService in Frameworks */, + 56AB289F2B8351730089D373 /* TealiumRemoteCommands in Frameworks */, + 56AB289D2B8351730089D373 /* TealiumLocation in Frameworks */, F77BC3EB293E5268005F2B08 /* Swifter in Frameworks */, F7BB7E4727A18C56009B9F29 /* Parchment in Frameworks */, F33EE6E12BF4BDA500CA1A51 /* NIOSSL in Frameworks */, @@ -3676,6 +3688,13 @@ F33EE6EF2BF4C0FF00CA1A51 /* NIO */, F327FA422B8CC0B900E5B743 /* SwipeCellKit */, 56AB28932B833E2D0089D373 /* Adjust */, + 56AB28962B8351720089D373 /* TealiumAutotracking */, + 56AB28982B8351720089D373 /* TealiumCore */, + 56AB289A2B8351720089D373 /* TealiumLifecycle */, + 56AB289C2B8351730089D373 /* TealiumLocation */, + 56AB289E2B8351730089D373 /* TealiumRemoteCommands */, + 56AB28A02B8351730089D373 /* TealiumTagManagement */, + 56AB28A22B8351740089D373 /* TealiumVisitorService */, ); productName = "Crypto Cloud"; productReference = F7CE8AFA1DC1F8D8009CAE48 /* Nextcloud.app */; @@ -6197,6 +6216,41 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 56AB28962B8351720089D373 /* TealiumAutotracking */ = { + isa = XCSwiftPackageProductDependency; + package = 56AB28952B8350F20089D373 /* XCRemoteSwiftPackageReference "tealium-swift" */; + productName = TealiumAutotracking; + }; + 56AB28982B8351720089D373 /* TealiumCore */ = { + isa = XCSwiftPackageProductDependency; + package = 56AB28952B8350F20089D373 /* XCRemoteSwiftPackageReference "tealium-swift" */; + productName = TealiumCore; + }; + 56AB289A2B8351720089D373 /* TealiumLifecycle */ = { + isa = XCSwiftPackageProductDependency; + package = 56AB28952B8350F20089D373 /* XCRemoteSwiftPackageReference "tealium-swift" */; + productName = TealiumLifecycle; + }; + 56AB289C2B8351730089D373 /* TealiumLocation */ = { + isa = XCSwiftPackageProductDependency; + package = 56AB28952B8350F20089D373 /* XCRemoteSwiftPackageReference "tealium-swift" */; + productName = TealiumLocation; + }; + 56AB289E2B8351730089D373 /* TealiumRemoteCommands */ = { + isa = XCSwiftPackageProductDependency; + package = 56AB28952B8350F20089D373 /* XCRemoteSwiftPackageReference "tealium-swift" */; + productName = TealiumRemoteCommands; + }; + 56AB28A02B8351730089D373 /* TealiumTagManagement */ = { + isa = XCSwiftPackageProductDependency; + package = 56AB28952B8350F20089D373 /* XCRemoteSwiftPackageReference "tealium-swift" */; + productName = TealiumTagManagement; + }; + 56AB28A22B8351740089D373 /* TealiumVisitorService */ = { + isa = XCSwiftPackageProductDependency; + package = 56AB28952B8350F20089D373 /* XCRemoteSwiftPackageReference "tealium-swift" */; + productName = TealiumVisitorService; + }; 56AB28932B833E2D0089D373 /* Adjust */ = { isa = XCSwiftPackageProductDependency; package = 56AB28922B833DEA0089D373 /* XCRemoteSwiftPackageReference "ios_sdk" */; From 0ccc0d54a5170d55be1d54badd82610a4138cffe Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Mon, 15 Apr 2024 14:31:05 +0530 Subject: [PATCH 22/22] NMC 2015 - Media command view file added --- Nextcloud.xcodeproj/project.pbxproj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 53a895c784..3f0cdec80f 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; }; 371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; }; 3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; }; + 568C76D02BCD0822009EE9C7 /* NCMediaCommandView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 568C76CF2BCD0822009EE9C7 /* NCMediaCommandView.xib */; }; 56AB28972B8351720089D373 /* TealiumAutotracking in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB28962B8351720089D373 /* TealiumAutotracking */; }; 56AB28992B8351720089D373 /* TealiumCore in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB28982B8351720089D373 /* TealiumCore */; }; 56AB289B2B8351720089D373 /* TealiumLifecycle in Frameworks */ = {isa = PBXBuildFile; productRef = 56AB289A2B8351720089D373 /* TealiumLifecycle */; }; @@ -1170,6 +1171,7 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; + 568C76CF2BCD0822009EE9C7 /* NCMediaCommandView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCMediaCommandView.xib; sourceTree = ""; }; 566FCF572B3ECD3400168DEA /* TealiumHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TealiumHelper.swift; sourceTree = ""; }; 566FCF582B3ECD3400168DEA /* AdjustHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdjustHelper.m; sourceTree = ""; }; 566FCF592B3ECD3400168DEA /* AdjustHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdjustHelper.h; sourceTree = ""; }; @@ -3133,6 +3135,7 @@ F7EC9CB921185F2000F1C5CE /* Media */ = { isa = PBXGroup; children = ( + 568C76CF2BCD0822009EE9C7 /* NCMediaCommandView.xib */, F720B5B72507B9A5008C94E5 /* Cell */, F7501C302212E57400FB1415 /* NCMedia.storyboard */, F7501C312212E57400FB1415 /* NCMedia.swift */, @@ -3993,6 +3996,7 @@ F72685E727C78E490019EF5E /* InfoPlist.strings in Resources */, 566EB7D52B3D71F800FB7CAD /* NCShareHeaderCustomCell.xib in Resources */, F769453C22E9CFFF000A798A /* NCShareUserCell.xib in Resources */, + 568C76D02BCD0822009EE9C7 /* NCMediaCommandView.xib in Resources */, F7F4F10927ECDBDB008676F9 /* Inconsolata-Bold.ttf in Resources */, F76D3CF52428D0C1005DFA87 /* NCViewerPDF.storyboard in Resources */, F700222C1EC479840080073F /* Custom.xcassets in Resources */, @@ -4021,7 +4025,6 @@ AF93471C27E2361E002537EE /* NCShareHeader.xib in Resources */, 566FCF292B3EAD0E00168DEA /* FolderPathCustomCell.xib in Resources */, AF93471C27E2361E002537EE /* NCShareAdvancePermissionHeader.xib in Resources */, - F7F1E54C2492369A00E42386 /* NCMediaCommandView.xib in Resources */, 566EB8072B3D7B5F00FB7CAD /* PdfWithOcrSwitchView.xib in Resources */, F76032A0252F0F8E0015A421 /* NCTransferCell.xib in Resources */, F7F4F10527ECDBDB008676F9 /* Inconsolata-SemiBold.ttf in Resources */,