Custom share permissions

Nextcloud.xcodeproj/project.pbxproj

@@ -1366,6 +1366,7 @@
 		F3CA337C2D0B2B6A00672333 /* AlbumModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlbumModel.swift; sourceTree = "<group>"; };
 		F3E173AF2C9AF637006D177A /* ScreenAwakeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScreenAwakeManager.swift; sourceTree = "<group>"; };
 		F3E173BF2C9B1067006D177A /* AwakeMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AwakeMode.swift; sourceTree = "<group>"; };
+		F3F9C4552DC8CAB8001D3E11 /* NextcloudKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = NextcloudKit; path = ../NextcloudKit; sourceTree = SOURCE_ROOT; };
 		F700222B1EC479840080073F /* Custom.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Custom.xcassets; sourceTree = "<group>"; };
 		F700510022DF63AC003A3356 /* NCShare.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCShare.storyboard; sourceTree = "<group>"; };
 		F700510422DF6A89003A3356 /* NCShare.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShare.swift; sourceTree = "<group>"; };
@@ -3271,6 +3272,7 @@
 		F7F67B9F1A24D27800EE80DA = {
 			isa = PBXGroup;
 			children = (
+				F3F9C4552DC8CAB8001D3E11 /* NextcloudKit */,
 				AA8E041E2D3114E200E7E89C /* README.md */,
 				F7B8B82F25681C3400967775 /* GoogleService-Info.plist */,
 				F7C1CDD91E6DFC6F005D92BE /* Brand */,
