Improvements code swift

Picker/DocumentPickerViewController.swift

@@ -467,7 +467,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             
             if metadata != nil {
                 if metadata!.type == k_metadataType_template {
-                    NCManageDatabase.sharedInstance.setLocalFile(fileID: metadata!.fileID, date: metadata!.date, exifDate: nil, exifLatitude: nil, exifLongitude: nil, fileName: nil, fileNamePrint: metadata!.fileNamePrint)
+                    NCManageDatabase.sharedInstance.setLocalFile(fileID: metadata!.fileID, dateOptional: metadata!.date, exifDateOptional: nil, exifLatitudeOptional: nil, exifLongitudeOptional: nil, fileNameOptional: nil, fileNamePrintOptional: metadata!.fileNamePrint)
                 }
             }
             tableView.reloadData()

iOSClient/Actions/CCActions.swift

@@ -297,7 +297,7 @@ class CCActions: NSObject {
             
         } else {
             
-            NCManageDatabase.sharedInstance.setLocalFile(fileID: metadataNet.fileID, date: nil, exifDate: nil, exifLatitude: nil, exifLongitude: nil, fileName: metadataNet.fileNameTo, fileNamePrint:  metadataNet.fileNameTo)            
+            NCManageDatabase.sharedInstance.setLocalFile(fileID: metadataNet.fileID, dateOptional: nil, exifDateOptional: nil, exifLatitudeOptional: nil, exifLongitudeOptional: nil, fileNameOptional: metadataNet.fileNameTo, fileNamePrintOptional:  metadataNet.fileNameTo)            
         }
         
         metadataNet.delegate?.renameSuccess(metadataNet)

iOSClient/AppDelegate.m

@@ -951,7 +951,7 @@
     NSInteger queueUpload = [self getNumberUploadInQueues] + [self getNumberUploadInQueuesWWan];
     
     // Total
-    NSInteger total = queueDownload + queueUpload + [[NCManageDatabase sharedInstance] countQueueUploadWithSession:nil];
+    NSInteger total = queueDownload + queueUpload + [[NCManageDatabase sharedInstance] countQueueUploadWithSessionOptional:nil];
     
     [UIApplication sharedApplication].applicationIconBadgeNumber = total;
     
