coding

iOSClient/Networking/NCService.swift

@@ -110,7 +110,9 @@ class NCService: NSObject {
                     let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + fileName
                     let etag = NCManageDatabase.shared.getTableAvatar(fileName: fileName)?.etag
                     NCCommunication.shared.downloadAvatar(user: user, fileNameLocalPath: fileNameLocalPath, size: NCGlobal.shared.avatarSize, etag: etag) { (account, data, etag, errorCode, errorMessage) in
-                        if let etag = etag, errorCode == 0 {
+                        if let etag = etag, errorCode == 0, let data = data, var image = UIImage.init(data: data) {
+                            image = NCUtility.shared.createAvatar(image: image, size: 30)
+                            (UIApplication.shared.delegate as! AppDelegate).avatars[user] = image
                             NCManageDatabase.shared.addAvatar(fileName: fileName, etag: etag)
                             NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadAvatar, userInfo: nil)
                         }

iOSClient/Notification/NCNotification.swift

@@ -136,8 +136,10 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
             if let parameter = JSON(subjectRichParameters).dictionary {
                 if let user = JSON(parameter).dictionary {
                     if let userId = user["id"]?.string {
+                        
                         let fileName = String(CCUtility.getUserUrlBase(appDelegate.user, urlBase: appDelegate.urlBase)) + "-" + userId + ".png"
                         let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + fileName
+                        
                         if FileManager.default.fileExists(atPath: fileNameLocalPath) {
                             if let image = UIImage(contentsOfFile: fileNameLocalPath) {
                                 cell.avatar.isHidden = false

iOSClient/Share/NCShare.swift

@@ -106,8 +106,11 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
                 let etag = NCManageDatabase.shared.getTableAvatar(fileName: fileName)?.etag
                 NCCommunication.shared.downloadAvatar(user: metadata!.ownerId, fileNameLocalPath: fileNameLocalPath, size: NCGlobal.shared.avatarSize, etag: etag) { (account, data, etag, errorCode, errorMessage) in
                     
-                    if errorCode == 0, let etag = etag, let image = UIImage(contentsOfFile: fileNameLocalPath) {
-                        self.sharedWithYouByImage.image = NCUtility.shared.createAvatar(image: image, size: 40)
+                    if errorCode == 0, let etag = etag, let data = data, var image = UIImage.init(data: data) {
+                        image = NCUtility.shared.createAvatar(image: image, size: 30)
+                        (UIApplication.shared.delegate as! AppDelegate).avatars[self.metadata!.ownerId] = image
+                        NCManageDatabase.shared.addAvatar(fileName: fileName, etag: etag)
+                        self.sharedWithYouByImage.image = image
                     } 
                 }
             }