1 files changed, 20 insertions, 20 deletions

diff --git a/iOSClient/Data/NCManageDatabase+Account.swift b/iOSClient/Data/NCManageDatabase+Account.swift
index 3f6956ca5..1f840b083 100644
--- a/iOSClient/Data/NCManageDatabase+Account.swift
+++ b/iOSClient/Data/NCManageDatabase+Account.swift
@@ -36,7 +36,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let addObject = tableAccount()
 
                 addObject.account = account
@@ -68,7 +68,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 realm.add(account, update: .all)
             }
         } catch let error {
@@ -81,7 +81,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let result = realm.objects(tableAccount.self).filter("account == %@", account)
 
                 realm.delete(result)
@@ -161,7 +161,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func getAccountAutoUploadDirectory(urlBase: String, account: String) -> String {
+    @objc func getAccountAutoUploadDirectory(urlBase: String, userId: String, account: String) -> String {
 
         let realm = try! Realm()
 
@@ -172,19 +172,19 @@ extension NCManageDatabase {
         if result.autoUploadDirectory.count > 0 {
             // FIX change webdav -> /dav/files/
             if result.autoUploadDirectory.contains("/webdav") {
-                return NCUtilityFileSystem.shared.getHomeServer(account: account)
+                return NCUtilityFileSystem.shared.getHomeServer(urlBase: urlBase, userId: userId)
             } else {
                 return result.autoUploadDirectory
             }
         } else {
-            return NCUtilityFileSystem.shared.getHomeServer(account: account)
+            return NCUtilityFileSystem.shared.getHomeServer(urlBase: urlBase, userId: userId)
         }
     }
 
-    @objc func getAccountAutoUploadPath(urlBase: String, account: String) -> String {
+    @objc func getAccountAutoUploadPath(urlBase: String, userId: String, account: String) -> String {
 
         let cameraFileName = self.getAccountAutoUploadFileName()
-        let cameraDirectory = self.getAccountAutoUploadDirectory(urlBase: urlBase, account: account)
+        let cameraDirectory = self.getAccountAutoUploadDirectory(urlBase: urlBase, userId: userId, account: account)
 
         let folderPhotos = CCUtility.stringAppendServerUrl(cameraDirectory, addFileName: cameraFileName)!
 
@@ -198,7 +198,7 @@ extension NCManageDatabase {
         var accountReturn = tableAccount()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let results = realm.objects(tableAccount.self)
                 for result in results {
@@ -223,7 +223,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 if let result = realm.objects(tableAccount.self).filter("account == %@", account).first {
                     result.password = "********"
@@ -239,7 +239,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("active == true").first {
                     if (tableAccount().objectSchema.properties.contains { $0.name == property }) {
                         result[property] = state
@@ -256,7 +256,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("active == true").first {
                     if let fileName = fileName {
                         result.autoUploadFileName = fileName
@@ -270,17 +270,17 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func setAccountAutoUploadDirectory(_ serverUrl: String?, urlBase: String, account: String) {
+    @objc func setAccountAutoUploadDirectory(_ serverUrl: String?, urlBase: String, userId: String, account: String) {
 
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("active == true").first {
                     if let serverUrl = serverUrl {
                         result.autoUploadDirectory = serverUrl
                     } else {
-                        result.autoUploadDirectory = self.getAccountAutoUploadDirectory(urlBase: urlBase, account: account)
+                        result.autoUploadDirectory = self.getAccountAutoUploadDirectory(urlBase: urlBase, userId: userId, account: account)
                     }
                 }
             }
@@ -300,7 +300,7 @@ extension NCManageDatabase {
                 return nil
             }
 
-            try realm.safeWrite {
+            try realm.write {
 
                 guard let result = realm.objects(tableAccount.self).filter("account == %@", activeAccount.account).first else {
                     return
@@ -350,7 +350,7 @@ extension NCManageDatabase {
                 return nil
             }
 
-            try realm.safeWrite {
+            try realm.write {
 
                 guard let result = realm.objects(tableAccount.self).filter("account == %@", activeAccount.account).first else {
                     return
@@ -377,7 +377,7 @@ extension NCManageDatabase {
 
         let realm = try! Realm()
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("account == %@", account).first {
                     result.mediaPath = path
                 }
@@ -391,7 +391,7 @@ extension NCManageDatabase {
 
         let realm = try! Realm()
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("account == %@", account).first {
                     result.userStatusClearAt = userStatusClearAt
                     result.userStatusIcon = userStatusIcon
@@ -413,7 +413,7 @@ extension NCManageDatabase {
         let alias = alias?.trimmingCharacters(in: .whitespacesAndNewlines)
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("active == true").first {
                     if let alias = alias {
                         result.alias = alias