Crashlytics #196 - CCMore

iOSClient/Database/NCManageDatabase.swift

@@ -1208,11 +1208,15 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func getAllExternalSites(predicate: NSPredicate) -> [tableExternalSites] {
+    @objc func getAllExternalSites() -> [tableExternalSites]? {
+        
+        guard let tableAccount = self.getAccountActive() else {
+            return nil
+        }
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableExternalSites.self).filter(predicate).sorted(byKeyPath: "idExternalSite", ascending: true)
+        let results = realm.objects(tableExternalSites.self).filter("account = %@", tableAccount.account).sorted(byKeyPath: "idExternalSite", ascending: true)
         
         return Array(results)
     }

iOSClient/Main/CCMore.swift

@@ -110,26 +110,29 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
         
         if NCBrandOptions.sharedInstance.disable_more_external_site == false {
         
-            menuExternalSite = NCManageDatabase.sharedInstance.getAllExternalSites(predicate: NSPredicate(format: "(account == '\(appDelegate.activeAccount!)')"))
-        
-            for table in menuExternalSite! {
+            menuExternalSite = NCManageDatabase.sharedInstance.getAllExternalSites()
             
-                item = OCExternalSites.init()
+            if menuExternalSite != nil {
+                
+                for table in menuExternalSite! {
             
-                item.name = table.name
-                item.url = table.url
-                item.icon = table.icon
+                    item = OCExternalSites.init()
             
-                if (table.type == "link") {
-                    item.icon = "moreExternalSite"
-                    functionMenu.append(item)
-                }
-                if (table.type == "settings") {
-                    item.icon = "moreSettingsExternalSite"
-                    settingsMenu.append(item)
-                }
-                if (table.type == "quota") {
-                    quotaMenu.append(item)
+                    item.name = table.name
+                    item.url = table.url
+                    item.icon = table.icon
+            
+                    if (table.type == "link") {
+                        item.icon = "moreExternalSite"
+                        functionMenu.append(item)
+                    }
+                    if (table.type == "settings") {
+                        item.icon = "moreSettingsExternalSite"
+                        settingsMenu.append(item)
+                    }
+                    if (table.type == "quota") {
+                        quotaMenu.append(item)
+                    }
                 }
             }
         }