Sync function

iOSClient/AppDelegate.m

@@ -38,7 +38,7 @@
 
 #import "Nextcloud-Swift.h"
 
-@interface AppDelegate () <CCActionsListingFavoritesDelegate>
+@interface AppDelegate ()
 {
     
 }
@@ -356,13 +356,10 @@
         [[NSNotificationCenter defaultCenter] postNotificationName:@"initStateCameraUpload" object:nil];
         
         NSLog(@"[LOG] Listning Favorites");
-        [[CCActions sharedInstance] listingFavorites:@"" delegate:self.activeOffline];
+        [[CCSynchronize sharedSynchronize] readListingFavorites];
         
-        NSLog(@"[LOG] read file Offline");
-        [[CCSynchronize sharedSynchronize] readFileOffline];
-        
-        NSLog(@"[LOG] read folder offline");
-        [[CCSynchronize sharedSynchronize] readFolderOffline];
+        NSLog(@"[LOG] files Offline");
+        [[CCSynchronize sharedSynchronize] readOffline];
     });
     
     // Initialize Camera Upload

iOSClient/CCGlobal.h

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

iOSClient/Offline/CCOffline.m

@@ -29,7 +29,7 @@
 
 #pragma GCC diagnostic ignored "-Wundeclared-selector"
 
-@interface CCOffline () <CCActionsListingFavoritesDelegate>
+@interface CCOffline ()
 {
     UIPageControl *pageControl;
 }
@@ -205,53 +205,4 @@
     }
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Listing Favorite Delegate =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)listingFavoritesSuccess:(CCMetadataNet *)metadataNet metadatas:(NSArray *)metadatas
-{
-    // verify active user
-    TableAccount *record = [CCCoreData getActiveAccount];
-    
-    if (![record.account isEqualToString:metadataNet.account])
-        return;
-
-    for (CCMetadata *metadata in metadatas) {
-        
-        // Delete Record NOT in session
-        [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND (fileID = %@) AND ((session == NULL) OR (session == ''))", app.activeAccount, metadata.directoryID, metadata.fileID]];
-        
-        // type of file
-        NSInteger typeFilename = [CCUtility getTypeFileName:metadata.fileName];
-        
-        // if crypto do not insert
-        if (typeFilename == k_metadataTypeFilenameCrypto) continue;
-        
-        // verify if the record encrypted has plist + crypto
-        if (typeFilename == k_metadataTypeFilenamePlist && metadata.directory == NO) {
-            
-            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;
-        }
-        
-        // end test, insert in CoreData
-        [CCCoreData addMetadata:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl context:nil];
-    }
-}
-
-- (void)listingFavoritesFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
-{
-}
-
 @end

iOSClient/Offline/CCSynchronize.h

@@ -33,11 +33,10 @@
 
 + (CCSynchronize *)sharedSynchronize;
 
-- (void)readFolderOffline;
+- (void)readListingFavorites;
+- (void)readOffline;
 - (void)addOfflineFolder:(NSString *)serverUrl;
 
-- (void)readFileOffline;
-
 - (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl account:(NSString *)account offline:(BOOL)offline;
 
 - (BOOL)offlineFolderAnimationDirectory:(NSArray *)directory setGraphicsFolder:(BOOL)setGraphicsFolder;

iOSClient/Offline/CCSynchronize.m

@@ -27,7 +27,10 @@
 #import "CCCoreData.h"
 #import "CCMain.h"
 
-@interface CCSynchronize ()
+#import "Nextcloud-Swift.h"
+
+
+@interface CCSynchronize () <CCActionsListingFavoritesDelegate>
 {
     // local
 }
@@ -48,16 +51,81 @@
 }
 
 #pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Read Folder Offline =====
+#pragma mark ===== Read Listing Favorites =====
 #pragma --------------------------------------------------------------------------------------------
 
-// MULTI THREAD
-- (void)readFolderOffline
+- (void)readListingFavorites
 {
     // test
     if (app.activeAccount.length == 0)
         return;
+    
+    // verify is offline procedure is in progress selectorDownloadFavorites
+    if ([[app verifyExistsInQueuesDownloadSelector:selectorDownloadFavorites] count] > 0)
+        return;
+    
+    [[CCActions sharedInstance] listingFavorites:@"" delegate:self];
+}
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ===== Listing Favorite Delegate =====
+#pragma --------------------------------------------------------------------------------------------
+
+- (void)listingFavoritesSuccess:(CCMetadataNet *)metadataNet metadatas:(NSArray *)metadatas
+{
+    // verify active user
+    TableAccount *record = [CCCoreData getActiveAccount];
+    
+    if (![record.account isEqualToString:metadataNet.account])
+        return;
+    
+    for (CCMetadata *metadata in metadatas) {
+        
+        // Delete Record NOT in session
+        [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND (fileID = %@) AND ((session == NULL) OR (session == ''))", app.activeAccount, metadata.directoryID, metadata.fileID]];
+        
+        // type of file
+        NSInteger typeFilename = [CCUtility getTypeFileName:metadata.fileName];
+        
+        // if crypto do not insert
+        if (typeFilename == k_metadataTypeFilenameCrypto) continue;
+        
+        // verify if the record encrypted has plist + crypto
+        if (typeFilename == k_metadataTypeFilenamePlist && metadata.directory == NO) {
+            
+            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;
+        }
+        
+        // end test, insert in CoreData
+        [CCCoreData addMetadata:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl context:nil];
+    }
+}
+
+- (void)listingFavoritesFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
+{
+}
+
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ===== Read Offline =====
+#pragma --------------------------------------------------------------------------------------------
+
+- (void)readOffline
+{
+    // test
+    if (app.activeAccount.length == 0)
+        return;
+    
     // verify is offline procedure is in progress selectorDownloadOffline
     if ([[app verifyExistsInQueuesDownloadSelector:selectorDownloadOffline] count] > 0)
         return;
@@ -66,29 +134,45 @@
         
         NSString *father = @"";
         NSArray *directories = [CCCoreData getOfflineDirectoryActiveAccount:app.activeAccount];
-    
+
         for (TableDirectory *directory in directories) {
         
             if (![directory.serverUrl containsString:father]) {
-        
+             
                 father = directory.serverUrl;
-            
-                CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
+                [self readFolder:directory];
+            }
+        }
         
-                metadataNet.action = actionReadFolder;
-                metadataNet.directoryID = directory.directoryID;
-                metadataNet.priority = NSOperationQueuePriorityVeryLow;
-                metadataNet.selector = selectorReadFolder;
-                metadataNet.serverUrl = directory.serverUrl;
+        NSArray *metadatas = [CCCoreData getOfflineLocalFileActiveAccount:app.activeAccount directoryUser:app.directoryUser];
         
-                [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+        for (CCMetadata *metadata in metadatas) {
             
-                NSLog(@"[LOG] Read offline directory : %@", directory.serverUrl);
-            }
+            [self readFile:metadata];
         }
     });
 }
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ===== Read Folder =====
+#pragma --------------------------------------------------------------------------------------------
+
+// MULTI THREAD
+- (void)readFolder:(TableDirectory *)directory
+{
+    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
+    
+    metadataNet.action = actionReadFolder;
+    metadataNet.directoryID = directory.directoryID;
+    metadataNet.priority = NSOperationQueuePriorityVeryLow;
+    metadataNet.selector = selectorReadFolder;
+    metadataNet.serverUrl = directory.serverUrl;
+        
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+            
+    NSLog(@"[LOG] Read offline directory : %@", directory.serverUrl);
+}
+
 //
 // Add Folder offline
 //