@@ -6209,8 +6211,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/scenee/FloatingPanel";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 2.0.0;
+				kind = exactVersion;
+				version = 2.8.6;
 			};
 		};
 		F77333862927A72100466E35 /* XCRemoteSwiftPackageReference "OpenSSL" */ = {

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -32,8 +32,7 @@ class tableMetadata: Object {
            self.altitude == object.altitude,
            self.status == object.status,
            Array(self.tags).elementsEqual(Array(object.tags)),
-           Array(self.shareType).elementsEqual(Array(object.shareType)),
-           Array(self.sharePermissionsCloudMesh).elementsEqual(Array(object.sharePermissionsCloudMesh)) {
+           Array(self.shareType).elementsEqual(Array(object.shareType)) {
             return true
         } else {
             return false
@@ -99,8 +98,8 @@ class tableMetadata: Object {
     @objc dynamic var sessionError = ""
     @objc dynamic var sessionSelector = ""
     @objc dynamic var sessionTaskIdentifier: Int = 0
+    /// The  integer for sharing permissions.
     @objc dynamic var sharePermissionsCollaborationServices: Int = 0
-    let sharePermissionsCloudMesh = List<String>()
     let shareType = List<Int>()
     @objc dynamic var size: Int64 = 0
     @objc dynamic var status: Int = 0
@@ -380,9 +379,7 @@ extension NCManageDatabase {
         metadata.serverUrl = file.serverUrl
         metadata.serveUrlFileName = file.serverUrl + "/" + file.fileName
         metadata.sharePermissionsCollaborationServices = file.sharePermissionsCollaborationServices
-        for element in file.sharePermissionsCloudMesh {
-            metadata.sharePermissionsCloudMesh.append(element)
-        }
+
         for element in file.shareType {
             metadata.shareType.append(element)
         }

iOSClient/Data/NCManageDatabase+Share.swift

@@ -55,6 +55,8 @@ class tableShareV2: Object {
     @objc dynamic var sendPasswordByTalk: Bool = false
     @objc dynamic var serverUrl = ""
 
+    ///
+    /// shareType - (int) 0 = user; 1 = group; 3 = public link; 4 = email; 6 = federated cloud share; 7 = circle; 10 = Talk conversation
     ///
     /// See [OCS Share API documentation](https://docs.nextcloud.com/server/latest/developer_manual/client_apis/OCS/ocs-share-api.html) for semantic definitions of the different possible values.
     ///
@@ -252,9 +254,9 @@ extension NCManageDatabase {
     // There is currently only one share attribute “download” from the scope “permissions”. This attribute is only valid for user and group shares, not for public link shares.
     func setAttibuteDownload(state: Bool) -> String? {
         if state {
-            return nil
+            return "[{\"scope\":\"permissions\",\"key\":\"download\",\"value\":true}]"
         } else {
-            return "[{\"scope\":\"permissions\",\"key\":\"download\",\"enabled\":false}]"
+            return "[{\"scope\":\"permissions\",\"key\":\"download\",\"value\":null}]"
         }
     }
 
@@ -264,10 +266,10 @@ extension NCManageDatabase {
                 if let json = try JSONSerialization.jsonObject(with: data) as? [Dictionary<String, Any>] {
                     for sub in json {
                         let key = sub["key"] as? String
-                        let enabled = sub["enabled"] as? Bool
+                        let enabled = (sub["value"] as? Bool) /* >= NC 30 */ ?? sub["enabled"] as? Bool // /* < NC 29 */
                         let scope = sub["scope"] as? String
-                        if key == "download", scope == "permissions", let enabled = enabled {
-                            return enabled
+                        if key == "download", scope == "permissions" {
+                            return enabled ?? false
                         }
                     }
                 }

iOSClient/Menu/NCShare+Menu.swift

@@ -30,7 +30,7 @@ extension NCShare {
         let capabilities = NCCapabilities.shared.getCapabilities(account: self.metadata.account)
         var actions = [NCMenuAction]()
 
-        if share.shareType == 3, canReshare {
+        if share.shareType == NCShareCommon().SHARE_TYPE_LINK, canReshare {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_share_add_sharelink_", comment: ""),
@@ -95,40 +95,69 @@ extension NCShare {
         self.presentMenu(with: actions, sender: sender)
     }
 
-    func toggleUserPermissionMenu(isDirectory: Bool, tableShare: tableShare, sender: Any?) {
+    func toggleQuickPermissionsMenu(isDirectory: Bool, share: tableShare, sender: Any?) {
         var actions = [NCMenuAction]()
         let permissions = NCPermissions()
 
-        actions.append(
-            NCMenuAction(
+        actions.append(contentsOf:
+            [NCMenuAction(
                 title: NSLocalizedString("_share_read_only_", comment: ""),
                 icon: utility.loadImage(named: "eye", colors: [NCBrandColor.shared.iconImageColor]),
-                selected: tableShare.permissions == (permissions.permissionReadShare + permissions.permissionShareShare) || tableShare.permissions == permissions.permissionReadShare,
+                selected: share.permissions == (permissions.permissionReadShare + permissions.permissionShareShare) || share.permissions == permissions.permissionReadShare,
                 on: false,
                 sender: sender,
                 action: { _ in
-                    let canShare = permissions.isPermissionToCanShare(tableShare.permissions)
-                    let permissions = permissions.getPermission(canEdit: false, canCreate: false, canChange: false, canDelete: false, canShare: canShare, isDirectory: isDirectory)
-                    self.updateSharePermissions(share: tableShare, permissions: permissions)
+                    let permissions = permissions.getPermissionValue(canCreate: false, canEdit: false, canDelete: false, canShare: false, isDirectory: isDirectory)
+                    self.updateSharePermissions(share: share, permissions: permissions)
                 }
-            )
-        )
-
-        actions.append(
+            ),
             NCMenuAction(
-                title: isDirectory ? NSLocalizedString("_share_allow_upload_", comment: "") : NSLocalizedString("_share_editing_", comment: ""),
+                title: NSLocalizedString("_share_editing_", comment: ""),
                 icon: utility.loadImage(named: "pencil", colors: [NCBrandColor.shared.iconImageColor]),
-                selected: hasUploadPermission(tableShare: tableShare),
+                selected: hasUploadPermission(tableShare: share),
                 on: false,
                 sender: sender,
                 action: { _ in
-                    let canShare = permissions.isPermissionToCanShare(tableShare.permissions)
-                    let permissions = permissions.getPermission(canEdit: true, canCreate: true, canChange: true, canDelete: true, canShare: canShare, isDirectory: isDirectory)
-                    self.updateSharePermissions(share: tableShare, permissions: permissions)
+                    let permissions = permissions.getPermissionValue(canCreate: true, canEdit: true, canDelete: true, canShare: true, isDirectory: isDirectory)
+                    self.updateSharePermissions(share: share, permissions: permissions)
                 }
-            )
+            ),
+            NCMenuAction(
+                title: NSLocalizedString("_custom_permissions_", comment: ""),
+                icon: utility.loadImage(named: "ellipsis", colors: [NCBrandColor.shared.iconImageColor]),
+                sender: sender,
+                action: { _ in
+                    guard
+                        let advancePermission = UIStoryboard(name: "NCShare", bundle: nil).instantiateViewController(withIdentifier: "NCShareAdvancePermission") as? NCShareAdvancePermission,
+                        let navigationController = self.navigationController, !share.isInvalidated else { return }
+                    advancePermission.networking = self.networking
+                    advancePermission.share = tableShare(value: share)
+                    advancePermission.oldTableShare = tableShare(value: share)
+                    advancePermission.metadata = self.metadata
+
+                    if let downloadLimit = try? self.database.getDownloadLimit(byAccount: self.metadata.account, shareToken: share.token) {
+                        advancePermission.downloadLimit = .limited(limit: downloadLimit.limit, count: downloadLimit.count)
+                    }
+
+                    navigationController.pushViewController(advancePermission, animated: true)
+                }
+            )]
         )
 
+        if isDirectory && (share.shareType == NCShareCommon().SHARE_TYPE_LINK /* public link */ || share.shareType == NCShareCommon().SHARE_TYPE_EMAIL) {
+            actions.insert(NCMenuAction(
+                       title: NSLocalizedString("_share_file_drop_", comment: ""),
+                       icon: utility.loadImage(named: "arrow.up.document", colors: [NCBrandColor.shared.iconImageColor]),
+                       selected: share.permissions == permissions.permissionCreateShare,
+                       on: false,
+                       sender: sender,
+                       action: { _ in
+                           let permissions = permissions.getPermissionValue(canRead: false, canCreate: true, canEdit: false, canDelete: false, canShare: false, isDirectory: isDirectory)
+                           self.updateSharePermissions(share: share, permissions: permissions)
+                       }
+                   ), at: 2)
+        }
+
         self.presentMenu(with: actions, sender: sender)
     }
 
@@ -152,6 +181,9 @@ extension NCShare {
             if let model = try database.getDownloadLimit(byAccount: metadata.account, shareToken: updatedShare.token) {
                 downloadLimit = .limited(limit: model.limit, count: model.count)
             }
+            if let model = try database.getDownloadLimit(byAccount: metadata.account, shareToken: updatedShare.token) {
+                downloadLimit = .limited(limit: model.limit, count: model.count)
+            }
         } catch {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Failed to get download limit from database!")
             return

iOSClient/Share/Advanced/NCShareAdvancePermission.swift

@@ -27,59 +27,6 @@ import SVGKit
 import CloudKit
 
 class NCShareAdvancePermission: UITableViewController, NCShareAdvanceFotterDelegate, NCShareNavigationTitleSetting {
-    func dismissShareAdvanceView(shouldSave: Bool) {
-        guard shouldSave else {
-            guard oldTableShare?.hasChanges(comparedTo: share) != false else {
-                navigationController?.popViewController(animated: true)
-                return
-            }
-
-            let alert = UIAlertController(
-                title: NSLocalizedString("_cancel_request_", comment: ""),
-                message: NSLocalizedString("_discard_changes_info_", comment: ""),
-                preferredStyle: .alert)
-
-            alert.addAction(UIAlertAction(
-                title: NSLocalizedString("_discard_changes_", comment: ""),
-                style: .destructive,
-                handler: { _ in self.navigationController?.popViewController(animated: true) }))
-
-            alert.addAction(UIAlertAction(title: NSLocalizedString("_continue_editing_", comment: ""), style: .default))
-            self.present(alert, animated: true)
-
-            return
-        }
-
-        Task {
-            // TODO: Apply share token to download limit object
-
-            if isNewShare {
-                let serverUrl = metadata.serverUrl + "/" + metadata.fileName
-
-                if share.shareType != NCShareCommon().SHARE_TYPE_LINK, metadata.e2eEncrypted,
-                   NCCapabilities.shared.getCapabilities(account: metadata.account).capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV20 {
-
-                    if NCNetworkingE2EE().isInUpload(account: metadata.account, serverUrl: serverUrl) {
-                        let error = NKError(errorCode: NCGlobal.shared.errorE2EEUploadInProgress, errorDescription: NSLocalizedString("_e2e_in_upload_", comment: ""))
-                        return NCContentPresenter().showInfo(error: error)
-                    }
-
-                    let error = await NCNetworkingE2EE().uploadMetadata(serverUrl: serverUrl, addUserId: share.shareWith, removeUserId: nil, account: metadata.account)
-
-                    if error != .success {
-                        return NCContentPresenter().showError(error: error)
-                    }
-                }
-
-                networking?.createShare(share, downloadLimit: self.downloadLimit)
-            } else {
-                networking?.updateShare(share, downloadLimit: self.downloadLimit)
-            }
-        }
-
-        navigationController?.popViewController(animated: true)
-    }
-
     let database = NCManageDatabase.shared
 
     var oldTableShare: tableShare?
@@ -172,7 +119,7 @@ class NCShareAdvancePermission: UITableViewController, NCShareAdvanceFotterDeleg
 
     override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         if section == 0 {
-            return NSLocalizedString("_permissions_", comment: "")
+            return NSLocalizedString("_custom_permissions_", comment: "")
         } else if section == 1 {
             return NSLocalizedString("_advanced_", comment: "")
         } else { return nil }
@@ -186,7 +133,7 @@ class NCShareAdvancePermission: UITableViewController, NCShareAdvanceFotterDeleg
         if section == 0 {
             // check reshare permission, if restricted add note
             let maxPermission = metadata.directory ? NCPermissions().permissionMaxFolderShare : NCPermissions().permissionMaxFileShare
-            return shareConfig.resharePermission != maxPermission ? shareConfig.permissions.count + 1 : shareConfig.permissions.count
+            return shareConfig.sharePermission != maxPermission ? shareConfig.permissions.count + 1 : shareConfig.permissions.count
         } else if section == 1 {
             return shareConfig.advanced.count
         } else { return 0 }
@@ -208,7 +155,7 @@ class NCShareAdvancePermission: UITableViewController, NCShareAdvanceFotterDeleg
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
         guard let cellConfig = shareConfig.config(for: indexPath) else { return }
-        guard let cellConfig = cellConfig as? NCShareDetails else {
+        guard let cellConfig = cellConfig as? NCAdvancedPermission else {
             cellConfig.didSelect(for: share)
             tableView.reloadData()
             return
@@ -259,8 +206,66 @@ class NCShareAdvancePermission: UITableViewController, NCShareAdvanceFotterDeleg
                 tableView.reloadData()
             }
             self.present(alertController, animated: true)
+        case .downloadAndSync:
+            share.downloadAndSync.toggle()
+            tableView.reloadData()
         }
     }
+
+    func dismissShareAdvanceView(shouldSave: Bool) {
+        guard shouldSave else {
+            guard oldTableShare?.hasChanges(comparedTo: share) != false else {
+                navigationController?.popViewController(animated: true)
+                return
+            }
+
+            let alert = UIAlertController(
+                title: NSLocalizedString("_cancel_request_", comment: ""),
+                message: NSLocalizedString("_discard_changes_info_", comment: ""),
+                preferredStyle: .alert)
+
+            alert.addAction(UIAlertAction(
+                title: NSLocalizedString("_discard_changes_", comment: ""),
+                style: .destructive,
+                handler: { _ in self.navigationController?.popViewController(animated: true) }))
+
+            alert.addAction(UIAlertAction(title: NSLocalizedString("_continue_editing_", comment: ""), style: .default))
+            self.present(alert, animated: true)
+
+            return
+        }
+
+        Task {
+            if (share.shareType == NCShareCommon().SHARE_TYPE_LINK || share.shareType == NCShareCommon().SHARE_TYPE_EMAIL) && NCPermissions().isPermissionToCanShare(share.permissions) {
+                share.permissions = share.permissions - NCPermissions().permissionShareShare
+            }
+
+            if isNewShare {
+                let serverUrl = metadata.serverUrl + "/" + metadata.fileName
+
+                if share.shareType != NCShareCommon().SHARE_TYPE_LINK, metadata.e2eEncrypted,
+                   NCCapabilities.shared.getCapabilities(account: metadata.account).capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV20 {
+
+                    if NCNetworkingE2EE().isInUpload(account: metadata.account, serverUrl: serverUrl) {
+                        let error = NKError(errorCode: NCGlobal.shared.errorE2EEUploadInProgress, errorDescription: NSLocalizedString("_e2e_in_upload_", comment: ""))
+                        return NCContentPresenter().showInfo(error: error)
+                    }
+
+                    let error = await NCNetworkingE2EE().uploadMetadata(serverUrl: serverUrl, addUserId: share.shareWith, removeUserId: nil, account: metadata.account)
+
+                    if error != .success {
+                        return NCContentPresenter().showError(error: error)
+                    }
+                }
+
+                networking?.createShare(share, downloadLimit: self.downloadLimit)
+            } else {
+                networking?.updateShare(share, downloadLimit: self.downloadLimit)
+            }
+        }
+
+        navigationController?.popViewController(animated: true)
+    }
 }
 
 // MARK: - NCShareDownloadLimitTableViewControllerDelegate