marinofaggiana 4 жил өмнө
parent
commit
0f790d20f9

+ 22 - 0
iOSClient/Database/NCManageDatabase.swift

@@ -1029,6 +1029,28 @@ class NCManageDatabase: NSObject {
         }
     }
     
+    @objc func getCapabilitiesHandwerkcloudEnabled(account: String) -> Bool {
+
+        let realm = try! Realm()
+        realm.refresh()
+        
+        guard let result = realm.objects(tableCapabilities.self).filter("account == %@", account).first else {
+            return false
+        }
+        guard let jsondata = result.jsondata else {
+            return false
+        }
+        
+        let json = JSON(jsondata)
+        let dataCapabilities = json["ocs"]["data"]["capabilities"]
+
+        if let result = dataCapabilities["handwerkcloud"]["enabled"].bool {
+            return result
+        } else {
+            return false
+        }
+    }
+    
     #if !EXTENSION
     @objc func addCapabilities(_ capabilities: OCCapabilities, account: String) {
         

+ 2 - 3
iOSClient/Settings/CCManageAccount.m

@@ -45,7 +45,6 @@
         
     NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts];
     tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
-    tableCapabilities *tableCapabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:tableAccount.account];
 
     // Section : ACCOUNTS -------------------------------------------
     
@@ -225,8 +224,8 @@
     }
     
     // Section : THIRT PART -------------------------------------------
-
-    if (tableCapabilities.isHandwerkcloudEnabled) {
+    BOOL isHandwerkcloudEnabled = [[NCManageDatabase sharedInstance] getCapabilitiesHandwerkcloudEnabledWithAccount:appDelegate.activeAccount];
+    if (isHandwerkcloudEnabled) {
 
         section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_user_job_", nil)];
         [form addFormSection:section];