Nmc/2161 menu option theming customisation

.github/workflows/nmc-custom-client.yml

@@ -0,0 +1,43 @@
+###
+# SPDX-License-Identifier: AGPL-3.0
+#
+# Author: Bernd rederlechner <bernd.rederlechner@t-systems.com>
+#
+# Builds a stable release package based on a release assembly
+# customisation-<version>-<increment>
+#
+# As soon as a package is deployed to production, the tag and the branch
+# MUST STAY FOR 2 years and not deleted.
+#
+# Release packages, tags and customisation branches not delivered to production should
+# be deleted asap a newer release is available.
+#
+
+name: MCLOUD custom client merge
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        type: choice
+        description: Custom build from base branch
+        options: 
+          - master
+          - stable-4.9.7
+          - stable-5.2.1
+          - stable-5.2.7
+          - stable-5.5.0
+          - stable-5.5.5
+          - stable-6.1.3
+          - stable-6.2.7
+          # - v3.0.8
+        default: master
+
+jobs:
+  assemble-custom:
+    uses: nextmcloud/.github/.github/workflows/nmc-custom-client.yml@master
+    with:
+      trunk: 'master'
+      stable: ${{ inputs.branch }}
+      result: ${{ format('customisation-{0}-{1}', github.actor, inputs.branch) }}
+    secrets: inherit

.github/workflows/nmc-custom-stables.yml

@@ -0,0 +1,40 @@
+###
+# SPDX-License-Identifier: AGPL-3.0
+#
+# Author: Bernd rederlechner <bernd.rederlechner@t-systems.com>
+#
+# Builds a stable release package based on a release assembly
+# customisation-<version>-<increment>
+#
+# As soon as a package is deployed to production, the tag and the branch
+# MUST STAY FOR 2 years and not deleted.
+#
+# Release packages, tags and customisation branches not delivered to production should
+# be deleted asap a newer release is available.
+#
+
+name: MCLOUD create stable backports
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        type: choice
+        description: Custom build from base branch
+        options: 
+          - stable-6.6.0
+          - stable-6.5.0
+          - stable-6.2.7
+          - stable-6.1.3
+          - stable-5.5.5
+          - stable-5.5.4
+          - stable-5.2.7
+        default: stable-6.6.0
+
+jobs:
+  backport-custom:
+    uses: nextmcloud/.github/.github/workflows/nmc-custom-stables.yml@master
+    with:
+      trunk: 'master'
+      stable: ${{ inputs.branch }}
+    secrets: inherit

Brand/NCBrand.swift

