coding

Nextcloud.xcodeproj/project.pbxproj

@@ -2939,7 +2939,7 @@
 			repositoryURL = "https://github.com/nextcloud/ios-communication-library/";
 			requirement = {
 				kind = revision;
-				revision = d742e340e924d3b44650d9af8c0cbd31a9253dc4;
+				revision = 3eec08097f76754b8f3ffb3c8d1cfba86be1acff;
 			};
 		};
 		F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {

Nextcloud.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -105,7 +105,7 @@
         "repositoryURL": "https://github.com/nextcloud/ios-communication-library/",
         "state": {
           "branch": null,
-          "revision": "d742e340e924d3b44650d9af8c0cbd31a9253dc4",
+          "revision": "3eec08097f76754b8f3ffb3c8d1cfba86be1acff",
           "version": null
         }
       },

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -625,13 +625,12 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             if layoutKey == NCGlobal.shared.layoutViewFiles {
             
                 var image = NCUtility.shared.loadImage(named: "person.crop.circle")
-                let fileNamePath = String(CCUtility.getDirectoryUserData()) + "/" + String(CCUtility.getUserUrlBase(appDelegate.user, urlBase: appDelegate.urlBase)) + "-" + appDelegate.user + ".png"
+                let fileName = String(CCUtility.getUserUrlBase(appDelegate.user, urlBase: appDelegate.urlBase)) + "-" + appDelegate.user + ".png"
+                let fileNamePath = String(CCUtility.getDirectoryUserData()) + "/" + fileName
                 if let userImage = UIImage(contentsOfFile: fileNamePath) {
                     image = userImage
                 }
-                
-                image = NCUtility.shared.createAvatar(image: image, size: 30)
-                
+                                
                 let button = UIButton(type: .custom)
                 button.setImage(image, for: .normal)
                 

iOSClient/NCGlobal.swift

@@ -93,6 +93,7 @@ class NCGlobal: NSObject {
     // Avatar & Preview size
     //
     let avatarSize: Int                             = 128 * Int(UIScreen.main.scale)
+    let sizeRoundedAvatar: Int                      = 30
     let sizePreview: Int                            = 1024
     let sizeIcon: Int                               = 512
     

iOSClient/Networking/NCOperationQueue.swift

@@ -463,11 +463,10 @@ class NCOperationDownloadAvatar: ConcurrentOperation {
         if isCancelled {
             self.finish()
         } else {
-            NCCommunication.shared.downloadAvatar(user: user, fileNameLocalPath: fileNameLocalPath, size: NCGlobal.shared.avatarSize, etag: self.etag) { (account, data, etag, errorCode, errorMessage) in
+            NCCommunication.shared.downloadAvatar(user: user, fileNameLocalPath: fileNameLocalPath, sizeImage: NCGlobal.shared.avatarSize, sizeRoundedAvatar: NCGlobal.shared.sizeRoundedAvatar, etag: self.etag) { (account, data, etag, errorCode, errorMessage) in
                 
-                if errorCode == 0, let data = data, let etag = etag, var image = UIImage.init(data: data) {
+                if errorCode == 0, let data = data, let etag = etag, let image = UIImage.init(data: data) {
                     
-                    image = NCUtility.shared.createAvatar(image: image, size: 30)
                     NCManageDatabase.shared.addAvatar(fileName: self.fileName, etag: etag)
                     #if !EXTENSION
                     (UIApplication.shared.delegate as! AppDelegate).avatars[self.user] = image
@@ -491,8 +490,8 @@ class NCOperationDownloadAvatar: ConcurrentOperation {
                             (self.view as? UITableView)?.reloadData()
                         }
                     }
-                } else if errorCode == NCGlobal.shared.errorNotModified, var image = UIImage(contentsOfFile: self.fileNameLocalPath) {
-                    image = NCUtility.shared.createAvatar(image: image, size: 30)
+                    
+                } else if errorCode == NCGlobal.shared.errorNotModified, let image = UIImage(contentsOfFile: self.fileNameLocalPath) {
                     #if !EXTENSION
                     (UIApplication.shared.delegate as! AppDelegate).avatars[self.user] = image
                     #endif

iOSClient/Networking/NCService.swift

@@ -110,14 +110,12 @@ 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, let data = data, var image = UIImage.init(data: data) {
-                            image = NCUtility.shared.createAvatar(image: image, size: 30)
+                    NCCommunication.shared.downloadAvatar(user: user, fileNameLocalPath: fileNameLocalPath, sizeImage: NCGlobal.shared.avatarSize, sizeRoundedAvatar: NCGlobal.shared.sizeRoundedAvatar, etag: etag) { (account, data, etag, errorCode, errorMessage) in
+                        if let etag = etag, errorCode == 0, let data = data, let image = UIImage.init(data: data) {
                             (UIApplication.shared.delegate as! AppDelegate).avatars[user] = image
                             NCManageDatabase.shared.addAvatar(fileName: fileName, etag: etag)
                             NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadAvatar, userInfo: nil)
-                        } else if errorCode == NCGlobal.shared.errorNotModified, var image = UIImage(contentsOfFile: fileNameLocalPath) {
-                            image = NCUtility.shared.createAvatar(image: image, size: 30)
+                        } else if errorCode == NCGlobal.shared.errorNotModified, let image = UIImage(contentsOfFile: fileNameLocalPath) {
                             (UIApplication.shared.delegate as! AppDelegate).avatars[user] = image
                             NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadAvatar, userInfo: nil)
                         }

iOSClient/Share/NCShare.swift

@@ -103,7 +103,7 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
                 let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + fileName
                 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
+                NCCommunication.shared.downloadAvatar(user: metadata!.ownerId, fileNameLocalPath: fileNameLocalPath, sizeImage: NCGlobal.shared.avatarSize, sizeRoundedAvatar: NCGlobal.shared.sizeRoundedAvatar, etag: etag) { (account, data, etag, errorCode, errorMessage) in
                     
                     if errorCode == 0, let etag = etag, let data = data, var image = UIImage.init(data: data) {
                         image = NCUtility.shared.createAvatar(image: image, size: 30)
@@ -348,7 +348,7 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
                 let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + fileName
                 let etag = NCManageDatabase.shared.getTableAvatar(fileName: fileName)?.etag
 
-                NCCommunication.shared.downloadAvatar(user: sharee.shareWith, fileNameLocalPath: fileNameLocalPath, size: NCGlobal.shared.avatarSize, etag: etag) { (account, data, etag, errorCode, errorMessage) in
+                NCCommunication.shared.downloadAvatar(user: sharee.shareWith, fileNameLocalPath: fileNameLocalPath, sizeImage: NCGlobal.shared.avatarSize, sizeRoundedAvatar: NCGlobal.shared.sizeRoundedAvatar, etag: etag) { (account, data, etag, errorCode, errorMessage) in
                     
                     if errorCode == 0, let etag = etag, let data = data, var image = UIImage.init(data: data) {
                         image = NCUtility.shared.createAvatar(image: image, size: 30)