fix

Picker/DocumentPickerViewController.swift

@@ -129,7 +129,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         hud = CCHud.init(view: self.navigationController?.view)
         
         // Theming
-        let tableCapabilities = NCManageDatabase.sharedInstance.getCapabilitesForAccount(activeAccount!)
+        let tableCapabilities = NCManageDatabase.sharedInstance.getCapabilites()
         if (tableCapabilities != nil && NCBrandOptions.sharedInstance.use_themingColor == true) {
             if ((tableCapabilities?.themingColor.characters.count)! > 0) {
                 NCBrandColor.sharedInstance.brand = CCGraphics.color(fromHexString: tableCapabilities?.themingColor)

Share Ext/ShareViewController.m

@@ -168,7 +168,7 @@
     UIBarButtonItem *rightButtonUpload, *rightButtonEncrypt, *leftButtonCancel;
 
     // Theming
-    tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesForAccount:self.activeAccount];
+    tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
     if ([NCBrandOptions sharedInstance].use_themingColor && capabilities.themingColor.length > 0)
         [NCBrandColor sharedInstance].brand = [CCGraphics colorFromHexString:capabilities.themingColor];
 

iOSClient/AppDelegate.m

@@ -936,7 +936,7 @@
     NSInteger queueUpload = [self getNumberUploadInQueues] + [self getNumberUploadInQueuesWWan];
     
     // Total
-    NSInteger total = queueDownload + queueUpload + [[NCManageDatabase sharedInstance] countAutomaticUploadForAccount:app.activeAccount session:nil];
+    NSInteger total = queueDownload + queueUpload + [[NCManageDatabase sharedInstance] countAutomaticUpload:nil];
     
     [UIApplication sharedApplication].applicationIconBadgeNumber = total;
     
@@ -963,7 +963,7 @@
 {
     if (self.activeAccount.length > 0) {
     
-        tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesForAccount:self.activeAccount];
+        tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
     
         if ([NCBrandOptions sharedInstance].use_themingColor && capabilities.themingColor.length == 7) {
         
@@ -1329,7 +1329,7 @@
         }
         
         if (!recordFound)
-            [[NCManageDatabase sharedInstance] unlockAutomaticUploadForAccount:_activeAccount assetLocalIdentifier:tableAutomaticUpload.assetLocalIdentifier];
+            [[NCManageDatabase sharedInstance] unlockAutomaticUpload:tableAutomaticUpload.assetLocalIdentifier];
     }
 
     // ------------------------- <selectorUploadAutomatic> -------------------------

iOSClient/FileSystem/NCManageDatabase.swift

@@ -505,7 +505,6 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
         
         let tableAccount = self.getAccountActive()
-        
         if tableAccount == nil {
             return false
         }
@@ -542,7 +541,6 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
         
         let tableAccount = self.getAccountActive()
-        
         if tableAccount == nil {
             return nil
         }
@@ -577,7 +575,6 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
         
         let tableAccount = self.getAccountActive()
-        
         if tableAccount == nil {
             return nil
         }
@@ -587,11 +584,16 @@ class NCManageDatabase: NSObject {
         return Array(results)
     }
 
-    func unlockAutomaticUploadForAccount(_ account: String, assetLocalIdentifier: String) {
+    func unlockAutomaticUpload(_ assetLocalIdentifier: String) {
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", account, assetLocalIdentifier)
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return
+        }
+        
+        let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", tableAccount!.account, assetLocalIdentifier)
         if (results.count > 0) {
             
             // UnLock
@@ -606,31 +608,36 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
         
         let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return
+        }
         
-        if tableAccount != nil {
-        
-            let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", tableAccount!.account, assetLocalIdentifier)
-            if (results.count > 0) {
+        let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", tableAccount!.account, assetLocalIdentifier)
+        if (results.count > 0) {
             
-                try! realm.write {
-                    realm.delete(results)
-                }
+            try! realm.write {
+                realm.delete(results)
             }
         }
     }
     
-    func countAutomaticUploadForAccount(_ account: String, session: String?) -> Int {
+    func countAutomaticUpload(_ session: String?) -> Int {
         
         let realm = try! Realm()
         let results : Results<tableAutomaticUpload>
         
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return 0
+        }
+        
         if (session == nil) {
             
-            results = realm.objects(tableAutomaticUpload.self).filter("account = %@", account)
+            results = realm.objects(tableAutomaticUpload.self).filter("account = %@", tableAccount!.account)
             
         } else {
             
-            results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND session = %@", account, session!)
+            results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND session = %@", tableAccount!.account, session!)
         }
         
         return results.count
@@ -639,11 +646,16 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Capabilities
     
-    func addCapabilities(_ capabilities: OCCapabilities, account: String) {
+    func addCapabilities(_ capabilities: OCCapabilities) {
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableCapabilities.self).filter("account = %@", account)
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return
+        }
+
+        let results = realm.objects(tableCapabilities.self).filter("account = %@", tableAccount!.account)
         
         try! realm.write {
             
@@ -653,7 +665,7 @@ class NCManageDatabase: NSObject {
                 resultCapabilities = results[0]
             }
             
-            resultCapabilities.account = account
+            resultCapabilities.account = tableAccount!.account
             resultCapabilities.themingBackground = capabilities.themingBackground
             resultCapabilities.themingColor = capabilities.themingColor
             resultCapabilities.themingLogo = capabilities.themingLogo
@@ -671,11 +683,16 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func getCapabilitesForAccount(_ account: String) -> tableCapabilities? {
+    func getCapabilites() -> tableCapabilities? {
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableCapabilities.self).filter("account = %@", account)
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return nil
+        }
+        
+        let results = realm.objects(tableCapabilities.self).filter("account = %@", tableAccount!.account)
         
         if (results.count > 0) {
             return results[0]
@@ -684,11 +701,16 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func getServerVersionAccount(_ account: String) -> Int {
+    func getServerVersion() -> Int {
 
         let realm = try! Realm()
 
-        let results = realm.objects(tableCapabilities.self).filter("account = %@", account)
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return 0
+        }
+        
+        let results = realm.objects(tableCapabilities.self).filter("account = %@", tableAccount!.account)
 
         if (results.count > 0) {
             return results[0].versionMajor
@@ -732,15 +754,20 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table External Sites
     
-    func addExternalSites(_ externalSites: OCExternalSites, account: String) {
+    func addExternalSites(_ externalSites: OCExternalSites) {
         
         let realm = try! Realm()
         
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return
+        }
+        
         try! realm.write {
             
             let addExternalSite = tableExternalSites()
             
-            addExternalSite.account = account
+            addExternalSite.account = tableAccount!.account
             addExternalSite.idExternalSite = externalSites.idExternalSite
             addExternalSite.icon = externalSites.icon
             addExternalSite.lang = externalSites.lang
@@ -752,11 +779,16 @@ class NCManageDatabase: NSObject {
         }
     }
 
-    func deleteExternalSitesForAccount(_ account: String) {
+    func deleteExternalSites() {
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableExternalSites.self).filter("account = %@", account)
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return
+        }
+        
+        let results = realm.objects(tableExternalSites.self).filter("account = %@", tableAccount!.account)
         try! realm.write {
             realm.delete(results)
         }
@@ -818,12 +850,17 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Share
     
-    func addShareLink(_ share: String, fileName: String, serverUrl: String, account: String) -> [String:String] {
+    func addShareLink(_ share: String, fileName: String, serverUrl: String) -> [String:String]? {
         
         let realm = try! Realm()
         
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return nil
+        }
+        
         // Verify if exists
-        let results = realm.objects(tableShare.self).filter("account = %@ AND fileName = %@ AND serverUrl = %@", account, fileName, serverUrl)
+        let results = realm.objects(tableShare.self).filter("account = %@ AND fileName = %@ AND serverUrl = %@", tableAccount!.account, fileName, serverUrl)
         if (results.count > 0) {
             try! realm.write {
                 results[0].shareLink = share;
@@ -836,7 +873,7 @@ class NCManageDatabase: NSObject {
             
             let addShare = tableShare()
             
-                addShare.account = account
+                addShare.account = tableAccount!.account
                 addShare.fileName = fileName
                 addShare.serverUrl = serverUrl
                 addShare.shareLink = share
@@ -848,12 +885,17 @@ class NCManageDatabase: NSObject {
         return ["\(serverUrl)\(fileName)" : share]
     }
 
-    func addShareUserAndGroup(_ share: String, fileName: String, serverUrl: String, account: String) -> [String:String] {
+    func addShareUserAndGroup(_ share: String, fileName: String, serverUrl: String) -> [String:String]? {
         
         let realm = try! Realm()
         
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return nil
+        }
+        
         // Verify if exists
-        let results = realm.objects(tableShare.self).filter("account = %@ AND fileName = %@ AND serverUrl = %@", account, fileName, serverUrl)
+        let results = realm.objects(tableShare.self).filter("account = %@ AND fileName = %@ AND serverUrl = %@", tableAccount!.account, fileName, serverUrl)
         if (results.count > 0) {
             try! realm.write {
                 results[0].shareUserAndGroup = share;
@@ -866,7 +908,7 @@ class NCManageDatabase: NSObject {
                 
                 let addShare = tableShare()
                 
-                addShare.account = account
+                addShare.account = tableAccount!.account
                 addShare.fileName = fileName
                 addShare.serverUrl = serverUrl
                 addShare.shareUserAndGroup = share
@@ -878,14 +920,19 @@ class NCManageDatabase: NSObject {
         return ["\(serverUrl)\(fileName)" : share]
     }
     
-    func unShare(_ share: String, fileName: String, serverUrl: String, sharesLink: [String:String], sharesUserAndGroup: [String:String], account: String) -> [Any] {
+    func unShare(_ share: String, fileName: String, serverUrl: String, sharesLink: [String:String], sharesUserAndGroup: [String:String]) -> [Any]? {
         
         var sharesLink = sharesLink
         var sharesUserAndGroup = sharesUserAndGroup
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableShare.self).filter("account = %@ AND (shareLink CONTAINS %@ OR shareUserAndGroup CONTAINS %@)", account, share, share)
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return nil
+        }
+        
+        let results = realm.objects(tableShare.self).filter("account = %@ AND (shareLink CONTAINS %@ OR shareUserAndGroup CONTAINS %@)", tableAccount!.account, share, share)
         if (results.count > 0) {
             
             let result = results[0]
@@ -926,22 +973,32 @@ class NCManageDatabase: NSObject {
         return [sharesLink, sharesUserAndGroup]
     }
     
-    func removeShareActiveAccount(_ account: String) {
+    func removeShareActiveAccount() {
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableShare.self).filter("account = %@", account)
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return
+        }
+        
+        let results = realm.objects(tableShare.self).filter("account = %@", tableAccount!.account)
         try! realm.write {
             realm.delete(results)
         }
     }
     
-    func updateShare(_ items: [String:OCSharedDto], account: String, activeUrl: String) -> [Any] {
+    func updateShare(_ items: [String:OCSharedDto], activeUrl: String) -> [Any]? {
+        
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return nil
+        }
         
         var sharesLink = [String:String]()
         var sharesUserAndGroup = [String:String]()
 
-        self.removeShareActiveAccount(account)
+        self.removeShareActiveAccount()
      
         var itemsLink = [OCSharedDto]()
         var itemsUsersAndGroups = [OCSharedDto]()
@@ -970,9 +1027,11 @@ class NCManageDatabase: NSObject {
             }
             
             if itemOCSharedDto.idRemoteShared > 0 {
-                let sharesLinkReturn = self.addShareLink("\(itemOCSharedDto.idRemoteShared)", fileName: fileName, serverUrl: serverUrl, account: account)
-                for (key,value) in sharesLinkReturn {
-                    sharesLink.updateValue(value, forKey:key)
+                let sharesLinkReturn = self.addShareLink("\(itemOCSharedDto.idRemoteShared)", fileName: fileName, serverUrl: serverUrl)
+                if sharesLinkReturn != nil {
+                    for (key,value) in sharesLinkReturn! {
+                        sharesLink.updateValue(value, forKey:key)
+                    }
                 }
             }
         }
@@ -1009,23 +1068,30 @@ class NCManageDatabase: NSObject {
                 serverUrl = NSString(string: serverUrl).substring(to: (serverUrl.characters.count - 1))
             }
             
-            let sharesUserAndGroupReturn = self.addShareUserAndGroup(idsRemoteShared, fileName: fileName, serverUrl: serverUrl, account: account)
-            for (key,value) in sharesUserAndGroupReturn {
-                sharesUserAndGroup.updateValue(value, forKey:key)
+            let sharesUserAndGroupReturn = self.addShareUserAndGroup(idsRemoteShared, fileName: fileName, serverUrl: serverUrl)
+            if sharesUserAndGroupReturn != nil {
+                for (key,value) in sharesUserAndGroupReturn! {
+                    sharesUserAndGroup.updateValue(value, forKey:key)
+                }
             }
         }
         
         return [sharesLink, sharesUserAndGroup]
     }
     
-    func getSharesAccount(_ account: String) -> [Any] {
+    func getShares() -> [Any]? {
 
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return nil
+        }
+        
         var sharesLink = [String:String]()
         var sharesUserAndGroup = [String:String]()
         
         let realm = try! Realm()
 
-        let results = realm.objects(tableShare.self).filter("account = %@", account)
+        let results = realm.objects(tableShare.self).filter("account = %@", tableAccount!.account)
         
         for resultShare in results {
             

iOSClient/Main/CCMain.m

@@ -197,7 +197,7 @@
     self.searchController.searchBar.delegate = self;
     self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_this_folder_",nil);
     
-    if ([[NCManageDatabase sharedInstance] getServerVersionAccount:app.activeAccount] >= 12) {
+    if ([[NCManageDatabase sharedInstance] getServerVersion] >= 12) {
         
         if (_isRoot)
             self.searchController.searchBar.scopeButtonTitles = [NSArray arrayWithObjects:NSLocalizedString(@"_search_this_folder_",nil),NSLocalizedString(@"_search_all_folders_",nil), nil];
@@ -356,9 +356,11 @@
         
         // populate shared Link & User variable
         
-        NSArray *results = [[NCManageDatabase sharedInstance] getSharesAccount:app.activeAccount];
-        app.sharesLink = results[0];
-        app.sharesUserAndGroup = results[1];
+        NSArray *results = [[NCManageDatabase sharedInstance] getShares];
+        if (results) {
+            app.sharesLink = results[0];
+            app.sharesUserAndGroup = results[1];
+        }
         
         // Setting Theming
         [app settingThemingColorBrand];
@@ -1082,10 +1084,10 @@
 
 - (void)getExternalSitesServerSuccess:(NSArray *)listOfExternalSites
 {
-    [[NCManageDatabase sharedInstance] deleteExternalSitesForAccount:app.activeAccount];
+    [[NCManageDatabase sharedInstance] deleteExternalSites];
     
     for (OCExternalSites *tableExternalSites in listOfExternalSites)
-        [[NCManageDatabase sharedInstance] addExternalSites:tableExternalSites account:app.activeAccount];
+        [[NCManageDatabase sharedInstance] addExternalSites:tableExternalSites];
 }
 
 - (void)getExternalSitesServerFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
@@ -1218,7 +1220,7 @@
 - (void)getCapabilitiesOfServerSuccess:(OCCapabilities *)capabilities
 {
     // Update capabilities db
-    [[NCManageDatabase sharedInstance] addCapabilities:capabilities account:app.activeAccount];
+    [[NCManageDatabase sharedInstance] addCapabilities:capabilities];
     
     // ------ THEMING -----------------------------------------------------------------------
     
@@ -1242,7 +1244,7 @@
     // ------ SEARCH  ------------------------------------------------------------------------
     
     // Search bar if change version
-    if ([[NCManageDatabase sharedInstance] getServerVersionAccount:app.activeAccount] != capabilities.versionMajor) {
+    if ([[NCManageDatabase sharedInstance] getServerVersion] != capabilities.versionMajor) {
     
         [self cancelSearchBar];
         
@@ -1998,7 +2000,7 @@
         
         _searchFileName = fileName;
         
-        if ([[NCManageDatabase sharedInstance] getServerVersionAccount:app.activeAccount] >= 12 && ![_depth isEqualToString:@"0"]) {
+        if ([[NCManageDatabase sharedInstance] getServerVersion] >= 12 && ![_depth isEqualToString:@"0"]) {
             
             [[CCActions sharedInstance] search:_serverUrl fileName:_searchFileName depth:_depth delegate:self];
             
@@ -2903,9 +2905,11 @@
     if([record.account isEqualToString:metadataNet.account] == NO)
         return;
     
-    NSArray *result = [[NCManageDatabase sharedInstance] updateShare:items account:appDelegate.activeAccount activeUrl:appDelegate.activeUrl];
-    appDelegate.sharesLink = result[0];
-    appDelegate.sharesUserAndGroup = result[1];
+    NSArray *result = [[NCManageDatabase sharedInstance] updateShare:items activeUrl:appDelegate.activeUrl];
+    if (result) {
+        appDelegate.sharesLink = result[0];
+        appDelegate.sharesUserAndGroup = result[1];
+    }
     
     if (openWindow) {
             
@@ -2974,10 +2978,12 @@
     AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
 
     // rimuoviamo la condivisione da db
-    NSArray *result = [[NCManageDatabase sharedInstance] unShare:metadataNet.share fileName:metadataNet.fileName serverUrl:metadataNet.serverUrl sharesLink:appDelegate.sharesLink sharesUserAndGroup:appDelegate.sharesUserAndGroup account:appDelegate.activeAccount];
+    NSArray *result = [[NCManageDatabase sharedInstance] unShare:metadataNet.share fileName:metadataNet.fileName serverUrl:metadataNet.serverUrl sharesLink:appDelegate.sharesLink sharesUserAndGroup:appDelegate.sharesUserAndGroup];
     
-    appDelegate.sharesLink = result[0];
-    appDelegate.sharesUserAndGroup = result[1];
+    if (result) {
+        appDelegate.sharesLink = result[0];
+        appDelegate.sharesUserAndGroup = result[1];
+    }
     
     if (_shareOC)
         [_shareOC reloadData];
@@ -3285,7 +3291,7 @@
     if ([NCBrandOptions sharedInstance].disable_multiaccount)
         return;
     
-    if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [[NCManageDatabase sharedInstance] countAutomaticUploadForAccount:app.activeAccount session:nil] > 0) {
+    if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [[NCManageDatabase sharedInstance] countAutomaticUpload:nil] > 0) {
         
         [app messageNotification:@"_transfers_in_queue_" description:nil visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo errorCode:0];
         return;

iOSClient/Settings/CCManageAccount.m

@@ -351,7 +351,7 @@
 
 - (void)ChangeDefaultAccount:(NSString *)account
 {
-    if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [[NCManageDatabase sharedInstance] countAutomaticUploadForAccount:app.activeAccount session:nil] > 0) {
+    if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [[NCManageDatabase sharedInstance] countAutomaticUpload:nil] > 0) {
         
         [app messageNotification:@"_transfers_in_queue_" description:nil visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo errorCode:0];
         [self UpdateForm];

iOSClient/Settings/CCSettings.m

@@ -433,7 +433,7 @@
         break;
         case 5: {
             
-            tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesForAccount:app.activeAccount];
+            tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
             
             NSString *versionServer = capabilities.versionString;
             

iOSClient/Transfers/CCTransfers.m

@@ -341,10 +341,10 @@
     NSString *titleSection, *numberTitle;
     NSInteger typeOfSession = 0;
     
-    NSInteger queueDownload = [app getNumberDownloadInQueues] + [[NCManageDatabase sharedInstance] countAutomaticUploadForAccount:app.activeAccount session:k_download_session];
-    NSInteger queueDownloadWWan = [app getNumberDownloadInQueuesWWan] + [[NCManageDatabase sharedInstance] countAutomaticUploadForAccount:app.activeAccount session:k_download_session_wwan];
-    NSInteger queueUpload = [app getNumberUploadInQueues] + [[NCManageDatabase sharedInstance] countAutomaticUploadForAccount:app.activeAccount session:k_upload_session];
-    NSInteger queueUploadWWan = [app getNumberUploadInQueuesWWan] + [[NCManageDatabase sharedInstance] countAutomaticUploadForAccount:app.activeAccount session:k_upload_session_wwan];
+    NSInteger queueDownload = [app getNumberDownloadInQueues] + [[NCManageDatabase sharedInstance] countAutomaticUpload:k_download_session];
+    NSInteger queueDownloadWWan = [app getNumberDownloadInQueuesWWan] + [[NCManageDatabase sharedInstance] countAutomaticUpload:k_download_session_wwan];
+    NSInteger queueUpload = [app getNumberUploadInQueues] + [[NCManageDatabase sharedInstance] countAutomaticUpload:k_upload_session];
+    NSInteger queueUploadWWan = [app getNumberUploadInQueuesWWan] + [[NCManageDatabase sharedInstance] countAutomaticUpload:k_upload_session_wwan];
     
     if ([[_sectionDataSource.sections objectAtIndex:section] isKindOfClass:[NSString class]]) titleSection = [_sectionDataSource.sections objectAtIndex:section];
     if ([[_sectionDataSource.sections objectAtIndex:section] isKindOfClass:[NSDate class]]) titleSection = [CCUtility getTitleSectionDate:[_sectionDataSource.sections objectAtIndex:section]];
@@ -426,7 +426,7 @@
     // Footer Download
     if ([titleSection containsString:@"download"] && ![titleSection containsString:@"wwan"] && titleSection != nil) {
         
-        NSInteger queueDownload = [app getNumberDownloadInQueues] + [[NCManageDatabase sharedInstance] countAutomaticUploadForAccount:app.activeAccount session:k_download_session];
+        NSInteger queueDownload = [app getNumberDownloadInQueues] + [[NCManageDatabase sharedInstance] countAutomaticUpload:k_download_session];
         
         // element or elements ?
         if (queueDownload > 1) element_s = NSLocalizedString(@"_elements_",nil);
@@ -443,7 +443,7 @@
     // Footer Download WWAN
     if ([titleSection containsString:@"download"] && [titleSection containsString:@"wwan"] && titleSection != nil) {
         
-        NSInteger queueDownloadWWan = [app getNumberDownloadInQueuesWWan] + [[NCManageDatabase sharedInstance] countAutomaticUploadForAccount:app.activeAccount session:k_download_session_wwan];
+        NSInteger queueDownloadWWan = [app getNumberDownloadInQueuesWWan] + [[NCManageDatabase sharedInstance] countAutomaticUpload:k_download_session_wwan];
         
         // element or elements ?
         if (queueDownloadWWan > 1) element_s = NSLocalizedString(@"_elements_",nil);
@@ -464,7 +464,7 @@
     // Footer Upload
     if ([titleSection containsString:@"upload"] && ![titleSection containsString:@"wwan"] && titleSection != nil) {
         
-        NSInteger queueUpload = [app getNumberUploadInQueues] + [[NCManageDatabase sharedInstance] countAutomaticUploadForAccount:app.activeAccount session:k_upload_session];
+        NSInteger queueUpload = [app getNumberUploadInQueues] + [[NCManageDatabase sharedInstance] countAutomaticUpload:k_upload_session];
         
         // element or elements ?
         if (queueUpload > 1) element_s = NSLocalizedString(@"_elements_",nil);
@@ -481,7 +481,7 @@
     // Footer Upload WWAN
     if ([titleSection containsString:@"upload"] && [titleSection containsString:@"wwan"] && titleSection != nil) {
         
-        NSInteger queueUploadWWan = [app getNumberUploadInQueuesWWan] + [[NCManageDatabase sharedInstance] countAutomaticUploadForAccount:app.activeAccount session:k_upload_session_wwan];
+        NSInteger queueUploadWWan = [app getNumberUploadInQueuesWWan] + [[NCManageDatabase sharedInstance] countAutomaticUpload:k_upload_session_wwan];
         
         // element or elements ?
         if (queueUploadWWan > 1) element_s = NSLocalizedString(@"_elements_",nil);