Bladeren bron

add groupfolders

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 1 jaar geleden
bovenliggende
commit
07113e4bc9
2 gewijzigde bestanden met toevoegingen van 4 en 3 verwijderingen
  1. 2 2
      iOSClient/Data/NCManageDatabase+Metadata.swift
  2. 2 1
      iOSClient/Groupfolders/NCGroupfolders.swift

+ 2 - 2
iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -1085,11 +1085,11 @@ extension NCManageDatabase {
         return num
     }
 
-    func getGroupFoldersMetadata(account: String) -> [tableMetadata] {
+    func getGroupFoldersMetadata(account: String, serverUrl: String) -> [tableMetadata] {
 
         let realm = try! Realm()
 
-        let result = realm.objects(tableMetadata.self).filter("mountType == 'group'")
+        let result = realm.objects(tableMetadata.self).filter("mountType == 'group' && directory == true && serverUrl == %@", serverUrl)
         return Array(result.map { tableMetadata.init(value: $0) })
     } 
 }

+ 2 - 1
iOSClient/Groupfolders/NCGroupfolders.swift

@@ -58,7 +58,8 @@ class NCGroupfolders: NCCollectionViewCommon {
             var metadatas: [tableMetadata] = []
 
             if self.serverUrl.isEmpty {
-                metadatas = NCManageDatabase.shared.getGroupFoldersMetadata(account: self.appDelegate.account)
+                let serverUrl = NCUtilityFileSystem.shared.getHomeServer(urlBase: self.appDelegate.urlBase, userId: self.appDelegate.userId)
+                metadatas = NCManageDatabase.shared.getGroupFoldersMetadata(account: self.appDelegate.account, serverUrl: serverUrl)
             } else {
                 metadatas = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", self.appDelegate.account, self.serverUrl))
             }