upload encrypted file

iOSClient/AppDelegate.m

@@ -1601,12 +1601,13 @@
 
 - (void)unlockEndToEndFolderEncryptedSuccess:(CCMetadataNet *)metadataNet
 {
-    [[NCManageDatabase sharedInstance] setDirectoryE2ETokenLockWithServerUrl:metadataNet.serverUrl token:metadataNet.token];
+    [[NCManageDatabase sharedInstance] setDirectoryE2ETokenLockWithServerUrl:metadataNet.serverUrl token:@""];
 }
 
 - (void)unlockEndToEndFolderEncryptedFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {
-    
+    if (errorCode == 404)
+         [[NCManageDatabase sharedInstance] setDirectoryE2ETokenLockWithServerUrl:metadataNet.serverUrl token:@""];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Networking/CCNetworking.m

@@ -929,6 +929,7 @@
         }
         
         // Now the fileName is fileNameIdentifier
+        fileName = fileNameIdentifier;
         metadata.fileName = fileNameIdentifier;
         metadata.e2eEncrypted = true;
     }
@@ -1276,10 +1277,20 @@
     metadata.sessionID = @"";
         
     metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata];
+    
+    if ([CCUtility isFolderEncrypted:serverUrl account:_activeAccount]) {
+        
+        // rename file fileNameView (original file) -> fileID
+        [CCUtility moveFileAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadata.fileNameView]  toPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadata.fileID]];
+        // remove encrypted file
+        [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, sessionID] error:nil];
         
-    // rename file sessionID -> fileID
-    [CCUtility moveFileAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, sessionID]  toPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadata.fileID]];
+    } else {
         
+        // rename file sessionID -> fileID
+        [CCUtility moveFileAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, sessionID]  toPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadata.fileID]];
+    }
+    
     // remove temp icon
     [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@.ico", _directoryUser, sessionID] error:nil];
     [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@.ico", _directoryUser, metadata.fileID] error:nil];

iOSClient/Networking/NCNetworkingSync.h

@@ -27,6 +27,4 @@
 - (NSError *)lockEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url fileID:(NSString *)fileID token:(NSString **)token;
 - (NSError *)unlockEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url fileID:(NSString *)fileID token:(NSString *)token;
 
-
-
 @end