coding

iOSClient/Favorites/CCFavorites.m

@@ -607,7 +607,7 @@
                         [self shouldPerformSegue:self.metadata selector:selectorLoadFileView];
                     }
                     
-                    [[NCNetworking shared] downloadWithOcId:self.metadata.ocId selector:selectorLoadFileViewFavorite setFavorite:false completion:^(NSInteger errorCode) { }];
+                    [[NCNetworking shared] downloadWithMetadata:self.metadata selector:selectorLoadFileViewFavorite setFavorite:false completion:^(NSInteger errorCode) { }];
                 }
             }
         }

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -345,11 +345,15 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
                                 if mediaType == PHAssetMediaType.image {
                                     let data = try Data(contentsOf: URL(fileURLWithPath: fileNamePath!))
                                     if let image = UIImage(data: data) {
-                                        cell.imageNewFile.image = image
+                                        DispatchQueue.main.async {
+                                            cell.imageNewFile.image = image
+                                        }
                                     }
                                 } else if mediaType == PHAssetMediaType.video {
                                     if let image = CCGraphics.thumbnailImage(forVideo: URL(fileURLWithPath: fileNamePath!), atTime: 1) {
-                                        cell.imageNewFile.image = image
+                                        DispatchQueue.main.async {
+                                            cell.imageNewFile.image = image
+                                        }
                                     }
                                 }