account

Share/ShareViewController.m

@@ -144,7 +144,7 @@
 
     // Theming
     if ([NCBrandOptions sharedInstance].use_themingColor) {
-        tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
+        tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:self.activeAccount];
         [CCGraphics settingThemingColor:capabilities.themingColor themingColorElement:capabilities.themingColorElement themingColorText:capabilities.themingColorText];
     }
     self.navigationController.navigationBar.barTintColor = [NCBrandColor sharedInstance].brand;

iOSClient/AppDelegate.m

@@ -904,7 +904,7 @@
     
     if ([NCBrandOptions sharedInstance].use_themingColor) {
         
-        tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
+        tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:self.activeAccount];
 
         [CCGraphics settingThemingColor:capabilities.themingColor themingColorElement:capabilities.themingColorElement themingColorText:capabilities.themingColorText];
             

iOSClient/Database/NCManageDatabase.swift

@@ -634,18 +634,14 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Capabilities
     
-    @objc func addCapabilities(_ capabilities: OCCapabilities) {
+    @objc func addCapabilities(_ capabilities: OCCapabilities, account: String) {
         
-        guard let tableAccount = self.getAccountActive() else {
-            return
-        }
-
         let realm = try! Realm()
 
         do {
             try realm.write {
             
-                let result = realm.objects(tableCapabilities.self).filter("account = %@", tableAccount.account).first
+                let result = realm.objects(tableCapabilities.self).filter("account = %@", account).first
 
                 var resultCapabilities = tableCapabilities()
             
@@ -653,7 +649,7 @@ class NCManageDatabase: NSObject {
                     resultCapabilities = result
                 }
                 
-                resultCapabilities.account = tableAccount.account
+                resultCapabilities.account = account
                 resultCapabilities.themingBackground = capabilities.themingBackground
                 resultCapabilities.themingBackgroundDefault = capabilities.themingBackgroundDefault
                 resultCapabilities.themingBackgroundPlain = capabilities.themingBackgroundPlain
@@ -685,59 +681,43 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func getCapabilites() -> tableCapabilities? {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return nil
-        }
+    @objc func getCapabilites(account: String) -> tableCapabilities? {
         
         let realm = try! Realm()
         realm.refresh()
         
-        return realm.objects(tableCapabilities.self).filter("account = %@", tableAccount.account).first
+        return realm.objects(tableCapabilities.self).filter("account = %@", account).first
     }
     
-    @objc func getServerVersion() -> Int {
-
-        guard let tableAccount = self.getAccountActive() else {
-            return 0
-        }
+    @objc func getServerVersion(account: String) -> Int {
 
         let realm = try! Realm()
         realm.refresh()
         
-        guard let result = realm.objects(tableCapabilities.self).filter("account = %@", tableAccount.account).first else {
+        guard let result = realm.objects(tableCapabilities.self).filter("account = %@", account).first else {
             return 0
         }
 
         return result.versionMajor
     }
 
-    @objc func getEndToEndEncryptionVersion() -> Float {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return 0
-        }
+    @objc func getEndToEndEncryptionVersion(account: String) -> Float {
         
         let realm = try! Realm()
         realm.refresh()
         
-        guard let result = realm.objects(tableCapabilities.self).filter("account = %@", tableAccount.account).first else {
+        guard let result = realm.objects(tableCapabilities.self).filter("account = %@", account).first else {
             return 0
         }
         
         return Float(result.endToEndEncryptionVersion)!
     }
     
-    @objc func compareServerVersion(_ versionCompare: String) -> Int {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return 0
-        }
+    @objc func compareServerVersion(_ versionCompare: String, account: String) -> Int {
         
         let realm = try! Realm()
 
-        guard let capabilities = realm.objects(tableCapabilities.self).filter("account = %@", tableAccount.account).first else {
+        guard let capabilities = realm.objects(tableCapabilities.self).filter("account = %@", account).first else {
             return -1
         }
         
@@ -762,16 +742,12 @@ class NCManageDatabase: NSObject {
         return result
     }
     
-    @objc func getRichdocumentsMimetypes() -> [String]? {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return nil
-        }
+    @objc func getRichdocumentsMimetypes(account: String) -> [String]? {
         
         let realm = try! Realm()
         realm.refresh()
         
-        guard let result = realm.objects(tableCapabilities.self).filter("account = %@", tableAccount.account).first else {
+        guard let result = realm.objects(tableCapabilities.self).filter("account = %@", account).first else {
             return nil
         }
         

iOSClient/Main/CCMain.m

@@ -602,7 +602,7 @@
             
         } else {
             
-            tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
+            tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:appDelegate.activeAccount];
             
             if ([capabilities.themingColor isEqualToString:@"#FFFFFF"])
                 return [CCGraphics changeThemingColorImage:imageThemingLogo multiplier:multiplier color:[UIColor blackColor]];
@@ -1439,7 +1439,7 @@
         [self readFolderSuccessFailure:metadataNet metadataFolder:nil metadatas:_searchResultMetadatas message:nil errorCode:0];
     
         // Version >= 12
-        if ([[NCManageDatabase sharedInstance] getServerVersion] >= 12) {
+        if ([[NCManageDatabase sharedInstance] getServerVersionWithAccount:appDelegate.activeAccount] >= 12) {
             
             [_timerWaitInput invalidate];
             _timerWaitInput = [NSTimer scheduledTimerWithTimeInterval:1.5 target:self selector:@selector(searchStartTimer) userInfo:nil repeats:NO];

iOSClient/Main/CCMore.swift

@@ -133,7 +133,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
 #endif
         
         // ITEM : Trash
-        let capabilities = NCManageDatabase.sharedInstance.getCapabilites()
+        let capabilities = NCManageDatabase.sharedInstance.getCapabilites(account: appDelegate.activeAccount)
         if capabilities != nil && capabilities!.versionMajor >= Int(k_trash_version_available) {
             
             item = OCExternalSites.init()

iOSClient/Main/Create cloud/NCCreateMenuAdd.swift

@@ -71,7 +71,7 @@ class NCCreateMenuAdd: NSObject {
          items.append(itemSectionMargin)
          */
         
-        if let richdocumentsMimetypes = NCManageDatabase.sharedInstance.getRichdocumentsMimetypes() {
+        if let richdocumentsMimetypes = NCManageDatabase.sharedInstance.getRichdocumentsMimetypes(account: appDelegate.activeAccount) {
             if richdocumentsMimetypes.count > 0 {
                 items.append(ActionSheetItem(title: NSLocalizedString("_create_new_document_", comment: ""), value: 6, image: UIImage.init(named: "document_menu")))
                 items.append(ActionSheetItem(title: NSLocalizedString("_create_new_spreadsheet_", comment: ""), value: 7, image: UIImage(named: "file_xls_menu")))

iOSClient/Move/CCMove.m

@@ -79,7 +79,7 @@
         
         _serverUrl = [CCUtility getHomeServerUrlActiveUrl:activeUrl];
         
-        tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
+        tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:activeAccount];
         if ([capabilities.themingColor isEqualToString:@"#FFFFFF"])
             image = [[UIImageView alloc] initWithImage:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"themingLogo"] multiplier:2 color:[UIColor blackColor]]];
         else

iOSClient/Networking/CCNetworking.m

@@ -919,7 +919,7 @@
             }
             
             addObject.serverUrl = metadata.serverUrl;
-            addObject.version = [[NCManageDatabase sharedInstance] getEndToEndEncryptionVersion];
+            addObject.version = [[NCManageDatabase sharedInstance] getEndToEndEncryptionVersionWithAccount:_activeAccount];
             
             // Get the last metadata
             tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@", _activeAccount, metadata.serverUrl]];

iOSClient/Networking/NCService.swift

@@ -138,7 +138,7 @@ class NCService: NSObject, OCNetworkingDelegate {
         if (errorCode == 0) {
             
             // Update capabilities db
-            NCManageDatabase.sharedInstance.addCapabilities(capabilities!)
+            NCManageDatabase.sharedInstance.addCapabilities(capabilities!, account: metadataNet.account)
             
             // ------ THEMING -----------------------------------------------------------------------
             
@@ -184,7 +184,7 @@ class NCService: NSObject, OCNetworkingDelegate {
             
             // ------ SEARCH ------------------------------------------------------------------------
             
-            if (NCManageDatabase.sharedInstance.getServerVersion() != capabilities!.versionMajor && appDelegate.activeMain != nil) {
+            if (NCManageDatabase.sharedInstance.getServerVersion(account: metadataNet.account) != capabilities!.versionMajor && appDelegate.activeMain != nil) {
                 appDelegate.activeMain.cancelSearchBar()
             }
             

iOSClient/Settings/CCSettings.m

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

iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -70,7 +70,7 @@
     
     form = [XLFormDescriptor formDescriptorWithTitle:NSLocalizedString(@"_e2e_settings_", nil)];
     
-    tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
+    tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:appDelegate.activeAccount];
 
     if (capabilities.endToEndEncryption == NO) {
         

iOSClient/Share/CCShareOC.m

@@ -73,7 +73,7 @@
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [section addFormRow:row];
  
-    tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
+    tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:appDelegate.activeAccount];
     if (capabilities != nil && capabilities.versionMajor >= k_nextcloud_version_15_0) {
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"hideDownload" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_share_link_hide_download_", nil)];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];

iOSClient/Utility/CCUtility.m

@@ -490,7 +490,7 @@
 
 + (BOOL)isEndToEndEnabled:(NSString *)account
 {
-    tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
+    tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:account];
 
     NSString *publicKey = [self getEndToEndPublicKey:account];
     NSString *privateKey = [self getEndToEndPrivateKey:account];

iOSClient/Viewer/NCViewerRichdocument.swift

@@ -159,7 +159,7 @@ class NCViewerRichdocument: NSObject, WKNavigationDelegate, WKScriptMessageHandl
      
     //MARK: -
     
-    @objc func isRichDocument( _ metadata: tableMetadata) -> Bool {
+    @objc func isRichDocument(_ metadata: tableMetadata) -> Bool {
         
         if appDelegate.reachability.isReachable() == false {
             return false
@@ -168,7 +168,7 @@ class NCViewerRichdocument: NSObject, WKNavigationDelegate, WKScriptMessageHandl
         guard let mimeType = CCUtility.getMimeType(metadata.fileNameView) else {
             return false
         }
-        guard let richdocumentsMimetypes = NCManageDatabase.sharedInstance.getRichdocumentsMimetypes() else {
+        guard let richdocumentsMimetypes = NCManageDatabase.sharedInstance.getRichdocumentsMimetypes(account: metadata.account) else {
             return false
         }