marinofaggiana 4 年之前
父節點
當前提交
7b5999c706

+ 1 - 1
File Provider Extension/FileProviderEnumerator.swift

@@ -239,7 +239,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
 
                 NCCommunication.sharedInstance.readFileOrFolder(serverUrlFileName: serverUrl, depth: "1", showHiddenFiles: CCUtility.getShowHiddenFiles(), account: fileProviderData.sharedInstance.account, completionHandler: { (account, files, errorCode, errorDescription) in
                     
-                    if errorCode == 0 && files != nil  && files!.count >= 1 {
+                    if errorCode == 0 && files != nil {
                         
                         // Metadata conversion
                         var metadataFolder = tableMetadata()

+ 1 - 1
Share/NCSelectDestination.m

@@ -228,7 +228,7 @@
 {
     [[NCCommunication sharedInstance] readFileOrFolderWithServerUrlFileName:_serverUrl depth:@"1" showHiddenFiles:[CCUtility getShowHiddenFiles] account:activeAccount completionHandler:^(NSString *account, NSArray<NCFile *> *files, NSInteger errorCode, NSString *errorDecription) {
         
-        if (errorCode == 0 && files.count >= 1) {
+        if (errorCode == 0 && files != nil) {
 
             // Metadata conversion
             tableMetadata *metadataFolder = [tableMetadata new];

+ 1 - 1
iOSClient/Activity/NCActivity.swift

@@ -406,7 +406,7 @@ extension activityTableViewCell: UICollectionViewDelegate {
                        
                         NCUtility.sharedInstance.stopActivityIndicator()
                         
-                        if account == self.appDelegate.activeAccount && errorCode == 0 && files?.count ?? 0 > 0  {
+                        if account == self.appDelegate.activeAccount && errorCode == 0 && files != nil  {
                             
                             let metadata = NCNetworking.sharedInstance.convertFileToMetadata(files![0])
                             metadata.fileName = fileName

+ 1 - 1
iOSClient/Favorites/CCFavorites.m

@@ -203,7 +203,7 @@
     
     [[NCCommunication sharedInstance] listingFavoritesWithServerUrl:appDelegate.activeUrl showHiddenFiles:[CCUtility getShowHiddenFiles] account:appDelegate.activeAccount completionHandler:^(NSString *account, NSArray *files, NSInteger errorCode, NSString *errorMessage) {
         
-         if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
+         if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount] && files != nil) {
              
              NSArray *metadatas = [[NCNetworking sharedInstance] convertFilesToMetadatas:files metadataFolder:nil];
              

+ 3 - 3
iOSClient/Main/CCMain.m

@@ -1379,7 +1379,7 @@
     
     [[NCCommunication sharedInstance] readFileOrFolderWithServerUrlFileName:serverUrl depth:@"1" showHiddenFiles:[CCUtility getShowHiddenFiles] account:appDelegate.activeAccount completionHandler:^(NSString *account, NSArray *files, NSInteger errorCode, NSString *errorDescription) {
         
-        if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
+        if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount] && files != nil) {
             
             tableMetadata *metadataFolder = [tableMetadata new];
             NSArray *metadatas = [[NCNetworking sharedInstance] convertFilesToMetadatas:files metadataFolder:&metadataFolder];
@@ -1443,7 +1443,7 @@
     
     [[NCCommunication sharedInstance] readFileOrFolderWithServerUrlFileName:self.serverUrl depth:@"0" showHiddenFiles:[CCUtility getShowHiddenFiles] account:appDelegate.activeAccount completionHandler:^(NSString *account, NSArray*files, NSInteger errorCode, NSString *errorMessage) {
           
-        if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount] && files.count > 0) {
+        if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount] && files != nil) {
             
             NCFile *file = files[0];
             
@@ -1480,7 +1480,7 @@
         
     [[NCCommunication sharedInstance] searchLiteralWithServerUrl:appDelegate.activeUrl user:appDelegate.activeUser depth:@"infinity" literal:_searchFileName showHiddenFiles:[CCUtility getShowHiddenFiles] account:appDelegate.activeAccount completionHandler:^(NSString *account, NSArray *files, NSInteger errorCode, NSString *errorDescription) {
         
-         if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
+         if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount] && files != nil) {
              
               NSArray *metadatas = [[NCNetworking sharedInstance] convertFilesToMetadatas:files metadataFolder:nil];
              _searchResultMetadatas = [[NSMutableArray alloc] initWithArray:metadatas];

+ 1 - 1
iOSClient/RichWorkspace/NCViewerRichWorkspace.swift

@@ -57,7 +57,7 @@ import MarkdownKit
         
         NCCommunication.sharedInstance.readFileOrFolder(serverUrlFileName: serverUrl, depth: "0", showHiddenFiles: CCUtility.getShowHiddenFiles(), account: appDelegate.activeAccount) { (account, files, errorCode, errorMessage) in
             
-            if errorCode == 0 && account == self.appDelegate.activeAccount && files?.count ?? 0 > 0 {
+            if errorCode == 0 && account == self.appDelegate.activeAccount && files != nil {
                 
                 if let file = files?[0] {
                     NCManageDatabase.sharedInstance.setDirectory(ocId: file.ocId, serverUrl: self.serverUrl, richWorkspace: file.richWorkspace, account: account)

+ 1 - 1
iOSClient/Select/NCSelect.swift

@@ -806,7 +806,7 @@ extension NCSelect {
         
         NCCommunication.sharedInstance.readFileOrFolder(serverUrlFileName: serverUrl, depth: "1", showHiddenFiles: CCUtility.getShowHiddenFiles(), account: appDelegate.activeAccount) { (account, files, errorCode, errorDescription) in
             
-            if errorCode == 0 && account == self.appDelegate.activeAccount {
+            if errorCode == 0 && account == self.appDelegate.activeAccount && files != nil {
                 
                 // Metadata conversion
                 let metadatas = NCNetworking.sharedInstance.convertFilesToMetadatas(files!, metadataFolder: &self.metadataFolder)

+ 1 - 1
iOSClient/Shares/NCShares.m

@@ -297,7 +297,7 @@
         NSString *serverUrlFileName = [NSString stringWithFormat:@"%@/%@", table.serverUrl, table.fileName];
                
         [[NCCommunication sharedInstance] readFileOrFolderWithServerUrlFileName:serverUrlFileName depth:@"0" showHiddenFiles:[CCUtility getShowHiddenFiles] account:appDelegate.activeAccount completionHandler:^(NSString *account, NSArray*files, NSInteger errorCode, NSString *errorDescription) {        
-            if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
+            if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount] && files != nil) {
                 tableMetadata *metadata = [[NCNetworking sharedInstance] convertFileToMetadata:files[0]];
                 metadata.fileName = table.fileName;
                 metadata.fileNameView = table.fileName;

+ 1 - 1
iOSClient/Synchronize/CCSynchronize.m

@@ -213,7 +213,7 @@
 
     [[NCCommunication sharedInstance] readFileOrFolderWithServerUrlFileName:serverUrlFileName depth:@"0" showHiddenFiles:[CCUtility getShowHiddenFiles] account:account completionHandler:^(NSString *account, NSArray*files, NSInteger errorCode, NSString *errorMessage) {
                 
-        if (errorCode == 0 && [account isEqualToString:account] && files.count > 0) {
+        if (errorCode == 0 && [account isEqualToString:account] && files != nil) {
             
             dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{