add groupfolders

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Groupfolders/NCGroupfolders.swift

@@ -55,7 +55,13 @@ class NCGroupfolders: NCCollectionViewCommon {
 
         DispatchQueue.global().async {
 
-            let metadatas = NCManageDatabase.shared.getGroupFoldersMetadata(account: self.appDelegate.account)
+            var metadatas: [tableMetadata] = []
+
+            if self.serverUrl.isEmpty {
+                metadatas = NCManageDatabase.shared.getGroupFoldersMetadata(account: self.appDelegate.account)
+            } else {
+                metadatas = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", self.appDelegate.account, self.serverUrl))
+            }
 
             self.dataSource = NCDataSource(
                 metadatas: metadatas,

iOSClient/Networking/NCService.swift

@@ -251,13 +251,6 @@ class NCService: NSObject {
                     NextcloudKit.shared.nkCommonInstance.addInternalTypeIdentifier(typeIdentifier: directEditing.mimetype, classFile: NKCommon.TypeClassFile.document.rawValue, editor: directEditing.editor, iconName: NKCommon.TypeIconFile.document.rawValue, name: "document")
                 }
             }
-
-            // Added Groupfolders
-            NextcloudKit.shared.getGroupfolders(options: options) { account, results, data, error in
-                if error == .success, let groupfolders = results {
-                    NCManageDatabase.shared.addGroupfolders(account: account, groupfolders: groupfolders)
-                }
-            }
         }
     }
 

iOSClient/Share/NCShare.swift

@@ -96,6 +96,7 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
         if sharingEnabled {
             let isVisible = (self.navigationController?.topViewController as? NCSharePaging)?.indexPage == .sharing
             networking?.readShare(showLoadingIndicator: isVisible)
+            networking?.readGroupfolders(showLoadingIndicator: isVisible)
         }
     }
 

iOSClient/Share/NCShareNetworking.swift

@@ -40,6 +40,7 @@ class NCShareNetworking: NSObject {
     }
 
     func readShare(showLoadingIndicator: Bool) {
+
         if showLoadingIndicator {
             NCActivityIndicator.shared.start(backgroundView: view)
         }
@@ -47,13 +48,10 @@ class NCShareNetworking: NSObject {
         let filenamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId, account: metadata.account)!
         let parameter = NKShareParameter(path: filenamePath)
 
-        NextcloudKit.shared.nkCommonInstance.writeLog("[TEST] READSHARES")
-        
         NextcloudKit.shared.readShares(parameters: parameter) { account, shares, data, error in
             if showLoadingIndicator {
                 NCActivityIndicator.shared.stop()
             }
-
             if error == .success, let shares = shares {
                 let home = NCUtilityFileSystem.shared.getHomeServer(urlBase: self.metadata.urlBase, userId: self.metadata.userId)
                 NCManageDatabase.shared.addShare(account: self.metadata.account, home:home, shares: shares)
@@ -63,6 +61,22 @@ class NCShareNetworking: NSObject {
             self.delegate?.readShareCompleted()
         }
     }
+
+    func readGroupfolders(showLoadingIndicator: Bool) {
+
+        if showLoadingIndicator {
+            NCActivityIndicator.shared.start(backgroundView: view)
+        }
+
+        NextcloudKit.shared.getGroupfolders() { account, results, data, error in
+            if showLoadingIndicator {
+                NCActivityIndicator.shared.stop()
+            }
+            if error == .success, let groupfolders = results {
+                NCManageDatabase.shared.addGroupfolders(account: account, groupfolders: groupfolders)
+            }
+        }
+    }
     
     func createShare(option: NCTableShareable) {
         // NOTE: Permissions don't work for creating with file drop!