New FileProviderEnumerator

Nextcloud.xcodeproj/project.pbxproj

@@ -240,6 +240,8 @@
 		F75AC2431F1F62450073EC19 /* NCManageAutoUploadFileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75AC2421F1F62450073EC19 /* NCManageAutoUploadFileName.swift */; };
 		F75ADF451DC75FFE008A7347 /* CCLogin.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F75ADF441DC75FFE008A7347 /* CCLogin.storyboard */; };
 		F75AE3C71E9D12900088BB09 /* SwiftyAvatar.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75AE3C61E9D12900088BB09 /* SwiftyAvatar.swift */; };
+		F75EAC4D20974B470071FF95 /* FileProviderEnumeratorWorkingSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75EAC4C20974B470071FF95 /* FileProviderEnumeratorWorkingSet.swift */; };
+		F75EAC4F20974B5E0071FF95 /* FileProviderEnumeratorFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75EAC4E20974B5E0071FF95 /* FileProviderEnumeratorFile.swift */; };
 		F75EDFBD1E8C112F00E6F369 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F75EDFBC1E8C112F00E6F369 /* libsqlite3.0.tbd */; };
 		F75EDFBF1E8C116D00E6F369 /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F75EDFBE1E8C116D00E6F369 /* libstdc++.tbd */; };
 		F762CAF71EACB66200B38484 /* XLFormBaseCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F762CAA41EACB66200B38484 /* XLFormBaseCell.m */; };
@@ -1037,6 +1039,8 @@
 		F75B923F1ECAE55F00199C96 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Intro.strings; sourceTree = "<group>"; };
 		F75B92401ECAE55F00199C96 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Error.strings; sourceTree = "<group>"; };
 		F75CDBF51DF063AD00116AD0 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; name = .gitignore; path = ../.gitignore; sourceTree = "<group>"; };
+		F75EAC4C20974B470071FF95 /* FileProviderEnumeratorWorkingSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileProviderEnumeratorWorkingSet.swift; sourceTree = "<group>"; };
+		F75EAC4E20974B5E0071FF95 /* FileProviderEnumeratorFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileProviderEnumeratorFile.swift; sourceTree = "<group>"; };
 		F75EDFBC1E8C112F00E6F369 /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
 		F75EDFBE1E8C116D00E6F369 /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
 		F762CAA31EACB66200B38484 /* XLFormBaseCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XLFormBaseCell.h; sourceTree = "<group>"; };
@@ -2160,6 +2164,8 @@
 			children = (
 				F7F54CAB1E5AFF1E00E19C62 /* PickerFileProvider-Bridging-Header.h */,
 				F7496B7B208F548E004B299C /* FileProviderEnumerator.swift */,
+				F75EAC4C20974B470071FF95 /* FileProviderEnumeratorWorkingSet.swift */,
+				F75EAC4E20974B5E0071FF95 /* FileProviderEnumeratorFile.swift */,
 				F7496B7C208F548E004B299C /* FileProviderItem.swift */,
 				F74344241E1264EE001CC831 /* FileProvider.swift */,
 			);
@@ -3761,10 +3767,12 @@
 				F7BB50CC1F22387900C47094 /* OCExternalSites.m in Sources */,
 				F7BB50EA1F2238FB00C47094 /* UIScrollView+EmptyDataSet.m in Sources */,
 				F7F878B11FB9E3B900599E4F /* NCEndToEndMetadata.swift in Sources */,
+				F75EAC4D20974B470071FF95 /* FileProviderEnumeratorWorkingSet.swift in Sources */,
 				F7BB50F71F2239BF00C47094 /* BKPasscodeLockScreenManager.m in Sources */,
 				F7BB50DB1F2238A900C47094 /* OCXMLShareByLinkParser.m in Sources */,
 				F7BB50E21F2238D000C47094 /* AFURLRequestSerialization.m in Sources */,
 				F7BB50BC1F22375D00C47094 /* CCBKPasscode.m in Sources */,
+				F75EAC4F20974B5E0071FF95 /* FileProviderEnumeratorFile.swift in Sources */,
 				F7BB50D81F2238A000C47094 /* OCXMLListParser.m in Sources */,
 				F7BB50E41F2238D500C47094 /* AFURLSessionManager.m in Sources */,
 				F7BB50F91F2239C800C47094 /* BKShiftingView.m in Sources */,

PickerFileProvider/FileProviderEnumerator.swift

@@ -38,21 +38,10 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
 
             if (enumeratedItemIdentifier == .rootContainer) {
                 serverUrl = homeServerUrl
-            } else if (enumeratedItemIdentifier == .workingSet) {
-                serverUrl = "workingSet"
             } else {
                 if let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", account, enumeratedItemIdentifier.rawValue))  {
-                    
-                    if metadata.directory == true {
-                        
-                        if let directorySource = NCManageDatabase.sharedInstance.getTableDirectory(predicate: NSPredicate(format: "account = %@ AND directoryID = %@", account, metadata.directoryID))  {
-                            serverUrl = directorySource.serverUrl + "/" + metadata.fileName
-                        }
-                        
-                    } else {
-                        
-                        print("è un file")
-                        
+                    if let directorySource = NCManageDatabase.sharedInstance.getTableDirectory(predicate: NSPredicate(format: "account = %@ AND directoryID = %@", account, metadata.directoryID))  {
+                        serverUrl = directorySource.serverUrl + "/" + metadata.fileName
                     }
                 }
             }

PickerFileProvider/FileProviderEnumeratorFile.swift

@@ -0,0 +1,9 @@
+//
+//  FileProviderEnumeratorFile.swift
+//  PickerFileProvider
+//
+//  Created by Marino Faggiana on 30/04/18.
+//  Copyright © 2018 TWS. All rights reserved.
+//
+
+import Foundation

PickerFileProvider/FileProviderEnumeratorWorkingSet.swift

@@ -0,0 +1,9 @@
+//
+//  FileProviderEnumeratorWorkingSet.swift
+//  PickerFileProvider
+//
+//  Created by Marino Faggiana on 30/04/18.
+//  Copyright © 2018 TWS. All rights reserved.
+//
+
+import Foundation