Marino Faggiana 6 rokov pred
rodič
commit
e4de3935d4

+ 1 - 1
File Provider Extension/FileProviderExtension+Network.swift

@@ -34,7 +34,7 @@ extension FileProviderExtension {
         let path = metadata.serverUrl + "/" + metadata.fileName
 
         OCnetworking.sharedManager().deleteFileOrFolder(withAccount: providerData.account, path: path, completion: { (account, message, errorCode) in
-            if errorCode == 0 || errorCode == 404 {
+            if errorCode == 0 || errorCode == kOCErrorServerPathNotFound {
                 self.deleteFileSystem(for: metadata, serverUrl: metadata.serverUrl, itemIdentifier: itemIdentifier)
             }
         })

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -1219,7 +1219,7 @@
                 NSError *error = [[NCNetworkingEndToEnd sharedManager] getEndToEndMetadata:&metadata fileID:metadataFolderFileID user:tableAccount.user userID:tableAccount.userID password:tableAccount.password url:tableAccount.url];
                 dispatch_async(dispatch_get_main_queue(), ^{
                     if (error) {
-                        if (error.code != 404)
+                        if (error.code != kOCErrorServerPathNotFound)
                             [appDelegate messageNotification:@"_e2e_error_get_metadata_" description:error.localizedDescription visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:error.code];
                     } else {
                         if ([[NCEndToEndMetadata sharedInstance] decoderMetadata:metadata privateKey:[CCUtility getEndToEndPrivateKey:account] serverUrl:self.serverUrl account:account url:tableAccount.url] == false)

+ 2 - 2
iOSClient/Networking/NCNetworkingEndToEnd.m

@@ -801,7 +801,7 @@
     
     // get Metadata for select updateEndToEndMetadata or storeEndToEndMetadata
     error = [self getEndToEndMetadata:&metadata fileID:directory.fileID user:user userID:userID password:password url:url];
-    if (error.code != 404 && error != nil) {
+    if (error.code != kOCErrorServerPathNotFound && error != nil) {
         return error;
     }
     
@@ -820,7 +820,7 @@
     // send Metadata
     if (error == nil)
         error = [self updateEndToEndMetadata:e2eMetadataJSON serverUrl:serverUrl fileID:directory.fileID unlock:NO user:user userID:userID password:password url:url];
-    else if (error.code == 404)
+    else if (error.code == kOCErrorServerPathNotFound)
         error = [self storeEndToEndMetadata:e2eMetadataJSON serverUrl:serverUrl fileID:directory.fileID unlock:NO user:user userID:userID password:password url:url];
     
     return error;

+ 2 - 2
iOSClient/Synchronize/CCSynchronize.m

@@ -191,7 +191,7 @@
         } else {
         
             // Folder not present, remove it
-            if (errorCode == 404) {
+            if (errorCode == kOCErrorServerPathNotFound) {
                 [[NCManageDatabase sharedInstance] deleteDirectoryAndSubDirectoryWithServerUrl:serverUrl account:account];
                 [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl fileID:nil action:k_action_NULL];
             }
@@ -223,7 +223,7 @@
                     [self verifyChangeMedatas:[[NSArray alloc] initWithObjects:addMetadata, nil] serverUrl:serverUrl account:appDelegate.activeAccount withDownload:withDownload];
             });
             
-        } else if (errorCode == 404) {
+        } else if (errorCode == kOCErrorServerPathNotFound) {
             
             [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", fileID]];
             [[NCManageDatabase sharedInstance] deleteLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", fileID]];