update table

iOSClient/FileSystem/CCCoreData.h

@@ -45,10 +45,10 @@
 
 // ===== Account =====
 
-+ (void)addAccount:(NSString *)account url:(NSString *)url user:(NSString *)user password:(NSString *)password;
-+ (void)updateAccount:(NSString *)account withPassword:(NSString *)password;
-+ (void)deleteAccount:(NSString *)account;
-+ (TableAccount *)setActiveAccount:(NSString *)account;
+//+ (void)addAccount:(NSString *)account url:(NSString *)url user:(NSString *)user password:(NSString *)password;
+//+ (void)updateAccount:(NSString *)account withPassword:(NSString *)password;
+//+ (void)deleteAccount:(NSString *)account;
+//+ (TableAccount *)setActiveAccount:(NSString *)account;
 
 + (NSArray *)getAllAccount;
 + (TableAccount *)getTableAccountFromAccount:(NSString *)account;

iOSClient/FileSystem/CCCoreData.m

@@ -31,6 +31,7 @@
 #pragma mark ===== Account =====
 #pragma --------------------------------------------------------------------------------------------
 
+/*
 + (void)addAccount:(NSString *)account url:(NSString *)url user:(NSString *)user password:(NSString *)password
 {
     NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
@@ -71,6 +72,7 @@
     [context MR_saveToPersistentStoreAndWait];
 }
 
+
 + (void)updateAccount:(NSString *)account withPassword:(NSString *)password
 {
     NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
@@ -82,6 +84,7 @@
     [context MR_saveToPersistentStoreAndWait];
 }
 
+
 + (void)deleteAccount:(NSString *)account
 {
     NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
@@ -92,6 +95,7 @@
     [context MR_saveToPersistentStoreAndWait];
 }
 
+
 + (TableAccount *)setActiveAccount:(NSString *)account
 {
     NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
@@ -117,6 +121,7 @@
         
     return [self getActiveAccount];
 }
+*/
 
 + (NSArray *)getAllAccount
 {

iOSClient/Login/CCLogin.m

@@ -279,17 +279,22 @@
         
         if (_loginType == loginModifyPasswordUser) {
             
-            [CCCoreData updateAccount:account withPassword:self.password.text];
+            //[CCCoreData updateAccount:account withPassword:self.password.text];
+            [[NCManageDatabase sharedInstance] setAccountPassword:account password:self.password.text];
             
         } else {
 
-            [CCCoreData deleteAccount:account];
+            [[NCManageDatabase sharedInstance] deleteAccount:account];
+            //[CCCoreData deleteAccount:account];
         
             // Add default account
-            [CCCoreData addAccount:account url:self.baseUrl.text user:self.user.text password:self.password.text];
+            //[CCCoreData addAccount:account url:self.baseUrl.text user:self.user.text password:self.password.text];
+            
+            [[NCManageDatabase sharedInstance] addAccount:account url:self.baseUrl.text user:self.user.text password:self.password.text];
         }
         
-        TableAccount *tableAccount = [CCCoreData setActiveAccount:account];
+        //TableAccount *tableAccount = [CCCoreData setActiveAccount:account];
+        tableAccount *tableAccount = [[NCManageDatabase sharedInstance] setAccountActive:account];
         
         // verifica
         if ([tableAccount.account isEqualToString:account]) {
@@ -306,7 +311,8 @@
         } else {
             
             if (_loginType != loginModifyPasswordUser)
-                [CCCoreData deleteAccount:account];
+                [[NCManageDatabase sharedInstance] deleteAccount:account];
+                //[CCCoreData deleteAccount:account];
             
             alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_error_", nil) message:@"Fatal error writing database" delegate:nil cancelButtonTitle:nil otherButtonTitles:NSLocalizedString(@"_ok_", nil), nil];
             [alertView show];

iOSClient/Login/CCLoginWeb.swift

@@ -70,10 +70,14 @@ extension CCLoginWeb: SwiftModalWebVCDelegate {
                 
                     let account : String = "\(username) \(serverUrl)"
                 
-                    CCCoreData.deleteAccount(account)
-                    CCCoreData.addAccount(account, url: serverUrl, user: username, password: password)
+                    //CCCoreData.deleteAccount(account)
+                    //CCCoreData.addAccount(account, url: serverUrl, user: username, password: password)
+                    NCManageDatabase.sharedInstance.deleteAccount(account)
+                    NCManageDatabase.sharedInstance.addAccount(account, url: serverUrl, user: username, password: password)
                 
-                    let tableAccount : TableAccount = CCCoreData.setActiveAccount(account)
+                    //let tableAccount : TableAccount = CCCoreData.setActiveAccount(account)
+                    
+                    let tableAccount : tableAccount = NCManageDatabase.sharedInstance.setAccountActive(account)
                 
                     if (tableAccount.account == account) {
                     

iOSClient/Main/CCMain.m

@@ -3355,7 +3355,9 @@
 
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.2 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
     
-        TableAccount *tableAccount = [CCCoreData setActiveAccount:[sender argument]];
+        //TableAccount *tableAccount = [CCCoreData setActiveAccount:[sender argument]];
+        
+        tableAccount *tableAccount = [[NCManageDatabase sharedInstance] setAccountActive:[sender argument]];
         if (tableAccount)
             [app settingActiveAccount:tableAccount.account activeUrl:tableAccount.url activeUser:tableAccount.user activePassword:tableAccount.password];
     

iOSClient/Settings/CCManageAccount.m

@@ -365,7 +365,8 @@
     // removed  this -> ?????
     
     // change account
-    TableAccount *tableAccount = [CCCoreData setActiveAccount:account];
+    //TableAccount *tableAccount = [CCCoreData setActiveAccount:account];
+    tableAccount *tableAccount = [[NCManageDatabase sharedInstance] setAccountActive:account];
     if (tableAccount)
         [app settingActiveAccount:tableAccount.account activeUrl:tableAccount.url activeUser:tableAccount.user activePassword:tableAccount.password];