@@ -20,6 +20,43 @@ let userAgent: String = {
  The codename embodies the concept of dynamic, living matter — reflecting our vision of a platform that is not only powerful and reliable, but also capable of continuous transformation and intelligent adaptation.
  */
 
+struct NextcloudVersion: Comparable {
+    let major: Int
+    let minor: Int
+    let micro: Int
+
+    init(_ major: Int, _ minor: Int = 0, _ micro: Int = 0) {
+        self.major = major
+        self.minor = minor
+        self.micro = micro
+    }
+
+    init(_ capabilities: NKCapabilities.Capabilities) {
+        self.major = capabilities.serverVersionMajor
+        self.minor = capabilities.serverVersionMinor
+        self.micro = capabilities.serverVersionMicro
+    }
+
+    static let v18 = NextcloudVersion(18)
+    static let v20 = NextcloudVersion(20)
+    static let v23 = NextcloudVersion(23)
+    static let v24 = NextcloudVersion(24)
+    static let v25 = NextcloudVersion(25)
+    static let v26 = NextcloudVersion(26)
+    static let v27 = NextcloudVersion(27)
+    static let v28 = NextcloudVersion(28)
+    static let v30 = NextcloudVersion(30)
+    static let v31 = NextcloudVersion(31)
+    static let v32 = NextcloudVersion(32)
+    static let v32_0_2 = NextcloudVersion(32, 0, 2)
+    static let v33 = NextcloudVersion(33)
+    static let v34 = NextcloudVersion(34)
+
+    static func < (lhs: NextcloudVersion, rhs: NextcloudVersion) -> Bool {
+        (lhs.major, lhs.minor, lhs.micro) < (rhs.major, rhs.minor, rhs.micro)
+    }
+}
+
 final class NCBrandOptions: @unchecked Sendable {
     static let shared = NCBrandOptions()
 
@@ -129,19 +166,8 @@ final class NCBrandOptions: @unchecked Sendable {
     }
 
     func isServerVersion(_ capabilities: NKCapabilities.Capabilities,
-                         greaterOrEqualTo major: Int,
-                         _ minor: Int,
-                         _ micro: Int) -> Bool {
-
-        let server = (
-            capabilities.serverVersionMajor,
-            capabilities.serverVersionMinor,
-            capabilities.serverVersionMicro
-        )
-
-        let required = (major, minor, micro)
-
-        return server >= required
+                         greaterOrEqualTo version: NextcloudVersion) -> Bool {
+        return NextcloudVersion(capabilities) >= version
     }
 }
 

File Provider Extension/FileProviderData.swift

@@ -90,7 +90,7 @@ class FileProviderData: NSObject {
             return isPaginated
         } else if serverUrl == NCUtilityFileSystem().getHomeServer(session: session),
                   let capabilities = await NextcloudKit.shared.getCapabilitiesAsync(account: session.account).capabilities,
-                  NCBrandOptions.shared.isServerVersion(capabilities, greaterOrEqualTo: 32, 0, 2) {
+                  NCBrandOptions.shared.isServerVersion(capabilities, greaterOrEqualTo: .v32_0_2) {
             isPaginated = true
             return true
         }
@@ -147,10 +147,7 @@ class FileProviderData: NSObject {
 
     func downloadComplete(fileName: String,
                           serverUrl: String,
-                          etag: String?,
-                          date: Date?,
-                          dateLastModified: Date?,
-                          length: Int64,
+                          allHeaderFields: [AnyHashable: Any]?,
                           task: URLSessionTask,
                           error: NKError) async {
         let taskIdentifier = task.taskIdentifier
@@ -165,6 +162,7 @@ class FileProviderData: NSObject {
         }
 
         let ocId = metadata.ocId
+        let etag = NextcloudKit.shared.nkCommonInstance.findHeader("oc-etag", allHeaderFields: allHeaderFields)
 
         await NCManageDatabase.shared.setMetadataSessionAsync(ocId: ocId,
                                                               session: "",
@@ -196,7 +194,8 @@ class FileProviderData: NSObject {
                         ocId: String?,
                         etag: String?,
                         date: Date?,
-                        size: Int64,
+                        ownerId: String?,
+                        permissions: String?,
                         task: URLSessionTask,
                         error: NKError) async {
         guard let metadata = await NCManageDatabase.shared.getMetadataAsync(predicate: NSPredicate(format: "serverUrl == %@ AND fileName == %@ AND sessionTaskIdentifier == %d", serverUrl, fileName, task.taskIdentifier)) else {
@@ -225,11 +224,22 @@ class FileProviderData: NSObject {
             metadata.uploadDate = (date as? NSDate) ?? NSDate()
             metadata.etag = etag ?? ""
             metadata.ocId = ocId
-            metadata.size = size
+
             if let fileId = fileProviderUtility().ocIdToFileId(ocId: ocId) {
                 metadata.fileId = fileId
             }
 
+            if let ownerId, !ownerId.isEmpty {
+                metadata.ownerId = ownerId
+                if let ownerDisplayName = await NCManageDatabase.shared.getOwnerDisplayName(account: metadata.account, ownerId: ownerId) {
+                    metadata.ownerDisplayName = ownerDisplayName
+                }
+            }
+
+            if let permissions, !permissions.isEmpty {
+                metadata.permissions = permissions
+            }
+
             metadata.sceneIdentifier = nil
             metadata.session = ""
             metadata.sessionError = ""

Nextcloud.xcodeproj/project.pbxproj

@@ -85,6 +85,10 @@
 		AFCE353727E4ED7B00FEA6C2 /* NCShareCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */; };
 		AFCE353927E5DE0500FEA6C2 /* Shareable.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* Shareable.swift */; };
 		CB3666201AF7550816B5CD6A /* NCContextMenuComment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8932E90EC4278026D86CCCC9 /* NCContextMenuComment.swift */; };
+		AFCE353927E5DE0500FEA6C2 /* NCShare+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */; };
+		B52FAED52DA8F616001AB1BD /* NCSelectableNavigationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAED42DA8F616001AB1BD /* NCSelectableNavigationView.swift */; };
+		C04E2F232A17BB4D001BAD85 /* FilesIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04E2F222A17BB4D001BAD85 /* FilesIntegrationTests.swift */; };
+		D575039F27146F93008DC9DC /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A0D1342591FBC5008F8A13 /* String+Extension.swift */; };
 		D5B6AA7827200C7200D49C24 /* NCActivityTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */; };
 		F310B1EF2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = F310B1EE2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift */; };
 		F31165022F9674A1009A1E37 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = F31165012F9674A1009A1E37 /* AppIcon.icon */; };
