lint

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Data/NCManageDatabase+Groupfolders.swift

@@ -57,9 +57,8 @@ extension NCManageDatabase {
 
     func addGroupfolders(account: String, groupfolders: [NKGroupfolders]) {
 
-        let realm = try! Realm()
-
         do {
+            let realm = try Realm()
             try realm.write {
 
                 let tableGroupfolders = realm.objects(TableGroupfolders.self).filter("account == %@", account)
@@ -69,9 +68,7 @@ extension NCManageDatabase {
                 realm.delete(tableGroupfoldersGroups)
 
                 for groupfolder in groupfolders {
-
                     let obj = TableGroupfolders()
-
                     obj.account = account
                     obj.acl = groupfolder.acl
                     for group in groupfolder.groups ?? [:] {
@@ -83,7 +80,6 @@ extension NCManageDatabase {
                     obj.mountPoint = groupfolder.mountPoint
                     obj.quota = groupfolder.quota
                     obj.size = groupfolder.size
-
                     realm.add(obj)
                 }
             }

iOSClient/Data/NCManageDatabase+LayoutForView.swift

@@ -44,15 +44,13 @@ extension NCManageDatabase {
     @discardableResult
     func setLayoutForView(account: String, key: String, serverUrl: String, layout: String? = nil, sort: String? = nil, ascending: Bool? = nil, groupBy: String? = nil, directoryOnTop: Bool? = nil, titleButtonHeader: String? = nil, itemForLine: Int? = nil) -> NCDBLayoutForView? {
 
-        let realm = try! Realm()
-
         var keyStore = key
         if !serverUrl.isEmpty { keyStore = serverUrl}
         let index = account + " " + keyStore
-
         var addObject = NCDBLayoutForView()
 
         do {
+            let realm = try Realm()
             try realm.write {
                 if let result = realm.objects(NCDBLayoutForView.self).filter("index == %@", index).first {
                     addObject = result
@@ -91,16 +89,16 @@ extension NCManageDatabase {
             NextcloudKit.shared.nkCommonInstance.writeLog("Could not write to database: \(error)")
         }
 
-        return NCDBLayoutForView.init(value: addObject)
+        return NCDBLayoutForView(value: addObject)
     }
 
     @discardableResult
     func setLayoutForView(layoutForView: NCDBLayoutForView) -> NCDBLayoutForView? {
 
-        let realm = try! Realm()
-        let result = NCDBLayoutForView.init(value: layoutForView)
+        let result = NCDBLayoutForView(value: layoutForView)
 
         do {
+            let realm = try Realm()
             try realm.write {
                 realm.add(result, update: .all)
             }
@@ -108,21 +106,26 @@ extension NCManageDatabase {
             NextcloudKit.shared.nkCommonInstance.writeLog("Could not write to database: \(error)")
             return nil
         }
-        return NCDBLayoutForView.init(value: result)
+        return NCDBLayoutForView(value: result)
     }
 
     func getLayoutForView(account: String, key: String, serverUrl: String) -> NCDBLayoutForView? {
 
-        let realm = try! Realm()
-
         var keyStore = key
         if !serverUrl.isEmpty { keyStore = serverUrl}
         let index = account + " " + keyStore
 
-        if let result = realm.objects(NCDBLayoutForView.self).filter("index == %@", index).first {
-            return NCDBLayoutForView.init(value: result)
-        } else {
-            return setLayoutForView(account: account, key: key, serverUrl: serverUrl)
+        do {
+            let realm = try Realm()
+            if let result = realm.objects(NCDBLayoutForView.self).filter("index == %@", index).first {
+                return NCDBLayoutForView(value: result)
+            } else {
+                return setLayoutForView(account: account, key: key, serverUrl: serverUrl)
+            }
+        } catch let error as NSError {
+            NextcloudKit.shared.nkCommonInstance.writeLog("Could not write to database: \(error)")
         }
+
+        return setLayoutForView(account: account, key: key, serverUrl: serverUrl)
     }
 }