Explorar o código

added hasAccessibleGroupFolders

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana hai 1 ano
pai
achega
5bcde03a92

+ 1 - 1
iOSClient/Data/NCElementsJSON.swift

@@ -71,5 +71,5 @@ import UIKit
     @objc public let capabilitiesUserStatusEnabled: Array = ["ocs", "data", "capabilities", "user_status", "enabled"]
     @objc public let capabilitiesUserStatusSupportsEmoji: Array = ["ocs", "data", "capabilities", "user_status", "supports_emoji"]
 
-    @objc public let capabilitiesGroupfoldersEnabled: Array = ["ocs", "data", "capabilities", "groupfolders", "enabled"]
+    @objc public let capabilitiesGroupfoldersEnabled: Array = ["ocs", "data", "capabilities", "groupfolders", "hasAccessibleGroupFolders"]
 }

+ 10 - 7
iOSClient/More/NCMore.swift

@@ -88,6 +88,7 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
 
         var item = NKExternalSite()
         var quota: String = ""
+        let serverVersionMajor = NCManageDatabase.shared.getCapabilitiesServerInt(account: appDelegate.account, elements: NCElementsJSON.shared.capabilitiesVersionMajor)
 
         // Clear
         functionMenu.removeAll()
@@ -149,13 +150,16 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         functionMenu.append(item)
 
         // ITEM : Groupfolders
-        item = NKExternalSite()
-        item.name = "_group_folders_"
-        item.icon = "groupfolders"
-        item.url = "segueGroupfolders"
-        item.order = 61
-        functionMenu.append(item)
 
+        let hasAccessibleGroupFolders = NCManageDatabase.shared.getCapabilitiesServerBool(account: appDelegate.account, elements: NCElementsJSON.shared.capabilitiesGroupfoldersEnabled, exists: false)
+        if serverVersionMajor >= NCGlobal.shared.nextcloudVersion27 && hasAccessibleGroupFolders {
+            item = NKExternalSite()
+            item.name = "_group_folders_"
+            item.icon = "groupfolders"
+            item.url = "segueGroupfolders"
+            item.order = 61
+            functionMenu.append(item)
+        }
         // ITEM : Scan
         item = NKExternalSite()
         item.name = "_scanned_images_"
@@ -165,7 +169,6 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         functionMenu.append(item)
 
         // ITEM : Trash
-        let serverVersionMajor = NCManageDatabase.shared.getCapabilitiesServerInt(account: appDelegate.account, elements: NCElementsJSON.shared.capabilitiesVersionMajor)
         if serverVersionMajor >= NCGlobal.shared.nextcloudVersion15 {
 
             item = NKExternalSite()

+ 1 - 0
iOSClient/NCGlobal.swift

@@ -102,6 +102,7 @@ class NCGlobal: NSObject {
     let nextcloudVersion24: Int                     =  24
     let nextcloudVersion25: Int                     =  25
     let nextcloudVersion26: Int                     =  26
+    let nextcloudVersion27: Int                     =  27
 
     // Nextcloud unsupported
     //