marinofaggiana 6 ani în urmă
părinte
comite
2248b6d051

+ 10 - 7
iOSClient/Database/NCManageDatabase.swift

@@ -467,7 +467,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func setAccountUserProfile(_ userProfile: OCUserProfile) -> tableAccount? {
+    @objc func setAccountUserProfile(_ userProfile: OCUserProfile, HCProperties: Bool) -> tableAccount? {
      
         guard let activeAccount = self.getAccountActive() else {
             return nil
@@ -491,17 +491,20 @@ class NCManageDatabase: NSObject {
                 
                 result.enabled = userProfile.enabled
                 result.address = userProfile.address
-                result.businessSize = Double(userProfile.businessSize)
-                result.businessType = userProfile.businessType
-                result.city = userProfile.city
-                result.company = userProfile.company
                 result.displayName = userProfile.displayName
                 result.email = userProfile.email
                 result.phone = userProfile.phone
-                result.role = userProfile.role
                 result.twitter = userProfile.twitter
                 result.webpage = userProfile.webpage
-                result.zip = userProfile.zip
+                
+                if HCProperties {
+                    result.businessSize = Double(userProfile.businessSize)
+                    result.businessType = userProfile.businessType
+                    result.city = userProfile.city
+                    result.company = userProfile.company
+                    result.role = userProfile.role
+                    result.zip = userProfile.zip
+                }
                 
                 result.quota = userProfile.quota
                 result.quotaFree = userProfile.quotaFree

+ 3 - 3
iOSClient/Networking/NCService.swift

@@ -233,7 +233,7 @@ class NCService: NSObject {
             if errorCode == 0 && account == self.appDelegate.activeAccount {
                 
                 // Update User (+ userProfile.id) & active account & account network
-                guard let tableAccount = NCManageDatabase.sharedInstance.setAccountUserProfile(userProfile!) else {
+                guard let tableAccount = NCManageDatabase.sharedInstance.setAccountUserProfile(userProfile!, HCProperties: false) else {
                     self.appDelegate.messageNotification("Accopunt", description: "Internal error : account not found on DB", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: Int(k_CCErrorInternalError))
                     return
                 }
@@ -326,7 +326,7 @@ class NCService: NSObject {
                     CCUtility.setHCBusinessType(nil)
                     OCNetworking.sharedManager()?.getHCUserProfile(withAccount: self.appDelegate.activeAccount, serverUrl: self.appDelegate.activeUrl, completion: { (account, userProfile, message, errorCode) in
                         if errorCode == 0 && account == self.appDelegate.activeAccount {
-                            _ = NCManageDatabase.sharedInstance.setAccountUserProfile(userProfile!)
+                            _ = NCManageDatabase.sharedInstance.setAccountUserProfile(userProfile!, HCProperties: true)
                         }
                     })
                 }
@@ -334,7 +334,7 @@ class NCService: NSObject {
         } else {
             OCNetworking.sharedManager()?.getHCUserProfile(withAccount: appDelegate.activeAccount, serverUrl: appDelegate.activeUrl, completion: { (account, userProfile, message, errorCode) in
                 if errorCode == 0 && account == self.appDelegate.activeAccount {
-                    _ = NCManageDatabase.sharedInstance.setAccountUserProfile(userProfile!)
+                    _ = NCManageDatabase.sharedInstance.setAccountUserProfile(userProfile!, HCProperties: true)
                 }
             })
         }