remove old code (verify file exists)

iOSClient/CCGlobal.h

@@ -155,7 +155,6 @@ extern NSString *const dav;
 #define selectorOpenIn                                  @"openIn"
 #define selectorOpenWindowShare                         @"openWindowShare"
 #define selectorReadFile                                @"readFile"
-#define selectorReadFileUploadFile                      @"readFileUploadFile"
 #define selectorReadFileVerifyUpload                    @"readFileVerifyUpload"
 #define selectorReadFileWithDownload                    @"readFileWithDownload"
 #define selectorReadFileReloadFolder                    @"readFileReloadFolder"

iOSClient/Main/CCMain.m

@@ -1603,14 +1603,15 @@
             
             CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
             
-            metadataNet.action = actionReadFile;
             metadataNet.assetLocalIdentifier = asset.localIdentifier;
             metadataNet.fileName = fileName;
             metadataNet.session = session;
-            metadataNet.selector = selectorReadFileUploadFile;
+            metadataNet.selector = selectorUploadFile;
+            metadataNet.selectorPost = nil;
             metadataNet.serverUrl = serverUrl;
-                
-            [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+            metadataNet.taskStatus = k_taskStatusResume;
+
+            (void)[[NCManageDatabase sharedInstance] addQueueUploadWithMetadataNet:metadataNet];
         }
     }
 }
@@ -1624,35 +1625,6 @@
     // Unauthorized
     if (errorCode == kOCErrorServerUnauthorized)
         [app openLoginView:self loginType:loginModifyPasswordUser];
-    
-    // UploadFile
-    if ([metadataNet.selector isEqualToString:selectorReadFileUploadFile]) {
-        
-        // File not exists
-        if (errorCode == 404) {
-            
-            metadataNet.errorCode = 0;
-            metadataNet.selector = selectorUploadFile;
-            metadataNet.selectorPost = nil;
-            metadataNet.taskStatus = k_taskStatusResume;
-                        
-            (void)[[NCManageDatabase sharedInstance] addQueueUploadWithMetadataNet:metadataNet];
-            
-        } else {
-            
-            // error ho many retry befor notification and go to on next asses
-            if (metadataNet.errorRetry < 3) {
-                
-                // Retry read file
-                [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-                
-            } else {
-                
-                // STOP check file, view message error
-                [app messageNotification:@"_upload_file_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
-            }
-        }
-    }
 }
 
 - (void)readFileSuccess:(CCMetadataNet *)metadataNet metadata:(tableMetadata *)metadata
@@ -1666,17 +1638,6 @@
             [self readFolder:metadataNet.serverUrl];
         }
     }
-    
-    // UploadFile
-    if ([metadataNet.selector isEqualToString:selectorReadFileUploadFile]) {
-        
-        metadataNet.errorCode = 403;                // File exists 403 Forbidden
-        metadataNet.selector = selectorUploadFile;
-        metadataNet.selectorPost = nil;
-        metadataNet.taskStatus = k_taskStatusResume;
-        
-        (void)[[NCManageDatabase sharedInstance] addQueueUploadWithMetadataNet:metadataNet];
-    }
 }
 
 - (void)readFileReloadFolder

iOSClient/Networking/CCNetworking.m

@@ -934,79 +934,12 @@
         metadata.e2eEncrypted = true;
     }
     
-    // File exists ???
-    if (errorCode == 403) {
-            
-        dispatch_async(dispatch_get_main_queue(), ^{
-                
-            UIAlertController *alertController = [UIAlertController alertControllerWithTitle:fileName message:NSLocalizedString(@"_file_already_exists_", nil) preferredStyle:UIAlertControllerStyleAlert];
-            
-            UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"_cancel_", nil) style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
-                
-                // Activity
-                [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:uploadID action:k_activityDebugActionUpload selector:selector note:NSLocalizedString(@"_file_already_exists_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:_activeUrl];
-                
-                // Error for uploadFileFailure
-                if ([[self getDelegate:uploadID] respondsToSelector:@selector(uploadFileFailure:fileID:serverUrl:selector:message:errorCode:)])
-                    [[self getDelegate:uploadID] uploadFileFailure:nil fileID:nil serverUrl:serverUrl selector:selector message:NSLocalizedString(@"_file_already_exists_", nil) errorCode:403];
-                
-                return;
-            }];
-            
-            UIAlertAction *overwriteAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"_overwrite_", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
-                
-                // -- remove record --
-                tableMetadata *metadataDelete = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND fileName = %@ AND directoryID = %@", _activeAccount, fileName, directoryID]];
-                
-                [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadataDelete.fileID] error:nil];
-                [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@.ico", _directoryUser, metadataDelete.fileID] error:nil];
-                
-                if (metadataDelete.directory && serverUrl) {
-                    
-                    NSString *dirForDelete = [CCUtility stringAppendServerUrl:serverUrl addFileName:metadataDelete.fileName];
-                    
-                    [[NCManageDatabase sharedInstance] deleteDirectoryAndSubDirectoryWithServerUrl:dirForDelete];
-                }
-                
-                [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadataDelete.fileID] clearDateReadDirectoryID:nil];
-                [[NCManageDatabase sharedInstance] deleteLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadataDelete.fileID]];
-
-                // -- Go to Upload --
-                [CCGraphics createNewImageFrom:fileNamePlain directoryUser:_directoryUser fileNameTo:metadata.fileID extension:[fileNamePlain pathExtension] size:@"m" imageForUpload:YES typeFile:metadata.typeFile writePreview:YES optimizedFileName:NO];
-                
-                metadata = [[NCManageDatabase sharedInstance] addMetadata:metadata];
-                
-                if (metadata) {
-                        
-                    [self uploadURLSession:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetLocalIdentifier:assetLocalIdentifier selector:selector];
-                }
-            }];
-            
-            [alertController addAction:cancelAction];
-            [alertController addAction:overwriteAction];
-        
-            UIWindow *alertWindow = [[UIWindow alloc]initWithFrame:[UIScreen mainScreen].bounds];
-            alertWindow.rootViewController = [[UIViewController alloc] init];
-            alertWindow.windowLevel = UIWindowLevelAlert + 1;
-        
-            [alertWindow makeKeyAndVisible];
-            
-            [alertWindow.rootViewController presentViewController:alertController animated:YES completion:nil];
-        });
-            
-    } else {
-            
-        // -- Go to upload --
-            
-        [CCGraphics createNewImageFrom:fileNamePlain directoryUser:_directoryUser fileNameTo:metadata.fileID extension:[fileNamePlain pathExtension] size:@"m" imageForUpload:YES typeFile:metadata.typeFile writePreview:YES optimizedFileName:NO];
+    [CCGraphics createNewImageFrom:fileNamePlain directoryUser:_directoryUser fileNameTo:metadata.fileID extension:[fileNamePlain pathExtension] size:@"m" imageForUpload:YES typeFile:metadata.typeFile writePreview:YES optimizedFileName:NO];
 
-        metadata = [[NCManageDatabase sharedInstance] addMetadata:metadata];
+    metadata = [[NCManageDatabase sharedInstance] addMetadata:metadata];
             
-        if (metadata) {
-                
-            [self uploadURLSession:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetLocalIdentifier:assetLocalIdentifier selector:selector];
-        }
-    }
+    if (metadata)
+        [self uploadURLSession:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetLocalIdentifier:assetLocalIdentifier selector:selector];
 }
 
 - (void)uploadFileMetadata:(tableMetadata *)metadata taskStatus:(NSInteger)taskStatus