Marino Faggiana 7 years ago
parent
commit
1f30b55b40
1 changed files with 16 additions and 11 deletions
  1. 16 11
      iOSClient/Database/NCManageDatabase.swift

+ 16 - 11
iOSClient/Database/NCManageDatabase.swift

@@ -1247,23 +1247,28 @@ class NCManageDatabase: NSObject {
         
         let realm = try! Realm()
         
-        try! realm.write {
-            
-            if (metadata.realm == nil) {
-                let metadataWithIcon = CCUtility.insertTypeFileIconName(metadata, serverUrl: serverUrl, autoUploadFileName: autoUploadFileName, autoUploadDirectory: autoUploadDirectory)
-                realm.add(metadataWithIcon!, update: true)
-            } else {
-                realm.add(metadata, update: true)
-            }
+        realm.beginWrite()
+        
+        if (metadata.realm == nil) {
+            let metadataWithIcon = CCUtility.insertTypeFileIconName(metadata, serverUrl: serverUrl, autoUploadFileName: autoUploadFileName, autoUploadDirectory: autoUploadDirectory)
+            realm.add(metadataWithIcon!, update: true)
+        } else {
+            realm.add(metadata, update: true)
         }
         
-        self.setDateReadDirectory(directoryID: metadata.directoryID)
+        try! realm.commitWrite()
         
-        if metadata.realm == nil {
+        if metadata.isInvalidated {
             return nil
         }
         
-        return tableMetadata.init(value: metadata)
+        self.setDateReadDirectory(directoryID: metadata.directoryID)
+        
+        if metadata.isInvalidated {
+            return nil
+        } else {
+            return tableMetadata.init(value: metadata)
+        }
     }
     
     func addMetadatas(_ metadatas: [tableMetadata], activeUrl: String, serverUrl: String) -> [tableMetadata] {