@@ -441,6 +445,13 @@
 		F75DD765290ABB25002EB562 /* Intent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F75DD769290ABB25002EB562 /* Intent.intentdefinition */; };
 		F75DD766290ABB25002EB562 /* Intent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F75DD769290ABB25002EB562 /* Intent.intentdefinition */; };
 		F75DD767290ABB25002EB562 /* Intent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F75DD769290ABB25002EB562 /* Intent.intentdefinition */; };
+		F75F4BC02FD008D7009E55ED /* Optional+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F343A4BA2A1E734600DDA874 /* Optional+Extension.swift */; };
+		F75F4BC12FD008D7009E55ED /* Optional+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F343A4BA2A1E734600DDA874 /* Optional+Extension.swift */; };
+		F75F4BC22FD008D7009E55ED /* Optional+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F343A4BA2A1E734600DDA874 /* Optional+Extension.swift */; };
+		F75F4BC32FD008D7009E55ED /* Optional+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F343A4BA2A1E734600DDA874 /* Optional+Extension.swift */; };
+		F75F4BC42FD008D7009E55ED /* Optional+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F343A4BA2A1E734600DDA874 /* Optional+Extension.swift */; };
+		F75F4BC52FD008D7009E55ED /* Optional+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F343A4BA2A1E734600DDA874 /* Optional+Extension.swift */; };
+		F75F4BC62FD008D7009E55ED /* Optional+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F343A4BA2A1E734600DDA874 /* Optional+Extension.swift */; };
 		F760DE032AE66EA80027D78A /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = F760DE022AE66EA80027D78A /* KeychainAccess */; };
 		F760DE052AE66EBE0027D78A /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = F760DE042AE66EBE0027D78A /* KeychainAccess */; };
 		F760DE072AE66EC70027D78A /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = F760DE062AE66EC70027D78A /* KeychainAccess */; };
