normalized

iOSClient/Activity/NCActivity.swift

@@ -228,11 +228,9 @@ extension NCActivity: UITableViewDataSource {
                         cell.avatar.image = NCUtility.shared.createAvatar(image: image, size: 30) 
                     }
                 } else {
-                    DispatchQueue.global().async {
-                        NCCommunication.shared.downloadAvatar(userId: activity.user, fileNameLocalPath: fileNameLocalPath, size: NCGlobal.shared.avatarSize) { (account, data, errorCode, errorMessage) in
-                            if errorCode == 0 && account == self.appDelegate.account && UIImage(data: data!) != nil {
-                                cell.avatar.image = NCUtility.shared.createAvatar(image: UIImage(data: data!)!, size: 30)
-                            }
+                    NCCommunication.shared.downloadAvatar(userId: activity.user, fileNameLocalPath: fileNameLocalPath, size: NCGlobal.shared.avatarSize) { (account, data, errorCode, errorMessage) in
+                        if errorCode == 0 && account == self.appDelegate.account && UIImage(data: data!) != nil {
+                            cell.avatar.image = NCUtility.shared.createAvatar(image: UIImage(data: data!)!, size: 30)
                         }
                     }
                 }

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1337,8 +1337,8 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                 cell.imageShared.image = NCBrandColor.cacheImages.canShare
             }
             if metadata.ownerId.count > 0 && metadata.ownerId != appDelegate.userId {
-                var fileNameUser = CCUtility.getDirectoryUserData() + "/" + CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase) + "-" + metadata.ownerId
-                fileNameUser = fileNameUser + ".png"
+                cell.imageShared.image = UIImage(named: "avatar")
+                let fileNameUser = String(CCUtility.getDirectoryUserData()) + "/" + String(CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase)) + "-" + metadata.ownerId + ".png"
                 if FileManager.default.fileExists(atPath: fileNameUser) {
                     if let image = UIImage(contentsOfFile: fileNameUser) {
                         cell.imageShared.image = NCUtility.shared.createAvatar(image: image, size: 30)

iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift

@@ -173,7 +173,7 @@ import NCCommunication
         // image
         let imagePreview = cell.viewWithTag(100) as! UIImageView
         if template.preview != "" {
-            let fileNameLocalPath = CCUtility.getDirectoryUserData() + "/" + template.name + ".png"
+            let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + template.name + ".png"
             if FileManager.default.fileExists(atPath: fileNameLocalPath) {
                 let imageURL = URL(fileURLWithPath: fileNameLocalPath)
                 if let image = UIImage(contentsOfFile: imageURL.path) {
@@ -505,7 +505,7 @@ import NCCommunication
     
     func getImageFromTemplate(name: String, preview: String, indexPath: IndexPath) {
         
-        let fileNameLocalPath = CCUtility.getDirectoryUserData() + "/" + name + ".png"
+        let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + name + ".png"
 
         NCCommunication.shared.download(serverUrlFileName: preview, fileNameLocalPath: fileNameLocalPath, requestHandler: { (_) in
             

iOSClient/Networking/NCService.swift

@@ -75,7 +75,7 @@ class NCService: NSObject {
                     
                     // Get Avatar
                     let avatarUrl = "\(self.appDelegate.urlBase)/index.php/avatar/\(self.appDelegate.user)/\(NCGlobal.shared.avatarSize)".addingPercentEncoding(withAllowedCharacters: .urlFragmentAllowed)!
-                    let fileNamePath = CCUtility.getDirectoryUserData() + "/" + stringUser + "-" + self.appDelegate.user + ".png"
+                    let fileNamePath = String(CCUtility.getDirectoryUserData()) + "/" + stringUser + "-" + self.appDelegate.user + ".png"
                     NCCommunication.shared.downloadContent(serverUrl: avatarUrl) { (account, data, errorCode, errorMessage) in
                         
                         if errorCode == 0 && account == self.appDelegate.account {

iOSClient/Notification/NCNotification.swift

@@ -100,7 +100,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
         var image : UIImage?
         
         if let urlIcon = urlIcon {
-            let pathFileName = CCUtility.getDirectoryUserData() + "/" + urlIcon.deletingPathExtension().lastPathComponent + ".png"
+            let pathFileName = String(CCUtility.getDirectoryUserData()) + "/" + urlIcon.deletingPathExtension().lastPathComponent + ".png"
             image = UIImage(contentsOfFile: pathFileName)
         }
         

iOSClient/Select/NCSelect.swift

@@ -566,8 +566,7 @@ extension NCSelect: UICollectionViewDataSource {
                 cell.imageShared.image = NCBrandColor.cacheImages.canShare
             }
             if metadata.ownerId.count > 0 && metadata.ownerId != appDelegate.userId {
-                var fileNameUser = CCUtility.getDirectoryUserData() + "/" + CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase) + "-" + metadata.ownerId
-                fileNameUser = fileNameUser + ".png"
+                let fileNameUser = String(CCUtility.getDirectoryUserData()) + "/" + String(CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase)) + "-" + metadata.ownerId + ".png"
                 if FileManager.default.fileExists(atPath: fileNameUser) {
                     cell.imageShared.image = UIImage(contentsOfFile: fileNameUser)
                 } else {

iOSClient/Share/NCShare.swift

@@ -90,8 +90,7 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
             sharedWithYouByLabel.text = NSLocalizedString("_shared_with_you_by_", comment: "") + " " + metadata!.ownerDisplayName
             sharedWithYouByImage.image = UIImage(named: "avatar")
 
-            var fileNameLocalPath = CCUtility.getDirectoryUserData() + "/" + CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase) + "-" + metadata!.ownerId
-            fileNameLocalPath = fileNameLocalPath + ".png"
+            let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + String(CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase)) + "-" + metadata!.ownerId + ".png"
             if FileManager.default.fileExists(atPath: fileNameLocalPath) {
                 if let image = UIImage(contentsOfFile: fileNameLocalPath) {
                     sharedWithYouByImage.image = NCUtility.shared.createAvatar(image: image, size: 40)
@@ -313,22 +312,19 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
                 cell.centerTitle.constant = 0
             }
 
-            var fileNameLocalPath = CCUtility.getDirectoryUserData() + "/" + CCUtility.getStringUser(self.appDelegate.user, urlBase: self.appDelegate.urlBase) + "-" + sharee.label
-            fileNameLocalPath = fileNameLocalPath + ".png"
+            let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + String(CCUtility.getStringUser(self.appDelegate.user, urlBase: self.appDelegate.urlBase)) + "-" + sharee.label + ".png"
             if FileManager.default.fileExists(atPath: fileNameLocalPath) {
                 if let image = UIImage(contentsOfFile: fileNameLocalPath) {
                     cell.imageItem.image = NCUtility.shared.createAvatar(image: image, size: 30)
                 }
             } else {
-                DispatchQueue.global().async {
-                    NCCommunication.shared.downloadAvatar(userId: sharee.shareWith, fileNameLocalPath: fileNameLocalPath, size: NCGlobal.shared.avatarSize) { (account, data, errorCode, errorMessage) in
-                        if errorCode == 0 && account == self.appDelegate.account && UIImage(data: data!) != nil {
-                            if let image = UIImage(contentsOfFile: fileNameLocalPath) {
-                                DispatchQueue.main.async {
-                                    cell.imageItem.image = NCUtility.shared.createAvatar(image: image, size: 30)
-                                }
+                NCCommunication.shared.downloadAvatar(userId: sharee.shareWith, fileNameLocalPath: fileNameLocalPath, size: NCGlobal.shared.avatarSize) { (account, data, errorCode, errorMessage) in
+                    if errorCode == 0 && account == self.appDelegate.account && UIImage(data: data!) != nil {
+                        if let image = UIImage(contentsOfFile: fileNameLocalPath) {
+                            DispatchQueue.main.async {
+                                cell.imageItem.image = NCUtility.shared.createAvatar(image: image, size: 30)
                             }
-                        } 
+                        }
                     }
                 }
             }
@@ -408,19 +404,16 @@ extension NCShare: UITableViewDataSource {
                 cell.imageStatus.image = status.onlineStatus
                 cell.status.text = status.statusMessage
                 
-                var fileNameLocalPath = CCUtility.getDirectoryUserData() + "/" + CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase) + "-" + tableShare.shareWith
-                fileNameLocalPath = fileNameLocalPath + ".png"
+                let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + String(CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase)) + "-" + tableShare.shareWith + ".png"
                 if FileManager.default.fileExists(atPath: fileNameLocalPath) {
                     if let image = UIImage(contentsOfFile: fileNameLocalPath) {
                         cell.imageItem.image = NCUtility.shared.createAvatar(image: image, size: 40)
                     }
                 } else {
-                    DispatchQueue.global().async {
-                        NCCommunication.shared.downloadAvatar(userId: tableShare.shareWith, fileNameLocalPath: fileNameLocalPath, size: NCGlobal.shared.avatarSize) { (account, data, errorCode, errorMessage) in
-                            if errorCode == 0 && account == self.appDelegate.account && UIImage(data: data!) != nil {
-                                if let image = UIImage(contentsOfFile: fileNameLocalPath) {
-                                    cell.imageItem.image = NCUtility.shared.createAvatar(image: image, size: 40)
-                                }
+                    NCCommunication.shared.downloadAvatar(userId: tableShare.shareWith, fileNameLocalPath: fileNameLocalPath, size: NCGlobal.shared.avatarSize) { (account, data, errorCode, errorMessage) in
+                        if errorCode == 0 && account == self.appDelegate.account && UIImage(data: data!) != nil {
+                            if let image = UIImage(contentsOfFile: fileNameLocalPath) {
+                                cell.imageItem.image = NCUtility.shared.createAvatar(image: image, size: 40)
                             }
                         }
                     }

iOSClient/Share/NCShareComments.swift

@@ -68,8 +68,7 @@ class NCShareComments: UIViewController, NCShareCommentsCellDelegate {
         }
         
         imageItem.image = UIImage(named: "avatar")
-        var fileNameLocalPath = CCUtility.getDirectoryUserData() + "/" + CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase) + "-" + appDelegate.user
-        fileNameLocalPath = fileNameLocalPath + ".png"
+        let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + String(CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase)) + "-" + appDelegate.user + ".png"
         if FileManager.default.fileExists(atPath: fileNameLocalPath) {
             if let image = UIImage(contentsOfFile: fileNameLocalPath) {
                 imageItem.image = NCUtility.shared.createAvatar(image: image, size: 40)
@@ -182,36 +181,33 @@ extension NCShareComments: UITableViewDataSource {
             // Image
             cell.imageItem.image = UIImage(named: "avatar")
 
-            var fileNameLocalPath = CCUtility.getDirectoryUserData() + "/" + CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase) + "-" + tableComments.actorId
-            fileNameLocalPath = fileNameLocalPath + ".png"
+            let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + String(CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase)) + "-" + tableComments.actorId + ".png"
             if FileManager.default.fileExists(atPath: fileNameLocalPath) {
                 if let image = UIImage(contentsOfFile: fileNameLocalPath) {
                     cell.imageItem.image = NCUtility.shared.createAvatar(image: image, size: 40)
                 }
             } else {
-                DispatchQueue.global().async {
-                    NCCommunication.shared.downloadAvatar(userId: tableComments.actorId, fileNameLocalPath: fileNameLocalPath, size: 128) { (account, data, errorCode, errorMessage) in
-                        if errorCode == 0 && UIImage(data: data!) != nil {
-                            if let image = UIImage(data: data!) {
-                                cell.imageItem.image = NCUtility.shared.createAvatar(image: image, size: 40)
-                            }
+                NCCommunication.shared.downloadAvatar(userId: tableComments.actorId, fileNameLocalPath: fileNameLocalPath, size: 128) { (account, data, errorCode, errorMessage) in
+                    if errorCode == 0 && UIImage(data: data!) != nil {
+                        if let image = UIImage(data: data!) {
+                            cell.imageItem.image = NCUtility.shared.createAvatar(image: image, size: 40)
                         }
                     }
-                    /*
-                    let url = self.appDelegate.urlBase + k_avatar + tableComments.actorId + "/" + k_avatar_size
-                    let encodedString = url.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)
-                    OCNetworking.sharedManager()?.downloadContents(ofUrl: encodedString, completion: { (data, message, errorCode) in
-                        if errorCode == 0 && UIImage(data: data!) != nil {
-                            do {
-                                try data!.write(to: NSURL(fileURLWithPath: fileNameLocalPath) as URL, options: .atomic)
-                                if let image = UIImage(contentsOfFile: fileNameLocalPath) { cell.imageItem.image = image }
-                            } catch { return }
-                        } else {
-                            cell.imageItem.image = UIImage(named: "avatar")
-                        }
-                    })
-                    */
                 }
+                /*
+                let url = self.appDelegate.urlBase + k_avatar + tableComments.actorId + "/" + k_avatar_size
+                let encodedString = url.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)
+                OCNetworking.sharedManager()?.downloadContents(ofUrl: encodedString, completion: { (data, message, errorCode) in
+                    if errorCode == 0 && UIImage(data: data!) != nil {
+                        do {
+                            try data!.write(to: NSURL(fileURLWithPath: fileNameLocalPath) as URL, options: .atomic)
+                            if let image = UIImage(contentsOfFile: fileNameLocalPath) { cell.imageItem.image = image }
+                        } catch { return }
+                    } else {
+                        cell.imageItem.image = UIImage(named: "avatar")
+                    }
+                })
+                */
             }
             // Username
             cell.labelUser.text = tableComments.actorDisplayName