marinofaggiana 5 年之前
父節點
當前提交
05e66cf99a

+ 4 - 1
File Provider Extension/FileProviderData.swift

@@ -99,7 +99,10 @@ class fileProviderData: NSObject {
                 account = tableAccount.account
                 accountUser = tableAccount.user
                 accountUserID = tableAccount.userID
-                accountPassword = CCUtility.getPassword(tableAccount.account)
+                guard let password = CCUtility.getPassword(tableAccount.account) else {
+                    return false
+                }
+                accountPassword = password
                 accountUrl = tableAccount.url
                 homeServerUrl = CCUtility.getHomeServerUrlActiveUrl(tableAccount.url)
                 

+ 4 - 2
iOSClient/Library/OCCommunicationLib/OCWebDavClient/OCWebDAVClient.m

@@ -454,18 +454,20 @@ NSString const *OCWebDAVModificationDateKey	= @"modificationdate";
                             "<d:descending/>"
                         "</d:order>"
                     "</d:orderby>"
+            /*
                     "<d:where><d:and><d:or>"
                         "<d:gte>"
                             "<d:prop><d:getlastmodified/></d:prop>"
                             "<d:literal>%@</d:literal>"
                         "</d:gte>"
                     "</d:or></d:and></d:where>"
-                    "<d:limit>"
+            */
+                "<d:limit>"
                         "<d:nresults>%@</d:nresults>"
                     "</d:limit>"
                 "</d:basicsearch>"
                 "</d:searchrequest>"
-    ,userID, folderStartWith, dateLastModified, [@(numberOfItem) stringValue]];
+    ,userID, folderStartWith, [@(numberOfItem) stringValue]];
     
     [request setHTTPBody:[body dataUsingEncoding:NSUTF8StringEncoding]];
     [request setValue:@"text/xml" forHTTPHeaderField:@"Content-Type"];