Clear code

iOSClient/MenuAccount+ControlCenter/CCControlCenter.m

@@ -425,12 +425,6 @@
     return 0;
 }
 
-/*
- - (void)pageViewController:(UIPageViewController *)pageViewController willTransitionToViewControllers:(NSArray<UIViewController *> *)pendingViewControllers
- {
- }
- */
-
 - (void)pageViewController:(UIPageViewController *)pageViewController didFinishAnimating:(BOOL)finished previousViewControllers:(NSArray<UIViewController *> *)previousViewControllers transitionCompleted:(BOOL)completed
 {
     [self changeTabBarApplicationFileImage];

iOSClient/MenuAccount+ControlCenter/CCControlCenterActivity.m

@@ -78,29 +78,38 @@
         return;
     
     if (app.controlCenter.isOpen) {
-                
+        
+        NSPredicate *predicate;
+        
         if ([CCUtility getActivityVerboseHigh])
-            _sectionDataSource = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"((account == %@) || (account == ''))", app.activeAccount]];
+            predicate = [NSPredicate predicateWithFormat:@"((account == %@) || (account == ''))", app.activeAccount];
         else
-            _sectionDataSource = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (verbose == %lu)", app.activeAccount, k_activityVerboseDefault]];
+            predicate = [NSPredicate predicateWithFormat:@"(account == %@) AND (verbose == %lu)", app.activeAccount, k_activityVerboseDefault];
+
+        _sectionDataSource = [CCCoreData getAllTableActivityWithPredicate: predicate];
+        
+        [self reloadCollection];
+    }
+}
+
+- (void)reloadCollection
+{
+    if ([[app.controlCenter getActivePage] isEqualToString:k_pageControlCenterActivity]) {
         
-        if ([[app.controlCenter getActivePage] isEqualToString:k_pageControlCenterActivity]) {
+        if ([_sectionDataSource count] == 0) {
             
-            if ([_sectionDataSource count] == 0) {
-                
-                app.controlCenter.labelMessageNoRecord.text = NSLocalizedString(@"_no_activity_",nil);
-                app.controlCenter.labelMessageNoRecord.hidden = NO;
+            app.controlCenter.labelMessageNoRecord.text = NSLocalizedString(@"_no_activity_",nil);
+            app.controlCenter.labelMessageNoRecord.hidden = NO;
             
-            } else {
+        } else {
             
-                app.controlCenter.labelMessageNoRecord.hidden = YES;
-            }
+            app.controlCenter.labelMessageNoRecord.hidden = YES;
         }
     }
-    
-    [self.collectionView reloadData];    
-}
 
+    [self.collectionView reloadData];
+}
+    
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark - ==== Table ====
 #pragma --------------------------------------------------------------------------------------------
@@ -114,7 +123,7 @@
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
     TableActivity *activity = [_sectionDataSource objectAtIndex:section];
-    
+        
     if ([activity.action isEqual: k_activityDebugActionDownload] || [activity.action isEqual: k_activityDebugActionUpload]) {
         
         if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@.ico", app.directoryUser, activity.fileID]])

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -774,10 +774,6 @@
     [self.detailViewController setTitle:_metadata.fileNamePrint];
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ====== --- Camera Upload --- ======
-#pragma --------------------------------------------------------------------------------------------
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark === initStateCameraUpload ===
 #pragma --------------------------------------------------------------------------------------------