clear code

iOSClient/AppDelegate.h

@@ -39,6 +39,7 @@
 #import "CCPhotos.h"
 #import "CCTransfers.h"
 #import "CCSettings.h"
+#import "CCFavorites.h"
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate, BKPasscodeLockScreenManagerDelegate, BKPasscodeViewControllerDelegate, LMMediaPlayerViewDelegate, TWMessageBarStyleSheet, CCNetworkingDelegate>
 
@@ -119,6 +120,7 @@
 
 @property (nonatomic, strong) CCMain *activeMain;
 @property (nonatomic, strong) CCMain *homeMain;
+@property (nonatomic, strong) CCFavorites *activeFavorites;
 @property (nonatomic, strong) CCPhotos *activePhotos;
 @property (nonatomic, retain) CCDetail *activeDetail;
 @property (nonatomic, retain) CCSettings *activeSettings;

iOSClient/AppDelegate.m

@@ -356,7 +356,7 @@
         [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"initStateAutoUpload" object:nil];
         
         NSLog(@"[LOG] Listning Favorites");
-        [[CCSynchronize sharedSynchronize] readListingFavorites];        
+        [_activeFavorites readListingFavorites];
     });
     
     // Initialize Auto upload

iOSClient/Favorites/CCFavorites.h

@@ -53,4 +53,7 @@
 @property (nonatomic, weak) CCDetail *detailViewController;
 @property (nonatomic, strong) UIDocumentInteractionController *docController;
 
+- (void)readListingFavorites;
+- (void)addFavoriteFolder:(NSString *)serverUrl;
+
 @end

iOSClient/Favorites/CCFavorites.m

@@ -23,6 +23,8 @@
 
 #import "CCFavorites.h"
 #import "AppDelegate.h"
+#import "CCSynchronize.h"
+
 #import "NCBridgeSwift.h"
 
 @interface CCFavorites () <CCActionsDeleteDelegate, CCActionsSettingFavoriteDelegate>
@@ -46,6 +48,8 @@
         
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(triggerProgressTask:) name:@"NotificationProgressTask" object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeTheming) name:@"changeTheming" object:nil];
+        
+        app.activeFavorites = self;
     }
     return self;
 }
@@ -197,6 +201,107 @@
     [self reloadDatasource];
 }
 
