favorite folders are not downloaded if option Offline available favorites is set #543

iOSClient/Main/CCMain.m

@@ -3856,12 +3856,6 @@
                                         [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:_autoUploadDirectory directoryID:nil];
                                                                                 
                                         [self readFolder:serverUrl];
-                                        
-                                        //NSLog(@"[LOG] Update Folder Photo");
-                                        //NSString *autoUploadPath = [[NCManageDatabase sharedInstance] getAccountAutoUploadPath:appDelegate.activeUrl];
-                                        //if ([autoUploadPath length] > 0) {
-                                        //    [[CCSynchronize sharedSynchronize] readFileForFolder:_metadata.fileName serverUrl:serverUrl selector:selectorReadFileFolder];
-                                        //}
                                     }];
         }
 

iOSClient/Synchronize/CCSynchronize.m

@@ -284,9 +284,10 @@
                 
                 NSString *serverUrl = [CCUtility stringAppendServerUrl:metadataNet.serverUrl addFileName:metadataNet.fileName];
                 tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", metadataNet.account, serverUrl]];
+                tableMetadata *tableMetadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND fileID = %@", metadataNet.account, metadata.fileID]];
                 
-                // Verify changed etag
-                if (![tableDirectory.etag isEqualToString:metadata.etag] && tableDirectory) {
+                // Verify changed etag OR was not favorite
+                if (!([tableDirectory.etag isEqualToString:metadata.etag] && tableDirectory) || (tableMetadata && tableMetadata.favorite == NO && metadata.favorite == YES)) {
                     
                     if ([metadataNet.selector isEqualToString:selectorReadFileFolder])
                         [self readFolder:serverUrl selector:selectorReadFolder];