dev

Nextcloud.xcodeproj/project.pbxproj

@@ -552,7 +552,6 @@
 		F7DFB7F4219C5CA800680748 /* NCCreateFormUploadScanDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DFB7F3219C5CA800680748 /* NCCreateFormUploadScanDocument.swift */; };
 		F7DFB7F6219C5F2300680748 /* NCCreateFormUploadRichdocuments.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7DFB7F5219C5F2300680748 /* NCCreateFormUploadRichdocuments.storyboard */; };
 		F7E9C41B20F4CA870040CF18 /* CCTransfers.m in Sources */ = {isa = PBXBuildFile; fileRef = F7E9C41820F4CA870040CF18 /* CCTransfers.m */; };
-		F7EC9CBC21185F2000F1C5CE /* CCMedia.m in Sources */ = {isa = PBXBuildFile; fileRef = F7EC9CBB21185F2000F1C5CE /* CCMedia.m */; };
 		F7ECBA6D1E239DCD003E6328 /* NCCreateFormUploadRichdocuments.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7ECBA6C1E239DCD003E6328 /* NCCreateFormUploadRichdocuments.swift */; };
 		F7F54CE51E5B14C700E19C62 /* ImageError.png in Resources */ = {isa = PBXBuildFile; fileRef = F7F54CAF1E5B14C700E19C62 /* ImageError.png */; };
 		F7F54CE61E5B14C700E19C62 /* ImageError@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7F54CB01E5B14C700E19C62 /* ImageError@2x.png */; };
