replace db

iOSClient/Create/CCCreateCloud.swift

@@ -473,7 +473,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
             
             if (useFolderPhotoRow.value! as AnyObject).boolValue == true {
                 
-                self.serverUrl = NCManageDatabase.sharedInstance.getAccountsCameraUploadFolderName(self.appDelegate.activeAccount, activeUrl: self.appDelegate.activeUrl)
+                self.serverUrl = NCManageDatabase.sharedInstance.getAccountsCameraUploadFolderName(self.appDelegate.activeUrl)
                 
                 //self.serverUrl = CCCoreData.getCameraUploadFolderNamePathActiveAccount(self.appDelegate.activeAccount, activeUrl: self.appDelegate.activeUrl)
                 useSubFolder = (useSubFolderRow.value! as AnyObject).boolValue

iOSClient/FileSystem/CCCoreData.h

@@ -69,7 +69,7 @@
 //+ (NSDate *)getCameraUploadDateVideoActiveAccount:(NSString *)activeAccount;
 //+ (BOOL)getCameraUploadWWanPhotoActiveAccount:(NSString *)activeAccount;
 //+ (BOOL)getCameraUploadWWanVideoActiveAccount:(NSString *)activeAccount;
-
+/*
 + (void)setCameraUpload:(BOOL)state activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadBackground:(BOOL)state activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadCreateSubfolderActiveAccount:(BOOL)state activeAccount:(NSString *)activeAccount;
@@ -83,6 +83,7 @@
 + (void)setCameraUploadWWanVideo:(BOOL)wWan activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadFolderName:(NSString *)fileName activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadFolderPath:(NSString *)pathName activeUrl:(NSString *)activeUrl activeAccount:(NSString *)activeAccount;
+*/ 
 //+ (void)setCameraUploadSaveAlbum:(BOOL)saveAlbum activeAccount:(NSString *)activeAccount;
 
 //+ (void)setUserProfileActiveAccount:(NSString *)activeAccount userProfile:(OCUserProfile *)userProfile;

iOSClient/FileSystem/CCCoreData.m

@@ -294,7 +294,7 @@
     if (record) return [record.cameraUploadWWAnVideo boolValue];
     else return NO;
 }
-*/
+
 // ******** SET *********
 
 + (void)setCameraUpload:(BOOL)state activeAccount:(NSString *)activeAccount
@@ -395,7 +395,6 @@
 
 + (void)setCameraUploadDateAssetType:(PHAssetMediaType)assetMediaType assetDate:(NSDate *)assetDate activeAccount:(NSString *)activeAccount
 {
-    /*
     if (assetMediaType == PHAssetMediaTypeImage && [assetDate compare:[self getCameraUploadDatePhotoActiveAccount:activeAccount]] ==  NSOrderedDescending && assetDate) {
         [self setCameraUploadDatePhoto:assetDate];
     }
@@ -403,7 +402,6 @@
     if (assetMediaType == PHAssetMediaTypeVideo && [assetDate compare:[self getCameraUploadDateVideoActiveAccount:activeAccount]] ==  NSOrderedDescending && assetDate) {
         [self setCameraUploadDateVideo:assetDate];
     }
-    */ 
 }
 
 + (void)setCameraUploadWWanPhoto:(BOOL)wWan activeAccount:(NSString *)activeAccount
@@ -462,7 +460,7 @@
     }];
 }
 
