remove offline cryptated

iOSClient/Main/CCMain.m

@@ -4269,7 +4269,7 @@
                                     }];
         }
         
-        if (!lockDirectory && ([upDir isEqualToString:homeDir] || ![CCCoreData isOfflineDirectoryServerUrl:upDir activeAccount:app.activeAccount])) {
+        if (!lockDirectory && ([upDir isEqualToString:homeDir] || ![CCCoreData isOfflineDirectoryServerUrl:upDir activeAccount:app.activeAccount]) && !_metadata.cryptated) {
         
             [actionSheet addButtonWithTitle:titleOfflineFolder
                                       image:[UIImage imageNamed:image_actionSheetOffline]
@@ -4414,25 +4414,28 @@
                                     }];
         }
         
-        [actionSheet addButtonWithTitle:titoloOffline
-                                  image:[UIImage imageNamed:image_actionSheetOffline]
-                        backgroundColor:[UIColor whiteColor]
-                                 height: 50.0
-                                   type:AHKActionSheetButtonTypeDefault
-                                handler:^(AHKActionSheet *as) {
+        if (!_metadata.cryptated) {
+        
+            [actionSheet addButtonWithTitle:titoloOffline
+                                      image:[UIImage imageNamed:image_actionSheetOffline]
+                            backgroundColor:[UIColor whiteColor]
+                                     height: 50.0
+                                       type:AHKActionSheetButtonTypeDefault
+                                    handler:^(AHKActionSheet *as) {
                                     
-                                    // close swipe
-                                    [self setEditing:NO animated:YES];
+                                        // close swipe
+                                        [self setEditing:NO animated:YES];
                                     
-                                    if ([CCCoreData isOfflineLocalFileID:_metadata.fileID activeAccount:app.activeAccount]) {
+                                        if ([CCCoreData isOfflineLocalFileID:_metadata.fileID activeAccount:app.activeAccount]) {
                                         
-                                        [self removeOffline:_metadata];
+                                            [self removeOffline:_metadata];
                                         
-                                    } else {
+                                        } else {
                                         
-                                        [self addOffline:_metadata];
-                                    }
-                                }];
+                                            [self addOffline:_metadata];
+                                        }
+                                    }];
+        }
         
         [actionSheet addButtonWithTitle:NSLocalizedString(@"_add_local_", nil)
                                   image:[UIImage imageNamed:image_actionSheetLocal]

iOSClient/Offline/CCOfflineFileFolder.m

@@ -211,6 +211,10 @@
         
         for (CCMetadata *metadata in metadatas) {
             
+            // reject cryptated
+            if (metadata.cryptated)
+                continue;
+            
             // dir recursive
             if (metadata.directory) {
                 
@@ -226,36 +230,6 @@
                 
             } else {
             
-                NSInteger typeFilename = [CCUtility getTypeFileName:metadata.fileName];
-            
-                // reject crypto
-                if (typeFilename == k_metadataTypeFilenameCrypto) continue;
-            
-                // Verify if the plist is complited
-                if (typeFilename == k_metadataTypeFilenamePlist) {
-                
-                    BOOL isCryptoComplete = NO;
-                    NSString *fileNameCrypto = [CCUtility trasformedFileNamePlistInCrypto:metadata.fileName];
-                
-                    for (CCMetadata *completeMetadata in metadatas) {
-                    
-                        if (completeMetadata.cryptated == NO) continue;
-                        else  if ([completeMetadata.fileName isEqualToString:fileNameCrypto]) {
-                            isCryptoComplete = YES;
-                            break;
-                        }
-                    }
-                    if (isCryptoComplete == NO) continue;
-                }
-        
-                // Error password
-                if (metadata.errorPasscode)
-                    continue;
-            
-                // Plist not download
-                if (metadata.cryptated && [metadata.title length] == 0)
-                    continue;
-            
                 // It's in session
                 BOOL recordInSession = NO;
                 for (TableMetadata *record in recordsInSessions) {