@@ -1398,8 +1397,6 @@
 		F7E45E6D21E75BF200579249 /* ja-JP */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ja-JP"; path = "ja-JP.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F7E9C41520F4CA870040CF18 /* CCTransfers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTransfers.h; sourceTree = "<group>"; };
 		F7E9C41820F4CA870040CF18 /* CCTransfers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTransfers.m; sourceTree = "<group>"; };
-		F7EC9CBA21185F2000F1C5CE /* CCMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMedia.h; sourceTree = "<group>"; };
-		F7EC9CBB21185F2000F1C5CE /* CCMedia.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCMedia.m; sourceTree = "<group>"; };
 		F7ECBA6C1E239DCD003E6328 /* NCCreateFormUploadRichdocuments.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadRichdocuments.swift; sourceTree = "<group>"; };
 		F7F0617A1BAACDD300846525 /* CryptoCloud.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoCloud.pch; sourceTree = "<group>"; };
 		F7F54CAF1E5B14C700E19C62 /* ImageError.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ImageError.png; sourceTree = "<group>"; };
@@ -2820,8 +2817,6 @@
 		F7EC9CB921185F2000F1C5CE /* Media */ = {
 			isa = PBXGroup;
 			children = (
-				F7EC9CBA21185F2000F1C5CE /* CCMedia.h */,
-				F7EC9CBB21185F2000F1C5CE /* CCMedia.m */,
 				F79D4CC822197EC1007F3B7B /* NCGridMediaCell.swift */,
 				F79D4CC722197EC1007F3B7B /* NCGridMediaCell.xib */,
 				F7501C302212E57400FB1415 /* NCMedia.storyboard */,
@@ -3757,7 +3752,6 @@
 				F70022E31EC4C9100080073F /* OCXMLParser.m in Sources */,
 				F77B0E311D118A16002130FE /* CCExifGeo.m in Sources */,
 				F73B4F0E1F470D9100BBEE4B /* nsMBCSGroupProber.cpp in Sources */,
-				F7EC9CBC21185F2000F1C5CE /* CCMedia.m in Sources */,
 				F7D423831F0596C6009C9782 /* ReaderThumbFetch.m in Sources */,
 				F73B4F171F470D9100BBEE4B /* uchardet.cpp in Sources */,
 				F7D4237A1F0596C6009C9782 /* ReaderConstants.m in Sources */,

iOSClient/AppDelegate.h

@@ -32,7 +32,6 @@
 #import "CCUtility.h"
 #import "CCDetail.h"
 #import "CCMain.h"
-#import "CCMedia.h"
 #import "CCSettings.h"
 #import "CCFavorites.h"
 #import "CCTransfers.h"

iOSClient/AppDelegate.m

@@ -27,7 +27,6 @@
 #import "AFURLSessionManager.h"
 #import "CCNetworking.h"
 #import "CCGraphics.h"
-#import "CCMedia.h"
 #import "CCSynchronize.h"
 #import "CCMain.h"
 #import "CCDetail.h"

iOSClient/Main/CCMain.m

@@ -25,7 +25,6 @@
 
 #import "CCMain.h"
 #import "AppDelegate.h"
-#import "CCMedia.h"
 #import "CCSynchronize.h"
 #import "OCActivity.h"
 #import "OCNotifications.h"

iOSClient/Media/CCMedia.h

@@ -1,53 +0,0 @@
-//
-//  CCMedia.h
-//  Nextcloud iOS
-//
-//  Created by Marino Faggiana on 29/07/15.
-//  Copyright (c) 2017 Marino Faggiana. All rights reserved.
-//
-//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#import <UIKit/UIKit.h>
-#import <Photos/Photos.h>
-#import <ImageIO/ImageIO.h>
-#import <DZNEmptyDataSet/UIScrollView+EmptyDataSet.h>
-
-#import "OCErrorMsg.h"
-#import "TWMessageBarManager.h"
-#import "CCManageLocation.h"
-#import "CCDetail.h"
-#import "CCUtility.h"
-#import "CCSection.h"
-#import "CCHud.h"
-#import "OCNetworking.h"
-
-@class tableMetadata;
-
-@interface CCMedia: UICollectionViewController <UICollectionViewDataSource, UICollectionViewDelegate, UIActionSheetDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
-
-@property (nonatomic, weak) CCDetail *detailViewController;
-@property (nonatomic, strong) tableMetadata *metadata;
-@property (nonatomic, strong) NSMutableArray *addMetadatasFromUpload;
-@property (nonatomic, strong) UIView *reMenuBackgroundView;
-@property (nonatomic, strong) UITapGestureRecognizer *singleFingerTap;
-
-- (void)downloadFileSuccessFailure:(NSString *)fileName fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector errorMessage:(NSString *)errorMessage errorCode:(NSInteger)errorCode;
-
-- (void)reloadDatasource:(NSString *)fileID action:(NSInteger)action;
-- (void)searchPhotoVideo;
-
-@end

iOSClient/Media/CCMedia.m

@@ -1,1024 +0,0 @@
-//
-//  CCMedia.m
-//  Nextcloud iOS
-//
-//  Created by Marino Faggiana on 29/07/15.
-//  Copyright (c) 2017 Marino Faggiana. All rights reserved.
-//
-//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#import "CCMedia.h"
-#import "AppDelegate.h"
-#import "CCManageAutoUpload.h"
-#import "TOScrollBar.h"
-#import "NCBridgeSwift.h"
-
-@interface CCMedia () <NCSelectDelegate>
-{
-    AppDelegate *appDelegate;
-
-    NSMutableArray *selectedMetadatas;
-    CCSectionDataSourceMetadata *sectionDataSource;
-    
-    BOOL filterTypeFileImage;
-    BOOL filterTypeFileVideo;
-    
-    BOOL isSearchMode;
-    BOOL isEditMode;
-    
-    TOScrollBar *scrollBar;
-    NSMutableDictionary *saveEtagForStartDirectory;
-    
-    // Fix Crash Thumbnail + collectionView ReloadData ?
-    NSInteger counterThumbnail;
-    BOOL collectionViewReloadDataInProgress;
-    
-    // Remenu
-    REMenu *menu;
-    REMenuItem *menuSelectMediaFolder;
-    REMenuItem *menuFilterImage;
-    REMenuItem *menuFilterVideo;
-    REMenuItem *menuSelectItems;
-}
-@end
-
-@implementation CCMedia
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Init =====
-#pragma --------------------------------------------------------------------------------------------
-
--  (id)initWithCoder:(NSCoder *)aDecoder
-{
-    if (self = [super initWithCoder:aDecoder])  {
-        
-        appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
-
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(triggerProgressTask:) name:@"NotificationProgressTask" object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeTheming) name:@"changeTheming" object:nil];
-    }
-    
-    return self;
-}
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    
-    if (self) {
-        
-        appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
-    }
-    
-    return self;
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== View =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    saveEtagForStartDirectory = [NSMutableDictionary new];
-    selectedMetadatas = [NSMutableArray new];
-    self.addMetadatasFromUpload = [NSMutableArray new];
-    
-    // empty Data Source
-    self.collectionView.emptyDataSetDelegate = self;
-    self.collectionView.emptyDataSetSource = self;
-
-    // scroll bar
-    scrollBar = [TOScrollBar new];
-    [self.collectionView to_addScrollBar:scrollBar];
-    
-    scrollBar.handleTintColor = [NCBrandColor sharedInstance].brand;
-    scrollBar.handleWidth = 20;
-    scrollBar.handleMinimiumHeight = 20;
-    scrollBar.trackWidth = 0;
-    scrollBar.edgeInset = 12;
-    
-    // Query data source
-    [self queryDatasourceWithReloadData:YES];
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    
-    // Color
-    [appDelegate aspectNavigationControllerBar:self.navigationController.navigationBar online:[appDelegate.reachability isReachable] hidden:NO];
-    [appDelegate aspectTabBar:self.tabBarController.tabBar hidden:NO];
-    
-    // Plus Button
-    [appDelegate plusButtonVisibile:true];
-}
-
-- (void)viewDidAppear:(BOOL)animated
-{
-    [super viewDidAppear:animated];
-    
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.001 * NSEC_PER_SEC), dispatch_get_main_queue(), ^(void) {
-        [self reloadDatasource:nil action:k_action_NULL];
-    });
-}
-
-- (void)viewSafeAreaInsetsDidChange
-{
-    [super viewSafeAreaInsetsDidChange];
-    
-    self.collectionView.contentInset = self.view.safeAreaInsets;
-}
-
-- (void)changeTheming
-{
-    if (self.isViewLoaded && self.view.window)
-        [appDelegate changeTheming:self];
-    
-    scrollBar.handleTintColor = [NCBrandColor sharedInstance].brand;
-    
-    [self.collectionView reloadData];
-}
-
-- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
-{
-    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
-    
-    [menu close];
-    
-    // Before rotation
-    
-    [coordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
-        
-        if (self.view.frame.size.width == ([[UIScreen mainScreen] bounds].size.width*([[UIScreen mainScreen] bounds].size.width<[[UIScreen mainScreen] bounds].size.height))+([[UIScreen mainScreen] bounds].size.height*([[UIScreen mainScreen] bounds].size.width>[[UIScreen mainScreen] bounds].size.height))) {
-            
-            // Portrait
-            
-        } else {
-            
-            // Landscape
-        }
-        
-        [self.collectionView reloadData];
-    }];
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Gestione Grafica Window =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)openMenu
-{
-    if (menu.isOpen) {
-        
-        [menu close];
-        
-    } else {
-        
-        [self createReMainMenu];
-        [menu showFromNavigationController:self.navigationController];
-        
-        // Backgroun reMenu & (Gesture)
-        [self createReMenuBackgroundView:menu];
-        
-        self.singleFingerTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(openMenu)];
-        [self.reMenuBackgroundView addGestureRecognizer:_singleFingerTap];
-    }
-}
-
-- (void)createReMenuBackgroundView:(REMenu *)menu
-{
-    CGFloat safeAreaBottom = 0;
-    CGFloat safeAreaTop = 0;
-    CGFloat statusBar = 0;
-    
-    if (@available(iOS 11, *)) {
-        safeAreaTop = [UIApplication sharedApplication].delegate.window.safeAreaInsets.top;
-        safeAreaBottom = [UIApplication sharedApplication].delegate.window.safeAreaInsets.bottom;
-    }
-    if ([UIApplication sharedApplication].isStatusBarHidden) {
-        statusBar = 13;
-    }
-    
-    CGFloat computeNavigationBarOffset = [menu computeNavigationBarOffset];
-    UIViewController *rootController = [[[[UIApplication sharedApplication]delegate] window] rootViewController];
-    CGRect globalPositionMenu = [menu.menuView convertRect:menu.menuView.bounds toView:rootController.view];
-    
-    self.reMenuBackgroundView = [UIView new];
-    self.reMenuBackgroundView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5];
-    self.reMenuBackgroundView.frame = CGRectMake(0, computeNavigationBarOffset, globalPositionMenu.size.width,  rootController.view.frame.size.height);
-    
-    [UIView animateWithDuration:0.2 animations:^{
-        
-        CGFloat minimum = safeAreaBottom + self.tabBarController.tabBar.frame.size.height;
-        CGFloat y =  rootController.view.frame.size.height - menu.menuView.frame.size.height - globalPositionMenu.origin.y + statusBar;
-        
-        if (y>minimum) {
-            
-            self.reMenuBackgroundView.frame = CGRectMake(0, rootController.view.frame.size.height, globalPositionMenu.size.width, - y);
-            [self.tabBarController.view addSubview:self.reMenuBackgroundView];
-        }
-    }];
-}
-
-- (void)createReMainMenu
-{
-    menuSelectItems = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_select_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"select"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
-        if ([sectionDataSource.allRecordsDataSource count] > 0) {
-            [self editingModeYES];
-        }
-    }];
-    
-    menuSelectMediaFolder = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_select_media_folder_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderMedia"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
-        [self selectStartDirectoryPhotosTab];
-    }];
-    
-    if (filterTypeFileImage) {
-        menuFilterImage = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_media_viewimage_show_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"imageno"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
-            filterTypeFileImage = NO;
-            [self reloadDatasource:nil action:k_action_NULL];
-        }];
-    } else {
-        menuFilterImage = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_media_viewimage_hide_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"imageyes"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
-            filterTypeFileImage = YES;
-            [self reloadDatasource:nil action:k_action_NULL];
-        }];
-    }
-    
-    if (filterTypeFileVideo) {
-        menuFilterVideo = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_media_viewvideo_show_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"videono"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
-            filterTypeFileVideo = NO;
-            [self reloadDatasource:nil action:k_action_NULL];
-        }];
-    } else {
-        menuFilterVideo = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_media_viewvideo_hide_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"videoyes"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
-            filterTypeFileVideo = YES;
-            [self reloadDatasource:nil action:k_action_NULL];
-        }];
-    }
-    
-    // REMENU --------------------------------------------------------------------------------------------------------------
-    
-    menu = [[REMenu alloc] initWithItems:@[menuSelectItems, menuSelectMediaFolder, menuFilterImage, menuFilterVideo]];
-    
-    menu.imageOffset = CGSizeMake(5, -1);
-    
-    menu.separatorOffset = CGSizeMake(50.0, 0.0);
-    menu.imageOffset = CGSizeMake(0, 0);
-    menu.waitUntilAnimationIsComplete = NO;
-    
-    menu.separatorHeight = 0.5;
-    menu.separatorColor = [NCBrandColor sharedInstance].seperator;
-    
-    menu.backgroundColor = [NCBrandColor sharedInstance].backgroundView;
-    menu.textColor = [UIColor blackColor];
-    menu.textAlignment = NSTextAlignmentLeft;
-    menu.textShadowColor = nil;
-    menu.textOffset = CGSizeMake(50, 0.0);
-    menu.font = [UIFont systemFontOfSize:14.0];
-    
-    menu.highlightedBackgroundColor = [[NCBrandColor sharedInstance] getColorSelectBackgrond];
-    menu.highlightedSeparatorColor = nil;
-    menu.highlightedTextColor = [UIColor blackColor];
-    menu.highlightedTextShadowColor = nil;
-    menu.highlightedTextShadowOffset = CGSizeMake(0, 0);
-    
-    menu.subtitleTextColor = [UIColor colorWithWhite:0.425 alpha:1];
-    menu.subtitleTextAlignment = NSTextAlignmentLeft;
-    menu.subtitleTextShadowColor = nil;
-    menu.subtitleTextShadowOffset = CGSizeMake(0, 0.0);
-    menu.subtitleTextOffset = CGSizeMake(50, 0.0);
-    menu.subtitleFont = [UIFont systemFontOfSize:12.0];
-    
-    menu.subtitleHighlightedTextColor = [UIColor lightGrayColor];
-    menu.subtitleHighlightedTextShadowColor = nil;
-    menu.subtitleHighlightedTextShadowOffset = CGSizeMake(0, 0);
-    
-    menu.borderWidth = 0.3;
-    menu.borderColor =  [UIColor lightGrayColor];
-    
-    menu.animationDuration = 0.2;
-    menu.closeAnimationDuration = 0.2;
-    
-    menu.bounce = NO;
-    
-    __weak typeof(self) weakSelf = self;
-    [menu setClosePreparationBlock:^{
-        
-        // Backgroun reMenu (Gesture)
-        [weakSelf.reMenuBackgroundView removeFromSuperview];
-        [weakSelf.reMenuBackgroundView removeGestureRecognizer:weakSelf.singleFingerTap];
-    }];
-}
-
-- (void)setUINavigationBarDefault
-{
-    [appDelegate aspectNavigationControllerBar:self.navigationController.navigationBar online:[appDelegate.reachability isReachable] hidden:NO];
- 
-    // curront folder search
-    NSString *directory = [[NCManageDatabase sharedInstance] getAccountStartDirectoryMediaTabView:[CCUtility getHomeServerUrlActiveUrl:appDelegate.activeUrl]];
-    NSString *home = [CCUtility getHomeServerUrlActiveUrl:appDelegate.activeUrl];
-    NSString *folder = @"";
-    if (home.length > 0) {
-        folder = [directory stringByReplacingOccurrencesOfString:home withString:@""];
-    }
-    
-    // Title
-    NSString *title;
-    if (folder.length == 0) {
-        title = NSLocalizedString(@"_media_", nil);
-    } else {
-        title = [NSString stringWithFormat:@"%@: %@", NSLocalizedString(@"_media_", nil), [folder substringFromIndex:1]];
-    }
-    
-    self.navigationItem.titleView = nil;
-    self.navigationItem.title = title;
-    
-    if (isSearchMode) {
-        [CCGraphics addImageToTitle:title colorTitle:[NCBrandColor sharedInstance].brandText imageTitle:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"load"] multiplier:2 color:[NCBrandColor sharedInstance].brandText] imageRight:NO navigationItem:self.navigationItem];
-    }
-    
-    // Button Item RIGHT
-    UIBarButtonItem *buttonMore = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"navigationControllerMenu"] style:UIBarButtonItemStylePlain target:self action:@selector(openMenu)];
-    
-    self.navigationItem.rightBarButtonItems = [[NSArray alloc] initWithObjects:buttonMore, nil];
-    self.navigationItem.leftBarButtonItems = nil;
-}
-
-- (void)setUINavigationBarSelected
-{
-    UIBarButtonItem *buttonDelete = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"delete"] style:UIBarButtonItemStylePlain target:self action:@selector(deleteSelectedFiles)];
-//    UIBarButtonItem *buttonOpenIn = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"openFile"] style:UIBarButtonItemStylePlain target:self action:@selector(openSelectedFiles)];
-    
-    UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"_cancel_", nil) style:UIBarButtonItemStylePlain target:self action:@selector(editingModeNO)];
-    
-    self.navigationItem.rightBarButtonItems = [[NSArray alloc] initWithObjects:cancelButton, nil];
-    self.navigationItem.leftBarButtonItems = [[NSArray alloc] initWithObjects:buttonDelete, nil];
-    
-    // Title
-    self.navigationItem.title = [NSString stringWithFormat:@"%@ : %lu / %lu", NSLocalizedString(@"_selected_", nil), (unsigned long)[selectedMetadatas count], (unsigned long)[sectionDataSource.allRecordsDataSource count]];
-}
-
-- (void)cellSelect:(BOOL)select indexPath:(NSIndexPath *)indexPath metadata:(tableMetadata *)metadata
-{
-    UICollectionViewCell *cell = [self.collectionView cellForItemAtIndexPath:indexPath];
-    UIVisualEffectView *effect = [cell viewWithTag:200];
-    UIImageView *checked = [cell viewWithTag:300];
-    
-    if (select) {
-        effect.hidden = NO;
-        effect.alpha = 0.4;
-        checked.hidden = NO;
-        [selectedMetadatas addObject:metadata];
-        
-    } else {
-        effect.hidden = YES;
-        checked.hidden = YES;
-        [selectedMetadatas removeObject:metadata];
-    }
-    
-    // Title
-    self.navigationItem.title = [NSString stringWithFormat:@"%@ : %lu / %lu", NSLocalizedString(@"_selected_", nil), (unsigned long)[selectedMetadatas count], (unsigned long)[sectionDataSource.allRecordsDataSource count]];
-}
-
-- (void)scrollToTop
-{
-    [self.collectionView setContentOffset:CGPointMake(0, - self.collectionView.contentInset.top) animated:NO];
-}
-
-- (void)getGeoLocationForSection:(NSInteger)section
-{
-    NSString *addLocation = @"";
-    
-    NSArray *fileIDsForKey = [sectionDataSource.sectionArrayRow objectForKey:[sectionDataSource.sections objectAtIndex:section]];
-    
-    for (NSString *fileID in fileIDsForKey) {
-    
-        tableLocalFile *localFile = [[NCManageDatabase sharedInstance] getTableLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", fileID]];
-    
-        if ([localFile.exifLatitude floatValue] > 0 || [localFile.exifLongitude floatValue] > 0) {
-        
-            NSString *location = [[NCManageDatabase sharedInstance] getLocationFromGeoLatitude:localFile.exifLatitude longitude:localFile.exifLongitude];
-            
-            addLocation = [NSString stringWithFormat:@"%@, %@", addLocation, location];
-        
-        }
-    }
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ==== DZNEmptyDataSetSource Methods ====
-#pragma --------------------------------------------------------------------------------------------
-
-- (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView
-{
-    return [NCBrandColor sharedInstance].backgroundView;
-}
-
-- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
-{
-    return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"mediaNoRecord"] multiplier:1 color:[NCBrandColor sharedInstance].graySoft];
-}
-
-- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
-{
-    NSString *text;
-    
-    if (isSearchMode) {
-        text = [NSString stringWithFormat:@"\n%@", NSLocalizedString(@"_search_in_progress_", nil)];
-    } else {
-        text = [NSString stringWithFormat:@"\n%@", NSLocalizedString(@"_tutorial_photo_view_", nil)];
-    }
-    
-    NSDictionary *attributes = @{NSFontAttributeName:[UIFont boldSystemFontOfSize:20.0f], NSForegroundColorAttributeName:[UIColor lightGrayColor]};
-    
-    return [[NSAttributedString alloc] initWithString:text attributes:attributes];
-}
-
-/*
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== openSelectedFiles =====
-#pragma--------------------------------------------------------------------------------------------
-
-- (void)openSelectedFiles
-{
-    NSMutableArray *dataToShare = [[NSMutableArray alloc] init];
-    
-    for (tableMetadata *metadata in selectedMetadatas) {
-    
-        NSString *fileNamePath = [CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileName:metadata.fileNameView];
-                
-        if ([CCUtility fileProviderStorageExists:metadata.fileID fileName:metadata.fileNameView]) {
-            
-            if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image]) {
-                
-                NSData *data = [NSData dataWithData:UIImageJPEGRepresentation([UIImage imageWithContentsOfFile:fileNamePath], 0.9)];
-                [dataToShare addObject:data];
-            }
-            
-            if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video]) {
-                
-                [dataToShare addObject:[NSURL fileURLWithPath:fileNamePath]];
-            }
-        }
-    }
-    
-    if ([dataToShare count] > 0) {
-        
-        UIActivityViewController* activityViewController = [[UIActivityViewController alloc] initWithActivityItems:dataToShare applicationActivities:nil];
-        
-        // iPad
-        activityViewController.popoverPresentationController.barButtonItem = self.navigationItem.rightBarButtonItems.lastObject;
-        
-        self.navigationItem.leftBarButtonItem.enabled = NO;
-        self.navigationItem.rightBarButtonItem.enabled = NO;
-        
-        [self presentViewController:activityViewController animated:YES completion:^{
-            
-            [activityViewController setCompletionWithItemsHandler:^(NSString *activityType, BOOL completed, NSArray *returnedItems, NSError *activityError) {
-                
-                self.navigationItem.leftBarButtonItem.enabled = YES;
-                self.navigationItem.rightBarButtonItem.enabled = YES;
-                
-                [self editingModeNO];
-
-                if (completed) {
-                    [self.collectionView reloadData];
-                }
-            }];
-        }];
-    }
-}
-*/
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Download =====
-#pragma--------------------------------------------------------------------------------------------
-
-- (void)triggerProgressTask:(NSNotification *)notification
-{
-}
-
-- (void)downloadFileSuccessFailure:(NSString *)fileName fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector errorMessage:(NSString *)errorMessage errorCode:(NSInteger)errorCode
-{
-    if (errorCode == 0) {
-        
-        tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", fileID]];
-        if (metadata == nil || metadata.account != appDelegate.activeAccount) {
-            return;
-        }
-
-        NSIndexPath *indexPath;
-        BOOL existsIcon = NO;
-        
-        if (fileID) {
-            existsIcon = [[NSFileManager defaultManager] fileExistsAtPath:[CCUtility getDirectoryProviderStorageIconFileID:fileID fileNameView:fileName]];
-            indexPath = [sectionDataSource.fileIDIndexPath objectForKey:fileID];
-        }
-        
-        if ([self indexPathIsValid:indexPath] && existsIcon) {
-            
-            UICollectionViewCell *cell = [self.collectionView cellForItemAtIndexPath:indexPath];
-            
-            if (cell) {
-                UIImageView *imageView = (UIImageView *)[cell viewWithTag:100];
-                UIVisualEffectView *effect = [cell viewWithTag:200];
-                UIImageView *checked = [cell viewWithTag:300];
-                
-                imageView.image = [UIImage imageWithContentsOfFile:[CCUtility getDirectoryProviderStorageIconFileID:fileID fileNameView:fileName]];
-                effect.hidden = YES;
-                checked.hidden = YES;
-            }
-        }
-        
-    } else {
-        
-        [appDelegate messageNotification:@"_download_selected_files_" description:@"_error_download_photobrowser_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
-    }
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Delete =====
-#pragma--------------------------------------------------------------------------------------------
-
-- (void)deleteFile:(NSArray *)metadatas e2ee:(BOOL)e2ee
-{
-    [[NCMainCommon sharedInstance ] deleteFileWithMetadatas:metadatas e2ee:false serverUrl:@"" folderFileID:@"" completion:^(NSInteger errorCode, NSString *message) {
-        [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:nil fileID:nil action:k_action_NULL];
-    }];
-    
-    [self editingModeNO];
-}
-
-- (void)deleteSelectedFiles
-{
-    if ([selectedMetadatas count] == 0)
-        return;
-    
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
-    
-    [alertController addAction: [UIAlertAction actionWithTitle:NSLocalizedString(@"_delete_", nil)
-                                                         style:UIAlertActionStyleDestructive
-                                                       handler:^(UIAlertAction *action) {
-                                                           [self deleteFile:selectedMetadatas e2ee:false];
-                                                       }]];
-    
-    [alertController addAction: [UIAlertAction actionWithTitle:NSLocalizedString(@"_cancel_", nil)
-                                                         style:UIAlertActionStyleCancel
-                                                       handler:^(UIAlertAction *action) {
-                                                       }]];
-    
-    alertController.popoverPresentationController.barButtonItem = self.navigationItem.leftBarButtonItems.firstObject;
-    
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
-        [alertController.view layoutIfNeeded];
-    
-    [self presentViewController:alertController animated:YES completion:NULL];
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ==== Download Thumbnail ====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)downloadThumbnail:(tableMetadata *)metadata indexPath:(NSIndexPath *)indexPath
-{
-    counterThumbnail++;
-    
-    CGFloat width = [[NCUtility sharedInstance] getScreenWidthForPreview];
-    CGFloat height = [[NCUtility sharedInstance] getScreenHeightForPreview];
-    
-    [[OCNetworking sharedManager] downloadPreviewWithAccount:appDelegate.activeAccount metadata:metadata withWidth:width andHeight:height completion:^(NSString *account, UIImage *image, NSString *message, NSInteger errorCode) {
-        
-        counterThumbnail--;
-        
-        if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
-            UICollectionViewCell *cell = [self.collectionView cellForItemAtIndexPath:indexPath];
-            UIImageView *imageView = (UIImageView *)[cell viewWithTag:100];
-            imageView.image = image;
-        }
-    }];
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ==== Change Start directory ====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)dismissSelectWithServerUrl:(NSString *)serverUrl metadata:(tableMetadata *)metadata type:(NSString *)type
-{
-    if ([type isEqualToString:@"mediaFolder"]) {
-        
-        NSString *oldStartDirectoryMediaTabView = [[NCManageDatabase sharedInstance] getAccountStartDirectoryMediaTabView:[CCUtility getHomeServerUrlActiveUrl:appDelegate.activeUrl]];
-        
-        if (![serverUrl isEqualToString:oldStartDirectoryMediaTabView]) {
-            
-            // Save Start Directory
-            [[NCManageDatabase sharedInstance] setAccountStartDirectoryMediaTabView:serverUrl];
-            
-            // search PhotoVideo with new start directory
-            [self searchPhotoVideo];
-        }
-    }
-}
-
-- (void)selectStartDirectoryPhotosTab
-{
-    UINavigationController *navigationController = [[UIStoryboard storyboardWithName:@"NCSelect" bundle:nil] instantiateInitialViewController];
-    NCSelect *viewController = (NCSelect *)navigationController.topViewController;
-    
-    viewController.delegate = self;
-    viewController.hideButtonCreateFolder = true;
-    viewController.selectFile = false;
-    viewController.includeDirectoryE2EEncryption = false;
-    viewController.includeImages = false;
-    viewController.type = @"mediaFolder";
-    viewController.titleButtonDone = NSLocalizedString(@"_select_", nil);
-    viewController.layoutViewSelect = k_layout_view_move;
-    
-    [navigationController setModalPresentationStyle:UIModalPresentationFormSheet];
-    [self presentViewController:navigationController animated:YES completion:nil];
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ==== Search Photo/Video ====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)searchPhotoVideo
-{
-    // test
-    if (appDelegate.activeAccount.length == 0 || isSearchMode)
-        return;
-    
-    // WAITING FOR d:creationdate
-    //
-    // tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
-    // account.dateSearchContentTypeImageVideo
-    
-    NSString *startDirectory = [[NCManageDatabase sharedInstance] getAccountStartDirectoryMediaTabView:[CCUtility getHomeServerUrlActiveUrl:appDelegate.activeUrl]];
-    
-    [[OCNetworking sharedManager] readFileWithAccount:appDelegate.activeAccount serverUrl:startDirectory fileName:nil completion:^(NSString *account, tableMetadata *metadata, NSString *message, NSInteger errorCode) {
-
-        if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
-            
-            if (![metadata.etag isEqualToString:[saveEtagForStartDirectory objectForKey:startDirectory]] || sectionDataSource.allRecordsDataSource.count == 0) {
-                
-                isSearchMode = YES;
-                [self editingModeNO];
-                                
-                [[OCNetworking sharedManager] searchWithAccount:appDelegate.activeAccount fileName:@"" serverUrl:startDirectory contentType:@[@"image/%", @"video/%"] lteDateLastModified:[NSDate date] gteDateLastModified: [NSDate distantPast] depth:@"infinity" completion:^(NSString *account, NSArray *metadatas, NSString *message, NSInteger errorCode) {
-                    
-                    isSearchMode = NO;
-
-                    if (errorCode == 0 && [appDelegate.activeAccount isEqualToString:account]) {
-                        
-                        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-                            
-                            // Clear all Hardcoded new foto/video from CCNetworking
-                            [self.addMetadatasFromUpload removeAllObjects];
-                            
-                           // [[NCManageDatabase sharedInstance] createTablePhotos:metadatas account:account];
-                            
-                            dispatch_async(dispatch_get_main_queue(), ^{
-                                [self reloadDatasource:nil action:k_action_NULL];
-                            });
-                            
-                            // Update date
-                            [[NCManageDatabase sharedInstance] setAccountDateSearchContentTypeImageVideo:[NSDate date]];
-                            // Save etag
-                            [saveEtagForStartDirectory setObject:metadata.etag forKey:metadata.serverUrl];
-                        });
-                        
-                    } else {
-                        [self reloadDatasource:nil action:k_action_NULL];
-                    }
-                }];
-                
-            } else {
-                if (errorCode != 0) {
-                    NSLog(@"[LOG] Search error.");
-                } else {
-                    NSLog(@"[LOG] It has been changed user during networking process, error.");
-                }
-                
-                [self reloadDatasource:nil action:k_action_NULL];
-            }
-        } else if (errorCode != 0) {
-            NSLog(@"[LOG] Read file error.");
-        } else {
-            NSLog(@"[LOG] It has been changed user during networking process, error.");
-        }
-    }];
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ==== Datasource ====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)reloadDatasource:(NSString *)fileID action:(NSInteger)action
-{
-    // test
-    if (appDelegate.activeAccount.length == 0 || self.view.window == nil) {
-        return;
-    }
-    
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-
-        collectionViewReloadDataInProgress = YES;
-
-        CCSectionDataSourceMetadata *sectionDataSourceTemp = [self queryDatasourceWithReloadData:NO];
-
-        dispatch_async(dispatch_get_main_queue(), ^{
-               
-            if (isEditMode)
-                [self setUINavigationBarSelected];
-            else
-                [self setUINavigationBarDefault];
-            
-            sectionDataSource = sectionDataSourceTemp;
-            [self.collectionView reloadData];
-            
-            [self.collectionView performBatchUpdates:^{} completion:^(BOOL finished) {
-                collectionViewReloadDataInProgress = NO;
-            }];
-        });
-    });
-}
-
-- (CCSectionDataSourceMetadata *)queryDatasourceWithReloadData:(BOOL)withReloadData
-{
-    // test
-    if (appDelegate.activeAccount.length == 0) {
-        return nil;
-    }
-    
-    CCSectionDataSourceMetadata *sectionDataSourceTemp = [CCSectionDataSourceMetadata new];
-    
-    NSArray *metadatas = [[NCManageDatabase sharedInstance] getTablePhotosWithAddMetadatasFromUpload:self.addMetadatasFromUpload account:appDelegate.activeAccount];
-    sectionDataSourceTemp = [CCSectionMetadata creataDataSourseSectionMetadata:metadatas listProgressMetadata:nil groupByField:@"date" filterFileID:appDelegate.filterFileID filterTypeFileImage:filterTypeFileImage filterTypeFileVideo:filterTypeFileVideo activeAccount:appDelegate.activeAccount];
-    
-    if (withReloadData) {
-        sectionDataSource = sectionDataSourceTemp;
-        [self.collectionView reloadData];
-    }
-    
-    return sectionDataSourceTemp;
-}
-
-- (void)editingModeYES
-{
-    [self.collectionView setAllowsMultipleSelection:true];
-    isEditMode = true;
-    [selectedMetadatas removeAllObjects];
-    [self setUINavigationBarSelected];
-
-    collectionViewReloadDataInProgress = YES;
-    [self.collectionView reloadData];
-    [self.collectionView performBatchUpdates:^{} completion:^(BOOL finished) {
-        collectionViewReloadDataInProgress = NO;
-    }];
-}
-
-- (void)editingModeNO
-{
-    [self.collectionView setAllowsMultipleSelection:false];
-    isEditMode = false;
-    [selectedMetadatas removeAllObjects];
-    [self setUINavigationBarDefault];
-    
-    collectionViewReloadDataInProgress = YES;
-    [self.collectionView reloadData];
-    [self.collectionView performBatchUpdates:^{} completion:^(BOOL finished) {
-        collectionViewReloadDataInProgress = NO;
-    }];
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ==== Collection ====
-#pragma --------------------------------------------------------------------------------------------
-
-- (BOOL)indexPathIsValid:(NSIndexPath *)indexPath
-{
-    return indexPath.section < [self numberOfSectionsInCollectionView:self.collectionView] && indexPath.row < [self collectionView:self.collectionView numberOfItemsInSection:indexPath.section];
-}
-
-- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
-{    
-    return [[sectionDataSource.sectionArrayRow allKeys] count];
-}
-
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
-{
-    return [[sectionDataSource.sectionArrayRow objectForKey:[sectionDataSource.sections objectAtIndex:section]] count];
-}
-
-- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-    UIInterfaceOrientation orientationOnLunch = [[UIApplication sharedApplication] statusBarOrientation];
-    
-    if (orientationOnLunch == UIInterfaceOrientationPortrait)
-        return CGSizeMake(collectionView.frame.size.width / 5.1f, collectionView.frame.size.width / 5.1f);
-    else
-        return CGSizeMake(collectionView.frame.size.width / 7.1f, collectionView.frame.size.width / 7.1f);
-}
-
--(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section
-{
-    if ([sectionDataSource.sections count] - 1 == section)
-        return CGSizeMake(collectionView.frame.size.width, 50);
-    
-    return CGSizeZero;
-}
-
-- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-    if (kind == UICollectionElementKindSectionHeader) {
-        
-        UICollectionReusableView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:@"header" forIndexPath:indexPath];
-        
-        //headerView.backgroundColor = COLOR_GROUPBY_BAR_NO_BLUR;
-        
-        [self getGeoLocationForSection:indexPath.section];
-        
-        UILabel *titleLabel = (UILabel *)[headerView viewWithTag:100];
-        titleLabel.textColor = [UIColor blackColor];
-        if (sectionDataSource.sections.count > indexPath.section)
-            titleLabel.text = [CCUtility getTitleSectionDate:[sectionDataSource.sections objectAtIndex:indexPath.section]];
-
-        return headerView;
-    }
-    
-    if (kind == UICollectionElementKindSectionFooter) {
-        
-        UICollectionReusableView *footerView = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:@"footer" forIndexPath:indexPath];
-        
-        UILabel *titleLabel = (UILabel *)[footerView viewWithTag:100];
-        titleLabel.textColor = [UIColor grayColor];
-        titleLabel.text = [NSString stringWithFormat:@"%lu %@, %lu %@", (long)sectionDataSource.image, NSLocalizedString(@"photo", nil), (long)sectionDataSource.video, NSLocalizedString(@"_video_", nil)];
-        
-        return footerView;
-    }
-    
-    return nil;
-}
-
-- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-    UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath];
-    UIImageView *imageView = (UIImageView *)[cell viewWithTag:100];
-    UIVisualEffectView *effect = [cell viewWithTag:200];
-
-    UIImageView *checkedOverlay = [cell viewWithTag:300];
-    checkedOverlay.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"checkedYes"] multiplier:2 color:[NCBrandColor sharedInstance].brand];
-    
-    UIImageView *videoOverlay = [cell viewWithTag:400];
-    videoOverlay.image = [UIImage imageNamed:@"VideoOverlay"];
-
-    NSArray *metadatasForKey = [sectionDataSource.sectionArrayRow objectForKey:[sectionDataSource.sections objectAtIndex:indexPath.section]];
-    
-    if ([metadatasForKey count] > indexPath.row) {
-        
-        NSString *fileID = [metadatasForKey objectAtIndex:indexPath.row];
-        tableMetadata *metadata = [sectionDataSource.allRecordsDataSource objectForKey:fileID];
-    
-        // Image
-        if ([[NSFileManager defaultManager] fileExistsAtPath:[CCUtility getDirectoryProviderStorageIconFileID:metadata.fileID fileNameView:metadata.fileNameView]]) {
-        
-            // insert Image
-            imageView.image = [UIImage imageWithContentsOfFile:[CCUtility getDirectoryProviderStorageIconFileID:metadata.fileID fileNameView:metadata.fileNameView]];
-        
-        } else {
-        
-            imageView.image = [UIImage imageNamed:@"file_photo"];
-
-            if (metadata.hasPreview == 1 && ![CCUtility fileProviderStorageIconExists:metadata.fileID fileNameView:metadata.fileNameView]) {
-                [self downloadThumbnail:metadata indexPath:indexPath];
-            }
-        }
-    
-        // Cheched Overlay
-        if (cell.selected) {
-            checkedOverlay.hidden = NO;
-            effect.hidden = NO;
-            effect.alpha = 0.4;
-        } else {
-            checkedOverlay.hidden = YES;
-            effect.hidden = YES;
-        }
-        
-        // Video Overlay
-        if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video]) {
-            videoOverlay.hidden = NO;
-        } else {
-            videoOverlay.hidden = YES;
-        }
-    }
-    
-    return cell;
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
-{
-    NSArray *metadatasForKey = [sectionDataSource.sectionArrayRow objectForKey:[sectionDataSource.sections objectAtIndex:indexPath.section]];
-    
-    if ([metadatasForKey count] > indexPath.row) {
-        
-        NSString *fileID = [metadatasForKey objectAtIndex:indexPath.row];
-        self.metadata = [sectionDataSource.allRecordsDataSource objectForKey:fileID];
-        
-        if (isEditMode) {
-        
-            [self cellSelect:YES indexPath:indexPath metadata:self.metadata];
-        
-        } else {
-        
-            if ([self shouldPerformSegue])
-                [self performSegueWithIdentifier:@"segueDetail" sender:self];
-        }
-    }
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didDeselectItemAtIndexPath:(NSIndexPath *)indexPath
-{
-    // test
-    if (isEditMode == NO)
-        return;
-   
-    NSArray *metadatasForKey = [sectionDataSource.sectionArrayRow objectForKey:[sectionDataSource.sections objectAtIndex:indexPath.section]];
-    
-    if ([metadatasForKey count] > indexPath.row) {
-        
-        NSString *fileID = [metadatasForKey objectAtIndex:indexPath.row];
-        self.metadata = [sectionDataSource.allRecordsDataSource objectForKey:fileID];
-        
-        [self cellSelect:NO indexPath:indexPath metadata:self.metadata];
-    }
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Navigation ====
-#pragma --------------------------------------------------------------------------------------------
-
-- (BOOL)shouldPerformSegue
-{
-    if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground)
-        return NO;
-    
-    // Not in first plain ? exit
-    if (self.view.window == NO)
-        return NO;
-    
-    // Collapsed but in first plain in detail exit
-    if (self.splitViewController.isCollapsed)
-        if (self.detailViewController.isViewLoaded && self.detailViewController.view.window)
-            return NO;
-    
-    // check if metadata is invalidated
-    if ([[NCManageDatabase sharedInstance] isTableInvalidated:self.metadata]) {
-        return NO;
-    }
-    
-    // ok perform segue
-    return YES;
-}
-
--(void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
-{
-    id controller = segue.destinationViewController;
-    
-    if ([controller isKindOfClass:[UINavigationController class]]) {
-        UINavigationController *navigationController = controller;
-        self.detailViewController = (CCDetail *)navigationController.topViewController;
-    } else {
-        self.detailViewController = segue.destinationViewController;
-    }
-    
-    NSMutableArray *photoDataSource = [NSMutableArray new];
-    
-    for (NSString *fileID in sectionDataSource.allFileID) {
-        tableMetadata *metadata = [sectionDataSource.allRecordsDataSource objectForKey:fileID];
-        if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image])
-            [photoDataSource addObject:metadata];
-    }
-    
-    self.detailViewController.photoDataSource = photoDataSource;
-    self.detailViewController.metadataDetail = self.metadata;
-    self.detailViewController.dateFilterQuery = self.metadata.date;
-    
-    [self.detailViewController setTitle:self.metadata.fileName];
-}
-
-@end

iOSClient/Settings/CCManageAutoUpload.h

@@ -24,7 +24,6 @@
 #import "XLFormViewController.h"
 #import "CCMain.h"
 #import "CCManageLocation.h"
-#import "CCMedia.h"
 
 @interface CCManageAutoUpload : XLFormViewController