- Temporary workaround: make importFileFromURL: not return directly w…

…ith the placeholder, but only when upload has completed - and then return the final item
owncloud · Jan 22, 2019 · 6a5581d · 6a5581d
1 parent 208733c
commit 6a5581d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/ownCloud File Provider/FileProviderExtension.m b/ownCloud File Provider/FileProviderExtension.m
@@ -570,8 +570,8 @@ - (void)importDocumentAtURL:(NSURL *)fileURL toParentItemIdentifier:(NSFileProvi
 
 		// Start import
 		[self.core importFileNamed:importFileName at:parentItem fromURL:fileURL isSecurityScoped:YES options:@{ OCCoreOptionImportByCopying : @(importByCopying) } placeholderCompletionHandler:^(NSError *error, OCItem *item) {
-			FPLogCmd(@"Completed with placeholderItem=%@, error=%@", item, error);
-			completionHandler(item, error);
+//			FPLogCmd(@"Completed with placeholderItem=%@, error=%@", item, error);
+//			completionHandler(item, error);
 		} resultHandler:^(NSError *error, OCCore *core, OCItem *item, id parameter) {
 			if ([error.domain isEqual:OCHTTPStatusErrorDomain] && (error.code == OCHTTPStatusCodePRECONDITION_FAILED))
 			{
@@ -595,6 +595,12 @@ - (void)importDocumentAtURL:(NSURL *)fileURL toParentItemIdentifier:(NSFileProvi
 					}
 				}
 			}
+			else
+			{
+				// Temporary: call completion handler only after upload has finished - with the final item
+				FPLogCmd(@"Completed with item=%@, error=%@", item, error);
+				completionHandler(item, error);
+			}
 		}];
 	}
 	else