remove old CCMetadata

Picker/DocumentPickerViewController.swift

@@ -45,7 +45,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
     var parameterEncrypted: Bool? = false
     var isCryptoCloudMode: Bool? = false
     
-    var metadata: CCMetadata?
+    var metadata: tableMetadata?
     var recordsTableMetadata: [TableMetadata]?
     var titleFolder: String?
     
@@ -289,7 +289,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         let predicate = NSPredicate(format: "(account == '\(activeAccount!)') AND (directoryID == '\(metadataNet.directoryID!)') AND ((session == NULL) OR (session == ''))")
         CCCoreData.deleteMetadata(with: predicate)
         
-        for metadata in metadatas as! [CCMetadata] {
+        for metadata in metadatas as! [tableMetadata] {
             
             // do not insert crypto file
             if CCUtility.isCryptoString(metadata.fileName) {
@@ -308,7 +308,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
                 
                 var isCryptoComplete = false
                 
-                for completeMetadata in metadatas as! [CCMetadata] {
+                for completeMetadata in metadatas as! [tableMetadata] {
                     
                     if completeMetadata.fileName == CCUtility.trasformedFileNamePlist(inCrypto: metadata.fileName) {
                         
@@ -326,7 +326,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             CCCoreData.add(metadata, activeAccount: activeAccount, activeUrl: activeUrl, context: nil)
             
             // if plist do not exists, download it
-            if CCUtility.isCryptoPlistString(metadata.fileName) && FileManager.default.fileExists(atPath: "\(directoryUser!)/\(metadata.fileName!)") == false {
+            if CCUtility.isCryptoPlistString(metadata.fileName) && FileManager.default.fileExists(atPath: "\(directoryUser!)/\(metadata.fileName)") == false {
                 
                 let metadataNet = CCMetadataNet.init(account: activeAccount)!
                 
@@ -375,7 +375,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         }
     }
     
-    func downloadThumbnail(_ metadata : CCMetadata) {
+    func downloadThumbnail(_ metadata : tableMetadata) {
         
         let metadataNet = CCMetadataNet.init(account: activeAccount)!
         
@@ -432,7 +432,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         case selectorLoadFileView :
             
             let sourceUrl = URL(string: "file://\(directoryUser!)/\(fileID!)".addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!)!
-            let destinationUrl : URL! = appGroupContainerURL()?.appendingPathComponent(metadata!.fileNamePrint!)
+            let destinationUrl : URL! = appGroupContainerURL()?.appendingPathComponent(metadata!.fileNamePrint)
             
             // Destination Provider
 
@@ -728,7 +728,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
         let metadata = CCCoreData.insertEntity(in: recordTableMetadata)!
         
         // File Image View
-        let filePath = "\(directoryUser!)/\(metadata.fileID!).ico"
+        let filePath = "\(directoryUser!)/\(metadata.fileID).ico"
         
         if FileManager.default.fileExists(atPath: filePath) {
             
@@ -738,11 +738,11 @@ extension DocumentPickerViewController: UITableViewDataSource {
             
             if metadata.directory {
                 
-                cell.fileImageView.image = CCGraphics.changeThemingColorImage(UIImage(named: metadata.iconName!), color: NCBrandColor.sharedInstance.brand)
+                cell.fileImageView.image = CCGraphics.changeThemingColorImage(UIImage(named: metadata.iconName), color: NCBrandColor.sharedInstance.brand)
                 
             } else {
                 
-                cell.fileImageView.image = UIImage(named: metadata.iconName!)
+                cell.fileImageView.image = UIImage(named: metadata.iconName)
                 if metadata.thumbnailExists {
                     
                     downloadThumbnail(metadata)
@@ -786,9 +786,9 @@ extension DocumentPickerViewController: UITableViewDataSource {
 
         if recordTableMetadata!.directory == 0 {
             
-            if FileManager.default.fileExists(atPath: "\(directoryUser!)/\(String(describing: self.metadata?.fileID!))") {
+            if FileManager.default.fileExists(atPath: "\(directoryUser!)/\(String(describing: self.metadata?.fileID))") {
                 
-                downloadFileSuccess(self.metadata?.fileID!, serverUrl: self.serverUrl!, selector: selectorLoadFileView, selectorPost: nil)
+                downloadFileSuccess(self.metadata?.fileID, serverUrl: self.serverUrl!, selector: selectorLoadFileView, selectorPost: nil)
                 
             } else {
             
@@ -813,7 +813,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
             
         } else {
             
-            var dir : String! = self.metadata?.fileName!
+            var dir : String! = self.metadata?.fileName
             
             if (self.metadata?.cryptated)! {
                 

Share Ext/ShareViewController.m

@@ -32,7 +32,7 @@
     NSUInteger totalSize;
     
     NSExtensionItem *inputItem;
-    CCMetadata *saveMetadataPlist;
+    tableMetadata *saveMetadataPlist;
     
     UIColor *barTintColor;
     UIColor *tintColor;
@@ -337,7 +337,7 @@
 {
     [self.hud hideHud];
     
-    CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:nil];
+    tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:nil];
         
     [self.filesName removeObject:metadata.fileNamePrint];
     [self.shareTable performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:NO];

iOSClient/Actions/CCActions.swift

@@ -83,7 +83,7 @@ class CCActions: NSObject {
     // MARK: Delete File or Folder
     // --------------------------------------------------------------------------------------------
 
-    func deleteFileOrFolder(_ metadata: CCMetadata, delegate: AnyObject) {
+    func deleteFileOrFolder(_ metadata: tableMetadata, delegate: AnyObject) {
         
         let serverUrl = CCCoreData.getServerUrl(fromDirectoryID: metadata.directoryID, activeAccount: appDelegate.activeAccount)
         let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
@@ -160,7 +160,7 @@ class CCActions: NSObject {
     // MARK: Rename File or Folder
     // --------------------------------------------------------------------------------------------
     
-    func renameFileOrFolder(_ metadata: CCMetadata, fileName: String, delegate: AnyObject) {
+    func renameFileOrFolder(_ metadata: tableMetadata, fileName: String, delegate: AnyObject) {
 
         let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
         
@@ -197,7 +197,7 @@ class CCActions: NSObject {
                 
                 do {
                     
-                    let file = "\(appDelegate.directoryUser!)/\(metadata.fileID!)"
+                    let file = "\(appDelegate.directoryUser!)/\(metadata.fileID)"
                     let dataFile = try NSData.init(contentsOfFile: file, options:[])
                     
                     do {
@@ -206,7 +206,7 @@ class CCActions: NSObject {
                         
                         do {
                             
-                            let fileUrl = URL(fileURLWithPath: "\(NSTemporaryDirectory())\(metadata.fileNameData!)")
+                            let fileUrl = URL(fileURLWithPath: "\(NSTemporaryDirectory())\(metadata.fileNameData)")
                             try dataFileEncrypted.write(to: fileUrl, options: [])
                             
                         } catch let error {
@@ -350,7 +350,7 @@ class CCActions: NSObject {
         appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
     }
     
-    func searchSuccess(_ metadataNet: CCMetadataNet, metadatas: [CCMetadata]) {
+    func searchSuccess(_ metadataNet: CCMetadataNet, metadatas: [tableMetadata]) {
         
         metadataNet.delegate?.searchSuccess(metadataNet, metadatas: metadatas)
     }
@@ -364,7 +364,7 @@ class CCActions: NSObject {
     // MARK: Download Tumbnail
     // --------------------------------------------------------------------------------------------
 
-    func downloadTumbnail(_ metadata: CCMetadata, delegate: AnyObject) {
+    func downloadTumbnail(_ metadata: tableMetadata, delegate: AnyObject) {
         
         let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
         let serverUrl = CCCoreData.getServerUrl(fromDirectoryID: metadata.directoryID, activeAccount: appDelegate.activeAccount)
@@ -398,7 +398,7 @@ class CCActions: NSObject {
     // MARK: Setting Favorite
     // --------------------------------------------------------------------------------------------
     
-    func settingFavorite(_ metadata: CCMetadata, favorite: Bool, delegate: AnyObject) {
+    func settingFavorite(_ metadata: tableMetadata, favorite: Bool, delegate: AnyObject) {
         
         let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
         let serverUrl = CCCoreData.getServerUrl(fromDirectoryID: metadata.directoryID, activeAccount: appDelegate.activeAccount)
@@ -444,7 +444,7 @@ class CCActions: NSObject {
         appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
     }
     
-    func listingFavoritesSuccess(_ metadataNet: CCMetadataNet, metadatas: [CCMetadata]) {
+    func listingFavoritesSuccess(_ metadataNet: CCMetadataNet, metadatas: [tableMetadata]) {
         
         metadataNet.delegate?.listingFavoritesSuccess(metadataNet, metadatas: metadatas)
     }

iOSClient/Activity/CCActivity.m

@@ -323,7 +323,7 @@
 {
     tableActivity *activity = [_sectionDataSource objectAtIndex:indexPath.section];
     
-    CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileID == %@)", activity.account, activity.fileID] context:nil];
+    tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileID == %@)", activity.account, activity.fileID] context:nil];
     
     if (metadata) {
         

iOSClient/AppDelegate.m

@@ -1412,7 +1412,7 @@
 - (void)sessionChanged:(NSNotification *)notification
 {
     NSURLSession *session;
-    CCMetadata *metadata;
+    tableMetadata *metadata;
     NSURLSessionTask *task;
     
     for (id object in notification.object) {
@@ -1420,7 +1420,7 @@
         if ([object isKindOfClass:[NSURLSession class]])
             session = object;
         
-        if ([object isKindOfClass:[CCMetadata class]])
+        if ([object isKindOfClass:[tableMetadata class]])
             metadata = object;
         
         if ([object isKindOfClass:[NSURLSessionTask class]])
@@ -1456,7 +1456,7 @@
     }
 }
 
-- (void)changeTask:(CCMetadata *)metadata
+- (void)changeTask:(tableMetadata *)metadata
 {
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
     

iOSClient/Favorites/CCFavorites.h

@@ -41,11 +41,13 @@
 #import "CCPassaporto.h"
 #import "CCPatenteGuida.h"
 
+@class tableMetadata;
+
 @interface CCFavorites : UIViewController <UITableViewDataSource, UITableViewDelegate, UIDocumentInteractionControllerDelegate, UIActionSheetDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate, CCAccountWebDelegate, CCBancomatDelegate, CCCartaDiCreditoDelegate, CCCartaIdentitaDelegate, CCContoCorrenteDelegate, CCNoteDelegate, CCPassaportoDelegate, CCPatenteGuidaDelegate>
 
 @property (nonatomic, weak) IBOutlet UITableView *tableView;
 
-@property (nonatomic, strong) CCMetadata *metadata;
+@property (nonatomic, strong) tableMetadata *metadata;
 @property (nonatomic, strong) NSString *serverUrl;
 @property (nonatomic, strong) NSString *titleViewControl;
 

iOSClient/Favorites/CCFavorites.m

@@ -61,7 +61,7 @@
     _dataSource = [NSMutableArray new];
     
     // Metadata
-    _metadata = [CCMetadata new];
+    _metadata = [tableMetadata new];
     
     self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width, 1)];
     self.tableView.separatorColor = [NCBrandColor sharedInstance].seperator;
@@ -238,7 +238,7 @@
 #pragma mark ===== menu =====
 #pragma--------------------------------------------------------------------------------------------
 
-- (void)openModel:(CCMetadata *)metadata
+- (void)openModel:(tableMetadata *)metadata
 {
     UIViewController *viewController;
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:_metadata.directoryID activeAccount:app.activeAccount];
@@ -282,7 +282,7 @@
     }
 }
 
-- (void)openWith:(CCMetadata *)metadata
+- (void)openWith:(tableMetadata *)metadata
 {
     NSString *fileNamePath = [NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID];
     
@@ -300,7 +300,7 @@
     }
 }
 
-- (void)requestDeleteMetadata:(CCMetadata *)metadata indexPath:(NSIndexPath *)indexPath
+- (void)requestDeleteMetadata:(tableMetadata *)metadata indexPath:(NSIndexPath *)indexPath
 {
     UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
         
@@ -356,7 +356,7 @@
     });
 }
 
-- (void)requestMoreMetadata:(CCMetadata *)metadata indexPath:(NSIndexPath *)indexPath
+- (void)requestMoreMetadata:(tableMetadata *)metadata indexPath:(NSIndexPath *)indexPath
 {
     UIImage *iconHeader;
     
@@ -468,9 +468,9 @@
 #pragma mark ==== Table ====
 #pragma --------------------------------------------------------------------------------------------
 
-- (CCMetadata *)setSelfMetadataFromIndexPath:(NSIndexPath *)indexPath
+- (tableMetadata *)setSelfMetadataFromIndexPath:(NSIndexPath *)indexPath
 {
-    CCMetadata *metadata;
+    tableMetadata *metadata;
     
     NSManagedObject *record = [_dataSource objectAtIndex:indexPath.row];
     metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", [record valueForKey:@"fileID"], app.activeAccount] context:nil];
@@ -527,7 +527,7 @@
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     CCFavoritesCell *cell = (CCFavoritesCell *)[tableView dequeueReusableCellWithIdentifier:@"Cell" forIndexPath:indexPath];
-    CCMetadata *metadata;
+    tableMetadata *metadata;
     
     // separator
     cell.separatorInset = UIEdgeInsetsMake(0.f, 60.f, 0.f, 0.f);
@@ -695,7 +695,7 @@
     
     NSMutableArray *allRecordsDataSourceImagesVideos = [NSMutableArray new];
     
-    for (CCMetadata *metadata in _dataSource) {
+    for (tableMetadata *metadata in _dataSource) {
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
             [allRecordsDataSourceImagesVideos addObject:metadata];
     }

iOSClient/Favorites/CCSynchronize.m

@@ -100,7 +100,7 @@
     NSString *father = @"";
     NSMutableArray *filesID = [NSMutableArray new];
     
-    for (CCMetadata *metadata in metadatas) {
+    for (tableMetadata *metadata in metadatas) {
         
         // type of file
         NSInteger typeFilename = [CCUtility getTypeFileName:metadata.fileName];
@@ -194,7 +194,7 @@
         
         NSArray *metadatas = [CCCoreData getOfflineLocalFileActiveAccount:app.activeAccount directoryUser:app.directoryUser];
         
-        for (CCMetadata *metadata in metadatas) {
+        for (tableMetadata *metadata in metadatas) {
             
             [self readFile:metadata withDownload:YES];
         }
@@ -273,30 +273,30 @@
         NSMutableArray *metadatasNotPresents = [[NSMutableArray alloc] init];
         NSArray *tableMetadatas = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND ((session == NULL) OR (session == ''))", app.activeAccount, metadataNet.directoryID] context:nil];
         
-        for (TableMetadata *tableMetadata in tableMetadatas) {
+        for (TableMetadata *record in tableMetadatas) {
             
             // reject cryptated
-            if (tableMetadata.cryptated)
+            if (record.cryptated)
                 continue;
             
             BOOL fileIDFound = NO;
             
-            for (CCMetadata *metadata in metadatas) {
+            for (tableMetadata *metadata in metadatas) {
                 
-                if ([tableMetadata.fileID isEqualToString:metadata.fileID]) {
+                if ([record.fileID isEqualToString:metadata.fileID]) {
                     fileIDFound = YES;
                     break;
                 }
             }
             
             if (!fileIDFound)
-                [metadatasNotPresents addObject:[CCCoreData insertEntityInMetadata:tableMetadata]];
+                [metadatasNotPresents addObject:[CCCoreData insertEntityInMetadata:record]];
         }
         
         dispatch_async(dispatch_get_main_queue(), ^{
             
             // delete metadata not present
-            for (CCMetadata *metadata in metadatasNotPresents) {
+            for (tableMetadata *metadata in metadatasNotPresents) {
                 
                 [CCCoreData deleteFile:metadata serverUrl:metadataNet.serverUrl directoryUser:app.directoryUser activeAccount:app.activeAccount];
             }
@@ -307,7 +307,7 @@
         
         // ----- Test : (MODIFY) -----
         
-        for (CCMetadata *metadata in metadatas) {
+        for (tableMetadata *metadata in metadatas) {
             
             // reject cryptated
             if (metadata.cryptated)
@@ -379,7 +379,7 @@
 #pragma mark ===== Read File =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)readFile:(CCMetadata *)metadata withDownload:(BOOL)withDownload
+- (void)readFile:(tableMetadata *)metadata withDownload:(BOOL)withDownload
 {
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:app.activeAccount];
     if (serverUrl == nil) return;
@@ -410,7 +410,7 @@
     }
 }
 
-- (void)readFileSuccess:(CCMetadataNet *)metadataNet metadata:(CCMetadata *)metadata
+- (void)readFileSuccess:(CCMetadataNet *)metadataNet metadata:(tableMetadata *)metadata
 {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
         
@@ -429,7 +429,7 @@
 {
     NSMutableArray *metadatas = [[NSMutableArray alloc] init];
     
-    for (CCMetadata *metadata in allRecordMetadatas) {
+    for (tableMetadata *metadata in allRecordMetadatas) {
         
         BOOL changeRev = NO;
         
@@ -492,7 +492,7 @@
         
         NSString *oldDirectoryID, *serverUrl;
 
-        for (CCMetadata *metadata in metadatas) {
+        for (tableMetadata *metadata in metadatas) {
         
             NSString *selector, *selectorPost;
             BOOL downloadData = NO, downloadPlist = NO;

iOSClient/FileSystem/CCCoreData.h

@@ -41,6 +41,8 @@
 #import "TableDirectory+CoreDataClass.h"
 #import "TableLocalFile+CoreDataClass.h"
 
+@class tableMetadata;
+
 @interface CCCoreData : NSObject
 
 // ===== Account =====
@@ -49,19 +51,19 @@
 
 // ===== Metadata =====
 
-+ (void)addMetadata:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context;
++ (void)addMetadata:(tableMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context;
 + (void)deleteMetadataWithPredicate:(NSPredicate *)predicate;
 + (void)moveMetadata:(NSString *)fileName directoryID:(NSString *)directoryID directoryIDTo:(NSString *)directoryIDTo activeAccount:(NSString *)activeAccount;
-+ (void)updateMetadata:(CCMetadata *)metadata predicate:(NSPredicate *)predicate activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context;
++ (void)updateMetadata:(tableMetadata *)metadata predicate:(NSPredicate *)predicate activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context;
 + (void)setMetadataSession:(NSString *)session sessionError:(NSString *)sessionError sessionSelector:(NSString *)sessionSelector sessionSelectorPost:(NSString *)sessionSelectorPost sessionTaskIdentifier:(NSInteger)sessionTaskIdentifier sessionTaskIdentifierPlist:(NSInteger)sessionTaskIdentifierPlist predicate:(NSPredicate *)predicate context:(NSManagedObjectContext *)context;
 + (void)setMetadataFavoriteFileID:(NSString *)fileID favorite:(BOOL)favorite activeAccount:(NSString *)activeAccount context:(NSManagedObjectContext *)context;
 
 + (TableMetadata *)getTableMetadataWithPreficate:(NSPredicate *)predicate;
 + (NSArray *)getTableMetadataWithPredicate:(NSPredicate *)predicate context:(NSManagedObjectContext *)context;
 + (NSArray *)getTableMetadataWithPredicate:(NSPredicate *)predicate fieldOrder:(NSString *)fieldOrder ascending:(BOOL)ascending;
-+ (CCMetadata *)getMetadataWithPreficate:(NSPredicate *)predicate context:(NSManagedObjectContext *)context;
-+ (CCMetadata *)getMetadataAtIndex:(NSPredicate *)predicate fieldOrder:(NSString *)fieldOrder ascending:(BOOL)ascending objectAtIndex:(NSUInteger)index;
-+ (CCMetadata *)getMetadataFromFileName:(NSString *)fileName directoryID:(NSString *)directoryID activeAccount:(NSString *)activeAccount context:(NSManagedObjectContext *)context;
++ (tableMetadata *)getMetadataWithPreficate:(NSPredicate *)predicate context:(NSManagedObjectContext *)context;
++ (tableMetadata *)getMetadataAtIndex:(NSPredicate *)predicate fieldOrder:(NSString *)fieldOrder ascending:(BOOL)ascending objectAtIndex:(NSUInteger)index;
++ (tableMetadata *)getMetadataFromFileName:(NSString *)fileName directoryID:(NSString *)directoryID activeAccount:(NSString *)activeAccount context:(NSManagedObjectContext *)context;
 
 + (NSArray *)getTableMetadataDownloadAccount:(NSString *)activeAccount;
 + (NSArray *)getTableMetadataDownloadWWanAccount:(NSString *)activeAccount;
@@ -109,11 +111,11 @@
 
 // ===== LocalFile =====
 
-+ (void)addLocalFile:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount;
++ (void)addLocalFile:(tableMetadata *)metadata activeAccount:(NSString *)activeAccount;
 + (void)deleteLocalFileWithPredicate:(NSPredicate *)predicate;
 
 + (void)renameLocalFileWithFileID:(NSString *)fileID fileNameTo:(NSString *)fileNameTo fileNamePrintTo:(NSString *)fileNamePrintTo activeAccount:(NSString *)activeAccount;
-+ (void)updateLocalFileModel:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount;
++ (void)updateLocalFileModel:(tableMetadata *)metadata activeAccount:(NSString *)activeAccount;
 
 + (TableLocalFile *)getLocalFileWithFileID:(NSString *)fileID activeAccount:(NSString *)activeAccount;
 + (NSArray *)getTableLocalFileWithPredicate:(NSPredicate *)predicate;
@@ -140,14 +142,14 @@
 
 // ===== File System =====
 
-+ (BOOL)downloadFile:(CCMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount;
-+ (void)downloadFilePlist:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl directoryUser:(NSString *)directoryUser;
-+ (void)deleteFile:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount;
++ (BOOL)downloadFile:(tableMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount;
++ (void)downloadFilePlist:(tableMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl directoryUser:(NSString *)directoryUser;
++ (void)deleteFile:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount;
 
 // ===== Metadata <> Entity =====
 
-+ (void)insertMetadataInEntity:(CCMetadata *)metadata recordMetadata:(TableMetadata *)recordMetadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl;
-+ (CCMetadata *)insertEntityInMetadata:(TableMetadata *)recordMetadata;
++ (void)insertMetadataInEntity:(tableMetadata *)metadata recordMetadata:(TableMetadata *)recordMetadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl;
++ (tableMetadata *)insertEntityInMetadata:(TableMetadata *)recordMetadata;
 
 // ===== Utility Database =====
 

iOSClient/FileSystem/CCCoreData.m

@@ -50,7 +50,7 @@
 #pragma mark ===== Metadata =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (void)addMetadata:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context
++ (void)addMetadata:(tableMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context
 {
     if (context == nil)
         context = [NSManagedObjectContext MR_context];
@@ -117,7 +117,7 @@
     }];
 }
 
-+ (void)updateMetadata:(CCMetadata *)metadata predicate:(NSPredicate *)predicate activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context
++ (void)updateMetadata:(tableMetadata *)metadata predicate:(NSPredicate *)predicate activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl context:(NSManagedObjectContext *)context
 {
     TableMetadata *record;
     
@@ -185,7 +185,7 @@
     }
 }
 
-+ (CCMetadata *)getMetadataWithPreficate:(NSPredicate *)predicate context:(NSManagedObjectContext *)context
++ (tableMetadata *)getMetadataWithPreficate:(NSPredicate *)predicate context:(NSManagedObjectContext *)context
 {
     if (context == nil)
         context = [NSManagedObjectContext MR_defaultContext];
@@ -237,7 +237,7 @@
     return [records sortedArrayUsingDescriptors:[NSArray arrayWithObjects:descriptor, nil]];
 }
 
-+ (CCMetadata *)getMetadataAtIndex:(NSPredicate *)predicate fieldOrder:(NSString *)fieldOrder ascending:(BOOL)ascending objectAtIndex:(NSUInteger)index
++ (tableMetadata *)getMetadataAtIndex:(NSPredicate *)predicate fieldOrder:(NSString *)fieldOrder ascending:(BOOL)ascending objectAtIndex:(NSUInteger)index
 {
     NSArray *records = [self getTableMetadataWithPredicate:predicate fieldOrder:fieldOrder ascending:ascending];
     
@@ -246,7 +246,7 @@
     return [self insertEntityInMetadata:record];
 }
 
-+ (CCMetadata *)getMetadataFromFileName:(NSString *)fileName directoryID:(NSString *)directoryID activeAccount:(NSString *)activeAccount context:(NSManagedObjectContext *)context
++ (tableMetadata *)getMetadataFromFileName:(NSString *)fileName directoryID:(NSString *)directoryID activeAccount:(NSString *)activeAccount context:(NSManagedObjectContext *)context
 {
     if (fileName == nil || directoryID == nil || activeAccount == nil)
         return nil;
@@ -748,7 +748,7 @@
 #pragma mark ===== LocalFile =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (void)addLocalFile:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount
++ (void)addLocalFile:(tableMetadata *)metadata activeAccount:(NSString *)activeAccount
 {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
         
@@ -805,7 +805,7 @@
     }];
 }
 
-+ (void)updateLocalFileModel:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount
++ (void)updateLocalFileModel:(tableMetadata *)metadata activeAccount:(NSString *)activeAccount
 {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
         
@@ -906,7 +906,7 @@
     for (TableLocalFile *file in files) {
         
         NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", file.fileID, activeAccount];
-        CCMetadata *metadata = [self getMetadataWithPreficate:predicate context:nil];
+        tableMetadata *metadata = [self getMetadataWithPreficate:predicate context:nil];
         
         if (metadata) {
             
@@ -1242,7 +1242,7 @@
 #pragma mark ===== File System =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (BOOL)downloadFile:(CCMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount
++ (BOOL)downloadFile:(tableMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount
 {
     // ----------------------------------------- FILESYSTEM ------------------------------------------
     
@@ -1265,7 +1265,7 @@
     return YES;
 }
 
-+ (void)downloadFilePlist:(CCMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl directoryUser:(NSString *)directoryUser
++ (void)downloadFilePlist:(tableMetadata *)metadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl directoryUser:(NSString *)directoryUser
 {
     // inseriamo le info nel plist
     [CCUtility insertInformationPlist:metadata directoryUser:directoryUser];
@@ -1279,7 +1279,7 @@
     }
 }
 
-+ (void)deleteFile:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount
++ (void)deleteFile:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount
 {
     // ----------------------------------------- FILESYSTEM ------------------------------------------
     
@@ -1303,7 +1303,7 @@
 #pragma mark ===== Metadata <> Entity =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (void)insertMetadataInEntity:(CCMetadata *)metadata recordMetadata:(TableMetadata *)recordMetadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl
++ (void)insertMetadataInEntity:(tableMetadata *)metadata recordMetadata:(TableMetadata *)recordMetadata activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl
 {
     if ([activeAccount length]) recordMetadata.account = activeAccount;
     recordMetadata.cryptated = [NSNumber numberWithBool:metadata.cryptated];
@@ -1320,7 +1320,7 @@
     if ([metadata.model length]) recordMetadata.model = metadata.model;
     if ([metadata.nameCurrentDevice length]) recordMetadata.nameCurrentDevice = metadata.nameCurrentDevice;
     if ([metadata.permissions length]) recordMetadata.permissions = metadata.permissions;
-    if ([metadata.protocol length]) recordMetadata.protocol = metadata.protocol;
+    if ([metadata.protocolCrypto length]) recordMetadata.protocol = metadata.protocolCrypto;
     
     if ([metadata.rev length]) recordMetadata.rev = metadata.rev;
     
@@ -1332,8 +1332,8 @@
     recordMetadata.sessionSelector = metadata.sessionSelector;
     recordMetadata.sessionSelectorPost = metadata.sessionSelectorPost;
 
-    recordMetadata.sessionTaskIdentifier = [NSNumber numberWithInt:metadata.sessionTaskIdentifier];
-    recordMetadata.sessionTaskIdentifierPlist = [NSNumber numberWithInt:metadata.sessionTaskIdentifierPlist];
+    recordMetadata.sessionTaskIdentifier = [NSNumber numberWithLong:metadata.sessionTaskIdentifier];
+    recordMetadata.sessionTaskIdentifierPlist = [NSNumber numberWithLong:metadata.sessionTaskIdentifierPlist];
     
     if (metadata.size) recordMetadata.size = [NSNumber numberWithLong:metadata.size];
     if ([metadata.title length]) recordMetadata.title = metadata.title;
@@ -1352,9 +1352,9 @@
     recordMetadata.iconName = metadata.iconName;
 }
 
-+ (CCMetadata *)insertEntityInMetadata:(TableMetadata *)recordMetadata
++ (tableMetadata *)insertEntityInMetadata:(TableMetadata *)recordMetadata
 {
-    CCMetadata *metadata = [[CCMetadata alloc] init];
+    tableMetadata *metadata = [[tableMetadata alloc] init];
     
     metadata.account = recordMetadata.account;
     metadata.cryptated = [recordMetadata.cryptated boolValue];
@@ -1372,7 +1372,7 @@
     metadata.model = recordMetadata.model;
     metadata.nameCurrentDevice = recordMetadata.nameCurrentDevice;
     metadata.permissions = recordMetadata.permissions;
-    metadata.protocol = recordMetadata.protocol;
+    metadata.protocolCrypto = recordMetadata.protocol;
     metadata.rev = recordMetadata.rev;
     
     metadata.session = recordMetadata.session;

iOSClient/FileSystem/CCMetadata.h

@@ -24,6 +24,9 @@
 #import <UIKit/UIKit.h>
 #import <Photos/Photos.h>
 
+@class tableMetadata;
+
+/*
 @interface CCMetadata : NSObject //<NSCopying, NSCoding>
 
 @property (nonatomic, strong) NSString *account;
@@ -62,9 +65,9 @@
 //- (id)initWithCCMetadata:(CCMetadata *)metadata;
 
 @end
+*/
 
-
-@interface CCMetadataNet : NSObject //<NSCopying>
+@interface CCMetadataNet : NSObject <NSCopying>
 
 @property (nonatomic, strong) NSString *account;
 @property (nonatomic, strong) NSString *action;
@@ -85,7 +88,7 @@
 @property (nonatomic, strong) NSString *fileNameLocal;
 @property (nonatomic, strong) NSString *fileNamePrint;
 @property (nonatomic, strong) NSString *assetLocalIdentifier;
-@property (nonatomic, strong) CCMetadata *metadata;
+@property (nonatomic, strong) tableMetadata *metadata;
 @property (nonatomic, strong) id options;
 @property (nonatomic, strong) NSString *password;
 @property (nonatomic, strong) NSString *pathFolder;
@@ -105,6 +108,6 @@
 @property NSInteger taskStatus;
 
 - (id)initWithAccount:(NSString *)withAccount;
-//- (id)copyWithZone:(NSZone *)zone;
+- (id)copyWithZone:(NSZone *)zone;
 
 @end

iOSClient/FileSystem/CCMetadata.m

@@ -23,6 +23,7 @@
 
 #import "CCMetadata.h"
 
+/*
 @implementation CCMetadata
 
 // override del metodo init
@@ -32,7 +33,7 @@
     return self;
 }
 
-/*
+
 - (id)initWithCCMetadata:(CCMetadata *)metadata {
     self = [self init];
     return [metadata copy];
@@ -153,9 +154,8 @@
     [encoder encodeObject:_typeFile forKey:@"typeFile"];
     [encoder encodeObject:_uuid forKey:@"uuid"];
 }
-*/
 @end
-
+*/
 
 @implementation CCMetadataNet
 
@@ -179,7 +179,6 @@
     return self;
 }
 
-/*
 - (id)copyWithZone: (NSZone *) zone
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet allocWithZone: zone] init];
@@ -224,6 +223,5 @@
     
     return metadataNet;
 }
-*/
 
 @end

iOSClient/FileSystem/NCDatabase.swift

@@ -140,7 +140,7 @@ class tableMetadata: Object {
     dynamic var directoryID = ""
     dynamic var errorPasscode : Bool = false
     dynamic var favorite : Bool = false
-    dynamic var etag = ""
+    dynamic var fileID = ""
     dynamic var fileName = ""
     dynamic var fileNameData = ""
     dynamic var fileNamePrint = ""
@@ -165,10 +165,11 @@ class tableMetadata: Object {
     dynamic var uuid = ""
     
     override static func primaryKey() -> String {
-        return "etag"
+        return "fileID"
     }
 }
 
+/*
 class tableMetadataNet: Object {
     
     dynamic var account = ""
@@ -208,6 +209,7 @@ class tableMetadataNet: Object {
     dynamic var size : Double = 0
     dynamic var taskStatus: Int = 0
 }
+*/
 
 class tableShare: Object {
     

iOSClient/Local storage/CCLocalStorage.h

@@ -41,11 +41,13 @@
 #import "CCPassaporto.h"
 #import "CCPatenteGuida.h"
 
+@class tableMetadata;
+
 @interface CCLocalStorage : UIViewController <UITableViewDataSource, UITableViewDelegate, UIDocumentInteractionControllerDelegate, UIActionSheetDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate, CCAccountWebDelegate, CCBancomatDelegate, CCCartaDiCreditoDelegate, CCCartaIdentitaDelegate, CCContoCorrenteDelegate, CCNoteDelegate, CCPassaportoDelegate, CCPatenteGuidaDelegate>
 
 @property (nonatomic, weak) IBOutlet UITableView *tableView;
 
-@property (nonatomic, strong) CCMetadata *metadata;
+@property (nonatomic, strong) tableMetadata *metadata;
 @property (nonatomic, strong) NSString *serverUrl;
 @property (nonatomic, strong) NSString *titleViewControl;
 

iOSClient/Local storage/CCLocalStorage.m

@@ -54,7 +54,7 @@
     dataSource = [NSMutableArray new];
     
     // Metadata
-    _metadata = [CCMetadata new];
+    _metadata = [tableMetadata new];
     
     self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width, 1)];
     self.tableView.separatorColor = [NCBrandColor sharedInstance].seperator;
@@ -164,7 +164,7 @@
 #pragma mark ===== menu =====
 #pragma--------------------------------------------------------------------------------------------
 
-- (void)openModel:(CCMetadata *)metadata
+- (void)openModel:(tableMetadata *)metadata
 {
     UIViewController *viewController;
     BOOL isLocal = YES;
@@ -209,7 +209,7 @@
     }
 }
 
-- (void)openWith:(CCMetadata *)metadata
+- (void)openWith:(tableMetadata *)metadata
 {
     NSString *fileNamePath = [NSString stringWithFormat:@"%@/%@", _serverUrl, metadata.fileNameData];
         
@@ -227,7 +227,7 @@
     }
 }
 
-- (void)requestDeleteMetadata:(CCMetadata *)metadata indexPath:(NSIndexPath *)indexPath
+- (void)requestDeleteMetadata:(tableMetadata *)metadata indexPath:(NSIndexPath *)indexPath
 {
     UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
         
@@ -260,7 +260,7 @@
 {
     CGPoint touchPoint = [sender convertPoint:CGPointZero toView:self.tableView];
     NSIndexPath *indexPath = [self.tableView indexPathForRowAtPoint:touchPoint];
-    CCMetadata *metadata = [CCMetadata new];
+    tableMetadata *metadata = [tableMetadata new];
     UIImage *iconHeader;
         
     NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
@@ -356,7 +356,7 @@
 #pragma mark ==== Table ====
 #pragma --------------------------------------------------------------------------------------------
 
-- (CCMetadata *)setSelfMetadataFromIndexPath:(NSIndexPath *)indexPath
+- (tableMetadata *)setSelfMetadataFromIndexPath:(NSIndexPath *)indexPath
 {
     NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
     NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPath:app.activeUrl];
@@ -401,7 +401,7 @@
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     CCLocalStorageCell *cell = (CCLocalStorageCell *)[tableView dequeueReusableCellWithIdentifier:@"Cell" forIndexPath:indexPath];
-    CCMetadata *metadata;
+    tableMetadata *metadata;
     
     // separator
     cell.separatorInset = UIEdgeInsetsMake(0.f, 60.f, 0.f, 0.f);
@@ -563,7 +563,7 @@
         
     for (NSString *fileName in dataSource) {
             
-        CCMetadata *metadata = [CCMetadata new];
+        tableMetadata *metadata = [tableMetadata new];
         metadata = [CCUtility insertFileSystemInMetadata:fileName directory:_serverUrl activeAccount:app.activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
             
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])

iOSClient/Main/CCDetail.h

@@ -35,9 +35,11 @@
 #import "CCGraphics.h"
 #import "CCCoreData.h"
 
+@class tableMetadata;
+
 @interface CCDetail : UIViewController <UIDocumentInteractionControllerDelegate, MWPhotoBrowserDelegate, ReaderViewControllerDelegate>
 
-@property (nonatomic, strong) CCMetadata *metadataDetail;
+@property (nonatomic, strong) tableMetadata *metadataDetail;
 @property BOOL sourceDirectoryLocal;
 @property BOOL isCameraUpload;
 @property (nonatomic, strong) NSDate *dateFilterQuery;
@@ -68,7 +70,7 @@
 - (void)changeToDisplayMode;
 
 - (void)downloadPhotoBrowserFailure:(NSInteger)errorCode;
-- (void)downloadPhotoBrowserSuccess:(CCMetadata *)metadataVar selector:(NSString *)selector;
+- (void)downloadPhotoBrowserSuccess:(tableMetadata *)metadataVar selector:(NSString *)selector;
 
 @end
 

iOSClient/Main/CCDetail.m

@@ -58,7 +58,7 @@
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(triggerProgressTask:) name:@"NotificationProgressTask" object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeTheming) name:@"changeTheming" object:nil];
 
-        self.metadataDetail = [[CCMetadata alloc] init];
+        self.metadataDetail = [[tableMetadata alloc] init];
         self.photos = [[NSMutableArray alloc] init];
         self.thumbs = [[NSMutableArray alloc] init];
         self.dataSourceImagesVideos = [[NSMutableArray alloc] init];
@@ -391,7 +391,7 @@
     if ([self.dataSourceImagesVideos count] == 0) return;
     
     NSUInteger index = 0;
-    for (CCMetadata *metadata in self.dataSourceImagesVideos) {
+    for (tableMetadata *metadata in self.dataSourceImagesVideos) {
         
         // start from here ?
         if (self.metadataDetail.fileID && [metadata.fileID isEqualToString:self.metadataDetail.fileID])
@@ -447,7 +447,7 @@
 
 - (NSString *)photoBrowser:(MWPhotoBrowser *)photoBrowser titleForPhotoAtIndex:(NSUInteger)index
 {
-    CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
+    tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
     
     NSString *titleDir = metadata.fileNamePrint;
     self.title = titleDir;
@@ -457,7 +457,7 @@
 
 - (void)photoBrowser:(MWPhotoBrowser *)photoBrowser didDisplayPhotoAtIndex:(NSUInteger)index
 {
-    CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
+    tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
     NSString *directory;
     
     self.indexNowVisible = index;
@@ -496,7 +496,7 @@
     else
         directory = app.directoryUser;
 
-    CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
+    tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
     
     //NSLog(@"[LOG] photoBrowser: photoAtIndex : %lu ---- di totali photo : %lu", (unsigned long)index, (unsigned long)_photos.count);
     
@@ -610,7 +610,7 @@
 {
     NSString *directory;
     
-    CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
+    tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
     
     if (_sourceDirectoryLocal)
         directory = self.metadataDetail.directoryID;
@@ -651,7 +651,7 @@
 {
     NSString *filePath;
 
-    CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
+    tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
     if (metadata == nil) return;
     
     if (_sourceDirectoryLocal) {
@@ -676,14 +676,14 @@
 
 - (void)photoBrowser:(MWPhotoBrowser *)photoBrowser shareButtonPressedForPhotoAtIndex:(NSUInteger)index
 {
-    CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
+    tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
     
     [app.activeMain openWindowShare:metadata];
 }
 
 - (void)photoBrowser:(MWPhotoBrowser *)photoBrowser deleteButtonPressedForPhotoAtIndex:(NSUInteger)index deleteButton:(UIBarButtonItem *)deleteButton
 {
-    CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
+    tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
     if (metadata == nil || [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID]] == NO) {
         
         [app messageNotification:@"_info_" description:@"_file_not_found_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo errorCode:0];
@@ -731,7 +731,7 @@
     [self.photoBrowser reloadData];
 }
 
-- (void)downloadPhotoBrowserSuccess:(CCMetadata *)metadataVar selector:(NSString *)selector
+- (void)downloadPhotoBrowserSuccess:(tableMetadata *)metadataVar selector:(NSString *)selector
 {
     NSUInteger index = 0;
     
@@ -741,7 +741,7 @@
     
     for (NSUInteger i=0; i < [self.dataSourceImagesVideos count]; i++ ) {
         
-        CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:i];
+        tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:i];
         
         // search index
         if ([metadataVar.fileID isEqualToString:metadata.fileID]) {
@@ -768,7 +768,7 @@
     }    
 }
 
-- (void)downloadPhotoBrowser:(CCMetadata *)metadata
+- (void)downloadPhotoBrowser:(tableMetadata *)metadata
 {
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
     
@@ -813,7 +813,7 @@
         // Fix BUG Geo latitude & longitude
         if ([localFile.exifLatitude doubleValue] == 9999 || [localFile.exifLongitude doubleValue] == 9999) {
             
-            CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
+            tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
             
             [CCExifGeo setExifLocalTableFileID:metadata directoryUser:app.directoryUser activeAccount:app.activeAccount];
         }
@@ -1007,7 +1007,7 @@
         // only photoBrowser if exists
         for (NSUInteger index=0; index < [self.dataSourceImagesVideos count] && _photoBrowser; index++ ) {
         
-            CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
+            tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
         
             // ricerca index
             if ([metadataNet.metadata.fileID isEqualToString:metadata.fileID]) {

iOSClient/Main/CCMain.h

@@ -61,6 +61,8 @@
 #import "CCPassaporto.h"
 #import "CCPatenteGuida.h"
 
+@class tableMetadata;
+
 @interface CCMain : UITableViewController <UITableViewDataSource, UITableViewDelegate, UIActionSheetDelegate, UIGestureRecognizerDelegate, UIDocumentInteractionControllerDelegate, UIViewControllerPreviewingDelegate, CCMoveDelegate, CTAssetsPickerControllerDelegate, BKPasscodeViewControllerDelegate, UISplitViewControllerDelegate, UIPopoverControllerDelegate, CCNetworkingDelegate, CCShareOCDelegate, CCAccountWebDelegate, CCBancomatDelegate, CCCartaDiCreditoDelegate, CCCartaIdentitaDelegate, CCContoCorrenteDelegate, CCNoteDelegate, CCPassaportoDelegate, CCPatenteGuidaDelegate, CCPeekPopDelegate, UIDocumentMenuDelegate, UIDocumentPickerDelegate, UISearchResultsUpdating, UISearchControllerDelegate, UISearchBarDelegate, UIScrollViewDelegate, CCLoginDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
 
 @property BOOL isFolderEncrypted;
@@ -82,16 +84,16 @@
 
 - (void)uploadFileAsset:(NSMutableArray *)assets serverUrl:(NSString *)serverUrl cryptated:(BOOL)cryptated useSubFolder:(BOOL)useSubFolder session:(NSString *)session;
 
-- (void)reloadTaskButton:(CCMetadata *)metadata;
-- (void)cancelTaskButton:(CCMetadata *)metadata reloadTable:(BOOL)reloadTable;
-- (void)stopTaskButton:(CCMetadata *)metadata;
+- (void)reloadTaskButton:(tableMetadata *)metadata;
+- (void)cancelTaskButton:(tableMetadata *)metadata reloadTable:(BOOL)reloadTable;
+- (void)stopTaskButton:(tableMetadata *)metadata;
 
 - (void)reloadDatasource;
 - (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID selector:(NSString *)selector;
 
 - (void)requestServerCapabilities;
 
-- (void)openWindowShare:(CCMetadata *)metadata;
+- (void)openWindowShare:(tableMetadata *)metadata;
 - (void)synchronizeFolderGraphicsServerUrl:(NSString *)serverUrl animation:(BOOL)animation;
 - (void)clearDateReadDataSource:(NSNotification *)notification;
 - (void)cancelSearchBar;

iOSClient/Main/CCMain.m

@@ -41,7 +41,7 @@
 
 @interface CCMain () <CCActionsDeleteDelegate, CCActionsRenameDelegate, CCActionsSearchDelegate, CCActionsDownloadThumbnailDelegate, CCActionsSettingFavoriteDelegate>
 {
-    CCMetadata *_metadata;
+    tableMetadata *_metadata;
         
     BOOL _isRoot;
     BOOL _isViewDidLoad;
@@ -121,7 +121,7 @@
     [super viewDidLoad];
     
     // init object
-    _metadata = [CCMetadata new];
+    _metadata = [tableMetadata new];
     _hud = [[CCHud alloc] initWithView:[[[UIApplication sharedApplication] delegate] window]];
     _hudDeterminate = [[CCHud alloc] initWithView:[[[UIApplication sharedApplication] delegate] window]];
     _selectedMetadatas = [NSMutableArray new];
@@ -994,7 +994,7 @@
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.01 * NSEC_PER_SEC), dispatch_get_main_queue(), ^(void) {
         
-        for (CCMetadata *metadata in metadatas) {
+        for (tableMetadata *metadata in metadatas) {
             
             if (metadata.directory == NO && [metadata.type isEqualToString: k_metadataType_file] && ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])) {
                 
@@ -1050,7 +1050,7 @@
 - (UIViewController *)previewingContext:(id<UIViewControllerPreviewing>)previewingContext viewControllerForLocation:(CGPoint)location
 {
     NSIndexPath *indexPath = [self.tableView indexPathForRowAtPoint:location];
-    CCMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+    tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
     
     if (metadata.thumbnailExists && !metadata.cryptated) {
         CCCellMain *cell = [self.tableView cellForRowAtIndexPath:indexPath];
@@ -1350,7 +1350,7 @@
 
 - (void)downloadFileFailure:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode
 {
-    CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
+    tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
     
     // File do not exists on server, remove in local
     if (errorCode == kOCErrorServerPathNotFound || errorCode == kCFURLErrorBadServerResponse) {
@@ -1381,7 +1381,7 @@
 
 - (void)downloadFileSuccess:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
 {
-    CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
+    tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
     
     if (metadata == nil) return;
     
@@ -1575,7 +1575,7 @@
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^(void) {
         
-        for (CCMetadata *metadata in selectedMetadatas) {
+        for (tableMetadata *metadata in selectedMetadatas) {
             
             if (metadata.directory == NO && [metadata.type isEqualToString: k_metadataType_file]) {
                 
@@ -1628,7 +1628,7 @@
     // Read File test do not exists
     if (errorCode == k_CCErrorFileUploadNotFound && fileID) {
        
-        CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
+        tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
         
         // reUpload
         if (metadata)
@@ -1773,7 +1773,7 @@
     }
 }
 
-- (void)readFileSuccess:(CCMetadataNet *)metadataNet metadata:(CCMetadata *)metadata
+- (void)readFileSuccess:(CCMetadataNet *)metadataNet metadata:(tableMetadata *)metadata
 {
     // UploadFile
     if ([metadataNet.selector isEqualToString:selectorReadFileUploadFile]) {
@@ -1844,7 +1844,7 @@
         [CCCoreData setDateReadDirectoryID:metadataNet.directoryID activeAccount:app.activeAccount];
     }
     
-    for (CCMetadata *metadata in metadatas) {
+    for (tableMetadata *metadata in metadatas) {
         
         // Delete Record only in Search Mode
         if (_isSearchMode)
@@ -1862,7 +1862,7 @@
             BOOL isCryptoComplete = NO;
             NSString *fileNameCrypto = [CCUtility trasformedFileNamePlistInCrypto:metadata.fileName];
             
-            for (CCMetadata *completeMetadata in metadatas) {
+            for (tableMetadata *completeMetadata in metadatas) {
                     
                 if (completeMetadata.cryptated == NO) continue;
                 else  if ([completeMetadata.fileName isEqualToString:fileNameCrypto]) {
@@ -1876,7 +1876,7 @@
         // verify if the record is in download/upload progress
         if (metadata.directory == NO && [recordsInSessions count] > 0) {
             
-            CCMetadata *metadataDB = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND (fileName == %@)", app.activeAccount, metadataNet.directoryID, metadata.fileName] context:nil];
+            tableMetadata *metadataDB = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND (fileName == %@)", app.activeAccount, metadataNet.directoryID, metadata.fileName] context:nil];
             
             // is in Upload
             if (metadataDB.session && [metadataDB.session containsString:@"upload"]) {
@@ -2127,7 +2127,7 @@
     }
 }
 
-- (void)deleteFileOrFolder:(CCMetadata *)metadata numFile:(NSInteger)numFile ofFile:(NSInteger)ofFile
+- (void)deleteFileOrFolder:(tableMetadata *)metadata numFile:(NSInteger)numFile ofFile:(NSInteger)ofFile
 {
     if (metadata.cryptated) {
         [_queueSelector addObject:selectorDeleteCrypto];
@@ -2178,12 +2178,12 @@
     [self readFolderWithForced:YES serverUrl:metadataNet.serverUrl];
 }
 
-- (void)renameFile:(CCMetadata *)metadata fileName:(NSString *)fileName
+- (void)renameFile:(tableMetadata *)metadata fileName:(NSString *)fileName
 {
     [[CCActions sharedInstance] renameFileOrFolder:metadata fileName:fileName delegate:self];
 }
 
-- (void)renameNote:(CCMetadata *)metadata fileName:(NSString *)fileName
+- (void)renameNote:(tableMetadata *)metadata fileName:(NSString *)fileName
 {
     CCTemplates *templates = [[CCTemplates alloc] init];
     
@@ -2283,7 +2283,7 @@
 {
     if ([_selectedMetadatas count] > 0) {
         
-        CCMetadata *metadata = [_selectedMetadatas objectAtIndex:0];
+        tableMetadata *metadata = [_selectedMetadatas objectAtIndex:0];
         
         // Plain
         if (metadata.cryptated == NO) {
@@ -2578,7 +2578,7 @@
     
     NSArray *selectedMetadatas = [self getMetadatasFromSelectedRows:[self.tableView indexPathsForSelectedRows]];
     
-    for (CCMetadata *metadata in selectedMetadatas) {
+    for (tableMetadata *metadata in selectedMetadatas) {
         if (metadata.cryptated == NO && metadata.directory == NO)
             [metadatas addObject:metadata];
     }
@@ -2587,7 +2587,7 @@
         
         NSLog(@"[LOG] Start encrypted selected files ...");
     
-        for (CCMetadata* metadata in metadatas) {
+        for (tableMetadata* metadata in metadatas) {
             
             NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
             
@@ -2604,7 +2604,7 @@
     
     NSArray *selectedMetadatas = [self getMetadatasFromSelectedRows:[self.tableView indexPathsForSelectedRows]];
     
-    for (CCMetadata *metadata in selectedMetadatas) {
+    for (tableMetadata *metadata in selectedMetadatas) {
         if (metadata.cryptated == YES && metadata.directory == NO && [metadata.model length] == 0)
             [metadatas addObject:metadata];
     }
@@ -2613,7 +2613,7 @@
         
         NSLog(@"[LOG] Start decrypted selected files ...");
         
-        for (CCMetadata* metadata in metadatas) {
+        for (tableMetadata* metadata in metadatas) {
             
             NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
             
@@ -2636,7 +2636,7 @@
     [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selector selectorPost:nil session:k_download_session taskStatus:k_taskStatusResume delegate:self];
 }
 
-- (void)encryptedFile:(CCMetadata *)metadata
+- (void)encryptedFile:(tableMetadata *)metadata
 {
     NSString *fileNameFrom = [NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID];
     NSString *fileNameTo = [NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileNamePrint];
@@ -2657,7 +2657,7 @@
     }
 }
 
-- (void)decryptedFile:(CCMetadata *)metadata
+- (void)decryptedFile:(tableMetadata *)metadata
 {
     NSString *fileNameFrom = [NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID];
     NSString *fileNameTo = [NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileNamePrint];
@@ -2727,14 +2727,14 @@
     
     if (indexPath) {
         
-        CCMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+        tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
         
         if (metadata)
             [self reloadTaskButton:metadata];
     }
 }
 
-- (void)reloadTaskButton:(CCMetadata *)metadata
+- (void)reloadTaskButton:(tableMetadata *)metadata
 {
     NSURLSession *session = [[CCNetworking sharedNetworking] getSessionfromSessionDescription:metadata.session];
     __block NSURLSessionTask *findTask;
@@ -2792,14 +2792,14 @@
     
     if (indexPath) {
         
-        CCMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+        tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
         
         if (metadata)
             [self cancelTaskButton:metadata reloadTable:YES];
     }
 }
 
-- (void)cancelTaskButton:(CCMetadata *)metadata reloadTable:(BOOL)reloadTable
+- (void)cancelTaskButton:(tableMetadata *)metadata reloadTable:(BOOL)reloadTable
 {
     NSURLSession *session = [[CCNetworking sharedNetworking] getSessionfromSessionDescription:metadata.session];
     __block NSURLSessionTask *findTask;
@@ -2855,14 +2855,14 @@
     
     if (indexPath) {
         
-        CCMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+        tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
         
         if (metadata)
             [self stopTaskButton:metadata];
     }
 }
 
-- (void)stopTaskButton:(CCMetadata *)metadata
+- (void)stopTaskButton:(tableMetadata *)metadata
 {
     NSURLSession *session = [[CCNetworking sharedNetworking] getSessionfromSessionDescription:metadata.session];
     __block NSURLSessionTask *findTask;
@@ -2919,7 +2919,7 @@
                 
         } else {
             
-            CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadataNet.fileID, app.activeAccount] context:nil];
+            tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadataNet.fileID, app.activeAccount] context:nil];
             
             // Apriamo la view
             _shareOC = [[UIStoryboard storyboardWithName:@"CCShare" bundle:nil] instantiateViewControllerWithIdentifier:@"CCShareOC"];
@@ -2954,7 +2954,7 @@
         [self changePasswordAccount];
 }
 
-- (void)share:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password
+- (void)share:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     
@@ -2991,7 +2991,7 @@
     [self tableViewReload];
 }
 
-- (void)unShare:(NSString *)share metadata:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl
+- (void)unShare:(NSString *)share metadata:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     
@@ -3008,7 +3008,7 @@
     [_hud visibleHudTitle:NSLocalizedString(@"_updating_sharing_", nil) mode:MBProgressHUDModeIndeterminate color:nil];
 }
 
-- (void)updateShare:(NSString *)share metadata:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password expirationTime:(NSString *)expirationTime permission:(NSInteger)permission
+- (void)updateShare:(NSString *)share metadata:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password expirationTime:(NSString *)expirationTime permission:(NSInteger)permission
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     
@@ -3054,7 +3054,7 @@
     [_hud visibleIndeterminateHud];
 }
 
-- (void)shareUserAndGroup:(NSString *)user shareeType:(NSInteger)shareeType permission:(NSInteger)permission metadata:(CCMetadata *)metadata directoryID:(NSString *)directoryID serverUrl:(NSString *)serverUrl
+- (void)shareUserAndGroup:(NSString *)user shareeType:(NSInteger)shareeType permission:(NSInteger)permission metadata:(tableMetadata *)metadata directoryID:(NSString *)directoryID serverUrl:(NSString *)serverUrl
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
 
@@ -3074,7 +3074,7 @@
     [_hud visibleHudTitle:NSLocalizedString(@"_creating_sharing_", nil) mode:MBProgressHUDModeIndeterminate color:nil];
 }
 
-- (void)openWindowShare:(CCMetadata *)metadata
+- (void)openWindowShare:(tableMetadata *)metadata
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     
@@ -3095,7 +3095,7 @@
     CGPoint location = [tapGesture locationInView:self.tableView];
     NSIndexPath * indexPath = [self.tableView indexPathForRowAtPoint:location];
     
-    CCMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+    tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
     
     if (metadata)
         [self openWindowShare:metadata];
@@ -3106,7 +3106,7 @@
     CGPoint location = [tapGesture locationInView:self.tableView];
     NSIndexPath * indexPath = [self.tableView indexPathForRowAtPoint:location];
     
-    CCMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+    tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
     
     if (metadata) {
         
@@ -3133,7 +3133,7 @@
     else
         [self reloadDatasource:metadataNet.serverUrl fileID:metadataNet.fileID selector:metadataNet.selector];
     
-    CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadataNet.fileID, app.activeAccount] context:nil];
+    tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadataNet.fileID, app.activeAccount] context:nil];
     
     if (metadata.directory && metadata.favorite) {
         
@@ -3147,7 +3147,7 @@
 {
 }
 
-- (void)addFavorite:(CCMetadata *)metadata
+- (void)addFavorite:(tableMetadata *)metadata
 {
     if (metadata.directory) {
         
@@ -3161,7 +3161,7 @@
     }
 }
 
-- (void)removeFavorite:(CCMetadata *)metadata
+- (void)removeFavorite:(tableMetadata *)metadata
 {
     [[CCActions sharedInstance] settingFavorite:metadata favorite:NO delegate:self];
 }
@@ -3170,7 +3170,7 @@
 #pragma mark ===== Offline =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)addOffline:(CCMetadata *)metadata
+- (void)addOffline:(tableMetadata *)metadata
 {
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
     
@@ -3180,7 +3180,7 @@
     if (indexPath) [self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObjects:indexPath, nil] withRowAnimation:UITableViewRowAnimationAutomatic];
 }
 
-- (void)removeOffline:(CCMetadata *)metadata
+- (void)removeOffline:(tableMetadata *)metadata
 {
     [CCCoreData setOfflineLocalFileID:metadata.fileID offline:NO activeAccount:app.activeAccount];
     
@@ -3193,7 +3193,7 @@
 #pragma mark ===== Local =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)addLocal:(CCMetadata *)metadata
+- (void)addLocal:(tableMetadata *)metadata
 {
     if (metadata.errorPasscode || !metadata.uuid) return;
     
@@ -3217,7 +3217,7 @@
 #pragma mark ===== Open in... =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)openIn:(CCMetadata *)metadata
+- (void)openIn:(tableMetadata *)metadata
 {
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
 
@@ -3231,7 +3231,7 @@
 #pragma mark ===== Remove Local File =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)removeLocalFile:(CCMetadata *)metadata
+- (void)removeLocalFile:(tableMetadata *)metadata
 {
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:_metadata.directoryID activeAccount:_metadata.account];
 
@@ -3764,7 +3764,7 @@
             
             NSArray *selectedMetadatas = [self getMetadatasFromSelectedRows:[self.tableView indexPathsForSelectedRows]];
             
-            for (CCMetadata *metadata in selectedMetadatas) {
+            for (tableMetadata *metadata in selectedMetadatas) {
                 
                 if (!metadata.directory && !metadata.errorPasscode && metadata.session.length == 0 && ![metadata.typeFile isEqualToString: k_metadataTypeFile_template])  {
                     
@@ -3789,7 +3789,7 @@
             NSDictionary *dic = [items objectAtIndex:0];
             
             NSData *dataMetadata = [dic objectForKey: k_metadataKeyedUnarchiver];
-            CCMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
+            tableMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
                         
             tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
             NSString *directoryUser = [CCUtility getDirectoryActiveUser:account.user activeUrl:account.url];
@@ -3818,7 +3818,7 @@
             // Value : (NSData) metadata
             
             NSData *dataMetadata = [dic objectForKey: k_metadataKeyedUnarchiver];
-            CCMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
+            tableMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
             tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
             
             NSString *directoryUser = [CCUtility getDirectoryActiveUser:account.user activeUrl:account.url];
@@ -3863,7 +3863,7 @@
     
     NSArray *selectedMetadatas = [self getMetadatasFromSelectedRows:[self.tableView indexPathsForSelectedRows]];
     
-    for (CCMetadata *metadata in selectedMetadatas) {
+    for (tableMetadata *metadata in selectedMetadatas) {
         
         if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID]]) {
             
@@ -3880,7 +3880,7 @@
     [self tableViewSelect:NO];
 }
 
-- (void)copyFileToPasteboard:(CCMetadata *)metadata
+- (void)copyFileToPasteboard:(tableMetadata *)metadata
 {
     UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
     NSMutableArray *items = [[NSMutableArray alloc] initWithArray:pasteboard.items];
@@ -3933,7 +3933,7 @@
         // Value : (NSData) metadata
         
         NSData *dataMetadata = [dic objectForKey: k_metadataKeyedUnarchiver];
-        CCMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
+        tableMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
         
         tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
         
@@ -4524,7 +4524,7 @@
 
 - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    CCMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+    tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
     
     if (metadata == nil || metadata.errorPasscode || (metadata.cryptated && [metadata.title length] == 0) || metadata.sessionTaskIdentifier  >= 0 || metadata.sessionTaskIdentifier >= 0) return NO;
     else return YES;
@@ -4532,7 +4532,7 @@
 
 - (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    CCMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+    tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
     
     if (metadata.errorPasscode || (metadata.cryptated && [metadata.title length] == 0) || metadata.sessionTaskIdentifier >= 0 || metadata.sessionTaskIdentifier >= 0) return UITableViewCellEditingStyleNone;
     else return UITableViewCellEditingStyleDelete;
@@ -4693,7 +4693,7 @@
         for (NSIndexPath *selectionIndex in selectedRows) {
             
             NSString *fileID = [[_sectionDataSource.sectionArrayRow objectForKey:[_sectionDataSource.sections objectAtIndex:selectionIndex.section]] objectAtIndex:selectionIndex.row];
-            CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+            tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
 
             [metadatas addObject:metadata];
         }
@@ -4702,7 +4702,7 @@
     return metadatas;
 }
 
-- (CCMetadata *)getMetadataFromSectionDataSource:(NSIndexPath *)indexPath
+- (tableMetadata *)getMetadataFromSectionDataSource:(NSIndexPath *)indexPath
 {
     NSInteger section = indexPath.section + 1;
     NSInteger row = indexPath.row + 1;
@@ -4922,7 +4922,7 @@
     NSString *dataFile;
     NSString *lunghezzaFile;
     
-    CCMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+    tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
     
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
     
@@ -5497,7 +5497,7 @@
     
     for (NSString* fileID in _sectionDataSource.allRecordsDataSource) {
         
-        CCMetadata *recordMetadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+        tableMetadata *recordMetadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
         
         if (recordMetadata.directory == NO)
             continue;
@@ -5556,7 +5556,7 @@
 {
     id viewController = segue.destinationViewController;
     NSMutableArray *allRecordsDataSourceImagesVideos = [NSMutableArray new];
-    CCMetadata *metadata;
+    tableMetadata *metadata;
     
     if ([viewController isKindOfClass:[UINavigationController class]]) {
         
@@ -5568,7 +5568,7 @@
         _detailViewController = segue.destinationViewController;
     }
     
-    if ([sender isKindOfClass:[CCMetadata class]]) {
+    if ([sender isKindOfClass:[tableMetadata class]]) {
     
         metadata = sender;
         [allRecordsDataSourceImagesVideos addObject:sender];
@@ -5578,7 +5578,7 @@
         metadata = _metadata;
         
         for (NSString *fileID in _sectionDataSource.allFileID) {
-            CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+            tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
             if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
                 [allRecordsDataSourceImagesVideos addObject:metadata];
         }

iOSClient/Main/CCSection.m

@@ -75,13 +75,13 @@
     
     for (id record in records) {
         
-        CCMetadata *metadata;
+        tableMetadata *metadata = [tableMetadata new];
         
         // verify type of class
         if ([record isKindOfClass:[TableMetadata class]])
             metadata = [CCCoreData insertEntityInMetadata:record];
         else
-            metadata = (CCMetadata *)record;
+            metadata = (tableMetadata *)record;
         
         // if exists replace date with exif date
         if (replaceDateToExifDate) {
@@ -106,7 +106,7 @@
      sectionArrayRow
     */
     
-    for (CCMetadata *metadata in copyRecords) {
+    for (tableMetadata *metadata in copyRecords) {
         
         // how many download underway (only for groupSession)
         if ([metadata.session containsString:@"download"] && [groupByField isEqualToString:@"session"]) {
@@ -196,7 +196,7 @@
         
         for (NSString *fileID in rows) {
             
-            CCMetadata *metadata = [dictionaryFileIDMetadataForIndexPath objectForKey:fileID];
+            tableMetadata *metadata = [dictionaryFileIDMetadataForIndexPath objectForKey:fileID];
             
             if (metadata.fileID) {
                 

iOSClient/Move/CCMove.h

@@ -30,6 +30,8 @@
 #import "OCNetworking.h"
 #import "CCHud.h"
 
+@class tableMetadata;
+
 @protocol CCMoveDelegate;
 
 @interface CCMove : UITableViewController <UIAlertViewDelegate, UITableViewDelegate, OCNetworkingDelegate, BKPasscodeViewControllerDelegate>
@@ -40,7 +42,7 @@
 @property BOOL onlyClearDirectory;
 
 @property (nonatomic, strong) NSString *serverUrl;
-@property (nonatomic, strong) CCMetadata *passMetadata;
+@property (nonatomic, strong) tableMetadata *passMetadata;
 
 //BKPasscodeViewController
 @property (nonatomic) NSUInteger failedAttempts;

iOSClient/Move/CCMove.m

@@ -244,7 +244,7 @@
 {
     if ([selector isEqualToString:selectorLoadPlist]) {
 
-        CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, activeAccount] context:nil];
+        tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, activeAccount] context:nil];
 
         [CCCoreData downloadFilePlist:metadata activeAccount:activeAccount activeUrl:activeUrl directoryUser:directoryUser];
         
@@ -278,7 +278,7 @@
     // remove all record
     [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND ((session == NULL) OR (session == ''))", activeAccount, metadataNet.directoryID]];
         
-    for (CCMetadata *metadata in metadatas) {
+    for (tableMetadata *metadata in metadatas) {
         
         // do not insert crypto file
         if ([CCUtility isCryptoString:metadata.fileName]) continue;
@@ -288,7 +288,7 @@
             
             BOOL isCryptoComplete = NO;
             
-            for (CCMetadata *completeMetadata in metadatas) {
+            for (tableMetadata *completeMetadata in metadatas) {
                 if ([completeMetadata.fileName isEqualToString:[CCUtility trasformedFileNamePlistInCrypto:metadata.fileName]]) isCryptoComplete = YES;
             }
             if (isCryptoComplete == NO) continue;
@@ -300,7 +300,7 @@
         if ([CCUtility isCryptoPlistString:metadata.fileName] && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", directoryUser, metadata.fileName]] == NO) {
             
             // download only the directories
-            for (CCMetadata *metadataDirectory in metadatas) {
+            for (tableMetadata *metadataDirectory in metadatas) {
                 
                 if (metadataDirectory.directory == YES && [metadataDirectory.fileName isEqualToString:metadata.fileNameData]) {
                     
@@ -422,7 +422,7 @@
     if (self.onlyClearDirectory) predicate = [NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND (directory == 1) AND (cryptated == 0)", activeAccount, directoryID];
     else predicate = [NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND (directory == 1)", activeAccount, directoryID];
 
-    CCMetadata *metadata = [CCCoreData getMetadataAtIndex:predicate fieldOrder:@"fileName" ascending:YES objectAtIndex:indexPath.row];
+    tableMetadata *metadata = [CCCoreData getMetadataAtIndex:predicate fieldOrder:@"fileName" ascending:YES objectAtIndex:indexPath.row];
     
     // colors
     if (metadata.cryptated) {
@@ -456,7 +456,7 @@
     if (self.onlyClearDirectory) predicate = [NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND (directory == 1) AND (cryptated == 0)", activeAccount, directoryID];
     else predicate = [NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND (directory == 1)", activeAccount, directoryID];
     
-    CCMetadata *metadata = [CCCoreData getMetadataAtIndex:predicate fieldOrder:@"fileName" ascending:YES objectAtIndex:index.row];
+    tableMetadata *metadata = [CCCoreData getMetadataAtIndex:predicate fieldOrder:@"fileName" ascending:YES objectAtIndex:index.row];
     
     if (metadata.errorPasscode == NO) {
     

iOSClient/Networking/CCNetworking.h

@@ -36,6 +36,8 @@
 #import "CCGraphics.h"
 #import "CCError.h"
 
+@class tableMetadata;
+
 @protocol CCNetworkingDelegate;
 
 @interface CCNetworking : NSObject <NSURLSessionTaskDelegate, NSURLSessionDelegate, NSURLSessionDownloadDelegate>
@@ -57,13 +59,13 @@
 - (void)settingSession:(NSString *)sessionDescription sessionTaskIdentifier:(NSUInteger)sessionTaskIdentifier taskStatus:(NSInteger)taskStatus;
 
 // Download
-- (void)downloadFile:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl downloadData:(BOOL)downloadData downloadPlist:(BOOL)downloadPlist selector:(NSString *)selector selectorPost:(NSString *)selectorPost session:(NSString *)session taskStatus:(NSInteger)taskStatus delegate:(id)delegate;
+- (void)downloadFile:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl downloadData:(BOOL)downloadData downloadPlist:(BOOL)downloadPlist selector:(NSString *)selector selectorPost:(NSString *)selectorPost session:(NSString *)session taskStatus:(NSInteger)taskStatus delegate:(id)delegate;
 
 // Upload
 - (void)uploadFileFromAssetLocalIdentifier:(NSString *)assetLocalIdentifier fileName:(NSString *)fileName serverUrl:(NSString *)serverUrl cryptated:(BOOL)cryptated session:(NSString *)session taskStatus:(NSInteger)taskStatus selector:(NSString *)selector selectorPost:(NSString *)selectorPost errorCode:(NSInteger)errorCode delegate:(id)delegate;
 - (void)uploadFile:(NSString *)fileName serverUrl:(NSString *)serverUrl cryptated:(BOOL)cryptated onlyPlist:(BOOL)onlyPlist session:(NSString *)session taskStatus:(NSInteger)taskStatus selector:(NSString *)selector selectorPost:(NSString *)selectorPost errorCode:(NSInteger)errorCode delegate:(id)delegate;
 - (void)uploadTemplate:(NSString *)fileNamePrint fileNameCrypto:(NSString *)fileNameCrypto serverUrl:(NSString *)serverUrl session:(NSString *)session taskStatus:(NSInteger)taskStatus selector:(NSString *)selector selectorPost:(NSString *)selectorPost errorCode:(NSInteger)errorCode delegate:(id)delegate;
-- (void)uploadFileMetadata:(CCMetadata *)metadata taskStatus:(NSInteger)taskStatus;
+- (void)uploadFileMetadata:(tableMetadata *)metadata taskStatus:(NSInteger)taskStatus;
 
 // Verify
 - (void)verifyDownloadInProgress;

iOSClient/Networking/CCNetworking.m

@@ -34,7 +34,7 @@
 {
     NSManagedObjectContext *_context;
     NSMutableDictionary *_taskData;
-    CCMetadata *_currentProgressMetadata;
+    tableMetadata *_currentProgressMetadata;
     
     NSString *_activeAccount;
     NSString *_activePassword;
@@ -64,7 +64,7 @@
     _context = [NSManagedObjectContext MR_context];
    
     _taskData = [[NSMutableDictionary alloc] init];
-    _currentProgressMetadata = [[CCMetadata alloc] init];
+    _currentProgressMetadata = [[tableMetadata alloc] init];
     _delegates = [[NSMutableDictionary alloc] init];
     
     // Initialization Sessions
@@ -376,7 +376,7 @@
     NSString *fileName = [url lastPathComponent];
     NSString *serverUrl = [self getServerUrlFromUrl:url];
     
-    CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(session = %@) AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))",session.sessionDescription, task.taskIdentifier, task.taskIdentifier] context:_context];
+    tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(session = %@) AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))",session.sessionDescription, task.taskIdentifier, task.taskIdentifier] context:_context];
     
     NSInteger errorCode;
     __block NSString *fileID = metadata.fileID;
@@ -488,7 +488,7 @@
 #pragma mark =====  Download =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)downloadFile:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl downloadData:(BOOL)downloadData downloadPlist:(BOOL)downloadPlist selector:(NSString *)selector selectorPost:(NSString *)selectorPost session:(NSString *)session taskStatus:(NSInteger)taskStatus delegate:(id)delegate
+- (void)downloadFile:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl downloadData:(BOOL)downloadData downloadPlist:(BOOL)downloadPlist selector:(NSString *)selector selectorPost:(NSString *)selectorPost session:(NSString *)session taskStatus:(NSInteger)taskStatus delegate:(id)delegate
 {
     // add delegate
     if (delegate)
@@ -634,7 +634,7 @@
     NSURLRequest *url = [downloadTask currentRequest];
     NSString *filename = [[url.URL absoluteString] lastPathComponent];
     
-    CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(session = %@) AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))",session.sessionDescription, downloadTask.taskIdentifier, downloadTask.taskIdentifier] context:_context];
+    tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(session = %@) AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))",session.sessionDescription, downloadTask.taskIdentifier, downloadTask.taskIdentifier] context:_context];
     
     // If the record metadata do not exists, exit
     if (!metadata)
@@ -703,7 +703,7 @@
         
     } else {
         
-        CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:_context];
+        tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:_context];
         
         if ([CCUtility isCryptoString:fileName] || [CCUtility isFileNotCryptated:fileName]) metadata.sessionTaskIdentifier = k_taskIdentifierDone;
         if ([CCUtility isCryptoPlistString:fileName]) metadata.sessionTaskIdentifierPlist = k_taskIdentifierDone;
@@ -730,7 +730,7 @@
                 [[self getDelegate:fileID] downloadFileSuccess:fileID serverUrl:serverUrl selector:selector selectorPost:selectorPost];
         });
         
-        NSLog(@"[LOG] Download Success Session Metadata : %@ - FileNamePrint : %@ - fileID : %@ - Task : [%i %i]", metadata.fileName, metadata.fileNamePrint, metadata.fileID, metadata.sessionTaskIdentifier, metadata.sessionTaskIdentifierPlist);
+        NSLog(@"[LOG] Download Success Session Metadata : %@ - FileNamePrint : %@ - fileID : %@ - Task : [%li %li]", metadata.fileName, metadata.fileNamePrint, metadata.fileID, (long)metadata.sessionTaskIdentifier, (long)metadata.sessionTaskIdentifierPlist);
     }    
 }
 
@@ -886,7 +886,7 @@
     NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
     NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPath:_activeUrl];
     
-    CCMetadata *metadata = [CCUtility insertFileSystemInMetadata:fileName directory:_directoryUser activeAccount:_activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
+    tableMetadata *metadata = [CCUtility insertFileSystemInMetadata:fileName directory:_directoryUser activeAccount:_activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
     
     //fileID
     NSString *uploadID =  [k_uploadSessionID stringByAppendingString:[CCUtility createRandomString:16]];
@@ -1025,7 +1025,7 @@
                 UIAlertAction *overwriteAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"_overwrite_", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
                     
                     // -- remove record --
-                    CCMetadata *metadataDelete = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileName == %@) AND (directoryID == %@)", _activeAccount, [fileNameCrypto stringByAppendingString:@".plist"], directoryID] context:nil];
+                    tableMetadata *metadataDelete = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileName == %@) AND (directoryID == %@)", _activeAccount, [fileNameCrypto stringByAppendingString:@".plist"], directoryID] context:nil];
                     [CCCoreData deleteFile:metadataDelete serverUrl:serverUrl directoryUser:_directoryUser activeAccount:_activeAccount];
                     
 #ifndef EXTENSION
@@ -1114,7 +1114,7 @@
             UIAlertAction *overwriteAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"_overwrite_", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
                 
                 // -- remove record --
-                CCMetadata *metadataDelete = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileName == %@) AND (directoryID == %@)", _activeAccount, fileName, directoryID] context:nil];
+                tableMetadata *metadataDelete = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileName == %@) AND (directoryID == %@)", _activeAccount, fileName, directoryID] context:nil];
                 [CCCoreData deleteFile:metadataDelete serverUrl:serverUrl directoryUser:_directoryUser activeAccount:_activeAccount];
                 
                 // -- Go to Upload --
@@ -1150,7 +1150,7 @@
     }
 }
 
-- (void)uploadFileMetadata:(CCMetadata *)metadata taskStatus:(NSInteger)taskStatus
+- (void)uploadFileMetadata:(tableMetadata *)metadata taskStatus:(NSInteger)taskStatus
 {
     BOOL send = NO;
     
@@ -1346,7 +1346,7 @@
     });
 }
 
-- (void)uploadFileSuccessFailure:(CCMetadata *)metadata fileName:(NSString *)fileName fileID:(NSString *)fileID rev:(NSString *)rev date:(NSDate *)date serverUrl:(NSString *)serverUrl errorCode:(NSInteger)errorCode
+- (void)uploadFileSuccessFailure:(tableMetadata *)metadata fileName:(NSString *)fileName fileID:(NSString *)fileID rev:(NSString *)rev date:(NSDate *)date serverUrl:(NSString *)serverUrl errorCode:(NSInteger)errorCode
 {
     NSString *sessionID = metadata.sessionID;
     
@@ -1492,7 +1492,7 @@
     
     for (TableMetadata *record in dataSource) {
         
-        __block CCMetadata *metadata = [CCCoreData insertEntityInMetadata:record];
+        __block tableMetadata *metadata = [CCCoreData insertEntityInMetadata:record];
         
         NSURLSession *session = [self getSessionfromSessionDescription:metadata.session];
         
@@ -1503,7 +1503,7 @@
             
             for (NSURLSessionDownloadTask *downloadTask in downloadTasks) {
                 
-                NSLog(@"[LOG] Find metadata Tasks [%i %i] = [%lu] state : %lu", metadata.sessionTaskIdentifier, metadata.sessionTaskIdentifierPlist ,(unsigned long)downloadTask.taskIdentifier, (unsigned long)[downloadTask state]);
+                NSLog(@"[LOG] Find metadata Tasks [%li %li] = [%lu] state : %lu", (long)metadata.sessionTaskIdentifier, (long)metadata.sessionTaskIdentifierPlist ,(unsigned long)downloadTask.taskIdentifier, (unsigned long)[downloadTask state]);
                 
                 if (metadata.sessionTaskIdentifier == downloadTask.taskIdentifier) findTask = YES;
                 if (metadata.sessionTaskIdentifierPlist == downloadTask.taskIdentifier) findTaskPlist = YES;
@@ -1514,7 +1514,7 @@
             // DATA
             if (findTask == NO && metadata.sessionTaskIdentifier >= 0) {
                 
-                NSLog(@"[LOG] NOT Find metadata Task [%i] fileID : %@ - filename : %@", metadata.sessionTaskIdentifier, metadata.fileID, metadata.fileNameData);
+                NSLog(@"[LOG] NOT Find metadata Task [%li] fileID : %@ - filename : %@", (long)metadata.sessionTaskIdentifier, metadata.fileID, metadata.fileNameData);
                 
                 [CCCoreData setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @k_CCErrorTaskDownloadNotFound] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier: k_taskIdentifierError sessionTaskIdentifierPlist: k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, _activeAccount] context:_context];
                 
@@ -1529,7 +1529,7 @@
             // PLIST
             if (findTaskPlist == NO && metadata.sessionTaskIdentifierPlist >= 0) {
                 
-                NSLog(@"[LOG] NOT Find metadata TaskPlist [%i] fileID : %@ - filename : %@", metadata.sessionTaskIdentifierPlist, metadata.fileID, metadata.fileName);
+                NSLog(@"[LOG] NOT Find metadata TaskPlist [%li] fileID : %@ - filename : %@", (long)metadata.sessionTaskIdentifierPlist, metadata.fileID, metadata.fileName);
                 
                 [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier: k_taskIdentifierNULL sessionTaskIdentifierPlist: k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, _activeAccount] context:_context];
                 
@@ -1556,7 +1556,7 @@
     
     for (TableMetadata *record in records) {
         
-        CCMetadata *metadata = [CCCoreData insertEntityInMetadata:record];
+        tableMetadata *metadata = [CCCoreData insertEntityInMetadata:record];
         
         NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
             
@@ -1568,7 +1568,7 @@
             
         [serversUrl addObject:serverUrl];
             
-        NSLog(@"[LOG] Re download file : %@ - %@ [%i %i]", metadata.fileName, metadata.fileNamePrint, metadata.sessionTaskIdentifier, metadata.sessionTaskIdentifierPlist);
+        NSLog(@"[LOG] Re download file : %@ - %@ [%li %li]", metadata.fileName, metadata.fileNamePrint, (long)metadata.sessionTaskIdentifier, (long)metadata.sessionTaskIdentifierPlist);
     }
     
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -1597,7 +1597,7 @@
     
     for (TableMetadata *record in dataSource) {
         
-        __block CCMetadata *metadata = [CCCoreData insertEntityInMetadata:record];
+        __block tableMetadata *metadata = [CCCoreData insertEntityInMetadata:record];
         __block NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:_activeAccount];
         
         NSURLSession *session = [self getSessionfromSessionDescription:metadata.session];
@@ -1610,7 +1610,7 @@
             // cerchiamo la corrispondenza dei task
             for (NSURLSessionUploadTask *uploadTask in uploadTasks) {
                 
-                NSLog(@"[LOG] Find metadata Tasks [%i %i] = [%lu] state : %lu", metadata.sessionTaskIdentifier, metadata.sessionTaskIdentifierPlist , (unsigned long)uploadTask.taskIdentifier, (unsigned long)[uploadTask state]);
+                NSLog(@"[LOG] Find metadata Tasks [%li %li] = [%lu] state : %lu", (long)metadata.sessionTaskIdentifier, (long)metadata.sessionTaskIdentifierPlist , (unsigned long)uploadTask.taskIdentifier, (unsigned long)[uploadTask state]);
                 
                 if (metadata.sessionTaskIdentifier == uploadTask.taskIdentifier) findTask = YES;
                 if (metadata.sessionTaskIdentifierPlist == uploadTask.taskIdentifier) findTaskPlist = YES;
@@ -1621,7 +1621,7 @@
             // se non c'è (ci sono) il relativo uploadTask.taskIdentifier allora chiediamolo
             if ((metadata.cryptated == YES && findTask == NO && findTaskPlist == NO) || (metadata.cryptated == NO && findTask == NO)) {
                 
-                NSLog(@"[LOG] Call ReadFileVerifyUpload because this file %@ (criptated %i) is in progress but there is no task : [%i %i]", metadata.fileNamePrint, metadata.cryptated, metadata.sessionTaskIdentifier, metadata.sessionTaskIdentifierPlist);
+                NSLog(@"[LOG] Call ReadFileVerifyUpload because this file %@ (criptated %i) is in progress but there is no task : [%li %li]", metadata.fileNamePrint, metadata.cryptated, (long)metadata.sessionTaskIdentifier, (long)metadata.sessionTaskIdentifierPlist);
                 
                 if (metadata.sessionTaskIdentifier >= 0) [self readFileVerifyUpload:metadata.fileNameData fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl];
                 if (metadata.sessionTaskIdentifierPlist >= 0) [self readFileVerifyUpload:metadata.fileName fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl];
@@ -1648,7 +1648,7 @@
     
     for (TableMetadata *record in records) {
         
-        CCMetadata *metadata = [CCCoreData insertEntityInMetadata:record];
+        tableMetadata *metadata = [CCCoreData insertEntityInMetadata:record];
         
         [self uploadFileMetadata:metadata taskStatus: k_taskStatusResume];
             
@@ -1685,7 +1685,7 @@
 //
 // File exists : selectorReadFileVerifyUpload
 //
-- (void)readFileSuccess:(CCMetadataNet *)metadataNet metadata:(CCMetadata *)metadata
+- (void)readFileSuccess:(CCMetadataNet *)metadataNet metadata:(tableMetadata *)metadata
 {
     NSString *fileName;
     
@@ -1696,7 +1696,7 @@
     
     NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:metadataNet.serverUrl activeAccount:_activeAccount];
     
-    CCMetadata *metadataTemp = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileName == %@) AND (directoryID == %@) AND (account == %@)", fileName , directoryID, _activeAccount] context:_context];
+    tableMetadata *metadataTemp = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileName == %@) AND (directoryID == %@) AND (account == %@)", fileName , directoryID, _activeAccount] context:_context];
     
     // is completed ?
     if (metadataTemp.sessionTaskIdentifier == k_taskIdentifierDone && metadataTemp.sessionTaskIdentifierPlist == k_taskIdentifierDone) {
@@ -1731,7 +1731,7 @@
     
     NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:metadataNet.serverUrl activeAccount:_activeAccount];
     
-    CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileName == %@) AND (directoryID == %@) AND (account == %@)",fileName , directoryID, _activeAccount] context:_context];
+    tableMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileName == %@) AND (directoryID == %@) AND (account == %@)",fileName , directoryID, _activeAccount] context:_context];
     
     NSInteger error;
     if (errorCode == kOCErrorServerPathNotFound)

iOSClient/Networking/OCNetworking.h

@@ -30,6 +30,7 @@
 #import "CCError.h"
 #import "CCCoreData.h"
 
+@class tableMetadata;
 
 @protocol OCNetworkingDelegate;
 
@@ -77,7 +78,7 @@
 - (void)renameSuccess:(CCMetadataNet *)metadataNet;
 - (void)renameMoveFileOrFolderFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode;
 
-- (void)readFileSuccess:(CCMetadataNet *)metadataNet metadata:(CCMetadata *)metadata;
+- (void)readFileSuccess:(CCMetadataNet *)metadataNet metadata:(tableMetadata *)metadata;
 - (void)readFileFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode;
 
 - (void)readSharedSuccess:(CCMetadataNet *)metadataNet items:(NSDictionary *)items openWindow:(BOOL)openWindow;

iOSClient/Networking/OCNetworking.m

@@ -901,7 +901,7 @@
         
         if ([recordAccount.account isEqualToString:_metadataNet.account] && [items count] > 0) {
             
-            CCMetadata *metadata = [[CCMetadata alloc] init];
+            tableMetadata *metadata = [tableMetadata new];
             
             OCFileDto *itemDto = [items objectAtIndex:0];
             itemDto.fileName = _metadataNet.fileName;

iOSClient/PeekPop/CCPeekPop.h

@@ -26,13 +26,15 @@
 #import "CCMetadata.h"
 #import "OCNetworking.h"
 
+@class tableMetadata;
+
 @protocol CCPeekPopDelegate;
 
 @interface CCPeekPop : UIViewController <OCNetworkingDelegate>
 
 @property (nonatomic, weak) id <CCPeekPopDelegate> delegate;
 
-@property (nonatomic, weak) CCMetadata *metadata;
+@property (nonatomic, strong) tableMetadata *metadata;
 
 @property (nonatomic, weak) IBOutlet UIImageView *imagePreview;
 

iOSClient/PeekPop/CCPeekPop.m

@@ -25,14 +25,16 @@
 
 #import "AppDelegate.h"
 #import "CCGraphics.h"
+#import "NCBridgeSwift.h"
 
 @interface CCPeekPop ()
 
+
 @end
 
 @implementation CCPeekPop
 
-- (void)setMetadata:(CCMetadata *)newMetadata
+- (void)setMetadata:(tableMetadata *)newMetadata
 {
     if (_metadata != newMetadata)
         _metadata = newMetadata;
@@ -102,7 +104,7 @@
     [self dismissViewControllerAnimated:YES completion:nil];
 }
 
-- (void)downloadThumbnail:(CCMetadata *)metadata
+- (void)downloadThumbnail:(tableMetadata *)metadata
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.h

@@ -40,6 +40,8 @@
 #import "CCHud.h"
 #import "OCNetworking.h"
 
+@class tableMetadata;
+
 @interface CCPhotosCameraUpload : UICollectionViewController <UICollectionViewDataSource, UICollectionViewDelegate, UIActionSheetDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate, CCManageLocationDelegate, PHPhotoLibraryChangeObserver, OCNetworkingDelegate>
 
 @property (nonatomic, weak) CCDetail *detailViewController;
@@ -47,7 +49,7 @@
 
 - (BOOL)checkIfLocationIsEnabled;
 
-- (void)downloadFileSuccess:(CCMetadata *)metadata;
+- (void)downloadFileSuccess:(tableMetadata *)metadata;
 - (void)downloadFileFailure:(NSInteger)errorCode;
 
 - (void)reloadDatasourceForced;

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -27,7 +27,7 @@
 
 @interface CCPhotosCameraUpload () <CCActionsDeleteDelegate, CCActionsDownloadThumbnailDelegate>
 {
-    CCMetadata *_metadata;
+    tableMetadata *_metadata;
 
     BOOL _cellEditing;
     NSMutableArray *_queueMetadatas;
@@ -172,7 +172,7 @@
     [self collectionSelect:YES];
 }
 
-- (void)cellSelect:(BOOL)select indexPath:(NSIndexPath *)indexPath metadata:(CCMetadata *)metadata
+- (void)cellSelect:(BOOL)select indexPath:(NSIndexPath *)indexPath metadata:(tableMetadata *)metadata
 {
     UICollectionViewCell *cell = [self.collectionView cellForItemAtIndexPath:indexPath];
     UIVisualEffectView *effect = [cell viewWithTag:200];
@@ -310,7 +310,7 @@
 {
     NSMutableArray *dataToShare = [[NSMutableArray alloc] init];
     
-    for (CCMetadata *metadata in _selectedMetadatas) {
+    for (tableMetadata *metadata in _selectedMetadatas) {
     
         NSString *fileNamePath = [NSTemporaryDirectory() stringByAppendingString:metadata.fileNamePrint];
         
@@ -375,7 +375,7 @@
     [app messageNotification:@"_download_selected_files_" description:@"_error_download_photobrowser_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
 }
 
-- (void)downloadFileSuccess:(CCMetadata *)metadata
+- (void)downloadFileSuccess:(tableMetadata *)metadata
 {
     NSIndexPath *indexPath;
     BOOL existsIcon = NO;
@@ -440,7 +440,7 @@
     }
 }
 
-- (void)deleteFileOrFolder:(CCMetadata *)metadata numFile:(NSInteger)numFile ofFile:(NSInteger)ofFile
+- (void)deleteFileOrFolder:(tableMetadata *)metadata numFile:(NSInteger)numFile ofFile:(NSInteger)ofFile
 {
     
     if (metadata.cryptated) {
@@ -623,7 +623,7 @@
 
     NSArray *metadatasForKey = [_sectionDataSource.sectionArrayRow objectForKey:[_sectionDataSource.sections objectAtIndex:indexPath.section]];
     NSString *fileID = [metadatasForKey objectAtIndex:indexPath.row];
-    CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+    tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
     
     // Image
     if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@.ico", app.directoryUser, metadata.fileID]]) {
@@ -735,7 +735,7 @@
     
     NSMutableArray *allRecordsDataSourceImagesVideos = [[NSMutableArray alloc] init];
     for (NSString *fileID in _sectionDataSource.allFileID) {
-        CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+        tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
             [allRecordsDataSourceImagesVideos addObject:metadata];
     }

iOSClient/Security/CCCrypto.h

@@ -30,6 +30,8 @@
 #import "CCMetadata.h"
 #import "CCUtility.h"
 
+@class tableMetadata;
+
 @interface CCCrypto : NSObject
 
 + (id)sharedManager;
@@ -46,7 +48,7 @@
 
 - (BOOL)updateTitleFilePlist:(NSString *)fileName title:(NSString *)title directoryUser:(NSString *)directoryUser;
 
-- (NSString *)createFileDirectoryPlist:(CCMetadata *)metadata;
+- (NSString *)createFileDirectoryPlist:(tableMetadata *)metadata;
 
 - (BOOL)createTemplatesPlist:(NSString *)nameFile title:(NSString *)title uuid:(NSString *)uuid icon:(NSString *)icon model:(NSString *)model dictionary:(NSMutableDictionary*)dictionary;
 

iOSClient/Security/CCCrypto.m

@@ -22,6 +22,7 @@
 //
 
 #import "CCCrypto.h"
+#import "NCBridgeSwift.h"
 
 @implementation CCCrypto
 
@@ -151,7 +152,7 @@
     return NO;
 }
 
-- (NSString *)createFileDirectoryPlist:(CCMetadata *)metadata
+- (NSString *)createFileDirectoryPlist:(tableMetadata *)metadata
 {
     NSMutableDictionary *data;
     

iOSClient/Share/CCShareInfoCMOC.h

@@ -27,11 +27,13 @@
 #import "UtilsFramework.h"
 #import "CCMetadata.h"
 
+@class tableMetadata;
+
 @interface CCShareInfoCMOC : XLFormViewController
 
 @property (nonatomic, weak) IBOutlet UIButton *endButton;
 
-@property (nonatomic, strong) CCMetadata *metadata;
+@property (nonatomic, strong) tableMetadata *metadata;
 
 - (IBAction)endButtonAction:(id)sender;
 

iOSClient/Share/CCShareOC.h

@@ -28,6 +28,8 @@
 #import "CCSharePermissionOC.h"
 #import "CCMetadata.h"
 
+@class tableMetadata;
+
 @protocol CCShareOCDelegate;
 
 @interface CCShareOC : XLFormViewController <CCShareUserOCDelegate, CCSharePermissionOCDelegate>
@@ -41,7 +43,7 @@
 @property (nonatomic, strong) NSString *serverUrl;
 @property (nonatomic, strong) NSString *shareLink;
 @property (nonatomic, strong) NSString *shareUserAndGroup;
-@property (nonatomic, strong) CCMetadata *metadata;
+@property (nonatomic, strong) tableMetadata *metadata;
 
 @property (nonatomic, strong) OCSharedDto *itemShareLink;
 @property (nonatomic, strong) NSArray *itemsUserAndGroupLink;
@@ -58,12 +60,12 @@
 
 @protocol CCShareOCDelegate
 
-- (void)share:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password;
-- (void)unShare:(NSString *)share metadata:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl;
-- (void)updateShare:(NSString *)share metadata:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password expirationTime:(NSString *)expirationTime permission:(NSInteger)permission;
+- (void)share:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password;
+- (void)unShare:(NSString *)share metadata:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl;
+- (void)updateShare:(NSString *)share metadata:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password expirationTime:(NSString *)expirationTime permission:(NSInteger)permission;
 
 - (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID selector:(NSString *)selector;
 - (void)getUserAndGroup:(NSString *)find;
-- (void)shareUserAndGroup:(NSString *)user shareeType:(NSInteger)shareeType permission:(NSInteger)permission metadata:(CCMetadata *)metadata directoryID:(NSString *)directoryID serverUrl:(NSString *)serverUrl;
+- (void)shareUserAndGroup:(NSString *)user shareeType:(NSInteger)shareeType permission:(NSInteger)permission metadata:(tableMetadata *)metadata directoryID:(NSString *)directoryID serverUrl:(NSString *)serverUrl;
 
 @end

iOSClient/Share/CCShareOC.m

@@ -471,7 +471,7 @@
     [self.delegate shareUserAndGroup:user shareeType:shareeType permission:permission metadata:self.metadata directoryID:self.metadata.directoryID serverUrl:self.serverUrl];
 }
 
-- (void)updateShare:(NSString *)share metadata:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password expirationTime:(NSString *)expirationTime permission:(NSInteger)permission
+- (void)updateShare:(NSString *)share metadata:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password expirationTime:(NSString *)expirationTime permission:(NSInteger)permission
 {
     [self.delegate updateShare:share metadata:metadata serverUrl:serverUrl password:password expirationTime:expirationTime permission:permission];
 }

iOSClient/Share/CCSharePermissionOC.h

@@ -28,6 +28,8 @@
 #import "UtilsFramework.h"
 #import "CCMetadata.h"
 
+@class tableMetadata;
+
 @protocol CCSharePermissionOCDelegate;
 
 @interface CCSharePermissionOC : XLFormViewController
@@ -36,7 +38,7 @@
 
 @property (nonatomic, weak) IBOutlet UIButton *endButton;
 @property (nonatomic, strong) NSString *idRemoteShared;
-@property (nonatomic, strong) CCMetadata *metadata;
+@property (nonatomic, strong) tableMetadata *metadata;
 @property (nonatomic, strong) NSString *serverUrl;
 
 - (IBAction)endButtonAction:(id)sender;
@@ -45,6 +47,6 @@
 
 @protocol CCSharePermissionOCDelegate
 
-- (void)updateShare:(NSString *)share metadata:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password expirationTime:(NSString *)expirationTime permission:(NSInteger)permission;
+- (void)updateShare:(NSString *)share metadata:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password expirationTime:(NSString *)expirationTime permission:(NSInteger)permission;
 
 @end

iOSClient/Transfers/CCTransfers.m

@@ -187,7 +187,7 @@
     if (indexPath) {
         
         NSString *fileID = [[_sectionDataSource.sectionArrayRow objectForKey:[_sectionDataSource.sections objectAtIndex:indexPath.section]] objectAtIndex:indexPath.row];
-        CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+        tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
         
         if (metadata)
             [app.activeMain reloadTaskButton:metadata];
@@ -201,7 +201,7 @@
     
     for (NSString *key in _sectionDataSource.allRecordsDataSource.allKeys) {
         
-        CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:key];
+        tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:key];
         
         if ([metadata.session containsString:@"download"] && (metadata.sessionTaskIdentifierPlist != k_taskIdentifierDone))
             continue;
@@ -225,7 +225,7 @@
     if (indexPath) {
         
         NSString *fileID = [[_sectionDataSource.sectionArrayRow objectForKey:[_sectionDataSource.sections objectAtIndex:indexPath.section]] objectAtIndex:indexPath.row];
-        CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+        tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
         
         if (metadata)
             [app.activeMain cancelTaskButton:metadata reloadTable:YES];
@@ -244,7 +244,7 @@
         if ([key isEqualToString:[_sectionDataSource.allRecordsDataSource.allKeys lastObject]])
             lastAndRefresh = YES;
         
-        CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:key];
+        tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:key];
         
         if ([metadata.session containsString:@"upload"] && metadata.cryptated && ((metadata.sessionTaskIdentifier == k_taskIdentifierDone && metadata.sessionTaskIdentifierPlist >= 0) || (metadata.sessionTaskIdentifier >= 0 && metadata.sessionTaskIdentifierPlist == k_taskIdentifierDone)))
             continue;
@@ -265,7 +265,7 @@
     if (indexPath) {
         
         NSString *fileID = [[_sectionDataSource.sectionArrayRow objectForKey:[_sectionDataSource.sections objectAtIndex:indexPath.section]] objectAtIndex:indexPath.row];
-        CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+        tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
         
         if (metadata)
             [app.activeMain stopTaskButton:metadata];
@@ -279,7 +279,7 @@
     
     for (NSString *key in _sectionDataSource.allRecordsDataSource.allKeys) {
         
-        CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:key];
+        tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:key];
         
         if ([metadata.session containsString:@"download"]) {
             [app.activeMain cancelTaskButton:metadata reloadTable:YES];
@@ -526,7 +526,7 @@
     NSString *lunghezzaFile;
     
     NSString *fileID = [[_sectionDataSource.sectionArrayRow objectForKey:[_sectionDataSource.sections objectAtIndex:indexPath.section]] objectAtIndex:indexPath.row];
-    CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+    tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
     
     CCTransfersCell *cell = (CCTransfersCell *)[tableView dequeueReusableCellWithIdentifier:@"Cell" forIndexPath:indexPath];
     cell.backgroundColor = [UIColor clearColor];

iOSClient/Utility/CCExifGeo.h

@@ -29,9 +29,11 @@
 #import "CCMetadata.h"
 #import "CCCoreData.h"
 
+@class tableMetadata;
+
 @interface CCExifGeo : NSObject
 
-+ (void)setExifLocalTableFileID:(CCMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount;
++ (void)setExifLocalTableFileID:(tableMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount;
 
 + (void)setGeocoderFileID:(NSString *)fileID exifDate:(NSDate *)exifDate latitude:(NSString*)latitude longitude:(NSString*)longitude;
 

iOSClient/Utility/CCExifGeo.m

@@ -26,7 +26,7 @@
 
 @implementation CCExifGeo
 
-+ (void)setExifLocalTableFileID:(CCMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount
++ (void)setExifLocalTableFileID:(tableMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount
 {
     NSString *stringLatitude;
     NSString *stringLongitude;

iOSClient/Utility/CCUtility.h

@@ -34,6 +34,8 @@
 #import "CCCrypto.h"
 #import "CCGlobal.h"
 
+@class tableMetadata;
+
 @interface CCUtility : NSObject
 
 // ===== KeyChainStore =====
@@ -165,11 +167,11 @@
 
 // ===== CCMetadata =====
 
-+ (CCMetadata *)trasformedOCFileToCCMetadata:(OCFileDto *)itemDto fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath activeAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser;
++ (tableMetadata *)trasformedOCFileToCCMetadata:(OCFileDto *)itemDto fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath activeAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser;
 
-+ (void)insertTypeFileIconName:(CCMetadata *)metadata directory:(NSString *)directory cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath;
-+ (void)insertInformationPlist:(CCMetadata *)metadata directoryUser:(NSString *)directoryUser;
-+ (CCMetadata *)insertFileSystemInMetadata:(NSString *)fileName directory:(NSString *)directory activeAccount:(NSString *)activeAccount cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath;
++ (void)insertTypeFileIconName:(tableMetadata *)metadata directory:(NSString *)directory cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath;
++ (void)insertInformationPlist:(tableMetadata *)metadata directoryUser:(NSString *)directoryUser;
++ (tableMetadata *)insertFileSystemInMetadata:(NSString *)fileName directory:(NSString *)directory activeAccount:(NSString *)activeAccount cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath;
 
 + (NSString *)trasformedFileNamePlistInCrypto:(NSString *)fileName;
 + (NSString *)trasformedFileNameCryptoInPlist:(NSString *)fileName;

iOSClient/Utility/CCUtility.m

@@ -776,9 +776,9 @@
 #pragma mark ===== CCMetadata =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (CCMetadata *)trasformedOCFileToCCMetadata:(OCFileDto *)itemDto fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath activeAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser
++ (tableMetadata *)trasformedOCFileToCCMetadata:(OCFileDto *)itemDto fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath activeAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser
 {
-    CCMetadata *metadata = [CCMetadata new];
+    tableMetadata *metadata = [tableMetadata new];
     
     metadata.account = activeAccount;
     metadata.cryptated = NO;
@@ -795,7 +795,7 @@
     metadata.model = @"";
     metadata.nameCurrentDevice = [CCUtility getNameCurrentDevice];
     metadata.permissions = itemDto.permissions;
-    metadata.protocol = @"";
+    metadata.protocolCrypto = @"";
     metadata.rev = itemDto.etag;
     metadata.size = itemDto.size;
     metadata.sessionTaskIdentifier = k_taskIdentifierDone;
@@ -829,7 +829,7 @@
     return metadata;
 }
 
-+ (void)insertTypeFileIconName:(CCMetadata *)metadata directory:(NSString *)directory cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath
++ (void)insertTypeFileIconName:(tableMetadata *)metadata directory:(NSString *)directory cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath
 {
     if ([metadata.type isEqualToString: k_metadataType_template]) {
         
@@ -933,7 +933,7 @@
     }
 }
 
-+ (void)insertInformationPlist:(CCMetadata *)metadata directoryUser:(NSString *)directoryUser
++ (void)insertInformationPlist:(tableMetadata *)metadata directoryUser:(NSString *)directoryUser
 {
     NSString *fileNamePlist, *temp, *passcode;
     NSError *error;
@@ -966,7 +966,7 @@
     metadata.iconName = [data objectForKey:@"icon"];
     metadata.model = [data objectForKey:@"model"];
     metadata.nameCurrentDevice = [data objectForKey:@"namecurrentdevice"];
-    metadata.protocol = [data objectForKey:@"protocol"];
+    metadata.protocolCrypto = [data objectForKey:@"protocol"];
     metadata.size = (long) [len longLongValue];
     if ([data objectForKey:@"image"] == nil)
         metadata.thumbnailExists = NO;
@@ -1023,9 +1023,9 @@
     }
 }
 
-+ (CCMetadata *)insertFileSystemInMetadata:(NSString *)fileName directory:(NSString *)directory activeAccount:(NSString *)activeAccount cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath
++ (tableMetadata *)insertFileSystemInMetadata:(NSString *)fileName directory:(NSString *)directory activeAccount:(NSString *)activeAccount cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath
 {
-    CCMetadata *metadata = [[CCMetadata alloc] init];
+    tableMetadata *metadata = [[tableMetadata alloc] init];
     
     NSString *fileNamePath = [NSString stringWithFormat:@"%@/%@", directory, fileName];
     
@@ -1045,7 +1045,7 @@
     metadata.fileNameData = fileName;
     metadata.fileNamePrint = fileName;
     metadata.nameCurrentDevice = [CCUtility getNameCurrentDevice];
-    metadata.protocol = k_versionProtocolPlist;
+    metadata.protocolCrypto = k_versionProtocolPlist;
     metadata.size = [attributes[NSFileSize] longValue];
     metadata.thumbnailExists = false;
     metadata.type = k_metadataType_local;