Browse Source

E2E Create folder

Marino Faggiana 7 years ago
parent
commit
6fceb79520
2 changed files with 3 additions and 25 deletions
  1. 2 22
      iOSClient/Main/CCMain.m
  2. 1 3
      iOSClient/Move/CCMove.m

+ 2 - 22
iOSClient/Main/CCMain.m

@@ -2387,34 +2387,14 @@
             dispatch_async(dispatch_get_main_queue(), ^{
                 if (error) {
                     [appDelegate messageNotification:@"_error_e2ee_" description:error.localizedDescription visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:error.code];
-                } else {
-                    [self readFolder:self.serverUrl];
                 }
+                [self readFolder:self.serverUrl];
             });
         });
         
     } else {
         
-        (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:newDirectory fileID:metadataNet.fileID permissions:nil encrypted:false];
-        
-        tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileName = %@ AND directoryID = %@", metadataNet.fileName, metadataNet.directoryID]];
-        
-        if (metadata) {
-            
-            [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileName = %@ AND directoryID = %@", metadataNet.fileName, metadataNet.directoryID] clearDateReadDirectoryID:nil];
-            
-            metadata.fileID = metadataNet.fileID;
-            metadata.date = metadataNet.date;
-            metadata.permissions = @"RDNVCK";
-            
-            (void)[[NCManageDatabase sharedInstance] addMetadata:metadata];
-            
-            [self reloadDatasource];
-            
-        } else {
-            
-            [self readFileReloadFolder];
-        }
+        [self readFolder:self.serverUrl];
     }
 }
 

+ 1 - 3
iOSClient/Move/CCMove.m

@@ -375,9 +375,7 @@
 }
 
 - (void)createFolderSuccess:(CCMetadataNet *)metadataNet
-{
-    (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:[NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName] fileID:metadataNet.fileID permissions:nil encrypted:false];
-    
+{    
     // Load Folder or the Datasource
     [self readFolder];
 }