- OCCore+CommandLocalImport: add convenience shortcut/detour to reportLocalModificationOfItem when OCConnectionOptionForceReplaceKey is set

- OCSyncActionUpload: fix issue where "Replace" didn't work, could end up with two items in the database for a single item on the server

Author: felix-schwarz

ownCloudSDK/Core/Sync/Actions/Upload/OCCore+CommandLocalImport.m

@@ -20,6 +20,7 @@
 #import "OCSyncActionUpload.h"
 #import "OCItem+OCFileURLMetadata.h"
 #import "OCCore+NameConflicts.h"
+#import "OCCore+Internal.h"
 
 #import <CoreServices/CoreServices.h>
 
@@ -66,6 +67,22 @@ - (nullable NSProgress *)importFileNamed:(nullable NSString *)newFileName at:(OC
 		}
 	}
 
+	// Replace existing
+	NSNumber *forceReplace = options[OCConnectionOptionForceReplaceKey];
+	if ((forceReplace != nil) && forceReplace.boolValue)
+	{
+		NSError *error = nil;
+		OCItem *existingItem = nil;
+
+		existingItem = [self cachedItemInParentLocation:parentItem.location withName:newFileName isDirectory:NO error:&error];
+
+		if (existingItem != nil)
+		{
+			// Schedule as local modification instead
+			return ([self reportLocalModificationOfItem:existingItem parentItem:parentItem withContentsOfFileAtURL:inputFileURL isSecurityScoped:isSecurityScoped options:options placeholderCompletionHandler:placeholderCompletionHandler resultHandler:resultHandler]);
+		}
+	}
+
 	// Create placeholder item and fill fields required by -[NSFileProviderExtension importDocumentAtURL:toParentItemIdentifier:completionHandler:] completion handler
 	placeholderItem = [OCItem placeholderItemOfType:OCItemTypeFile];
 

ownCloudSDK/Core/Sync/Actions/Upload/OCSyncActionUpload.m

@@ -510,6 +510,13 @@ - (NSError *)resolveIssue:(OCSyncIssue *)issue withChoice:(OCSyncIssueChoice *)c
 			options[OCConnectionOptionForceReplaceKey] = @(YES);
 			self.options = options;
 
+			OCItem *preExistingItem = [self _preExistingItem];
+			if (preExistingItem != nil)
+			{
+				// Remove (possible) duplicate item from database
+				syncContext.removedItems = @[ preExistingItem ];
+			}
+
 			syncContext.updateStoredSyncRecordAfterItemUpdates = YES;
 
 			[syncContext transitionToState:OCSyncRecordStateReady withWaitConditions:nil];