bugfix graphics

iOSClient/AppDelegate.m

@@ -381,7 +381,7 @@
         [directory addObject:record.serverUrl];
     
     if ([directory count] > 0)
-        [[CCSynchronize sharedSynchronize] offlineFolderAnimationDirectory:directory setGraphicsFolder:YES];
+        [[CCSynchronize sharedSynchronize] synchronizeFolderAnimationDirectory:directory setGraphicsFolder:YES];
 
 // ONLY BACKGROUND
     

iOSClient/CCGlobal.h

@@ -163,8 +163,7 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define selectorDeleteCrypto                            @"deleteCrypto"
 #define selectorDeletePlist                             @"deletePlist"
 #define selectorDownloadThumbnail                       @"downloadThumbnail"
-#define selectorDownloadFavorites                       @"downloadFavorites"
-#define selectorDownloadOffline                         @"downloadOffline"
+#define selectorDownloadSynchronize                     @"downloadSynchronize"
 #define selectorEncryptFile                             @"encryptFile"
 #define selectorGetUserAndGroup                         @"getUserAndGroup"
 #define selectorLoadFileView                            @"loadFileView"

iOSClient/Main/CCMain.m

@@ -1238,8 +1238,8 @@
         [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
     }
     
-    // Offline Directory
-    if ([selector isEqualToString:selectorDownloadOffline]) {
+    // Synchronized
+    if ([selector isEqualToString:selectorDownloadSynchronize]) {
         
         [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
     }
@@ -1816,7 +1816,7 @@
     // File is changed ??
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
         if (!_isSearchMode)
-            [[CCSynchronize sharedSynchronize] verifyChangeMedatas:metadatas serverUrl:metadataNet.serverUrl account:app.activeAccount offline:NO];
+            [[CCSynchronize sharedSynchronize] verifyChangeMedatas:metadatas serverUrl:metadataNet.serverUrl account:app.activeAccount synchronize:NO];
     });
 
     // Search Mode
@@ -4695,7 +4695,7 @@
     // Reload -> Self se non siamo nella dir appropriata cercala e se è in memoria reindirizza il reload
     if ([serverUrl isEqualToString:_serverUrl] == NO || _serverUrl == nil) {
         
-        if ([selector isEqualToString:selectorDownloadOffline]) {
+        if ([selector isEqualToString:selectorDownloadSynchronize]) {
             [app.controlCenter reloadDatasource];
         } else {
             CCMain *main = [app.listMainVC objectForKey:serverUrl];
@@ -5068,19 +5068,7 @@
         
         if (isOfflineDirectory) {
             
-            // Image Offline
             cell.offlineImageView.image = [UIImage imageNamed:image_offline];
-            
-            // Animation synchronized gif
-            if ([[CCSynchronize sharedSynchronize] offlineFolderAnimationDirectory:[[NSArray alloc] initWithObjects:directoryServerUrl, nil] setGraphicsFolder:NO]) {
-                
-                NSURL *myURL;
-                
-                if (metadata.cryptated) myURL = [[NSBundle mainBundle] URLForResource: @"synchronizedcrypto" withExtension:@"gif"];
-                else myURL = [[NSBundle mainBundle] URLForResource: @"synchronized" withExtension:@"gif"];
-                
-                cell.synchronizedImageView.image = [UIImage animatedImageWithAnimatedGIFURL:myURL];
-            }
         }
         
         // ----------------------------------------------------------------------------------------------------------
@@ -5091,6 +5079,17 @@
             
             cell.offlineImageView.image = [UIImage imageNamed:image_favorite];
         }
+        
+        // Animation synchronized gif
+        if ([[CCSynchronize sharedSynchronize] synchronizeFolderAnimationDirectory:[[NSArray alloc] initWithObjects:directoryServerUrl, nil] setGraphicsFolder:NO]) {
+            
+            NSURL *myURL;
+            
+            if (metadata.cryptated) myURL = [[NSBundle mainBundle] URLForResource: @"synchronizedcrypto" withExtension:@"gif"];
+            else myURL = [[NSBundle mainBundle] URLForResource: @"synchronized" withExtension:@"gif"];
+            
+            cell.synchronizedImageView.image = [UIImage animatedImageWithAnimatedGIFURL:myURL];
+        }
 
     } else {
     

iOSClient/Offline/CCSynchronize.h

@@ -39,8 +39,8 @@
 - (void)addFavoriteFolder:(NSString *)serverUrl;
 - (void)addOfflineFolder:(NSString *)serverUrl;
 
-- (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl account:(NSString *)account offline:(BOOL)offline;
+- (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl account:(NSString *)account synchronize:(BOOL)synchronize;
 
-- (BOOL)offlineFolderAnimationDirectory:(NSArray *)directory setGraphicsFolder:(BOOL)setGraphicsFolder;
+- (BOOL)synchronizeFolderAnimationDirectory:(NSArray *)directory setGraphicsFolder:(BOOL)setGraphicsFolder;
 
 @end

iOSClient/Offline/CCSynchronize.m

@@ -60,8 +60,8 @@
     if (app.activeAccount.length == 0)
         return;
     
-    // verify is offline procedure is in progress selectorDownloadFavorites
-    if ([[app verifyExistsInQueuesDownloadSelector:selectorDownloadFavorites] count] > 0)
+    // verify is offline procedure is in progress selectorDownloadSynchronize
+    if ([[app verifyExistsInQueuesDownloadSelector:selectorDownloadSynchronize] count] > 0)
         return;
     
     [[CCActions sharedInstance] listingFavorites:@"" delegate:self];
@@ -160,8 +160,8 @@
     if (app.activeAccount.length == 0)
         return;
     
-    // verify is offline procedure is in progress selectorDownloadOffline
-    if ([[app verifyExistsInQueuesDownloadSelector:selectorDownloadOffline] count] > 0)
+    // verify is offline procedure is in progress selectorDownloadSynchronize
+    if ([[app verifyExistsInQueuesDownloadSelector:selectorDownloadSynchronize] count] > 0)
         return;
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
@@ -212,14 +212,14 @@
 //
 //
 
-- (BOOL)offlineFolderAnimationDirectory:(NSArray *)directory setGraphicsFolder:(BOOL)setGraphicsFolder
+- (BOOL)synchronizeFolderAnimationDirectory:(NSArray *)directory setGraphicsFolder:(BOOL)setGraphicsFolder
 {
     BOOL animation = NO;
     BOOL isAtLeastOneInAnimation = NO;
     NSMutableOrderedSet *serversUrlInDownload = [[NSMutableOrderedSet alloc] init];
     
     // Active for download
-    NSMutableArray *metadatasNet = [app verifyExistsInQueuesDownloadSelector:selectorDownloadOffline];
+    NSMutableArray *metadatasNet = [app verifyExistsInQueuesDownloadSelector:selectorDownloadSynchronize];
     
     for (CCMetadataNet *metadataNet in metadatasNet)
         [serversUrlInDownload addObject:metadataNet.serverUrl];
@@ -364,7 +364,7 @@
         }
         
         if ([metadatasForOfflineFolder count] > 0)
-            [self verifyChangeMedatas:metadatasForOfflineFolder serverUrl:metadataNet.serverUrl account:metadataNet.account offline:YES];
+            [self verifyChangeMedatas:metadatasForOfflineFolder serverUrl:metadataNet.serverUrl account:metadataNet.account synchronize:YES];
     });
 }
 
@@ -406,7 +406,7 @@
 {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
         
-        [self verifyChangeMedatas:[[NSArray alloc] initWithObjects:metadata, nil] serverUrl:metadataNet.serverUrl account:app.activeAccount offline:NO];
+        [self verifyChangeMedatas:[[NSArray alloc] initWithObjects:metadata, nil] serverUrl:metadataNet.serverUrl account:app.activeAccount synchronize:NO];
     });
 }
 
