fix upload

iOSClient/Database/NCManageDatabase.swift

@@ -62,7 +62,6 @@ class NCManageDatabase: NSObject {
              /*
              
              11 : Add object tableE2eEncryption
-                  Add encrypted on tableQueueDownload, tableQueueUpload
 
              */
             

iOSClient/Main/CCMain.m

@@ -779,23 +779,14 @@
         
         NSString *serverUrl = [app getTabBarControllerActiveServerUrl];
         
-        BOOL isEncrypted = [CCUtility isFolderEncrypted:serverUrl account:app.activeAccount];
-
-        if (isEncrypted) {
-            
-            [self uploadFileAsset:assets serverUrl:serverUrl useSubFolder:NO session:k_upload_session];
-            
-        } else {
-            
-            CreateFormUploadAssets *form = [[CreateFormUploadAssets alloc] initWithServerUrl:serverUrl assets:assets cryptated:NO session:k_upload_session delegate:self];
-            form.title = NSLocalizedString(@"_upload_photos_videos_", nil);
-            
-            UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:form];
+        CreateFormUploadAssets *form = [[CreateFormUploadAssets alloc] initWithServerUrl:serverUrl assets:assets cryptated:NO session:k_upload_session delegate:self];
+        form.title = NSLocalizedString(@"_upload_photos_videos_", nil);
             
-            [navigationController setModalPresentationStyle:UIModalPresentationFormSheet];
+        UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:form];
             
-            [self presentViewController:navigationController animated:YES completion:nil];
-        }
+        [navigationController setModalPresentationStyle:UIModalPresentationFormSheet];
+        
+        [self presentViewController:navigationController animated:YES completion:nil];
     }];
 }
 
@@ -1609,9 +1600,6 @@
         if (![[NCAutoUpload sharedInstance] createFolderSubFolderAutoUploadFolderPhotos:autoUploadPath useSubFolder:useSubFolder assets:(PHFetchResult *)assets selector:selectorUploadFile])
             return;
     
-    // Is encrypted
-    BOOL isEncrypted = [CCUtility isFolderEncrypted:self.serverUrl account:app.activeAccount];
-    
     NSLog(@"[LOG] Asset N. %lu", (unsigned long)[assets count]);
     
     for (PHAsset *asset in assets) {

iOSClient/Networking/CCNetworking.m

@@ -735,43 +735,6 @@
 #pragma mark =====  Upload =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (BOOL)newEndToEndFile:(NSString *)fileName fileNameIdentifier:(NSString *)fileNameIdentifier serverUrl:(NSString *)serverUrl
-{
-    NSString *key;
-    NSString *initializationVector;
-    NSString *authenticationTag;
-    
-    BOOL result = [[NCEndToEndEncryption sharedManager] encryptFileName:fileName fileNameIdentifier:fileNameIdentifier directoryUser: _directoryUser key:&key initializationVector:&initializationVector authenticationTag:&authenticationTag];
-    
-    // Write to DB
-    if (result) {
-        
-        tableE2eEncryption *addObject = [tableE2eEncryption new];
-        
-        addObject.account = _activeAccount;
-        addObject.authenticationTag = authenticationTag;
-        addObject.fileName = [CCUtility returnFileNamePathFromFileName:fileName serverUrl:serverUrl activeUrl:_activeUrl];
-        addObject.fileNameIdentifier = fileNameIdentifier;
-        addObject.key = key;
-        addObject.initializationVector = initializationVector;
-        
-        CFStringRef UTI = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)[fileName pathExtension], NULL);
-        CFStringRef mimeTypeRef = UTTypeCopyPreferredTagWithClass (UTI, kUTTagClassMIMEType);
-        if (mimeTypeRef) {
-            addObject.mimeType = (__bridge NSString *)mimeTypeRef;
-        } else {
-            addObject.mimeType = @"application/octet-stream";
-        }
-        
-        addObject.serverUrl = serverUrl;
-        addObject.version = [[NCManageDatabase sharedInstance] getEndToEndEncryptionVersion];
-        
-        result = [[NCManageDatabase sharedInstance] addE2eEncryption:addObject];
-    }
-    
-    return result;
-}
-
 - (void)uploadFileFromAssetLocalIdentifier:(CCMetadataNet *)metadataNet delegate:(id)delegate
 {
     //delegate
@@ -1114,7 +1077,7 @@
         NSURLSession *sessionUpload;
         NSError *error;
 
-        // *** IS ENCRYPTED ***
+        // *** IS ENCRYPTED --> LOCK ***
         BOOL encrypted = [CCUtility isFolderEncrypted:serverUrl account:_activeAccount];
         if (encrypted) {
             
@@ -1573,6 +1536,47 @@
     return [data objectForKey:@"title"];
 }
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark =====  End To End Encryption =====
+#pragma --------------------------------------------------------------------------------------------
+
+- (BOOL)newEndToEndFile:(NSString *)fileName fileNameIdentifier:(NSString *)fileNameIdentifier serverUrl:(NSString *)serverUrl
+{
+    NSString *key;
+    NSString *initializationVector;
+    NSString *authenticationTag;
+    
+    BOOL result = [[NCEndToEndEncryption sharedManager] encryptFileName:fileName fileNameIdentifier:fileNameIdentifier directoryUser: _directoryUser key:&key initializationVector:&initializationVector authenticationTag:&authenticationTag];
+    
+    // Write to DB
+    if (result) {
+        
+        tableE2eEncryption *addObject = [tableE2eEncryption new];
+        
+        addObject.account = _activeAccount;
+        addObject.authenticationTag = authenticationTag;
+        addObject.fileName = [CCUtility returnFileNamePathFromFileName:fileName serverUrl:serverUrl activeUrl:_activeUrl];
+        addObject.fileNameIdentifier = fileNameIdentifier;
+        addObject.key = key;
+        addObject.initializationVector = initializationVector;
+        
+        CFStringRef UTI = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)[fileName pathExtension], NULL);
+        CFStringRef mimeTypeRef = UTTypeCopyPreferredTagWithClass (UTI, kUTTagClassMIMEType);
+        if (mimeTypeRef) {
+            addObject.mimeType = (__bridge NSString *)mimeTypeRef;
+        } else {
+            addObject.mimeType = @"application/octet-stream";
+        }
+        
+        addObject.serverUrl = serverUrl;
+        addObject.version = [[NCManageDatabase sharedInstance] getEndToEndEncryptionVersion];
+        
+        result = [[NCManageDatabase sharedInstance] addE2eEncryption:addObject];
+    }
+    
+    return result;
+}
+
 @end
 
 #pragma --------------------------------------------------------------------------------------------