Marino Faggiana 6 years ago
parent
commit
19e07f95f9

+ 2 - 0
PickerFileProvider/FileProviderEnumerator.swift

@@ -90,6 +90,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             }
             
             // Favorite Directory
+            /*
             listFavoriteIdentifierRank = NCManageDatabase.sharedInstance.getTableMetadatasDirectoryFavoriteIdentifierRank()
             for (identifier, _) in listFavoriteIdentifierRank {
              
@@ -103,6 +104,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
                     items.append(item)
                 }
             }
+            */
             
             observer.didEnumerate(items)
             observer.finishEnumerating(upTo: nil)

+ 3 - 8
PickerFileProvider/FileProviderExtension+Actions.swift

@@ -280,10 +280,6 @@ extension FileProviderExtension {
             return
         }
          
-        // Refresh Favorite Identifier Rank
-        listFavoriteIdentifierRank = NCManageDatabase.sharedInstance.getTableMetadatasDirectoryFavoriteIdentifierRank()
-        var favorite = false
-        
         if favoriteRank == nil {
             listFavoriteIdentifierRank.removeValue(forKey: itemIdentifier.rawValue)
         } else {
@@ -291,7 +287,6 @@ extension FileProviderExtension {
             if rank == nil {
                 listFavoriteIdentifierRank[itemIdentifier.rawValue] = favoriteRank//NSNumber(value: Int64(newRank))
             }
-            favorite = true
         }
         
         let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier, providerData: providerData)
@@ -301,9 +296,9 @@ extension FileProviderExtension {
             
         completionHandler(item, nil)
         
-        if (favorite == true && metadata.favorite == false) || (favorite == false && metadata.favorite == true) {
-            settingFavorite(favorite, withIdentifier: itemIdentifier, parentItemIdentifier: parentItemIdentifier, metadata: metadata)
-        }
+        //if (favorite == true && metadata.favorite == false) || (favorite == false && metadata.favorite == true) {
+        //    settingFavorite(favorite, withIdentifier: itemIdentifier, parentItemIdentifier: parentItemIdentifier, metadata: metadata)
+        //}
     }
     
     override func setTagData(_ tagData: Data?, forItemIdentifier itemIdentifier: NSFileProviderItemIdentifier, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void) {

+ 11 - 21
PickerFileProvider/FileProviderExtension+Network.swift

@@ -88,29 +88,19 @@ extension FileProviderExtension {
             return
         }
         
-        DispatchQueue(label: "com.nextcloud", qos: .background, attributes: .concurrent, autoreleaseFrequency: .inherit, target: nil).async {
-                
-            //NSString *fileOrFolderPath = [CCUtility returnFileNamePathFromFileName:fileName serverUrl:serverUrl activeUrl:_activeUrl];
-                
-            let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: self.providerData.accountUser, withUserID: self.providerData.accountUserID, withPassword: self.providerData.accountPassword, withUrl: self.providerData.accountUrl)
-            ocNetworking?.settingFavorite(metadata.fileName, serverUrl: serverUrl, favorite: favorite, success: {
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
+        ocNetworking?.settingFavorite(metadata.fileName, serverUrl: serverUrl, favorite: favorite, success: {
                     
-                // Change DB
-                metadata.favorite = favorite
-                _ = NCManageDatabase.sharedInstance.addMetadata(metadata)
+            // Change DB
+            metadata.favorite = favorite
+            _ = NCManageDatabase.sharedInstance.addMetadata(metadata)
                     
-                // Refresh Favorite Identifier Rank
-                listFavoriteIdentifierRank = NCManageDatabase.sharedInstance.getTableMetadatasDirectoryFavoriteIdentifierRank()
-                                    
-                let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier, providerData: self.providerData)
-
-                fileProviderSignalUpdateItem[item.itemIdentifier] = item
-                self.signalEnumerator(for: [item.parentItemIdentifier, .workingSet])
-                
-            }, failure: { (errorMessage, errorCode) in
-                print("errorMessage")
-            })
-        }
+            // Refresh Favorite Identifier Rank
+            //listFavoriteIdentifierRank = NCManageDatabase.sharedInstance.getTableMetadatasDirectoryFavoriteIdentifierRank()
+            
+        }, failure: { (errorMessage, errorCode) in
+            print("errorMessage")
+        })
     }
     
     // --------------------------------------------------------------------------------------------

+ 0 - 2
PickerFileProvider/FileProviderExtension.swift

@@ -82,8 +82,6 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
         
         if #available(iOSApplicationExtension 11.0, *) {
             
-            //providerData.listFavoriteIdentifierRank = NCManageDatabase.sharedInstance.getTableMetadatasDirectoryFavoriteIdentifierRank()
-            
             // Timer for upload
             if timerUpload == nil {
                 

+ 1 - 2
PickerFileProvider/FileProviderItem.swift

@@ -115,11 +115,10 @@ class FileProviderItem: NSObject, NSFileProviderItem {
             
         } else {
             
-            
             if #available(iOSApplicationExtension 11.0, *) {
                 let rank = listFavoriteIdentifierRank[metadata.fileID]
                 if (rank == nil) {
-                    favoriteRank = NSNumber(value: Int64(NSFileProviderFavoriteRankUnranked))
+                    favoriteRank = nil
                 } else {
                     favoriteRank = listFavoriteIdentifierRank[metadata.fileID]
                 }