Browse Source

remove check e2eEncrypted on detect thumbnailExists

Marino Faggiana 7 years ago
parent
commit
11bb4450d7
2 changed files with 7 additions and 1 deletions
  1. 6 0
      iOSClient/Main/CCMain.m
  2. 1 1
      iOSClient/Utility/CCUtility.m

+ 6 - 0
iOSClient/Main/CCMain.m

@@ -2057,6 +2057,12 @@
 {
     [_queueSelector addObject:selectorDelete];
     
+    // E2E LOCK
+    tableE2eEncryption *tableE2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND fileNameIdentifier = %@", appDelegate.activeAccount, metadata.fileName]];
+    if (tableE2eEncryption) {
+        
+    }
+    
     [[CCActions sharedInstance] deleteFileOrFolder:metadata delegate:self];
         
     [_hud visibleHudTitle:[NSString stringWithFormat:NSLocalizedString(@"_delete_file_n_", nil), ofFile - numFile + 1, ofFile] mode:MBProgressHUDModeIndeterminate color:nil];

+ 1 - 1
iOSClient/Utility/CCUtility.m

@@ -1011,7 +1011,7 @@
         
         // thumbnailExists
             
-        if (([ext isEqualToString:@"JPG"] || [ext isEqualToString:@"PNG"] || [ext isEqualToString:@"JPEG"] || [ext isEqualToString:@"GIF"] || [ext isEqualToString:@"BMP"] || [ext isEqualToString:@"MP3"]  || [ext isEqualToString:@"MOV"]  || [ext isEqualToString:@"MP4"]  || [ext isEqualToString:@"M4V"] || [ext isEqualToString:@"3GP"]) && metadata.e2eEncrypted == NO)
+        if ([ext isEqualToString:@"JPG"] || [ext isEqualToString:@"PNG"] || [ext isEqualToString:@"JPEG"] || [ext isEqualToString:@"GIF"] || [ext isEqualToString:@"BMP"] || [ext isEqualToString:@"MP3"]  || [ext isEqualToString:@"MOV"]  || [ext isEqualToString:@"MP4"]  || [ext isEqualToString:@"M4V"] || [ext isEqualToString:@"3GP"])
             metadata.thumbnailExists = YES;
         else
             metadata.thumbnailExists = NO;