+- (void)readListingFavorites
+{
+    // test
+    if (app.activeAccount.length == 0)
+        return;
+    
+    // verify is offline procedure is in progress selectorDownloadSynchronize
+    if ([[app verifyExistsInQueuesDownloadSelector:selectorDownloadSynchronize] count] > 0)
+        return;
+    
+    [[CCActions sharedInstance] listingFavorites:@"" delegate:self];
+}
+
+- (void)addFavoriteFolder:(NSString *)serverUrl
+{
+    NSString *directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrl];
+    NSString *selector;
+    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
+    
+    metadataNet.action = actionReadFolder;
+    metadataNet.directoryID = directoryID;
+    metadataNet.priority = NSOperationQueuePriorityNormal;
+    
+    if ([CCUtility getFavoriteOffline])
+        selector = selectorReadFolderWithDownload;
+    else
+        selector = selectorReadFolder;
+    
+    metadataNet.selector = selector;
+    metadataNet.serverUrl = serverUrl;
+    
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+}
+
+- (void)listingFavoritesSuccess:(CCMetadataNet *)metadataNet metadatas:(NSArray *)metadatas
+{
+    // verify active user
+    tableAccount *record = [[NCManageDatabase sharedInstance] getAccountActive];
+    
+    if (![record.account isEqualToString:metadataNet.account])
+        return;
+    
+    NSString *father = @"";
+    NSMutableArray *filesEtag = [NSMutableArray new];
+    
+    for (tableMetadata *metadata in metadatas) {
+        
+        // type of file
+        NSInteger typeFilename = [CCUtility getTypeFileName:metadata.fileName];
+        
+        // do not insert cryptated favorite file
+        if (typeFilename == k_metadataTypeFilenameCrypto || typeFilename == k_metadataTypeFilenamePlist)
+            continue;
+        
+        // insert for test NOT favorite
+        [filesEtag addObject:metadata.fileID];
+        
+        // Get ServerUrl
+        NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
+        serverUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:metadata.fileNameData];
+        
+        if (![serverUrl containsString:father]) {
+            
+            if (metadata.directory) {
+                
+                NSString *selector;
+                
+                if ([CCUtility getFavoriteOffline])
+                    selector = selectorReadFolderWithDownload;
+                else
+                    selector = selectorReadFolder;
+                
+                [[CCSynchronize sharedSynchronize] readFolderServerUrl:serverUrl selector:selector];
+                
+            } else {
+                
+                if ([CCUtility getFavoriteOffline])
+                    [[CCSynchronize sharedSynchronize] readFile:metadata withDownload:YES];
+                else
+                    [[CCSynchronize sharedSynchronize] readFile:metadata withDownload:NO];
+            }
+            
+            father = serverUrl;
+        }
+    }
+    
+    // Verify remove favorite
+    NSArray *allRecordFavorite = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND favorite = true", app.activeAccount] sorted:nil ascending:NO];
+    
+    for (tableMetadata *metadata in allRecordFavorite)
+        if (![filesEtag containsObject:metadata.fileID])
+            [[NCManageDatabase sharedInstance] setMetadataFavoriteWithFileID:metadata.fileID favorite:NO];
+    
+    [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
+}
+
+- (void)listingFavoritesFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
+{
+    NSLog(@"Read Favorites Failure");
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ==== Download Thumbnail <Delegate> ====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Favorites/CCSynchronize.h

@@ -34,11 +34,9 @@
 
 @property (nonatomic, strong) NSMutableOrderedSet *foldersInSynchronized;
 
-- (void)readListingFavorites;
-- (void)addFavoriteFolder:(NSString *)serverUrl;
+- (void)readFolderServerUrl:(NSString *)serverUrl selector:(NSString *)selector;
+- (void)readFile:(id)metadata withDownload:(BOOL)withDownload;
 
 - (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl account:(NSString *)account withDownload:(BOOL)withDownload;
 
-- (void)readFolderServerUrl:(NSString *)serverUrl selector:(NSString *)selector;
-
 @end

iOSClient/Favorites/CCSynchronize.m

@@ -26,7 +26,7 @@
 #import "CCMain.h"
 #import "NCBridgeSwift.h"
 
-@interface CCSynchronize () <CCActionsListingFavoritesDelegate>
+@interface CCSynchronize () 
 {
     // local
 }
@@ -50,111 +50,6 @@
     }
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Read Listing Favorites =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)readListingFavorites
-{
-    // test
-    if (app.activeAccount.length == 0)
-        return;
-    
-    // verify is offline procedure is in progress selectorDownloadSynchronize
-    if ([[app verifyExistsInQueuesDownloadSelector:selectorDownloadSynchronize] count] > 0)
-        return;
-    
-    [[CCActions sharedInstance] listingFavorites:@"" delegate:self];
-}
-
-- (void)addFavoriteFolder:(NSString *)serverUrl
-{
-    NSString *directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrl];
-    NSString *selector;
-    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-    
-    metadataNet.action = actionReadFolder;
-    metadataNet.directoryID = directoryID;
-    metadataNet.priority = NSOperationQueuePriorityNormal;
-    
-    if ([CCUtility getFavoriteOffline])
-        selector = selectorReadFolderWithDownload;
-    else
-        selector = selectorReadFolder;
-    
-    metadataNet.selector = selector;
-    metadataNet.serverUrl = serverUrl;
-    
-    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-}
-
-- (void)listingFavoritesSuccess:(CCMetadataNet *)metadataNet metadatas:(NSArray *)metadatas
-{
-    // verify active user
-    tableAccount *record = [[NCManageDatabase sharedInstance] getAccountActive];
-    
-    if (![record.account isEqualToString:metadataNet.account])
-        return;
-    
-    NSString *father = @"";
-    NSMutableArray *filesEtag = [NSMutableArray new];
-    
-    for (tableMetadata *metadata in metadatas) {
-        
-        // type of file
-        NSInteger typeFilename = [CCUtility getTypeFileName:metadata.fileName];
-        
-        // do not insert cryptated favorite file
-        if (typeFilename == k_metadataTypeFilenameCrypto || typeFilename == k_metadataTypeFilenamePlist)
-            continue;
-
-        // insert for test NOT favorite
-        [filesEtag addObject:metadata.fileID];
-        
-        // Get ServerUrl
-        NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
-        serverUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:metadata.fileNameData];
-        
-        if (![serverUrl containsString:father]) {
-            
-            if (metadata.directory) {
-                
-                NSString *selector;
-                
-                if ([CCUtility getFavoriteOffline])
-                    selector = selectorReadFolderWithDownload;
-                else
-                    selector = selectorReadFolder;
-                
-                [self readFolderServerUrl:serverUrl selector:selector];
-                
-            } else {
-                
-                if ([CCUtility getFavoriteOffline])
-                    [self readFile:metadata withDownload:YES];
-                else
-                    [self readFile:metadata withDownload:NO];
-            }
-            
-            father = serverUrl;
-        }
-    }
-    
-    // Verify remove favorite
-    NSArray *allRecordFavorite = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND favorite = true", app.activeAccount] sorted:nil ascending:NO];
-    
-    for (tableMetadata *metadata in allRecordFavorite)
-        if (![filesEtag containsObject:metadata.fileID])
-            [[NCManageDatabase sharedInstance] setMetadataFavoriteWithFileID:metadata.fileID favorite:NO];
-    
-    [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
-}
-
-- (void)listingFavoritesFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
-{
-    NSLog(@"Read Favorites Failure");
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Read Folder =====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Main/CCMain.m

@@ -3167,7 +3167,7 @@
         
         NSString *dir = [CCUtility stringAppendServerUrl:metadataNet.serverUrl addFileName:metadata.fileNameData];
         
-        [[CCSynchronize sharedSynchronize] addFavoriteFolder:dir];
+        [app.activeFavorites addFavoriteFolder:dir];
     }
 }
 

iOSClient/Settings/CCSettings.m

@@ -418,7 +418,7 @@
         } 
     }
     
-    [[CCSynchronize sharedSynchronize] readListingFavorites];
+    [app.activeFavorites readListingFavorites];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -60,6 +60,7 @@
 "_file_not_found_"          = "File not found";
 "_continue_"                = "Do you want to continue?";
 "_auto_upload_folder_"      = "Auto upload";
+"_gallery_"                 = "Gallery";
 
 // App