@@ -416,7 +416,7 @@
 
 
 // MULTI THREAD
-- (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl account:(NSString *)account offline:(BOOL)offline
+- (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl account:(NSString *)account synchronize:(BOOL)synchronize
 {
     NSMutableArray *metadatas = [[NSMutableArray alloc] init];
     
@@ -434,7 +434,7 @@
         
         TableLocalFile *record = [TableLocalFile MR_findFirstWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileID == %@)", app.activeAccount, metadata.fileID]];
         
-        if (offline) {
+        if (synchronize) {
             
             if (![record.rev isEqualToString:metadata.rev])
                 changeRev = YES;
@@ -466,15 +466,15 @@
     
     dispatch_async(dispatch_get_main_queue(), ^{
         if ([metadatas count])
-            [self SynchronizeMetadatas:metadatas serverUrl:serverUrl offline:offline];
+            [self SynchronizeMetadatas:metadatas serverUrl:serverUrl synchronize:synchronize];
     });
 }
 
 // MAIN THREAD
-- (void)SynchronizeMetadatas:(NSArray *)metadatas serverUrl:(NSString *)serverUrl offline:(BOOL)offline
+- (void)SynchronizeMetadatas:(NSArray *)metadatas serverUrl:(NSString *)serverUrl synchronize:(BOOL)synchronize
 {
     // HUD
-    if ([metadatas count] > 50 && offline) {
+    if ([metadatas count] > 50 && synchronize) {
         if (!_hud) _hud = [[CCHud alloc] initWithView:[[[UIApplication sharedApplication] delegate] window]];
         [_hud visibleIndeterminateHud];
     }
@@ -494,7 +494,7 @@
         
             if ([metadata.type isEqualToString: k_metadataType_file]) {
                 downloadData = YES;
-                selector = selectorDownloadOffline;
+                selector = selectorDownloadSynchronize;
             }
         
             if ([metadata.type isEqualToString: k_metadataType_template]) {
@@ -519,7 +519,7 @@
             [app addNetworkingOperationQueue:app.netQueueDownload delegate:app.activeMain metadataNet:metadataNet];
         }
     
-        [[CCSynchronize sharedSynchronize] offlineFolderAnimationDirectory:[[NSArray alloc] initWithObjects:serverUrl, nil] setGraphicsFolder:YES];
+        [[CCSynchronize sharedSynchronize] synchronizeFolderAnimationDirectory:[[NSArray alloc] initWithObjects:serverUrl, nil] setGraphicsFolder:YES];
         
         [app.activeMain reloadDatasource:serverUrl fileID:nil selector:nil];