marinofaggiana 4 years ago
parent
commit
3a78a2e65c
2 changed files with 14 additions and 22 deletions
  1. 1 1
      iOSClient/Database/NCManageDatabase.swift
  2. 13 21
      iOSClient/Main/CCMore.swift

+ 1 - 1
iOSClient/Database/NCManageDatabase.swift

@@ -1512,7 +1512,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
         realm.refresh()
         
-        let results = realm.objects(tableExternalSites.self).filter("account == %@", account).sorted(byKeyPath: "idExternalSite", ascending: true)
+        let results = realm.objects(tableExternalSites.self).filter("account == %@", account).sorted(byKeyPath: "idExternalSite", ascending: true).freeze()
         
         return Array(results)
     }

+ 13 - 21
iOSClient/Main/CCMore.swift

@@ -40,7 +40,6 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
 
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
 
-    var listExternalSite: [tableExternalSites]?
     var tabAccount: tableAccount?
 
     required init?(coder aDecoder: NSCoder) {
@@ -137,29 +136,22 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
 
         // ITEM : External
         if NCBrandOptions.sharedInstance.disable_more_external_site == false {
-
-            listExternalSite = NCManageDatabase.sharedInstance.getAllExternalSites(account: appDelegate.activeAccount)
-
-            if listExternalSite != nil {
-
-                for table in listExternalSite! {
-
-                    item = NCCommunicationExternalSite()
-                    item.name = table.name
-                    item.url = table.url
-                    item.icon = table.icon
-
-                    if (table.type == "link") {
+            if let externalSites = NCManageDatabase.sharedInstance.getAllExternalSites(account: appDelegate.activeAccount) {
+                for externalSite in externalSites {
+                    if (externalSite.type == "link" && externalSite.name != "" && externalSite.url != "") {
+                        item = NCCommunicationExternalSite()
+                        item.name = externalSite.name
+                        item.url = externalSite.url
                         item.icon = "world"
                         externalSiteMenu.append(item)
                     }
-                    if (table.type == "settings") {
-                        item.icon = "settings"
-                        settingsMenu.append(item)
-                    }
-                    if (table.type == "quota") {
-                        quotaMenu.append(item)
-                    }
+//                    if (externalSite.type == "settings") {
+//                        item.icon = "settings"
+//                        settingsMenu.append(item)
+//                    }
+//                    if (externalSite.type == "quota") {
+//                        quotaMenu.append(item)
+//                    }
                 }
             }
         }