Browse Source

improved detect E2EE in loadAutoDownloadUpload

Marino Faggiana 6 years ago
parent
commit
1781625529
1 changed files with 7 additions and 3 deletions
  1. 7 3
      iOSClient/AppDelegate.m

+ 7 - 3
iOSClient/AppDelegate.m

@@ -1283,11 +1283,15 @@
         return;
     
     // Detect E2EE
+    NSString *saveDirectoryID = @"";
     NSArray *metadatasForE2EE = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND status != %d", self.activeAccount, k_metadataStatusNormal] sorted:nil ascending:NO];
     for (tableMetadata *metadata in metadatasForE2EE) {
-        if ([[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"directoryID == %@ AND e2eEncrypted == 1", metadata.directoryID]] != nil) {
-            isE2EE = true;
-            break;
+        if (![saveDirectoryID isEqualToString:metadata.directoryID]) {
+            saveDirectoryID = metadata.directoryID;
+            if ([[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"directoryID == %@ AND e2eEncrypted == 1", metadata.directoryID]] != nil) {
+                isE2EE = true;
+                break;
+            }
         }
     }