Browse Source

add groupfolders

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 years ago
parent
commit
92b773f91b
2 changed files with 13 additions and 21 deletions
  1. 0 1
      iOSClient/Share/NCShare.swift
  2. 13 20
      iOSClient/Share/NCShareNetworking.swift

+ 0 - 1
iOSClient/Share/NCShare.swift

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

+ 13 - 20
iOSClient/Share/NCShareNetworking.swift

@@ -49,35 +49,28 @@ class NCShareNetworking: NSObject {
         let parameter = NKShareParameter(path: filenamePath)
 
         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)
+                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)
+                    }
+                    self.delegate?.readShareCompleted()
+                }
             } else {
+                if showLoadingIndicator {
+                    NCActivityIndicator.shared.stop()
+                }
                 NCContentPresenter.shared.showError(error: error)
+                self.delegate?.readShareCompleted()
             }
-            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!
         // https://github.com/nextcloud/server/issues/17504