Browse Source

clear code

marinofaggiana 6 years ago
parent
commit
e9a8869844
1 changed files with 3 additions and 4 deletions
  1. 3 4
      iOSClient/Database/NCManageDatabase.swift

+ 3 - 4
iOSClient/Database/NCManageDatabase.swift

@@ -1997,13 +1997,12 @@ class NCManageDatabase: NSObject {
             return nil
             return nil
         }
         }
     
     
-        let directoryLocked = realm.objects(tableDirectory.self).filter(NSPredicate(format: "account == %@ AND lock == true", account))
-        if directoryLocked.count == 0 {
+        let serversUrlLocked = realm.objects(tableDirectory.self).filter(NSPredicate(format: "account == %@ AND lock == true", account)).map { $0.serverUrl } as Array
+        if serversUrlLocked.count == 0 {
             return Array(results.map { tableMetadata.init(value:$0) })
             return Array(results.map { tableMetadata.init(value:$0) })
         }
         }
         
         
         var metadatas = [tableMetadata]()
         var metadatas = [tableMetadata]()
-        let arrayServerUrlLocked = Array(directoryLocked.map { $0.serverUrl })
         var oldServerUrl = ""
         var oldServerUrl = ""
         var lock = false
         var lock = false
 
 
@@ -2011,7 +2010,7 @@ class NCManageDatabase: NSObject {
             if result.serverUrl != oldServerUrl {
             if result.serverUrl != oldServerUrl {
                 var foundLock = false
                 var foundLock = false
                 oldServerUrl = result.serverUrl
                 oldServerUrl = result.serverUrl
-                for serverUrlLocked in arrayServerUrlLocked {
+                for serverUrlLocked in serversUrlLocked {
                     if result.serverUrl.contains(serverUrlLocked) {
                     if result.serverUrl.contains(serverUrlLocked) {
                         foundLock = true
                         foundLock = true
                         break
                         break