@@ -255,34 +339,22 @@
 #pragma mark ===== Read File Offline =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)readFileOffline
+- (void)readFile:(CCMetadata *)metadata
 {
-    // test
-    if (app.activeAccount.length == 0)
-        return;
-    
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-
-        NSArray *metadatas = [CCCoreData getOfflineLocalFileActiveAccount:app.activeAccount directoryUser:app.directoryUser];
-    
-        for (CCMetadata *metadata in metadatas) {
-        
-            NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:app.activeAccount];
-            if (serverUrl == nil) continue;
+    NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:app.activeAccount];
+    if (serverUrl == nil) return;
         
-            CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
+    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
         
-            metadataNet.action = actionReadFile;
-            metadataNet.fileID = metadata.fileID;
-            metadataNet.fileName = metadata.fileName;
-            metadataNet.fileNamePrint = metadata.fileNamePrint;
-            metadataNet.serverUrl = serverUrl;
-            metadataNet.selector = selectorReadFileOffline;
-            metadataNet.priority = NSOperationQueuePriorityVeryLow;
+    metadataNet.action = actionReadFile;
+    metadataNet.fileID = metadata.fileID;
+    metadataNet.fileName = metadata.fileName;
+    metadataNet.fileNamePrint = metadata.fileNamePrint;
+    metadataNet.serverUrl = serverUrl;
+    metadataNet.selector = selectorReadFileOffline;
+    metadataNet.priority = NSOperationQueuePriorityVeryLow;
         
-            [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-        }
-    });
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 }
 
 - (void)readFileFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode