update database

iOSClient/FileSystem/CCCoreData.h

@@ -50,8 +50,8 @@
 //+ (void)deleteAccount:(NSString *)account;
 //+ (TableAccount *)setActiveAccount:(NSString *)account;
 
-+ (NSArray *)getAllAccount;
-+ (TableAccount *)getTableAccountFromAccount:(NSString *)account;
+//+ (NSArray *)getAllAccount;
+//+ (TableAccount *)getTableAccountFromAccount:(NSString *)account;
 + (NSArray *)getAllTableAccount;
 + (TableAccount *)getActiveAccount;
 

iOSClient/FileSystem/CCCoreData.m

@@ -121,7 +121,6 @@
         
     return [self getActiveAccount];
 }
-*/
 
 + (NSArray *)getAllAccount
 {
@@ -144,6 +143,7 @@
 
     return [TableAccount MR_findFirstByAttribute:@"account" withValue:account inContext:context];
 }
+ */
 
 + (NSArray *)getAllTableAccount
 {

iOSClient/Main/CCMain.m

@@ -3786,7 +3786,10 @@
             NSData *dataMetadata = [dic objectForKey: k_metadataKeyedUnarchiver];
             CCMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
             
-            TableAccount *account = [CCCoreData getTableAccountFromAccount:metadata.account];
+            //TableAccount *account = [CCCoreData getTableAccountFromAccount:metadata.account];
+            
+            NSArray *accounts = [[NCManageDatabase sharedInstance] getAccounts:metadata.account];
+            tableAccount *account = [accounts objectAtIndex:0];
             NSString *directoryUser = [CCUtility getDirectoryActiveUser:account.user activeUrl:account.url];
             
             if (directoryUser) {
@@ -3815,7 +3818,11 @@
             NSData *dataMetadata = [dic objectForKey: k_metadataKeyedUnarchiver];
             CCMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
             
-            TableAccount *account = [CCCoreData getTableAccountFromAccount:metadata.account];
+            //TableAccount *account = [CCCoreData getTableAccountFromAccount:metadata.account];
+            
+            NSArray *accounts = [[NCManageDatabase sharedInstance] getAccounts:metadata.account];
+            tableAccount *account = [accounts objectAtIndex:0];
+            
             NSString *directoryUser = [CCUtility getDirectoryActiveUser:account.user activeUrl:account.url];
             
             if (directoryUser) {
@@ -3930,7 +3937,11 @@
         NSData *dataMetadata = [dic objectForKey: k_metadataKeyedUnarchiver];
         CCMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
             
-        TableAccount *account = [CCCoreData getTableAccountFromAccount:metadata.account];
+        //TableAccount *account = [CCCoreData getTableAccountFromAccount:metadata.account];
+        
+        NSArray *accounts = [[NCManageDatabase sharedInstance] getAccounts:metadata.account];
+        tableAccount *account = [accounts objectAtIndex:0];
+        
         NSString *directoryUser = [CCUtility getDirectoryActiveUser:account.user activeUrl:account.url];
             
         if (directoryUser) {

iOSClient/Settings/CCManageAccount.m

@@ -47,7 +47,8 @@
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeTheming) name:@"changeTheming" object:nil];
     
-    NSArray *listAccount = [CCCoreData getAllAccount];
+    //NSArray *listAccount = [CCCoreData getAllAccount];
+    NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts:nil];
 
     // Section : CLOUD ACCOUNT -------------------------------------------
     
@@ -291,7 +292,8 @@
     XLFormPickerCell *pickerAccount = (XLFormPickerCell *)[[self.form formRowWithTag:@"pickerAccount"] cellForFormController:self];
     
     NSString *accountNow = pickerAccount.rowDescriptor.value;
-    NSArray *listAccount = [CCCoreData getAllAccount];
+    //NSArray *listAccount = [CCCoreData getAllAccount];
+    NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts:nil];
     
     [actionSheet dismissWithClickedButtonIndex:buttonIndex animated:YES];
     
@@ -306,7 +308,8 @@
         // Clear active user
         [app settingActiveAccount:nil activeUrl:nil activeUser:nil activePassword:nil];
         
-        listAccount = [CCCoreData getAllAccount];
+        //listAccount = [CCCoreData getAllAccount];
+        listAccount = [[NCManageDatabase sharedInstance] getAccounts:nil];
         
         if ([listAccount count] > 0) [self ChangeDefaultAccount:listAccount[0]];
         else {
@@ -382,7 +385,8 @@
 
 - (void)UpdateForm
 {
-    NSArray *listAccount = [CCCoreData getAllAccount];
+    //NSArray *listAccount = [CCCoreData getAllAccount];
+    NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts:nil];
     
     if (listAccount == nil) {
         [self addAccountFoced];