convert db

Picker/DocumentPickerViewController.swift

@@ -89,12 +89,13 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         providerDB = providerSessionDB.sharedInstance
         
-        if let record = CCCoreData.getActiveAccount() {
+        //if let record = CCCoreData.getActiveAccount() {
+        if let record = NCManageDatabase.sharedInstance.getAccountActive() {
             
-            activeAccount = record.account!
-            activePassword = record.password!
-            activeUrl = record.url!
-            activeUser = record.user!
+            activeAccount = record.account
+            activePassword = record.password
+            activeUrl = record.url
+            activeUser = record.user
             directoryUser = CCUtility.getDirectoryActiveUser(activeUser, activeUrl: activeUrl)
             
             if (self.serverUrl == nil) {

Share Ext/ShareViewController.m

@@ -55,7 +55,8 @@
     [MagicalRecord setupCoreDataStackWithAutoMigratingSqliteStoreNamed:(id)[dirGroup URLByAppendingPathComponent:[appDatabase stringByAppendingPathComponent:@"cryptocloud"]]];
     [MagicalRecord setLoggingLevel:MagicalRecordLoggingLevelOff];
 
-    TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     if (recordAccount == nil) {
         
         // close now

iOSClient/AppDelegate.m

@@ -139,7 +139,8 @@
     [self upgrade];
     
     // Set account, if no exists clear all
-    TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     if (recordAccount == nil) {
         

iOSClient/Favorites/CCSynchronize.m

@@ -92,7 +92,8 @@
 - (void)listingFavoritesSuccess:(CCMetadataNet *)metadataNet metadatas:(NSArray *)metadatas
 {
     // verify active user
-    TableAccount *record = [CCCoreData getActiveAccount];
+    //TableAccount *record = [CCCoreData getActiveAccount];
+    tableAccount *record = [[NCManageDatabase sharedInstance] getAccountActive];
     
     if (![record.account isEqualToString:metadataNet.account])
         return;
@@ -247,7 +248,8 @@
 - (void)readFolderFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {
     // verify active user
-    TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     // Folder not present, remove it
     if (errorCode == 404 && [recordAccount.account isEqualToString:metadataNet.account])
@@ -257,7 +259,8 @@
 // MULTI THREAD
 - (void)readFolderSuccess:(CCMetadataNet *)metadataNet permissions:(NSString *)permissions etag:(NSString *)etag metadatas:(NSArray *)metadatas
 {
-    TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     __block NSMutableArray *metadatasForVerifyChange = [NSMutableArray new];
     
@@ -401,7 +404,8 @@
 - (void)readFileFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {
     // verify active user
-    TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     // File not present, remove it
     if (errorCode == 404 && [recordAccount.account isEqualToString:metadataNet.account]) {

iOSClient/FileSystem/CCCoreData.h

@@ -52,8 +52,8 @@
 
 //+ (NSArray *)getAllAccount;
 //+ (TableAccount *)getTableAccountFromAccount:(NSString *)account;
-+ (NSArray *)getAllTableAccount;
-+ (TableAccount *)getActiveAccount;
+//+ (NSArray *)getAllTableAccount;
+//+ (TableAccount *)getActiveAccount;
 
 + (NSString *)getCameraUploadFolderNameActiveAccount:(NSString *)activeAccount;
 + (NSString *)getCameraUploadFolderPathActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl;

iOSClient/FileSystem/CCCoreData.m

@@ -143,7 +143,6 @@
 
     return [TableAccount MR_findFirstByAttribute:@"account" withValue:account inContext:context];
 }
- */
 
 + (NSArray *)getAllTableAccount
 {
@@ -168,6 +167,7 @@
     if (record) return record;
     else return nil;
 }
+*/
 
 + (NSString *)getCameraUploadFolderNameActiveAccount:(NSString *)activeAccount
 {

iOSClient/Main/CCMain.m

@@ -1795,7 +1795,8 @@
 - (void)readFolderFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {
     // verify active user
-    TableAccount *record = [CCCoreData getActiveAccount];
+    //TableAccount *record = [CCCoreData getActiveAccount];
+    tableAccount *record = [[NCManageDatabase sharedInstance] getAccountActive];
     
     [_hud hideHud];
 
@@ -1815,7 +1816,8 @@
 - (void)readFolderSuccess:(CCMetadataNet *)metadataNet permissions:(NSString *)permissions etag:(NSString *)etag metadatas:(NSArray *)metadatas
 {
     // verify active user
-    TableAccount *record = [CCCoreData getActiveAccount];
+    //TableAccount *record = [CCCoreData getActiveAccount];
+    tableAccount *record = [[NCManageDatabase sharedInstance] getAccountActive];
 
     if (![record.account isEqualToString:metadataNet.account])
         return;
@@ -2896,7 +2898,8 @@
     AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
     
     // change account ?
-    TableAccount *record = [CCCoreData getActiveAccount];
+    //TableAccount *record = [CCCoreData getActiveAccount];
+    tableAccount *record = [[NCManageDatabase sharedInstance] getAccountActive];
     if([record.account isEqualToString:metadataNet.account] == NO)
         return;
     
@@ -3291,7 +3294,9 @@
         return;
     }
     
-    NSArray *listTableAccount = [CCCoreData getAllTableAccount];
+    //NSArray *listTableAccount = [CCCoreData getAllTableAccount];
+    NSArray *listTableAccount = [[NCManageDatabase sharedInstance] getAccounts:nil];
+    
     NSMutableArray *menuArray = [NSMutableArray new];
     
     for (TableAccount *record in listTableAccount) {

iOSClient/Main/CCMore.swift

@@ -41,7 +41,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
     
     var menuExternalSite: [tableExternalSites]?
-    var tableAccont : TableAccount?
+    var tabAccount : tableAccount?
     
     override func viewDidLoad() {
         
@@ -193,29 +193,30 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         }
         
         // Display Name user & Quota
-        tableAccont = CCCoreData.getActiveAccount()
-        if (tableAccont != nil) {
+        //tableAccont = CCCoreData.getActiveAccount()
+        tabAccount = NCManageDatabase.sharedInstance.getAccountActive()
+        if (tabAccount != nil) {
             
-            if let displayName = self.tableAccont!.displayName {
+            if let displayName = tabAccount?.displayName {
                 if displayName.isEmpty {
-                    labelUsername.text = self.tableAccont!.user
+                    labelUsername.text = tabAccount!.user
                 }
                 else{
-                    labelUsername.text = self.tableAccont!.displayName
+                    labelUsername.text = tabAccount!.displayName
                 }
             }
             else{
-                labelUsername.text = self.tableAccont!.user
+                labelUsername.text = tabAccount!.user
             }
             
             // fix CCMore.swift line 208 Version 2.17.2 (00005)
-            if (self.tableAccont?.quotaRelative != nil && self.tableAccont?.quotaTotal != nil && self.tableAccont?.quotaUsed != nil) {
+            if (tabAccount?.quotaRelative != nil && tabAccount?.quotaTotal != nil && tabAccount?.quotaUsed != nil) {
                 
-                progressQuota.progress = Float((self.tableAccont?.quotaRelative)!) / 100
+                progressQuota.progress = Float((tabAccount?.quotaRelative)!) / 100
                 progressQuota.progressTintColor = NCBrandColor.sharedInstance.brand
                 
-                let quota : String = CCUtility.transformedSize(Double((self.tableAccont?.quotaTotal)!))
-                let quotaUsed : String = CCUtility.transformedSize(Double((self.tableAccont?.quotaUsed)!))
+                let quota : String = CCUtility.transformedSize(Double((tabAccount?.quotaTotal)!))
+                let quotaUsed : String = CCUtility.transformedSize(Double((tabAccount?.quotaUsed)!))
                 
                 labelQuota.text = String.localizedStringWithFormat(NSLocalizedString("_quota_using_", comment: ""), quotaUsed, quota)
             }

iOSClient/Move/CCMove.m

@@ -45,7 +45,8 @@
 {
     [super viewDidLoad];
     
-    TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+    tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     if (recordAccount) {
         

iOSClient/Networking/CCNetworking.m

@@ -90,8 +90,9 @@
 
 - (void)settingAccount
 {
-    TableAccount *tableAccount = [CCCoreData getActiveAccount];
-    
+    //TableAccount *tableAccount = [CCCoreData getActiveAccount];
+    tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
+
     _activeAccount = tableAccount.account;
     _activePassword = tableAccount.password;
     _activeUser = tableAccount.user;

iOSClient/Networking/OCNetworking.m

@@ -253,7 +253,8 @@
     
     [communication getRemoteThumbnailByServer:[_activeUrl stringByAppendingString:@"/"] ofFilePath:_metadataNet.fileName withWidth:width andHeight:height onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSData *thumbnail, NSString *redirectedServer) {
         
-        TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         
         if ([recordAccount.account isEqualToString:_metadataNet.account] && [thumbnail length] > 0) {
         
@@ -737,7 +738,8 @@
         
     } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
         
-        TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
 
         [communication createFolder:folderPathName onCommunication:communication withForbiddenCharactersSupported:YES successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
             
@@ -893,7 +895,8 @@
     
     [communication readFile:fileName onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *items, NSString *redirectedServer) {
         
-        TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         
         if ([recordAccount.account isEqualToString:_metadataNet.account] && [items count] > 0) {
             
@@ -925,7 +928,8 @@
         
     } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
         
-        TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         
         _metadataNet.errorRetry++;
         
@@ -1006,7 +1010,8 @@
         
         [[self getShareID] removeAllObjects];
         
-        TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         
         if ([recordAccount.account isEqualToString:_metadataNet.account]) {
         
@@ -1570,7 +1575,8 @@
     
     [communication getCapabilitiesOfServer:[_activeUrl stringByAppendingString:@"/"] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, OCCapabilities *capabilities, NSString *redirectedServer) {
         
-        TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        //TableAccount *recordAccount = [CCCoreData getActiveAccount];
+        tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         
         if ([self.delegate respondsToSelector:@selector(getCapabilitiesOfServerSuccess:)] && [recordAccount.account isEqualToString:_metadataNet.account])
             [self.delegate getCapabilitiesOfServerSuccess:capabilities];

iOSClient/Settings/CCManageAccount.m

@@ -30,7 +30,7 @@
 
 @interface CCManageAccount ()
 {
-    TableAccount *_tableAccount;
+    tableAccount *_tableAccount;
 
     CCLoginWeb *_loginWeb;
     CCLogin *_loginVC;
@@ -422,7 +422,8 @@
 
     // --
     
-     _tableAccount = [CCCoreData getActiveAccount];
+    //_tableAccount = [CCCoreData getActiveAccount];
+    _tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     XLFormRowDescriptor *rowUserFullName = [self.form formRowWithTag:@"userfullname"];
     XLFormRowDescriptor *rowUserAddress = [self.form formRowWithTag:@"useraddress"];