-/*
+
 + (void)setCameraUploadSaveAlbum:(BOOL)saveAlbum activeAccount:(NSString *)activeAccount
 {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
@@ -1800,8 +1798,8 @@
     if ([metadata.uuid length]) recordMetadata.uuid = metadata.uuid;
 
     // inseriamo il typeFile e icona di default.
-    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:activeAccount activeUrl:nil];
-    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:activeAccount activeUrl:activeUrl];
+    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:activeUrl];
     
     [CCUtility insertTypeFileIconName:metadata directory:[self getServerUrlFromDirectoryID:metadata.directoryID activeAccount:activeAccount] cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
     

iOSClient/FileSystem/NCManageDatabase.swift

@@ -164,12 +164,11 @@ class NCManageDatabase: NSObject {
         return Array(results)
     }
     
-    // getCameraUploadFolderNameActiveAccount + getCameraUploadFolderPathActiveAccount
-    func getAccountsCameraUploadFolderName(_ account: String, activeUrl : String?) -> String {
+    func getAccountsCameraUploadFolderName(_ activeUrl : String?) -> String {
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableAccount.self).filter("account = %@", account)
+        let results = realm.objects(tableAccount.self).filter("active = true")
         if (results.count > 0) {
             
             if results[0].cameraUploadFolderName.characters.count > 0 {
@@ -199,11 +198,10 @@ class NCManageDatabase: NSObject {
         return ""
     }
 
-    // getCameraUploadFolderNamePathActiveAccount
-    func getAccountsCameraUploadFolderPath(_ account: String, activeUrl : String) -> String {
+    func getAccountsCameraUploadFolderPath(_ activeUrl : String) -> String {
         
-        let cameraFolderName = self.getAccountsCameraUploadFolderName(account, activeUrl: nil)
-        let cameraFolderPath = self.getAccountsCameraUploadFolderName(account, activeUrl: activeUrl)
+        let cameraFolderName = self.getAccountsCameraUploadFolderName(nil)
+        let cameraFolderPath = self.getAccountsCameraUploadFolderName(activeUrl)
      
         let folderPhotos = CCUtility.stringAppendServerUrl(cameraFolderPath, addFileName: cameraFolderName)!
         
@@ -236,11 +234,11 @@ class NCManageDatabase: NSObject {
         return activeAccount
     }
 
-    func setAccountCameraStateFiled(_ account: String, state: Bool, field: String) {
+    func setAccountCameraStateFiled(field: String, state: Bool) {
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableAccount.self).filter("account = %@", account)
+        let results = realm.objects(tableAccount.self).filter("active = true")
         if (results.count > 0) {
             try! realm.write {
                 
@@ -268,11 +266,11 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func setAccountsCameraUploadDateAssetType(_ account: String, assetMediaType: PHAssetMediaType, assetDate: NSDate) {
+    func setAccountsCameraUploadDateAssetType(assetMediaType: PHAssetMediaType, assetDate: NSDate) {
 
         let realm = try! Realm()
         
-        let results = realm.objects(tableAccount.self).filter("account = %@", account)
+        let results = realm.objects(tableAccount.self).filter("active = true")
         
         try! realm.write {
             if (assetMediaType == PHAssetMediaType.image && results.count > 0) {
@@ -284,16 +282,16 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func setAccountsCameraUploadFolderName(_ account: String, folderName: String?) {
+    func setAccountsCameraUploadFolderName(folderName: String?) {
         
         let realm = try! Realm()
         var folderName : String? = folderName
         
         if folderName == nil {
-            folderName = self.getAccountsCameraUploadFolderName(account, activeUrl: nil)
+            folderName = self.getAccountsCameraUploadFolderName(nil)
         }
         
-        let results = realm.objects(tableAccount.self).filter("account = %@", account)
+        let results = realm.objects(tableAccount.self).filter("active = true")
         if (results.count > 0) {
             try! realm.write {
                 
@@ -302,16 +300,16 @@ class NCManageDatabase: NSObject {
         }
     }
 
-    func setAccountsCameraUploadFolderPath(_ account: String, pathName: String?, activeUrl: String) {
+    func setAccountsCameraUploadFolderPath(pathName: String?, activeUrl: String) {
         
         let realm = try! Realm()
         var pathName : String? = pathName
         
         if pathName == nil {
-            pathName = self.getAccountsCameraUploadFolderPath(account, activeUrl: activeUrl)
+            pathName = self.getAccountsCameraUploadFolderPath(activeUrl)
         }
         
-        let results = realm.objects(tableAccount.self).filter("account = %@", account)
+        let results = realm.objects(tableAccount.self).filter("active = true")
         if (results.count > 0) {
             try! realm.write {
                 

iOSClient/Main/CCMain.m

@@ -783,7 +783,7 @@
         
         [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
         [CCCoreData setCameraUploadDateVideo:[NSDate date]];
-
+        
     }
     
     /*
@@ -4308,7 +4308,7 @@
                                         
                                         // Settings new folder Automatatic upload
                                        // NSString *oldPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
-                                        NSString *oldPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeAccount activeUrl:app.activeUrl];
+                                        NSString *oldPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeUrl];
 
                                         
                                         [CCCoreData setCameraUploadFolderName:_metadata.fileName activeAccount:app.activeAccount];
@@ -4323,7 +4323,7 @@
                                         
                                         NSLog(@"[LOG] Update Folder Photo");
                                         //NSString *folderCameraUpload = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
-                                        NSString *folderCameraUpload = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeAccount activeUrl:app.activeUrl];
+                                        NSString *folderCameraUpload = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeUrl];
                                         if ([folderCameraUpload length] > 0)
                                             [[CCSynchronize sharedSynchronize] readFolderServerUrl:folderCameraUpload directoryID:[CCCoreData getDirectoryIDFromServerUrl:folderCameraUpload activeAccount:app.activeAccount] selector:selectorReadFolder];
                                         

iOSClient/Networking/CCNetworking.m

@@ -886,8 +886,8 @@
     // create Metadata
     //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_activeAccount];
     //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_activeAccount activeUrl:_activeUrl];
-    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:_activeAccount activeUrl:nil];
-    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_activeAccount activeUrl:_activeUrl];
+    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_activeUrl];
     
     CCMetadata *metadata = [CCUtility insertFileSystemInMetadata:fileName directory:_directoryUser activeAccount:_activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
     

iOSClient/Networking/OCNetworking.m

@@ -333,8 +333,8 @@
         
         NSString *directoryID = [CCCoreData addDirectory:_metadataNet.serverUrl permissions:permissions activeAccount:_metadataNet.account];
         
-        NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:_metadataNet.account activeUrl:nil];
-        NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_metadataNet.account activeUrl:_activeUrl];
+        NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+        NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_activeUrl];
         
         //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
         //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl];
@@ -441,8 +441,8 @@
         
         NSMutableArray *metadatas = [NSMutableArray new];
         
-        NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:_metadataNet.account activeUrl:nil];
-        NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_metadataNet.account activeUrl:_activeUrl];
+        NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+        NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_activeUrl];
 
         //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
         //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl];
@@ -578,8 +578,8 @@
         
         //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
         //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl];
-        NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:_metadataNet.account activeUrl:nil];
-        NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_metadataNet.account activeUrl:_activeUrl];
+        NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+        NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_activeUrl];
 
         NSString *directoryUser = [CCUtility getDirectoryActiveUser:_activeUser activeUrl:_activeUrl];
         
@@ -671,8 +671,8 @@
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     NSString *nameFolderURL = [NSString stringWithFormat:@"%@/%@", _metadataNet.serverUrl, _metadataNet.fileName];
-    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:_metadataNet.account activeUrl:nil];
-    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_metadataNet.account activeUrl:_activeUrl];
+    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_activeUrl];
     
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
     [communication setUserAgent:[CCUtility getUserAgent]];
@@ -917,8 +917,8 @@
             itemDto.fileName = _metadataNet.fileName;
             
             NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:_metadataNet.serverUrl activeAccount:_metadataNet.account];
-            NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:_metadataNet.account activeUrl:nil];
-            NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_metadataNet.account activeUrl:_activeUrl];
+            NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+            NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:_activeUrl];
 
             //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
             //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl];

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -532,7 +532,7 @@
         return;
     
     //NSString *serverUrl = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
-    NSString *serverUrl = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeAccount activeUrl:app.activeUrl];
+    NSString *serverUrl = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeUrl];
 
     if (_sectionDataSource) {
         
@@ -1141,7 +1141,7 @@
     tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     //NSString *folderPhotos = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
-    NSString *folderPhotos = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeAccount activeUrl:app.activeUrl];
+    NSString *folderPhotos = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeUrl];
     //BOOL useSubFolder = [CCCoreData getCameraUploadCreateSubfolderActiveAccount:app.activeAccount];
     BOOL useSubFolder = tableAccount.cameraUploadCreateSubfolder;