fix

iOSClient/FileSystem/CCCoreData.h

@@ -195,7 +195,7 @@
 + (void)moveCoreDataToGroup;
 + (void)moveAllUserToGroup;
 
-+ (void)flushTableAccount:(NSString *)account;
+//+ (void)flushTableAccount:(NSString *)account;
 + (void)flushTableDirectoryAccount:(NSString *)account;
 + (void)flushTableLocalFileAccount:(NSString *)account;
 + (void)flushTableMetadataAccount:(NSString *)account;

iOSClient/FileSystem/CCCoreData.m

@@ -1949,22 +1949,6 @@
 #pragma mark ===== Flush Database =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (void)flushTableAccount:(NSString *)account
-{
-    NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
-    
-    if (account) {
-        
-        [TableAccount MR_deleteAllMatchingPredicate:[NSPredicate predicateWithFormat:@"(account == %@)", account] inContext:context];
-        
-    } else {
-        
-        [TableAccount MR_truncateAllInContext:context];
-    }
-    
-    [context MR_saveToPersistentStoreAndWait];
-}
-
 + (void)flushTableDirectoryAccount:(NSString *)account
 {
     NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];

iOSClient/Login/CCLogin.m

@@ -285,15 +285,12 @@
         } else {
 
             [[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];
-            
+            // Add account
             [[NCManageDatabase sharedInstance] addAccount:account url:self.baseUrl.text user:self.user.text password:self.password.text];
         }
         
-        //TableAccount *tableAccount = [CCCoreData setActiveAccount:account];
+        // Set this account as default
         tableAccount *tableAccount = [[NCManageDatabase sharedInstance] setAccountActive:account];
         
         // verifica

iOSClient/Settings/CCManageAccount.m

@@ -292,7 +292,6 @@
     XLFormPickerCell *pickerAccount = (XLFormPickerCell *)[[self.form formRowWithTag:@"pickerAccount"] cellForFormController:self];
     
     NSString *accountNow = pickerAccount.rowDescriptor.value;
-    //NSArray *listAccount = [CCCoreData getAllAccount];
     NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts];
     
     [actionSheet dismissWithClickedButtonIndex:buttonIndex animated:YES];
@@ -308,7 +307,6 @@
         // Clear active user
         [app settingActiveAccount:nil activeUrl:nil activeUser:nil activePassword:nil];
         
-        //listAccount = [CCCoreData getAllAccount];
         listAccount = [[NCManageDatabase sharedInstance] getAccounts];
         
         if ([listAccount count] > 0) [self ChangeDefaultAccount:listAccount[0]];
@@ -321,18 +319,17 @@
 
 - (void)deleteAccount:(NSString *)account
 {
-    [CCCoreData flushTableAccount:account];
-    
+    [[NCManageDatabase sharedInstance] clearTable:[tableAccount class] account:account];
     [[NCManageDatabase sharedInstance] clearTable:[tableActivity class] account:account];
-    [[NCManageDatabase sharedInstance] clearTable:[tableAutomaticUpload class] account:app.activeAccount];
-    [[NCManageDatabase sharedInstance] clearTable:[tableCapabilities class] account:app.activeAccount];
-    [[NCManageDatabase sharedInstance] clearTable:[tableExternalSites class] account:app.activeAccount];
+    [[NCManageDatabase sharedInstance] clearTable:[tableAutomaticUpload class] account:account];
+    [[NCManageDatabase sharedInstance] clearTable:[tableCapabilities class] account:account];
+    [[NCManageDatabase sharedInstance] clearTable:[tableExternalSites class] account:account];
 
     [CCCoreData flushTableDirectoryAccount:account];
     [CCCoreData flushTableLocalFileAccount:account];
     [CCCoreData flushTableMetadataAccount:account];
     
-    [[NCManageDatabase sharedInstance] clearTable:[tableShare class] account:app.activeAccount];
+    [[NCManageDatabase sharedInstance] clearTable:[tableShare class] account:account];
 }
 
 - (void)answerDelAccount:(XLFormRowDescriptor *)sender
@@ -368,7 +365,6 @@
     // removed  this -> ?????
     
     // change 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];
@@ -385,7 +381,6 @@
 
 - (void)UpdateForm
 {
-    //NSArray *listAccount = [CCCoreData getAllAccount];
     NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts];
     
     if (listAccount == nil) {
@@ -422,7 +417,6 @@
 
     // --
     
-    //_tableAccount = [CCCoreData getActiveAccount];
     _tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     XLFormRowDescriptor *rowUserFullName = [self.form formRowWithTag:@"userfullname"];