coding

iOSClient/Networking/NCOperationQueue.swift

@@ -473,6 +473,7 @@ class NCOperationDownloadAvatar: ConcurrentOperation {
                 if errorCode == 0, let image = image, let etag = etag {
                     
                     NCManageDatabase.shared.addAvatar(fileName: self.fileName, etag: etag)
+                    
                     if self.user == self.cell.fileUser {
                         if let avatarImageView = self.cell?.fileAvatarImageView  {
                             UIView.transition(with: avatarImageView, duration: 0.75, options: .transitionCrossDissolve) {
@@ -494,6 +495,7 @@ class NCOperationDownloadAvatar: ConcurrentOperation {
                     }
                     
                 } else if errorCode == NCGlobal.shared.errorNotModified {
+                    
                     NCManageDatabase.shared.setAvatarLoaded(fileName: self.fileName)
                 }
                 

iOSClient/Networking/NCService.swift

@@ -114,9 +114,12 @@ class NCService: NSObject {
                     NCCommunication.shared.downloadAvatar(user: user, fileNameLocalPath: fileNameLocalPath, sizeImage: NCGlobal.shared.avatarSize, sizeRoundedAvatar: NCGlobal.shared.sizeRoundedAvatar, etag: etag) { (account, image, etag, errorCode, errorMessage) in
                         
                         if let etag = etag, errorCode == 0 {
+                            
                             NCManageDatabase.shared.addAvatar(fileName: fileName, etag: etag)
                             NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadAvatar, userInfo: nil)
+                            
                         } else if errorCode == NCGlobal.shared.errorNotModified {
+                            
                             NCManageDatabase.shared.setAvatarLoaded(fileName: fileName)
                         }
                     }

iOSClient/Share/NCShare.swift

@@ -109,12 +109,13 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
                 NCCommunication.shared.downloadAvatar(user: metadata!.ownerId, fileNameLocalPath: fileNameLocalPath, sizeImage: NCGlobal.shared.avatarSize, sizeRoundedAvatar: NCGlobal.shared.sizeRoundedAvatar, etag: etag) { (account, image, etag, errorCode, errorMessage) in
                     
                     if errorCode == 0, let etag = etag, let image = image {
+                        
                         NCManageDatabase.shared.addAvatar(fileName: fileName, etag: etag)
                         self.sharedWithYouByImage.image = image
-                    } else if errorCode == NCGlobal.shared.errorNotModified {
-                        if let image = NCManageDatabase.shared.setAvatarLoaded(fileName: fileName) {
-                            self.sharedWithYouByImage.image = image
-                        }
+                        
+                    } else if errorCode == NCGlobal.shared.errorNotModified, let image = NCManageDatabase.shared.setAvatarLoaded(fileName: fileName) {
+                        
+                        self.sharedWithYouByImage.image = image
                     }
                 }
             }
@@ -356,9 +357,12 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
                 NCCommunication.shared.downloadAvatar(user: sharee.shareWith, fileNameLocalPath: fileNameLocalPath, sizeImage: NCGlobal.shared.avatarSize, sizeRoundedAvatar: NCGlobal.shared.sizeRoundedAvatar, etag: etag) { (account, image, etag, errorCode, errorMessage) in
                     
                     if errorCode == 0, let etag = etag, let image = image {
+                        
                         NCManageDatabase.shared.addAvatar(fileName: fileName, etag: etag)
                         cell.imageItem.image = image
+                        
                     } else if errorCode == NCGlobal.shared.errorNotModified, let image = NCManageDatabase.shared.setAvatarLoaded(fileName: fileName) {
+                        
                         cell.imageItem.image = image
                     }
                 }