marinofaggiana 4 년 전
부모
커밋
12df15f99f
1개의 변경된 파일23개의 추가작업 그리고 22개의 파일을 삭제
  1. 23 22
      iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

+ 23 - 22
iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -338,31 +338,32 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
                 } else {
                     
                     CCUtility.extractImageVideoFromAssetLocalIdentifier(forUpload: metadataNewFile, notification: false) { (metadataNew, fileNamePath) in
-                        
-                        if metadataNew != nil {
-                            self.fileNamesPath[metadataNewFile.fileNameView] = fileNamePath!
-                            do {
-                                if mediaType == PHAssetMediaType.image {
-                                    let data = try Data(contentsOf: URL(fileURLWithPath: fileNamePath!))
-                                    if let image = UIImage(data: data) {
-                                        DispatchQueue.main.async {
-                                            cell.imageNewFile.image = image
+                        DispatchQueue.main.async {
+                            if metadataNew != nil {
+                                self.fileNamesPath[metadataNewFile.fileNameView] = fileNamePath!
+                                do {
+                                    if mediaType == PHAssetMediaType.image {
+                                        let data = try Data(contentsOf: URL(fileURLWithPath: fileNamePath!))
+                                        if let image = UIImage(data: data) {
+                                            DispatchQueue.main.async {
+                                                cell.imageNewFile.image = image
+                                            }
                                         }
-                                    }
-                                } else if mediaType == PHAssetMediaType.video {
-                                    if let image = CCGraphics.thumbnailImage(forVideo: URL(fileURLWithPath: fileNamePath!), atTime: 1) {
-                                        DispatchQueue.main.async {
-                                            cell.imageNewFile.image = image
+                                    } else if mediaType == PHAssetMediaType.video {
+                                        if let image = CCGraphics.thumbnailImage(forVideo: URL(fileURLWithPath: fileNamePath!), atTime: 1) {
+                                            DispatchQueue.main.async {
+                                                cell.imageNewFile.image = image
+                                            }
                                         }
                                     }
-                                }
-                                
-                                let fileDictionary = try FileManager.default.attributesOfItem(atPath: fileNamePath!)
-                                let fileSize = fileDictionary[FileAttributeKey.size] as! Double
-                                
-                                cell.labelDetailNewFile.text = CCUtility.dateDiff(date) + "\n" + CCUtility.transformedSize(fileSize)
-                                
-                            } catch { print("Error: \(error)") }
+                                    
+                                    let fileDictionary = try FileManager.default.attributesOfItem(atPath: fileNamePath!)
+                                    let fileSize = fileDictionary[FileAttributeKey.size] as! Double
+                                    
+                                    cell.labelDetailNewFile.text = CCUtility.dateDiff(date) + "\n" + CCUtility.transformedSize(fileSize)
+                                    
+                                } catch { print("Error: \(error)") }
+                            }
                         }
                     }
                 }