clear code

iOSClient/Actions/CCActions.swift

@@ -34,11 +34,6 @@ import Foundation
     func searchSuccessFailure(_ metadataNet: CCMetadataNet, metadatas: [Any], message: NSString, errorCode: NSInteger)
 }
 
-@objc protocol CCActionsListingFavoritesDelegate {
-    
-    func listingFavoritesSuccessFailure(_ metadataNet: CCMetadataNet, metadatas: [Any], message: NSString, errorCode: NSInteger)
-}
-
 class CCActions: NSObject {
     
     //MARK: Shared Instance
@@ -205,26 +200,6 @@ class CCActions: NSObject {
         
         metadataNet.delegate?.searchSuccessFailure(metadataNet, metadatas: metadatas, message: message, errorCode: errorCode)
     }
-    
-    // --------------------------------------------------------------------------------------------
-    // MARK: Linsting Favorites
-    // --------------------------------------------------------------------------------------------
-    
-    @objc func listingFavorites(_ serverUrl: String, delegate: AnyObject) {
-        
-        let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
-        
-        metadataNet.action = actionListingFavorites
-        metadataNet.delegate = delegate
-        metadataNet.serverUrl = serverUrl
-        
-        appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
-    }
-    
-    @objc func listingFavoritesSuccessFailure(_ metadataNet: CCMetadataNet, metadatas: [tableMetadata], message: NSString, errorCode: NSInteger) {
-        
-        metadataNet.delegate?.listingFavoritesSuccessFailure(metadataNet, metadatas: metadatas, message: message, errorCode: errorCode)
-    }
 }
 
 

iOSClient/CCGlobal.h

@@ -220,7 +220,6 @@
 #define actionGetSharePermissionsFile                   @"getSharePermissionsFile"
 #define actionGetExternalSitesServer                    @"getExternalSitesServer"
 #define actionMiddlewarePing                            @"middlewarePing"
-#define actionListingFavorites                          @"listingFavorites"
 #define actionMoveFileOrFolder                          @"moveFileOrFolder"
 #define actionReadFile                                  @"readFile"
 #define actionReadFolder                                @"readFolder"

iOSClient/Favorites/CCFavorites.m

@@ -266,17 +266,18 @@
 }
 
 #pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== listingFavorites <delegate> =====
+#pragma mark ===== listingFavorites =====
 #pragma--------------------------------------------------------------------------------------------
 
-- (void)listingFavoritesSuccessFailure:(CCMetadataNet *)metadataNet metadatas:(NSArray *)metadatas message:(NSString *)message errorCode:(NSInteger)errorCode
+- (void)listingFavorites
 {
-    // Check Active Account
-    if (![metadataNet.account isEqualToString:appDelegate.activeAccount])
+    // test
+    if (appDelegate.activeAccount.length == 0)
         return;
     
-    if (errorCode == 0) {
-    
+    OCnetworking *ocNetworking = [[OCnetworking alloc] initWithDelegate:nil metadataNet:nil withUser:appDelegate.activeUser withUserID:appDelegate.activeUserID withPassword:appDelegate.activePassword withUrl:appDelegate.activeUrl];
+    [ocNetworking listingFavorites:@"" account:appDelegate.activeAccount success:^(NSArray *metadatas) {
+        
         NSString *father = @"";
         NSMutableArray *filesEtag = [NSMutableArray new];
         
@@ -296,7 +297,7 @@
                         [[CCSynchronize sharedSynchronize] readFileForFolder:metadata.fileName serverUrl:serverUrl selector:selectorReadFileFolderWithDownload];
                     else
                         [[CCSynchronize sharedSynchronize] readFileForFolder:metadata.fileName serverUrl:serverUrl selector:selectorReadFileFolder];
-
+                    
                 } else {
                     
                     if ([CCUtility getFavoriteOffline])
@@ -317,20 +318,10 @@
                 [[NCManageDatabase sharedInstance] setMetadataFavoriteWithFileID:metadata.fileID favorite:NO];
         
         [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
-    
-    } else {
         
+    } failure:^(NSString *message, NSInteger errorCode) {
         NSLog(@"[LOG] Listing Favorites failure error %d, %@", (int)errorCode, message);
-    }
-}
-
-- (void)listingFavorites
-{
-    // test
-    if (appDelegate.activeAccount.length == 0)
-        return;
-    
-    [[CCActions sharedInstance] listingFavorites:@"" delegate:self];
+    }];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Networking/OCNetworking.m

@@ -756,24 +756,6 @@
 #pragma mark ===== Listing Favorites =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)listingFavorites
-{
-    [self listingFavorites:_metadataNet.serverUrl account:_metadataNet.account success:^(NSArray *metadatas) {
-    
-        if ([self.delegate respondsToSelector:@selector(listingFavoritesSuccessFailure:metadatas:message:errorCode:)])
-            [self.delegate listingFavoritesSuccessFailure:_metadataNet metadatas:metadatas message:nil errorCode:0];
-        
-        [self complete];
-        
-    } failure:^(NSString *message, NSInteger errorCode) {
-        
-        if ([self.delegate respondsToSelector:@selector(listingFavoritesSuccessFailure:metadatas:message:errorCode:)])
-            [self.delegate listingFavoritesSuccessFailure:_metadataNet metadatas:nil message:message errorCode:errorCode];
-        
-        [self complete];
-    }];
-}
-
 - (void)listingFavorites:(NSString *)serverUrl account:(NSString *)account success:(void(^)(NSArray *metadatas))success failure:(void (^)(NSString *message, NSInteger errorCode))failure
 {
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;