@@ -1261,8 +1272,8 @@
 		AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateFormatter+Extension.swift"; sourceTree = "<group>"; };
 		AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareCells.swift; sourceTree = "<group>"; };
 		AFCE353827E5DE0400FEA6C2 /* Shareable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shareable.swift; sourceTree = "<group>"; };
-		B4C7A5B36D1ED178FB6B76CB /* NCContextMenuPlayerTracks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCContextMenuPlayerTracks.swift; sourceTree = "<group>"; };
-		BB7697C94BA14450A0867940 /* NCContextMenuProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCContextMenuProfile.swift; sourceTree = "<group>"; };
+		AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCShare+Helper.swift"; sourceTree = "<group>"; };
+		B52FAED42DA8F616001AB1BD /* NCSelectableNavigationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCSelectableNavigationView.swift; sourceTree = "<group>"; };
 		C0046CDA2A17B98400D87C9D /* NextcloudUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		C04E2F202A17BB4D001BAD85 /* NextcloudIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCActivityTableViewCell.swift; sourceTree = "<group>"; };
@@ -2549,6 +2560,7 @@
 		F7603298252F0E550015A421 /* Collection Common */ = {
 			isa = PBXGroup;
 			children = (
+				B52FAED42DA8F616001AB1BD /* NCSelectableNavigationView.swift */,
 				F75FE06B2BB01D0D00A0EFEF /* Cell */,
 				F70D7C3525FFBF81002B9E34 /* NCCollectionViewCommon.swift */,
 				F76995F32F9A4AC000291FA7 /* NCCollectionViewCommon+UIEditMenuInteractionDelegate.swift */,
@@ -4163,6 +4175,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				F73EF7BD2B0224AB0087E6E9 /* NCManageDatabase+ExternalSites.swift in Sources */,
+				F75F4BC62FD008D7009E55ED /* Optional+Extension.swift in Sources */,
 				F73EF7C52B02250B0087E6E9 /* NCManageDatabase+GPS.swift in Sources */,
 				2C1D5D7923E2DE9100334ABB /* NCBrand.swift in Sources */,
 				F770768A263A8A2500A1BA94 /* NCUtilityFileSystem.swift in Sources */,
@@ -4257,6 +4270,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				F78E2D6A29AF02DB0024D4F3 /* Database.swift in Sources */,
+				F75F4BC52FD008D7009E55ED /* Optional+Extension.swift in Sources */,
 				F7490E6E29882B56009DCE94 /* NCBrand.swift in Sources */,
 				F7D61E942EBF1366007F865B /* UIColor+Extension.swift in Sources */,
 				F71F6D0C2B6A6A5E00F1EB15 /* ThreadSafeArray.swift in Sources */,
@@ -4327,6 +4341,7 @@
 				F77C973A2953143A00FDDD09 /* NCCameraRoll.swift in Sources */,
 				F740BEF02A35C2AD00E9B6D5 /* UILabel+Extension.swift in Sources */,
 				F7C30E01291BD2610017149B /* NCNetworkingE2EERename.swift in Sources */,
+				F75F4BC22FD008D7009E55ED /* Optional+Extension.swift in Sources */,
 				AF4BF61A27562A4B0081CEEF /* NCManageDatabase+Metadata.swift in Sources */,
 				AF4BF615275629E20081CEEF /* NCManageDatabase+Account.swift in Sources */,
 				F798F0E225880608000DAFFD /* UIColor+Extension.swift in Sources */,
@@ -4477,6 +4492,7 @@
 				F72EA95228B7BA2A00C88F0C /* DashboardWidgetProvider.swift in Sources */,
 				F77E8C242E79717D00EAE68F /* NCManageDatabase+LivePhoto.swift in Sources */,
 				F76340F72EBDE9760056F538 /* NCManageDatabaseCore.swift in Sources */,
+				F75F4BC02FD008D7009E55ED /* Optional+Extension.swift in Sources */,
 				F7D496FD2EBFA6D9004F9823 /* String+Extension.swift in Sources */,
 				F7D7A7702DCDD437003D2007 /* NCManageDatabase+AutoUpload.swift in Sources */,
 				F72EA95828B7BC4F00C88F0C /* FilesData.swift in Sources */,
@@ -4514,6 +4530,7 @@
 				F3E173C42C9B1067006D177A /* AwakeMode.swift in Sources */,
 				F7D61E932EBF1366007F865B /* UIColor+Extension.swift in Sources */,
 				F76340F42EBDE9760056F538 /* NCManageDatabaseCore.swift in Sources */,
+				F75F4BC42FD008D7009E55ED /* Optional+Extension.swift in Sources */,
 				F7CAFE212F17A37C00DB35A5 /* NCNetworking+Actor.swift in Sources */,
 				F76340EE2EBDE74C0056F538 /* NCManageDatabase.swift in Sources */,
 				F763410A2EBDFCB10056F538 /* NCManageDatabase+CreateMetadata.swift in Sources */,
@@ -4854,6 +4871,7 @@
 				F7FFFCA22FB300600015441E /* NCAssistantSharedTextStore.swift in Sources */,
 				F3DDFE0F2F15453900A784C8 /* NCAssistantChat.swift in Sources */,
 				F7D68FCC28CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift in Sources */,
+				B52FAED52DA8F616001AB1BD /* NCSelectableNavigationView.swift in Sources */,
 				F76882292C0DD1E7001CF441 /* NCManageE2EEModel.swift in Sources */,
 				F7CCAB512ECF316700F8E68B /* NCCollectionViewCommon+SyncMetadata.swift in Sources */,
 				AA8E041D2D300FDE00E7E89C /* NCShareNetworkingDelegate.swift in Sources */,
@@ -4909,6 +4927,7 @@
 				F7C55C8E2FB5B03D004A974F /* NCGlobal.swift in Sources */,
 				F7C55CC92FB5CE74004A974F /* ActionViewController.swift in Sources */,
 				F7C55C9B2FB5B1A7004A974F /* UIColor+Extension.swift in Sources */,
+				F75F4BC32FD008D7009E55ED /* Optional+Extension.swift in Sources */,
 				F7C55C8D2FB5B02C004A974F /* NCAssistantSharedTextStore.swift in Sources */,
 				F7C55C9A2FB5B127004A974F /* ThreadSafeDictionary.swift in Sources */,
 			);
@@ -4965,6 +4984,7 @@
 				F71F6D092B6A6A5E00F1EB15 /* ThreadSafeArray.swift in Sources */,
 				F757CC8429E7F88B00F31428 /* NCManageDatabase+Groupfolders.swift in Sources */,
 				F78E2D6729AF02DB0024D4F3 /* Database.swift in Sources */,
+				F75F4BC12FD008D7009E55ED /* Optional+Extension.swift in Sources */,
 				F77DD6AA2C5CC093009448FB /* NCSession.swift in Sources */,
 				F7A8D73628F17E1A008BBE1C /* NCManageDatabase+Activity.swift in Sources */,
 			);