@@ -1458,7 +1458,7 @@
     
     if ([[_listChangeTask objectForKey:fileID] isEqualToString:@"stopUpload"]) {
         
-        [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionError:@"" sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:k_taskIdentifierStop sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
+        [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionErrorOptional:@"" sessionSelectorOptional:nil sessionSelectorPostOptional:nil sessionTaskIdentifier:k_taskIdentifierStop sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
         
     }
     else if ([[_listChangeTask objectForKey:fileID] isEqualToString:@"reloadUpload"]) {
@@ -1491,7 +1491,7 @@
     }
     else if ([[_listChangeTask objectForKey:fileID] isEqualToString:@"cancelDownload"]) {
         
-        [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:k_taskIdentifierDone sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
+        [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionErrorOptional:@"" sessionSelectorOptional:@"" sessionSelectorPostOptional:@"" sessionTaskIdentifier:k_taskIdentifierDone sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
     }
     
     // remove ChangeTask (fileID) from the list

iOSClient/Database/NCManageDatabase.swift

@@ -327,23 +327,23 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func setAccountAutoUploadFileName(_ fileName: String?) {
+    func setAccountAutoUploadFileName(_ fileNameOptional: String?) {
         
         let realm = try! Realm()
         
-        var fileName : String? = fileName
-        
-        if fileName == nil {
-            fileName = self.getAccountAutoUploadFileName()
-        }
-        
         do {
             try realm.write {
                 
-                let result = realm.objects(tableAccount.self).filter("active = true").first
-                
-                if result != nil {
-                    result?.autoUploadFileName = fileName!
+                if let result = realm.objects(tableAccount.self).filter("active = true").first {
+                    
+                    if let fileName = fileNameOptional {
+                        
+                        result.autoUploadFileName = fileName
+                        
+                    } else {
+                        
+                        result.autoUploadFileName = self.getAccountAutoUploadFileName()
+                    }
                 }
             }
         } catch let error {
@@ -351,23 +351,23 @@ class NCManageDatabase: NSObject {
         }
     }
 
-    func setAccountAutoUploadDirectory(_ serverUrl: String?, activeUrl: String) {
+    func setAccountAutoUploadDirectory(_ serverUrlOptional: String?, activeUrl: String) {
         
         let realm = try! Realm()
         
-        var serverUrl : String? = serverUrl
-        
-        if serverUrl == nil {
-            serverUrl = self.getAccountAutoUploadDirectory(activeUrl)
-        }
-        
         do {
             try realm.write {
                 
-                let result = realm.objects(tableAccount.self).filter("active = true").first
-
-                if result != nil {
-                    result?.autoUploadDirectory = serverUrl!
+                if let result = realm.objects(tableAccount.self).filter("active = true").first {
+                    
+                    if let serverUrl = serverUrlOptional {
+                        
+                        result.autoUploadDirectory = serverUrl
+                        
+                    } else {
+                        
+                        result.autoUploadDirectory = self.getAccountAutoUploadDirectory(activeUrl)
+                    }
                 }
             }
         } catch let error {
@@ -993,13 +993,11 @@ class NCManageDatabase: NSObject {
         
         let realm = try! Realm()
         
-        let result = realm.objects(tableGPS.self).filter("latitude = %@ AND longitude = %@", latitude, longitude).first
-        
-        if result == nil {
+        guard let result = realm.objects(tableGPS.self).filter("latitude = %@ AND longitude = %@", latitude, longitude).first else {
             return nil
-        } else {
-            return result!.location
         }
+        
+        return result.location
     }
 
     //MARK: -
@@ -1056,7 +1054,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func setLocalFile(fileID: String, date: NSDate?, exifDate: NSDate?, exifLatitude: String?, exifLongitude: String?, fileName: String?, fileNamePrint: String?) {
+    func setLocalFile(fileID: String, dateOptional: NSDate?, exifDateOptional: NSDate?, exifLatitudeOptional: String?, exifLongitudeOptional: String?, fileNameOptional: String?, fileNamePrintOptional: String?) {
         
         guard self.getAccountActive() != nil else {
             return
@@ -1067,28 +1065,27 @@ class NCManageDatabase: NSObject {
         do {
             try realm.write {
                 
-                let result = realm.objects(tableLocalFile.self).filter("fileID = %@", fileID).first
-
-                if result != nil {
+                guard let result = realm.objects(tableLocalFile.self).filter("fileID = %@", fileID).first else {
+                    return
+                }
                 
-                    if date != nil {
-                        result?.date = date!
-                    }
-                    if exifDate != nil {
-                        result?.exifDate = exifDate!
-                    }
-                    if exifLatitude != nil {
-                        result?.exifLatitude = exifLatitude!
-                    }
-                    if exifLongitude != nil {
-                        result?.exifLongitude = exifLongitude!
-                    }
-                    if fileName != nil {
-                        result?.fileName = fileName!
-                    }
-                    if fileNamePrint != nil {
-                        result?.fileNamePrint = fileNamePrint!
-                    }
+                if let date = dateOptional {
+                    result.date = date
+                }
+                if let exifDate = exifDateOptional {
+                    result.exifDate = exifDate
+                }
+                if let exifLatitude = exifLatitudeOptional {
+                    result.exifLatitude = exifLatitude
+                }
+                if let exifLongitude = exifLongitudeOptional {
+                    result.exifLongitude = exifLongitude
+                }
+                if let fileName = fileNameOptional {
+                    result.fileName = fileName
+                }
+                if let fileNamePrint = fileNamePrintOptional {
+                    result.fileNamePrint = fileNamePrint
                 }
             }
         } catch let error {
@@ -1104,13 +1101,11 @@ class NCManageDatabase: NSObject {
         
         let realm = try! Realm()
         
-        let result = realm.objects(tableLocalFile.self).filter(predicate).first
-        
-        if result != nil {
-            return tableLocalFile.init(value: result!)
-        } else {
+        guard let result = realm.objects(tableLocalFile.self).filter(predicate).first else {
             return nil
         }
+
+        return tableLocalFile.init(value: result)
     }
 
     //MARK: -
@@ -1243,7 +1238,7 @@ class NCManageDatabase: NSObject {
         return tableMetadata.init(value: metadata)
     }
     
-    func setMetadataSession(_ session: String?, sessionError: String?, sessionSelector: String?, sessionSelectorPost: String?, sessionTaskIdentifier: Int, sessionTaskIdentifierPlist: Int, predicate: NSPredicate) {
+    func setMetadataSession(_ sessionOptional: String?, sessionErrorOptional: String?, sessionSelectorOptional: String?, sessionSelectorPostOptional: String?, sessionTaskIdentifier: Int, sessionTaskIdentifierPlist: Int, predicate: NSPredicate) {
         
         guard self.getAccountActive() != nil else {
             return
@@ -1260,17 +1255,17 @@ class NCManageDatabase: NSObject {
             return
         }
         
-        if session != nil {
-            result.session = session!
+        if let session = sessionOptional {
+            result.session = session
         }
-        if sessionError != nil {
-            result.sessionError = sessionError!
+        if let sessionError = sessionErrorOptional {
+            result.sessionError = sessionError
         }
-        if sessionSelector != nil {
-            result.sessionSelector = sessionSelector!
+        if let sessionSelector = sessionSelectorOptional {
+            result.sessionSelector = sessionSelector
         }
-        if sessionSelectorPost != nil {
-            result.sessionSelectorPost = sessionSelectorPost!
+        if let sessionSelectorPost = sessionSelectorPostOptional {
+            result.sessionSelectorPost = sessionSelectorPost
         }
         if sessionTaskIdentifier != Int(k_taskIdentifierNULL) {
             result.sessionTaskIdentifier = sessionTaskIdentifier
@@ -1365,13 +1360,11 @@ class NCManageDatabase: NSObject {
         
         let realm = try! Realm()
         
-        let result = realm.objects(tableMetadata.self).filter(predicate).first
-        
-        if result != nil {
-            return tableMetadata.init(value: result!)
-        } else {
+        guard let result = realm.objects(tableMetadata.self).filter(predicate).first else {
             return nil
         }
+        
+        return tableMetadata.init(value: result)
     }
     
     func getMetadatas(predicate: NSPredicate, sortedOptional: String?, ascending: Bool) -> [tableMetadata]? {
@@ -1760,10 +1753,8 @@ class NCManageDatabase: NSObject {
         do {
             try realm.write {
                 
-                let result = realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND selector = %@", tableAccount.account, assetLocalIdentifier, selector).first
-                
-                if result != nil {
-                    realm.delete(result!)
+                if let result = realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND selector = %@", tableAccount.account, assetLocalIdentifier, selector).first {
+                    realm.delete(result)
                 }
             }
         } catch let error {
@@ -1771,7 +1762,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func countQueueUpload(session: String?) -> Int {
+    func countQueueUpload(sessionOptional: String?) -> Int {
         
         guard let tableAccount = self.getAccountActive() else {
             return 0
@@ -1780,13 +1771,10 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
         let results : Results<tableQueueUpload>
         
-        if (session == nil) {
-            
-            results = realm.objects(tableQueueUpload.self).filter("account = %@", tableAccount.account)
-            
+        if let session = sessionOptional {
+            results = realm.objects(tableQueueUpload.self).filter("account = %@ AND session = %@", tableAccount.account, session)
         } else {
-            
-            results = realm.objects(tableQueueUpload.self).filter("account = %@ AND session = %@", tableAccount.account, session!)
+            results = realm.objects(tableQueueUpload.self).filter("account = %@", tableAccount.account)
         }
         
         return results.count

iOSClient/Main/CCMain.m

@@ -1479,7 +1479,7 @@
         
         // se è un template aggiorniamo anche nel FileSystem
         if ([metadata.type isEqualToString: k_metadataType_template]) {
-            [[NCManageDatabase sharedInstance] setLocalFileWithFileID:metadata.fileID date:metadata.date exifDate:nil exifLatitude:nil exifLongitude:nil fileName:nil fileNamePrint:metadata.fileNamePrint];
+            [[NCManageDatabase sharedInstance] setLocalFileWithFileID:metadata.fileID dateOptional:metadata.date exifDateOptional:nil exifLatitudeOptional:nil exifLongitudeOptional:nil fileNameOptional:nil fileNamePrintOptional:metadata.fileNamePrint];
         }
         
         [self openModel:metadata.model isNew:false];
@@ -3338,7 +3338,7 @@
     if ([NCBrandOptions sharedInstance].disable_multiaccount)
         return;
     
-    if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [[NCManageDatabase sharedInstance] countQueueUploadWithSession:nil] > 0) {
+    if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [[NCManageDatabase sharedInstance] countQueueUploadWithSessionOptional:nil] > 0) {
         
         [app messageNotification:@"_transfers_in_queue_" description:nil visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo errorCode:0];
         return;

iOSClient/Move/CCMove.m

@@ -283,7 +283,7 @@
         
         // se è un template aggiorniamo anche nel FileSystem
         if ([metadata.type isEqualToString: k_metadataType_template]) {
-            [[NCManageDatabase sharedInstance] setLocalFileWithFileID:metadata.fileID date:metadata.date exifDate:nil exifLatitude:nil exifLongitude:nil fileName:nil fileNamePrint:metadata.fileNamePrint];
+            [[NCManageDatabase sharedInstance] setLocalFileWithFileID:metadata.fileID dateOptional:metadata.date exifDateOptional:nil exifLatitudeOptional:nil exifLongitudeOptional:nil fileNameOptional:nil fileNamePrintOptional:metadata.fileNamePrint];
         }
 
         [self.tableView reloadData];

iOSClient/Networking/CCNetworking.m

@@ -316,7 +316,7 @@
         
         if (download && taskStatus == k_taskStatusCancel) {
         
-            [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:k_taskIdentifierDone sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"account = %@ AND session CONTAINS 'download'", _activeAccount]];
+            [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionErrorOptional:@"" sessionSelectorOptional:@"" sessionSelectorPostOptional:@"" sessionTaskIdentifier:k_taskIdentifierDone sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"account = %@ AND session CONTAINS 'download'", _activeAccount]];
         }
     
         if (upload && taskStatus == k_taskStatusCancel) {
@@ -542,7 +542,7 @@
         
         if (localfile != nil && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadata.fileID]]) {
             
-            [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:k_taskIdentifierDone sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
+            [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionErrorOptional:@"" sessionSelectorOptional:@"" sessionSelectorPostOptional:@"" sessionTaskIdentifier:k_taskIdentifierDone sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
             
             dispatch_async(dispatch_get_main_queue(), ^{
                 if ([[self getDelegate:metadata.fileID] respondsToSelector:@selector(downloadFileSuccess:serverUrl:selector:selectorPost:)])
@@ -552,7 +552,7 @@
             return;
         }
         
-        [[NCManageDatabase sharedInstance] setMetadataSession:session sessionError:@"" sessionSelector:selector sessionSelectorPost:selectorPost sessionTaskIdentifier:k_taskIdentifierNULL sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"fileID = %@",metadata.fileID]];
+        [[NCManageDatabase sharedInstance] setMetadataSession:session sessionErrorOptional:@"" sessionSelectorOptional:selector sessionSelectorPostOptional:selectorPost sessionTaskIdentifier:k_taskIdentifierNULL sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"fileID = %@",metadata.fileID]];
         
         [self downloaURLSession:metadata.fileNameData fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl fileID:metadata.fileID session:session taskStatus:taskStatus selector:selector];
     }
@@ -572,7 +572,7 @@
             return;
         }
         
-        [[NCManageDatabase sharedInstance] setMetadataSession:session sessionError:@"" sessionSelector:selector sessionSelectorPost:selectorPost sessionTaskIdentifier:k_taskIdentifierNULL sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"fileID = %@",metadata.fileID]];
+        [[NCManageDatabase sharedInstance] setMetadataSession:session sessionErrorOptional:@"" sessionSelectorOptional:selector sessionSelectorPostOptional:selectorPost sessionTaskIdentifier:k_taskIdentifierNULL sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"fileID = %@",metadata.fileID]];
         
         [self downloaURLSession:metadata.fileName fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl fileID:metadata.fileID session:session taskStatus:taskStatus selector:selector];
     }
@@ -607,7 +607,7 @@
         if ([CCUtility isFileNotCryptated:fileName] || [CCUtility isCryptoString:fileName]) sessionTaskIdentifier = k_taskIdentifierError;
         if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = k_taskIdentifierError;
         
-        [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @k_CCErrorTaskNil] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
+        [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionErrorOptional:[NSString stringWithFormat:@"%@", @k_CCErrorTaskNil] sessionSelectorOptional:nil sessionSelectorPostOptional:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
         
         NSLog(@"[LOG] downloadFileSession TaskIdentifier [error CCErrorTaskNil] - %@ - %@", fileName, fileNamePrint);
         
@@ -619,7 +619,7 @@
         if ([CCUtility isCryptoString:fileName] || [CCUtility isFileNotCryptated:fileName]) sessionTaskIdentifier = downloadTask.taskIdentifier;
         if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = downloadTask.taskIdentifier;
         
-        [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionError:nil sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
+        [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionErrorOptional:nil sessionSelectorOptional:nil sessionSelectorPostOptional:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
         
         // Manage uploadTask cancel,suspend,resume
         if (taskStatus == k_taskStatusCancel) [downloadTask cancel];
@@ -726,11 +726,11 @@
             
             if ([CCUtility isCryptoPlistString:fileName]) {
             
-                [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:k_taskIdentifierDone sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
+                [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionErrorOptional:@"" sessionSelectorOptional:@"" sessionSelectorPostOptional:@"" sessionTaskIdentifier:k_taskIdentifierDone sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
             
             } else {
             
-                [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @(errorCode)] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:k_taskIdentifierError sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
+                [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionErrorOptional:[NSString stringWithFormat:@"%@", @(errorCode)] sessionSelectorOptional:nil sessionSelectorPostOptional:nil sessionTaskIdentifier:k_taskIdentifierError sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
             }
         }
         
@@ -784,7 +784,7 @@
             
         } else {
             
-            [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionError:nil sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
+            [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionErrorOptional:nil sessionSelectorOptional:nil sessionSelectorPostOptional:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
         }
         
         // DATA
@@ -1237,7 +1237,7 @@
         
         NSLog(@"[LOG] Re-upload File : %@ - fileID : %@", metadata.fileNamePrint, metadata.fileID);
         
-        [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionError:@"" sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:k_taskIdentifierNULL sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"sessionID = %@ AND account = %@", metadata.sessionID, _activeAccount]];
+        [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionErrorOptional:@"" sessionSelectorOptional:nil sessionSelectorPostOptional:nil sessionTaskIdentifier:k_taskIdentifierNULL sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"sessionID = %@ AND account = %@", metadata.sessionID, _activeAccount]];
         
     } else {
         
@@ -1317,7 +1317,7 @@
         if ([CCUtility isFileNotCryptated:fileName] || [CCUtility isCryptoString:fileName]) sessionTaskIdentifier = k_taskIdentifierError;
         if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = k_taskIdentifierError;
         
-        [[NCManageDatabase sharedInstance] setMetadataSession:session sessionError:[NSString stringWithFormat:@"%@", @k_CCErrorTaskNil] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"sessionID = %@ AND account = %@", sessionID, _activeAccount]];
+        [[NCManageDatabase sharedInstance] setMetadataSession:session sessionErrorOptional:[NSString stringWithFormat:@"%@", @k_CCErrorTaskNil] sessionSelectorOptional:nil sessionSelectorPostOptional:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"sessionID = %@ AND account = %@", sessionID, _activeAccount]];
         
         NSLog(@"[LOG] Upload file TaskIdentifier [error CCErrorTaskNil] - %@ - %@", fileName, fileNamePrint);
         
@@ -1329,7 +1329,7 @@
         if ([CCUtility isCryptoString:fileName] || [CCUtility isFileNotCryptated:fileName]) sessionTaskIdentifier = uploadTask.taskIdentifier;
         if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = uploadTask.taskIdentifier;
         
-        [[NCManageDatabase sharedInstance] setMetadataSession:session sessionError:@"" sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"sessionID = %@ AND account = %@", sessionID, _activeAccount]];
+        [[NCManageDatabase sharedInstance] setMetadataSession:session sessionErrorOptional:@"" sessionSelectorOptional:nil sessionSelectorPostOptional:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"sessionID = %@ AND account = %@", sessionID, _activeAccount]];
         
         // Delete record on Table Auto Upload
         if ([selector isEqualToString:selectorUploadAutoUpload] || [selector isEqualToString:selectorUploadAutoUploadAll])
@@ -1413,7 +1413,7 @@
             if ([CCUtility isFileNotCryptated:fileName] || [CCUtility isCryptoString:fileName]) sessionTaskIdentifier = k_taskIdentifierError;
             if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = k_taskIdentifierError;
         
-            [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @(errorCode)] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"sessionID = %@ AND account = %@", metadata.sessionID, _activeAccount]];
+            [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionErrorOptional:[NSString stringWithFormat:@"%@", @(errorCode)] sessionSelectorOptional:nil sessionSelectorPostOptional:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"sessionID = %@ AND account = %@", metadata.sessionID, _activeAccount]];
         }
         
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -1573,7 +1573,7 @@
                 
                     NSLog(@"[LOG] NOT Find metadata Task [%li] fileID : %@ - filename : %@", (long)metadata.sessionTaskIdentifier, metadata.fileID, metadata.fileNameData);
                 
-                    [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @k_CCErrorTaskDownloadNotFound] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:k_taskIdentifierError sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"fileID = %@ ", metadata.fileID]];
+                    [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionErrorOptional:[NSString stringWithFormat:@"%@", @k_CCErrorTaskDownloadNotFound] sessionSelectorOptional:nil sessionSelectorPostOptional:nil sessionTaskIdentifier:k_taskIdentifierError sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"fileID = %@ ", metadata.fileID]];
                 
                     dispatch_async(dispatch_get_main_queue(), ^{
                         if ([self.delegate respondsToSelector:@selector(reloadDatasource:)])
@@ -1586,7 +1586,7 @@
                 
                     NSLog(@"[LOG] NOT Find metadata TaskPlist [%li] fileID : %@ - filename : %@", (long)metadata.sessionTaskIdentifierPlist, metadata.fileID, metadata.fileName);
                 
-                    [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:k_taskIdentifierNULL sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
+                    [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionErrorOptional:@"" sessionSelectorOptional:@"" sessionSelectorPostOptional:@"" sessionTaskIdentifier:k_taskIdentifierNULL sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
                     
                     dispatch_async(dispatch_get_main_queue(), ^{
                         if ([self.delegate respondsToSelector:@selector(reloadDatasource:)])

iOSClient/Settings/CCManageAccount.m

@@ -351,7 +351,7 @@
 
 - (void)ChangeDefaultAccount:(NSString *)account
 {
-    if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [[NCManageDatabase sharedInstance] countQueueUploadWithSession:nil] > 0) {
+    if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [[NCManageDatabase sharedInstance] countQueueUploadWithSessionOptional:nil] > 0) {
         
         [app messageNotification:@"_transfers_in_queue_" description:nil visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo errorCode:0];
         [self UpdateForm];

iOSClient/Transfers/CCTransfers.m

@@ -353,10 +353,10 @@
     NSString *titleSection, *numberTitle;
     NSInteger typeOfSession = 0;
     
-    NSInteger queueDownload = [app getNumberDownloadInQueues] + [[NCManageDatabase sharedInstance] countQueueUploadWithSession:k_download_session];
-    NSInteger queueDownloadWWan = [app getNumberDownloadInQueuesWWan] + [[NCManageDatabase sharedInstance] countQueueUploadWithSession:k_download_session_wwan];
-    NSInteger queueUpload = [app getNumberUploadInQueues] + [[NCManageDatabase sharedInstance] countQueueUploadWithSession:k_upload_session];
-    NSInteger queueUploadWWan = [app getNumberUploadInQueuesWWan] + [[NCManageDatabase sharedInstance] countQueueUploadWithSession:k_upload_session_wwan];
+    NSInteger queueDownload = [app getNumberDownloadInQueues] + [[NCManageDatabase sharedInstance] countQueueUploadWithSessionOptional:k_download_session];
+    NSInteger queueDownloadWWan = [app getNumberDownloadInQueuesWWan] + [[NCManageDatabase sharedInstance] countQueueUploadWithSessionOptional:k_download_session_wwan];
+    NSInteger queueUpload = [app getNumberUploadInQueues] + [[NCManageDatabase sharedInstance] countQueueUploadWithSessionOptional:k_upload_session];
+    NSInteger queueUploadWWan = [app getNumberUploadInQueuesWWan] + [[NCManageDatabase sharedInstance] countQueueUploadWithSessionOptional:k_upload_session_wwan];
     
     if ([[_sectionDataSource.sections objectAtIndex:section] isKindOfClass:[NSString class]]) titleSection = [_sectionDataSource.sections objectAtIndex:section];
     if ([[_sectionDataSource.sections objectAtIndex:section] isKindOfClass:[NSDate class]]) titleSection = [CCUtility getTitleSectionDate:[_sectionDataSource.sections objectAtIndex:section]];
@@ -438,7 +438,7 @@
     // Footer Download
     if ([titleSection containsString:@"download"] && ![titleSection containsString:@"wwan"] && titleSection != nil) {
         
-        NSInteger queueDownload = [app getNumberDownloadInQueues] + [[NCManageDatabase sharedInstance] countQueueUploadWithSession:k_download_session];
+        NSInteger queueDownload = [app getNumberDownloadInQueues] + [[NCManageDatabase sharedInstance] countQueueUploadWithSessionOptional:k_download_session];
         
         // element or elements ?
         if (queueDownload > 1) element_s = NSLocalizedString(@"_elements_",nil);
@@ -455,7 +455,7 @@
     // Footer Download WWAN
     if ([titleSection containsString:@"download"] && [titleSection containsString:@"wwan"] && titleSection != nil) {
         
-        NSInteger queueDownloadWWan = [app getNumberDownloadInQueuesWWan] + [[NCManageDatabase sharedInstance] countQueueUploadWithSession:k_download_session_wwan];
+        NSInteger queueDownloadWWan = [app getNumberDownloadInQueuesWWan] + [[NCManageDatabase sharedInstance] countQueueUploadWithSessionOptional:k_download_session_wwan];
         
         // element or elements ?
         if (queueDownloadWWan > 1) element_s = NSLocalizedString(@"_elements_",nil);
@@ -476,7 +476,7 @@
     // Footer Upload
     if ([titleSection containsString:@"upload"] && ![titleSection containsString:@"wwan"] && titleSection != nil) {
         
-        NSInteger queueUpload = [app getNumberUploadInQueues] + [[NCManageDatabase sharedInstance] countQueueUploadWithSession:k_upload_session];
+        NSInteger queueUpload = [app getNumberUploadInQueues] + [[NCManageDatabase sharedInstance] countQueueUploadWithSessionOptional:k_upload_session];
         
         // element or elements ?
         if (queueUpload > 1) element_s = NSLocalizedString(@"_elements_",nil);
@@ -493,7 +493,7 @@
     // Footer Upload WWAN
     if ([titleSection containsString:@"upload"] && [titleSection containsString:@"wwan"] && titleSection != nil) {
         
-        NSInteger queueUploadWWan = [app getNumberUploadInQueuesWWan] + [[NCManageDatabase sharedInstance] countQueueUploadWithSession:k_upload_session_wwan];
+        NSInteger queueUploadWWan = [app getNumberUploadInQueuesWWan] + [[NCManageDatabase sharedInstance] countQueueUploadWithSessionOptional:k_upload_session_wwan];
         
         // element or elements ?
         if (queueUploadWWan > 1) element_s = NSLocalizedString(@"_elements_",nil);

iOSClient/Utility/CCExifGeo.m

@@ -112,7 +112,7 @@
 
     // Wite data EXIF in TableLocalFile
     if (tiff || gps)
-        [[NCManageDatabase sharedInstance] setLocalFileWithFileID:metadata.fileID date:nil exifDate:date exifLatitude:stringLatitude exifLongitude:stringLongitude fileName:nil fileNamePrint:nil];
+        [[NCManageDatabase sharedInstance] setLocalFileWithFileID:metadata.fileID dateOptional:nil exifDateOptional:date exifLatitudeOptional:stringLatitude exifLongitudeOptional:stringLongitude fileNameOptional:nil fileNamePrintOptional:nil];
     
     CFRelease(originalSource);
     CFRelease(imageProperties);