dev

iOSClient/AppDelegate.m

@@ -1342,7 +1342,6 @@
     }
     else if ([[_listChangeTask objectForKey:fileID] isEqualToString:@"cancelUpload"]) {
         
-        // remove the file
         [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryProviderStorageFileID:fileID] error:nil];
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", fileID] clearDateReadDirectoryID:nil];
     }

iOSClient/Favorites/CCFavorites.m

@@ -645,9 +645,8 @@
         
         NSString *date = [CCUtility dateDiff:metadata.date];
         NSString *length = [CCUtility transformedSize:metadata.size];
-        BOOL fileExists = [CCUtility fileProviderStorageExists:metadata.fileID fileName:metadata.fileNameView];
-            
-        if (fileExists)
+        
+        if ([CCUtility fileProviderStorageExists:metadata.fileID fileName:metadata.fileNameView])
             cell.local.image = [UIImage imageNamed:@"local"];
         else
             cell.local.image = nil;

iOSClient/Main/CCMain.m

@@ -2084,8 +2084,6 @@
 {
     if (errorCode == 0) {
         
-        [[NSFileManager defaultManager] createDirectoryAtPath:[NSString stringWithFormat:@"%@/%@", [CCUtility getDirectoryProviderStorage], metadataNet.fileID] withIntermediateDirectories:YES attributes:nil error:nil];
-        
         NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName];
         
         if (_metadataFolder.e2eEncrypted) {

iOSClient/Networking/CCNetworking.m

@@ -1181,7 +1181,7 @@
     }
    
     // Write to DB
-    if ([[NCEndToEndEncryption sharedManager] encryptFileName:fileName fileNameIdentifier:*fileNameIdentifier directory: [CCUtility getDirectoryProviderStorageFileID:fileID] key:&key initializationVector:&initializationVector authenticationTag:&authenticationTag]) {
+    if ([[NCEndToEndEncryption sharedManager] encryptFileName:fileName fileNameIdentifier:*fileNameIdentifier directory:[CCUtility getDirectoryProviderStorageFileID:fileID] key:&key initializationVector:&initializationVector authenticationTag:&authenticationTag]) {
         
         tableE2eEncryption *object = [[NCManageDatabase sharedInstance] getE2eEncryptionWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@", _activeAccount, serverUrl]];
         if (object) {

iOSClient/Synchronize/CCSynchronize.m

@@ -355,7 +355,7 @@
         
         if (changeRev) {
             
-            // remove & recreate
+            // remove & re-create
             [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryProviderStorageFileID:metadata.fileID] error:nil];
             [CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileName:metadata.fileNameView];