@@ -6346,7 +6366,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/nextcloud/NextcloudKit";
 			requirement = {
-				branch = 7.3.2;
+				branch = main;
 				kind = branch;
 			};
 		};

Share/NCShareExtension+Files.swift

@@ -12,7 +12,22 @@ extension NCShareExtension {
     func reloadData() async {
         let session = NCShareExtensionData.shared.getSession()
         let layoutForView = NCManageDatabase.shared.getLayoutForView(account: session.account, key: keyLayout, serverUrl: serverUrl)
-        let predicate = NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileName != %@ AND directory == true", session.account, serverUrl, NextcloudKit.shared.nkCommonInstance.rootFileName)
+        let showHiddenFiles = NCPreferences().getShowHiddenFiles(account: session.account)
+        let predicate = showHiddenFiles
+            ? NSPredicate(
+                format: "account == %@ AND serverUrl == %@ AND fileName != %@ AND directory == true",
+                session.account,
+                serverUrl,
+                NextcloudKit.shared.nkCommonInstance.rootFileName
+            )
+            : NSPredicate(
+                format: "account == %@ AND serverUrl == %@ AND fileName != %@ AND directory == true AND NOT fileName BEGINSWITH[c] %@",
+                session.account,
+                serverUrl,
+                NextcloudKit.shared.nkCommonInstance.rootFileName,
+                "."
+            )
+
         let metadatas = await NCManageDatabase.shared.getMetadatasAsync(predicate: predicate,
                                                                         withLayout: layoutForView,
                                                                         withAccount: session.account)

iOSClient/Assistant/NCAssistantModel.swift

@@ -43,7 +43,7 @@ class NCAssistantModel {
         self.session = NCSession.shared.getSession(controller: controller)
         let capabilities = NCNetworking.shared.capabilities[session.account] ?? NKCapabilities.Capabilities()
 
-        useV2 = capabilities.serverVersionMajor >= NCGlobal.shared.nextcloudVersion30
+        useV2 = NCBrandOptions.shared.isServerVersion(capabilities, greaterOrEqualTo: .v30)
         loadAllTypes()
     }