fix

iOSClient/FileSystem/NCManageDatabase.swift

@@ -185,7 +185,6 @@ class NCManageDatabase: NSObject {
         }
     }
 
-    
     func setAccountPassword(_ account: String, password: String) {
         
         let realm = try! Realm()
@@ -224,21 +223,19 @@ class NCManageDatabase: NSObject {
         }
     }
 
-    func getAccounts(_ account: String?) -> [tableAccount] {
+    func getAccounts() -> [String] {
         
         let realm = try! Realm()
         let results : Results<tableAccount>
+        var accounts = [String]()
+        
+        results = realm.objects(tableAccount.self).sorted(byKeyPath: "account", ascending: true)
             
-        if account == nil {
-            
-            results = realm.objects(tableAccount.self).sorted(byKeyPath: "account", ascending: true)
-            
-        } else {
-            
-            results = realm.objects(tableAccount.self).filter("account = %@", account!).sorted(byKeyPath: "account", ascending: true)
+        for result in results {
+            accounts.append(result.account)
         }
-        
-        return Array(results)
+
+        return Array(accounts)
     }
     
     func getAccountCameraUploadFolderName() -> String {

iOSClient/Main/CCMain.m

@@ -1474,7 +1474,6 @@
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image]) {
             
             // evitiamo il rimando photo
-            //[CCCoreData setCameraUploadDatePhoto:[NSDate date]];
             [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeImage assetDate:[NSDate date]];
 
             UIImage *image = [UIImage imageWithContentsOfFile:file];
@@ -1488,7 +1487,6 @@
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video]) {
             
             // we avoid the cross-reference video
-            //[CCCoreData setCameraUploadDateVideo:[NSDate date]];
             [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeVideo assetDate:[NSDate date]];
             
             [[NSFileManager defaultManager] linkItemAtPath:file toPath:[NSTemporaryDirectory() stringByAppendingString:metadata.fileNamePrint] error:nil];
@@ -1798,7 +1796,6 @@
 - (void)readFolderFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {
     // verify active user
-    //TableAccount *record = [CCCoreData getActiveAccount];
     tableAccount *record = [[NCManageDatabase sharedInstance] getAccountActive];
     
     [_hud hideHud];
@@ -3281,9 +3278,6 @@
 
 - (void)menuLogo
 {
-    // Test crash
-    //[[Crashlytics sharedInstance] crash];
-    
     if (app.reSelectMenu.isOpen || app.reMainMenu.isOpen)
         return;
     
@@ -3298,18 +3292,18 @@
     }
     
     //NSArray *listTableAccount = [CCCoreData getAllTableAccount];
-    NSArray *listTableAccount = [[NCManageDatabase sharedInstance] getAccounts:nil];
+    NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts];
     
     NSMutableArray *menuArray = [NSMutableArray new];
     
-    for (TableAccount *record in listTableAccount) {
+    for (NSString *account in listAccount) {
      
-        if ([record.account isEqualToString:app.activeAccount]) continue;
+        if ([account isEqualToString:app.activeAccount]) continue;
         
         CCMenuItem *item = [[CCMenuItem alloc] init];
         
-        item.title = [record.account stringByTruncatingToWidth:self.view.bounds.size.width - 100 withFont:[UIFont systemFontOfSize:12.0] atEnd:YES];
-        item.argument = record.account;
+        item.title = [account stringByTruncatingToWidth:self.view.bounds.size.width - 100 withFont:[UIFont systemFontOfSize:12.0] atEnd:YES];
+        item.argument = account;
         item.image = [UIImage imageNamed:@"menuLogoUser"];
         item.target = self;
         item.action = @selector(changeDefaultAccount:);
@@ -3794,8 +3788,7 @@
             NSData *dataMetadata = [dic objectForKey: k_metadataKeyedUnarchiver];
             CCMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
                         
-            NSArray *accounts = [[NCManageDatabase sharedInstance] getAccounts:metadata.account];
-            tableAccount *account = [accounts objectAtIndex:0];
+            tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
             NSString *directoryUser = [CCUtility getDirectoryActiveUser:account.user activeUrl:account.url];
             
             if (directoryUser) {
@@ -3823,11 +3816,7 @@
             
             NSData *dataMetadata = [dic objectForKey: k_metadataKeyedUnarchiver];
             CCMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
-            
-            //TableAccount *account = [CCCoreData getTableAccountFromAccount:metadata.account];
-            
-            NSArray *accounts = [[NCManageDatabase sharedInstance] getAccounts:metadata.account];
-            tableAccount *account = [accounts objectAtIndex:0];
+            tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
             
             NSString *directoryUser = [CCUtility getDirectoryActiveUser:account.user activeUrl:account.url];
             
@@ -3942,11 +3931,8 @@
         
         NSData *dataMetadata = [dic objectForKey: k_metadataKeyedUnarchiver];
         CCMetadata *metadata = [NSKeyedUnarchiver unarchiveObjectWithData:dataMetadata];
-            
-        //TableAccount *account = [CCCoreData getTableAccountFromAccount:metadata.account];
         
-        NSArray *accounts = [[NCManageDatabase sharedInstance] getAccounts:metadata.account];
-        tableAccount *account = [accounts objectAtIndex:0];
+        tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
         
         NSString *directoryUser = [CCUtility getDirectoryActiveUser:account.user activeUrl:account.url];
             

iOSClient/Settings/CCManageAccount.m

@@ -48,7 +48,7 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeTheming) name:@"changeTheming" object:nil];
     
     //NSArray *listAccount = [CCCoreData getAllAccount];
-    NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts:nil];
+    NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts];
 
     // Section : CLOUD ACCOUNT -------------------------------------------
     
@@ -293,7 +293,7 @@
     
     NSString *accountNow = pickerAccount.rowDescriptor.value;
     //NSArray *listAccount = [CCCoreData getAllAccount];
-    NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts:nil];
+    NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts];
     
     [actionSheet dismissWithClickedButtonIndex:buttonIndex animated:YES];
     
@@ -309,7 +309,7 @@
         [app settingActiveAccount:nil activeUrl:nil activeUser:nil activePassword:nil];
         
         //listAccount = [CCCoreData getAllAccount];
-        listAccount = [[NCManageDatabase sharedInstance] getAccounts:nil];
+        listAccount = [[NCManageDatabase sharedInstance] getAccounts];
         
         if ([listAccount count] > 0) [self ChangeDefaultAccount:listAccount[0]];
         else {
@@ -386,7 +386,7 @@
 - (void)UpdateForm
 {
     //NSArray *listAccount = [CCCoreData getAllAccount];
-    NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts:nil];
+    NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts];
     
     if (listAccount == nil) {
         [self addAccountFoced];