marinofaggiana 3 years ago
parent
commit
43d04ae866

+ 4 - 4
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -626,11 +626,11 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             
                 var image = NCUtility.shared.loadImage(named: "person.crop.circle")
                 
-                /*
-                if let data = try? Data(contentsOf: fileNameDataUrl), let imageAvatar = UIImage(data: data) {
-                    image = NCUtility.shared.createAvatar(image: imageAvatar, size: 30)
+                let fileName = String(CCUtility.getUserUrlBase(appDelegate.user, urlBase: appDelegate.urlBase)) + "-" + self.appDelegate.user + "-original.png"
+                let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + fileName
+                if let imageUser = UIImage(contentsOfFile: fileNameLocalPath) {
+                    image = NCUtility.shared.createAvatar(image: imageUser, size: 30)
                 }
-                */
                 
                 let button = UIButton(type: .custom)
                 button.setImage(image, for: .normal)

+ 4 - 3
iOSClient/Networking/NCService.swift

@@ -116,9 +116,10 @@ class NCService: NSObject {
                         if let etag = etag, errorCode == 0, let imageOriginal = imageOriginal {
                             
                             do {
-                                let image = NCUtility.shared.createAvatar(image: imageOriginal, size: 30)
-                                if let pngData = image.pngData() {
-                                    let url = URL.init(fileURLWithPath: (fileNameLocalPath + "-x30.png"))
+                                if let pngData = imageOriginal.pngData() {
+                                    let fileName = String(CCUtility.getUserUrlBase(user, urlBase: url)) + "-" + self.appDelegate.user + "-original.png"
+                                    let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + fileName
+                                    let url = URL.init(fileURLWithPath: fileNameLocalPath)
                                     try pngData.write(to: url)
                                 }
                             } catch {}