Browse Source

clear code

Marino Faggiana 6 years ago
parent
commit
b58603a639

+ 1 - 1
iOSClient/AppDelegate.h

@@ -119,7 +119,7 @@
 @property (nonatomic, strong) NSMutableDictionary *listMainVC;
 @property (nonatomic, strong) NSMutableDictionary *listProgressMetadata;
 
-@property (nonatomic, strong) NSMutableArray *fileIDHide;
+@property (nonatomic, strong) NSMutableArray *filterFileID;
 
 // Maintenance Mode
 @property BOOL maintenanceMode;

+ 1 - 1
iOSClient/AppDelegate.m

@@ -177,7 +177,7 @@
     self.sharesUserAndGroup = [NSMutableDictionary new];
     
     // Filter fileID
-    self.fileIDHide = [NSMutableArray new];
+    self.filterFileID = [NSMutableArray new];
 
     // Initialization Notification
     self.listOfNotifications = [NSMutableArray new];

+ 1 - 1
iOSClient/Favorites/CCFavorites.m

@@ -589,7 +589,7 @@
             recordsTableMetadata = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"directoryID == %@", directoryID] sorted:sorted ascending:[CCUtility getAscendingSettings]];
     }
         
-    sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:nil fileIDHide:appDelegate.fileIDHide activeAccount:appDelegate.activeAccount];
+    sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:nil filterFileID:appDelegate.filterFileID activeAccount:appDelegate.activeAccount];
         
     // get auto upload folder
     autoUploadFileName = [[NCManageDatabase sharedInstance] getAccountAutoUploadFileName];

+ 2 - 2
iOSClient/Main/CCMain.m

@@ -3871,7 +3871,7 @@
             }
         }
         
-        sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatas listProgressMetadata:nil groupByField:_directoryGroupBy fileIDHide:appDelegate.fileIDHide activeAccount:appDelegate.activeAccount];
+        sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatas listProgressMetadata:nil groupByField:_directoryGroupBy filterFileID:appDelegate.filterFileID activeAccount:appDelegate.activeAccount];
 
         [self tableViewReloadData];
         
@@ -3941,7 +3941,7 @@
             NSArray *recordsTableMetadata = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"directoryID == %@ AND status != %i", directoryID, k_metadataStatusHide] sorted:sorted ascending:[CCUtility getAscendingSettings]];
                                                   
             sectionDataSource = [CCSectionDataSourceMetadata new];
-            sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:_directoryGroupBy fileIDHide:appDelegate.fileIDHide activeAccount:appDelegate.activeAccount];
+            sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:_directoryGroupBy filterFileID:appDelegate.filterFileID activeAccount:appDelegate.activeAccount];
             
             // get auto upload folder
             _autoUploadFileName = [[NCManageDatabase sharedInstance] getAccountAutoUploadFileName];

+ 1 - 1
iOSClient/Main/CCSection.h

@@ -44,7 +44,7 @@
 
 @interface CCSectionMetadata : NSObject
 
-+ (CCSectionDataSourceMetadata *)creataDataSourseSectionMetadata:(NSArray *)arrayMetadatas listProgressMetadata:(NSMutableDictionary *)listProgressMetadata groupByField:(NSString *)groupByField fileIDHide:(NSArray *)fileIDHide activeAccount:(NSString *)activeAccount;
++ (CCSectionDataSourceMetadata *)creataDataSourseSectionMetadata:(NSArray *)arrayMetadatas listProgressMetadata:(NSMutableDictionary *)listProgressMetadata groupByField:(NSString *)groupByField filterFileID:(NSArray *)filterFileID activeAccount:(NSString *)activeAccount;
 
 + (void)removeAllObjectsSectionDataSource:(CCSectionDataSourceMetadata *)sectionDataSource;
 

+ 2 - 2
iOSClient/Main/CCSection.m

@@ -74,7 +74,7 @@
 //
 // orderByField : nil, date, typeFile
 //
-+ (CCSectionDataSourceMetadata *)creataDataSourseSectionMetadata:(NSArray *)arrayMetadatas listProgressMetadata:(NSMutableDictionary *)listProgressMetadata groupByField:(NSString *)groupByField fileIDHide:(NSArray *)fileIDHide activeAccount:(NSString *)activeAccount
++ (CCSectionDataSourceMetadata *)creataDataSourseSectionMetadata:(NSArray *)arrayMetadatas listProgressMetadata:(NSMutableDictionary *)listProgressMetadata groupByField:(NSString *)groupByField filterFileID:(NSArray *)filterFileID activeAccount:(NSString *)activeAccount
 {
     id dataSection;
 
@@ -95,7 +95,7 @@
     for (tableMetadata* metadata in arrayMetadatas) {
         
         // *** LIST : DO NOT INSERT ***
-        if (metadata.status == k_metadataStatusHide || [fileIDHide containsObject: metadata.fileID]) {
+        if (metadata.status == k_metadataStatusHide || [filterFileID containsObject: metadata.fileID]) {
             continue;
         }
         

+ 2 - 2
iOSClient/Main/NCMainCommon.swift

@@ -523,7 +523,7 @@ class NCMainCommon: NSObject {
                 continue
             }
             
-            self.appDelegate.fileIDHide.add(metadata.fileID)
+            self.appDelegate.filterFileID.add(metadata.fileID)
             
             ocNetworking?.deleteFileOrFolder(metadata.fileName, serverUrl: serverUrl, completion: { (message, errorCode) in
                 
@@ -549,7 +549,7 @@ class NCMainCommon: NSObject {
                     
                 } else {
                     
-                    self.appDelegate.fileIDHide.remove(metadata.fileID)
+                    self.appDelegate.filterFileID.remove(metadata.fileID)
                     
                     completionErrorCode = errorCode
                     completionMessage = message!

+ 1 - 1
iOSClient/Photos/CCPhotos.m

@@ -566,7 +566,7 @@
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         NSArray *metadatas = [[NCManageDatabase sharedInstance] getTablePhotosWithAddMetadatasFromUpload:self.addMetadatasFromUpload];
-        sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatas listProgressMetadata:nil groupByField:@"date" fileIDHide:appDelegate.fileIDHide activeAccount:appDelegate.activeAccount];
+        sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatas listProgressMetadata:nil groupByField:@"date" filterFileID:appDelegate.filterFileID activeAccount:appDelegate.activeAccount];
         
         dispatch_async(dispatch_get_main_queue(), ^{
                

+ 1 - 1
iOSClient/Settings/CCAdvanced.m

@@ -389,7 +389,7 @@
             
             [[NCAutoUpload sharedInstance] alignPhotoLibrary];
             
-            [appDelegate.fileIDHide removeAllObjects];
+            [appDelegate.filterFileID removeAllObjects];
         }
         
         [appDelegate maintenanceMode:NO];

+ 1 - 1
iOSClient/Transfers/CCTransfers.m

@@ -215,7 +215,7 @@
     
     NSArray *recordsTableMetadata = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND ((session CONTAINS 'upload') OR (session CONTAINS 'download'))", appDelegate.activeAccount] sorted:@"sessionTaskIdentifier" ascending:NO];
     
-    sectionDataSource  = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:appDelegate.listProgressMetadata groupByField:@"session" fileIDHide:appDelegate.fileIDHide activeAccount:appDelegate.activeAccount];
+    sectionDataSource  = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:appDelegate.listProgressMetadata groupByField:@"session" filterFileID:appDelegate.filterFileID activeAccount:appDelegate.activeAccount];
         
     [self.tableView reloadData];
 }