Browse Source

E2E delete

Marino Faggiana 7 years ago
parent
commit
5575d64cfa

+ 4 - 0
iOSClient/Favorites/CCFavorites.m

@@ -172,6 +172,10 @@
 
 - (void)deleteFileOrFolderSuccess:(CCMetadataNet *)metadataNet
 {
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [[CCNetworking sharedNetworking] rebuildAndSendEndToEndMetadataOnServerUrl:metadataNet.serverUrl];
+    });
+    
     [self reloadDatasource];
 }
 

+ 5 - 0
iOSClient/Main/CCDetail.m

@@ -854,6 +854,11 @@
 
 - (void)deleteFileOrFolderSuccess:(CCMetadataNet *)metadataNet
 {
+    // E2E
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [[CCNetworking sharedNetworking] rebuildAndSendEndToEndMetadataOnServerUrl:metadataNet.serverUrl];
+    });
+    
     // reload Main
     [appDelegate.activeMain reloadDatasource];
     

+ 3 - 4
iOSClient/Main/CCMain.m

@@ -2011,10 +2011,9 @@
         } else {
             
             // E2E
-            if (_metadataFolder.e2eEncrypted)
-                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                    [[CCNetworking sharedNetworking] rebuildAndSendEndToEndMetadataOnServerUrl:self.serverUrl];
-                });
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                [[CCNetworking sharedNetworking] rebuildAndSendEndToEndMetadataOnServerUrl:self.serverUrl];
+            });
             
             // End Select Table View
             [self tableViewSelect:NO];

+ 3 - 1
iOSClient/Networking/CCNetworking.m

@@ -1532,7 +1532,9 @@
     NSString *e2eMetadataJSON;
 
     tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", _activeAccount, serverUrl]];
-
+    if (directory.e2eEncrypted == NO)
+        return nil;
+    
     NSArray *tableE2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionsWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", _activeAccount, serverUrl]];
     if (tableE2eEncryption) {