marinofaggiana 4 years ago
parent
commit
2830354dda
1 changed files with 27 additions and 32 deletions
  1. 27 32
      iOSClient/Database/NCManageDatabase.swift

+ 27 - 32
iOSClient/Database/NCManageDatabase.swift

@@ -2015,29 +2015,27 @@ class NCManageDatabase: NSObject {
             let realm = try! Realm()
             do {
                 try realm.safeWrite {
-                    
-                    if let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first {
-                        if let session = session {
-                            result.session = session
-                        }
-                        if let sessionError = sessionError {
-                            result.sessionError = sessionError
-                        }
-                        if let sessionSelector = sessionSelector {
-                            result.sessionSelector = sessionSelector
-                        }
-                        if let sessionTaskIdentifier = sessionTaskIdentifier {
-                            result.sessionTaskIdentifier = sessionTaskIdentifier
-                        }
-                        if let status = status {
-                            result.status = status
-                        }
-                        if let etag = etag {
-                            result.etag = etag
-                        }
-                        if setFavorite {
-                            result.favorite = true
-                        }
+                    let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first
+                    if let session = session {
+                        result?.session = session
+                    }
+                    if let sessionError = sessionError {
+                        result?.sessionError = sessionError
+                    }
+                    if let sessionSelector = sessionSelector {
+                        result?.sessionSelector = sessionSelector
+                    }
+                    if let sessionTaskIdentifier = sessionTaskIdentifier {
+                        result?.sessionTaskIdentifier = sessionTaskIdentifier
+                    }
+                    if let status = status {
+                        result?.status = status
+                    }
+                    if let etag = etag {
+                        result?.etag = etag
+                    }
+                    if setFavorite {
+                        result?.favorite = true
                     }
                 }
             } catch let error {
@@ -2069,9 +2067,8 @@ class NCManageDatabase: NSObject {
         
         do {
             try realm.safeWrite {
-                if let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first {
-                    result.favorite = favorite
-                }
+                let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first
+                result?.favorite = favorite
             }
         } catch let error {
             NCCommunicationCommon.shared.writeLog("Could not write to database: \(error)")
@@ -2084,9 +2081,8 @@ class NCManageDatabase: NSObject {
         
         do {
             try realm.safeWrite {
-                if let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first {
-                    result.e2eEncrypted = encrypted
-                }
+                let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first
+                result?.e2eEncrypted = encrypted
             }
         } catch let error {
             NCCommunicationCommon.shared.writeLog("Could not write to database: \(error)")
@@ -2099,9 +2095,8 @@ class NCManageDatabase: NSObject {
         
         do {
             try realm.safeWrite {
-                if let result = realm.objects(tableMetadata.self).filter("account == %@ AND serverUrl == %@ AND fileName == %@", account, serverUrl, fileName).first {
-                    result.fileNameView = newFileNameView
-                }
+                let result = realm.objects(tableMetadata.self).filter("account == %@ AND serverUrl == %@ AND fileName == %@", account, serverUrl, fileName).first
+                result?.fileNameView = newFileNameView
             }
         } catch let error {
             NCCommunicationCommon.shared.writeLog("Could not write to database: \(error)")