Przeglądaj źródła

fix group

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 1 rok temu
rodzic
commit
9479f6981e

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

@@ -1115,7 +1115,7 @@ extension NCManageDatabase {
 
         let groupfolders = realm.objects(TableGroupfolders.self).filter("account == %@", account)
         for groupfolder in groupfolders {
-            let serverUrlFileName = homeServerUrl + "/" + groupfolder.mountPoint
+            let serverUrlFileName = homeServerUrl + groupfolder.mountPoint
             if let directory = realm.objects(tableDirectory.self).filter("account == %@ AND serverUrl == %@", account, serverUrlFileName).first,
                let metadata = realm.objects(tableMetadata.self).filter("ocId == %@", directory.ocId).first {
                 metadatas.append(tableMetadata(value: metadata))

+ 1 - 1
iOSClient/Groupfolders/NCGroupfolders.swift

@@ -126,7 +126,7 @@ class NCGroupfolders: NCCollectionViewCommon {
                 if error == .success, let groupfolders = results {
                     NCManageDatabase.shared.addGroupfolders(account: account, groupfolders: groupfolders)
                     for groupfolder in groupfolders {
-                        let serverUrlFileName = homeServerUrl + "/" + groupfolder.mountPoint
+                        let serverUrlFileName = homeServerUrl + groupfolder.mountPoint
                         if NCManageDatabase.shared.getMetadataFromDirectory(account: self.appDelegate.account, serverUrl: serverUrlFileName) == nil {
                             NCOperationQueue.shared.readFile(serverUrlFileName: serverUrlFileName)
                         }

+ 1 - 1
iOSClient/More/NCMore.swift

@@ -151,7 +151,7 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
 
         // ITEM : Groupfolders
         let hasAccessibleGroupFolders = NCManageDatabase.shared.getCapabilitiesServerBool(account: appDelegate.account, elements: NCElementsJSON.shared.capabilitiesGroupfoldersEnabled, exists: false)
-        if serverVersionMajor >= NCGlobal.shared.nextcloudVersion27 && hasAccessibleGroupFolders {
+        if serverVersionMajor >= NCGlobal.shared.nextcloudVersion26 && hasAccessibleGroupFolders {
             item = NKExternalSite()
             item.name = "_group_folders_"
             item.icon = "groupfolders"

+ 1 - 1
iOSClient/Networking/NCOperationQueue.swift

@@ -40,7 +40,7 @@ import NextcloudKit
     private let downloadThumbnailActivityQueue = Queuer(name: "downloadThumbnailActivityQueue", maxConcurrentOperationCount: 10, qualityOfService: .default)
     private let downloadAvatarQueue = Queuer(name: "downloadAvatarQueue", maxConcurrentOperationCount: 10, qualityOfService: .default)
     private let unifiedSearchQueue = Queuer(name: "unifiedSearchQueue", maxConcurrentOperationCount: 1, qualityOfService: .default)
-    private let readFileQueue = Queuer(name: "unifiedSearchQueue", maxConcurrentOperationCount: 10, qualityOfService: .default)
+    private let readFileQueue = Queuer(name: "readFileQueue", maxConcurrentOperationCount: 10, qualityOfService: .default)
 
     @objc func cancelAllQueue() {
         downloadCancelAll()