Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/ios.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift')
-rw-r--r--iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift5
1 files changed, 3 insertions, 2 deletions
diff --git a/iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift b/iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift
index 7e57a43cd..223512855 100644
--- a/iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift
+++ b/iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift
@@ -24,6 +24,7 @@
import UIKit
import NextcloudKit
import Photos
+import JGProgressHUD
@objc protocol NCCreateFormUploadConflictDelegate {
@objc func dismissCreateFormUploadConflict(metadatas: [tableMetadata]?)
@@ -315,7 +316,7 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
cell.backgroundColor = tableView.backgroundColor
- let metadataNewFile = metadatasUploadInConflict[indexPath.row]
+ let metadataNewFile = tableMetadata.init(value: metadatasUploadInConflict[indexPath.row])
cell.ocId = metadataNewFile.ocId
cell.delegate = self
@@ -390,7 +391,7 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
} else {
// PREVIEW
- NCUtility.shared.extractImageVideoFromAssetLocalIdentifier(metadata: metadataNewFile, modifyMetadataForUpload: false) { metadata, fileNamePath, error in
+ NCUtility.shared.extractImageVideoFromAssetLocalIdentifier(metadata: metadataNewFile, modifyMetadataForUpload: false, viewController: self, hud: JGProgressHUD()) { metadata, fileNamePath, error in
if !error {
self.fileNamesPath[metadataNewFile.fileNameView] = fileNamePath!
do {