[fix/recursive-fp-copy] Fix recursive copy in File Provider (#162)

* - OCVaultLocation: fix vfsItemID for cases where only .vfsNodeID is not set, but the node is still a virtual node (=> should have affected mostly drive-representing VFS nodes)

* - OCBookmark:
	- add new .uuidString property (including caching) to avoid OCBookmark.uuid.uuidString calls
	- switch from bookmark.uuid.UUIDString to bookmark.uuidString across the codebase
- OCSyncContext:
	- modernize syntax for private ivars
	- add new mechanism to add completion handler(s) to run after context actions have run
- OCSyncActionCreateFolder:
	- add bookmarkUUID to placeholderItem
	- run the placeholder completion handler only after the folder item has been added to the database
- OCVaultLocation: add debug description
- OCVFSCore: add (and comment out) verbose debug logging for resolution

Author: felix-schwarz

ownCloudSDK/Authentication/OCAuthenticationMethodOAuth2.m

@@ -777,7 +777,7 @@ - (void)_refreshTokenForConnection:(OCConnection *)connection availabilityHandle
 {
 	__weak OCAuthenticationMethodOAuth2 *weakSelf = self;
 
-	OCLockRequest *lockRequest = [[OCLockRequest alloc] initWithResourceIdentifier:[NSString stringWithFormat:@"authentication-data-update:%@", connection.bookmark.uuid.UUIDString] acquiredHandler:^(NSError * _Nullable error, OCLock * _Nullable lock) {
+	OCLockRequest *lockRequest = [[OCLockRequest alloc] initWithResourceIdentifier:[NSString stringWithFormat:@"authentication-data-update:%@", connection.bookmark.uuidString] acquiredHandler:^(NSError * _Nullable error, OCLock * _Nullable lock) {
 		// Wait for exclusive lock on authentication data before performing the refresh
 		[weakSelf __refreshTokenForConnection:connection availabilityHandler:^(NSError *error, BOOL authenticationIsAvailable) {
 			// Invoke original availabilityHandler

ownCloudSDK/Bookmark/OCBookmark.h

@@ -42,6 +42,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface OCBookmark : NSObject <NSSecureCoding, NSCopying>
 
 @property(readonly) OCBookmarkUUID uuid; //!< UUID uniquely identifying the bookmark
+@property(readonly,nonatomic) OCBookmarkUUIDString uuidString; //!< String version of .uuid (cached!)
 
 @property(strong,nullable) NSString *name; //!< Name of the server
 @property(strong,nullable) NSURL *url; //!< URL to use to connect to the server

ownCloudSDK/Bookmark/OCBookmark.m

@@ -28,7 +28,7 @@
 #import <UIKit/UIKit.h>
 #endif /* TARGET_OS_IOS */
 
-@interface OCBookmark ()
+@implementation OCBookmark
 {
 	OCIPCNotificationName _coreUpdateNotificationName;
 	OCIPCNotificationName _bookmarkAuthUpdateNotificationName;
@@ -40,10 +40,9 @@ @interface OCBookmark ()
 	NSString *_lastUsername;
 
 	NSString *_lastDescription;
-}
-@end
 
-@implementation OCBookmark
+	OCBookmarkUUIDString _uuidString;
+}
 
 @synthesize uuid = _uuid;
 
@@ -119,6 +118,17 @@ - (NSData *)bookmarkData
 	return ([NSKeyedArchiver archivedDataWithRootObject:self]);
 }
 
+#pragma mark - UUID string
+- (OCBookmarkUUIDString)uuidString
+{
+	if (_uuidString == nil)
+	{
+		_uuidString = _uuid.UUIDString;
+	}
+
+	return (_uuidString);
+}
+
 #pragma mark - Keychain access
 - (NSData *)authenticationData
 {
@@ -462,6 +472,7 @@ - (instancetype)initWithCoder:(NSCoder *)decoder
 	if ((self = [self init]) != nil)
 	{
 		_uuid = [decoder decodeObjectOfClass:NSUUID.class forKey:@"uuid"];
+		_uuidString = nil;
 
 		_name = [decoder decodeObjectOfClass:NSString.class forKey:@"name"];
 		_url = [decoder decodeObjectOfClass:NSURL.class forKey:@"url"];

ownCloudSDK/Connection/OCConnection+Upload.m

@@ -322,7 +322,7 @@ - (OCProgress *)_continueTusJob:(OCTUSJob *)tusJob lastTask:(NSString *)lastTask
 		}
 
 		tusProgress = [[OCProgress alloc] initWithPath:((self.bookmark.uuid != nil) ?
-								@[ OCProgressPathElementIdentifierCoreRoot, self.bookmark.uuid.UUIDString, OCProgressPathElementIdentifierCoreConnectionPath, tusJob.trackingID ] :
+								@[ OCProgressPathElementIdentifierCoreRoot, self.bookmark.uuidString, OCProgressPathElementIdentifierCoreConnectionPath, tusJob.trackingID ] :
 								@[])
 						      progress:actionProgress];
 	}

ownCloudSDK/Connection/OCConnection.m

@@ -473,7 +473,7 @@ - (instancetype)initWithBookmark:(OCBookmark *)bookmark
 {
 	if ((self = [super init]) != nil)
 	{
-		_partitionID = bookmark.uuid.UUIDString;
+		_partitionID = bookmark.uuidString;
 
 		self.bookmark = bookmark;
 
@@ -2076,6 +2076,13 @@ - (void)_handleRetrieveItemListAtPathResult:(OCHTTPRequest *)request error:(NSEr
 			{
 				event.error = errors.firstObject;
 			}
+			else if (items != nil)
+			{
+				OCBookmarkUUIDString bookmarkUUIDString = self.bookmark.uuidString;
+				for (OCItem *item in items) {
+					item.bookmarkUUID = bookmarkUUIDString;
+				}
+			}
 
 			switch (eventType)
 			{

ownCloudSDK/Core/ItemList/OCCore+ItemList.m

@@ -1957,7 +1957,7 @@ - (void)_coordinatedScanForChanges
 
 				if (_scanForChangesLockRequest == nil) // do not make second request if another one is already in progress - do nothing in that case
 				{
-					_scanForChangesLockRequest = [[OCLockRequest alloc] initWithResourceIdentifier:[OCLockResourceIdentifierCoreUpdateScan stringByAppendingFormat:@":%@",_bookmark.uuid.UUIDString] tryAcquireHandler:^(NSError * _Nullable error, OCLock * _Nullable lock) {
+					_scanForChangesLockRequest = [[OCLockRequest alloc] initWithResourceIdentifier:[OCLockResourceIdentifierCoreUpdateScan stringByAppendingFormat:@":%@",_bookmark.uuidString] tryAcquireHandler:^(NSError * _Nullable error, OCLock * _Nullable lock) {
 						OCCore *core;
 
 						if ((core = weakSelf) != nil)

ownCloudSDK/Core/ItemPolicies/OCCore+ItemPolicies.m

@@ -441,7 +441,7 @@ - (void)_updatePolicyProcessors
 #pragma mark - IPC
 - (OCIPCNotificationName)itemPoliciesChangedNotificationName
 {
-	return ([OCIPCNotificationNameItemPoliciesChangedPrefix stringByAppendingFormat:@".%@", self.bookmark.uuid.UUIDString]);
+	return ([OCIPCNotificationNameItemPoliciesChangedPrefix stringByAppendingFormat:@".%@", self.bookmark.uuidString]);
 }
 
 - (void)setupItemPolicies

ownCloudSDK/Core/OCCore.m

@@ -257,7 +257,7 @@ - (instancetype)initWithBookmark:(OCBookmark *)bookmark
 
 		_preferredChecksumAlgorithm = OCChecksumAlgorithmIdentifierSHA1;
 
-		_eventHandlerIdentifier = [@"OCCore-" stringByAppendingString:_bookmark.uuid.UUIDString];
+		_eventHandlerIdentifier = [@"OCCore-" stringByAppendingString:_bookmark.uuidString];
 		_pendingThumbnailRequests = [NSMutableDictionary new];
 
 		_ipNotificationCenter = OCIPNotificationCenter.sharedNotificationCenter;
@@ -318,7 +318,7 @@ - (instancetype)initWithBookmark:(OCBookmark *)bookmark
 			}]);
 		}];
 
-		_activityManager = [[OCActivityManager alloc] initWithUpdateNotificationName:[@"OCCore.ActivityUpdate." stringByAppendingString:_bookmark.uuid.UUIDString]];
+		_activityManager = [[OCActivityManager alloc] initWithUpdateNotificationName:[@"OCCore.ActivityUpdate." stringByAppendingString:_bookmark.uuidString]];
 		_publishedActivitySyncRecordIDs = [NSMutableSet new];
 
 		_itemPolicies = [NSMutableArray new];

ownCloudSDK/Core/Resources/Sources/OCResourceSource.m

@@ -29,7 +29,7 @@ - (instancetype)initWithCore:(OCCore *)core
 	if ((self = [super init]) != nil)
 	{
 		_core = core;
-		_eventHandlerIdentifier = [NSString stringWithFormat:@"%@-%@-%@", NSStringFromClass(self.class), self.identifier, core.bookmark.uuid.UUIDString];
+		_eventHandlerIdentifier = [NSString stringWithFormat:@"%@-%@-%@", NSStringFromClass(self.class), self.identifier, core.bookmark.uuidString];
 	}
 
 	return (self);

ownCloudSDK/Core/Sync/Actions/CreateFolder/OCSyncActionCreateFolder.m

@@ -38,6 +38,7 @@ - (instancetype)initWithParentItem:(OCItem *)parentItem folderName:(NSString *)f
 
 		if ((placeholderItem = [OCItem placeholderItemOfType:OCItemTypeCollection]) != nil)
 		{
+			placeholderItem.bookmarkUUID = self.core.bookmark.uuidString;
 			placeholderItem.parentFileID = parentItem.fileID;
 			placeholderItem.parentLocalID = parentItem.localID;
 			placeholderItem.driveID = parentItem.driveID;
@@ -73,7 +74,13 @@ - (void)preflightWithContext:(OCSyncContext *)syncContext
 
 		if ((placeholderCompletionHandler = self.ephermalParameters[OCCoreOptionPlaceholderCompletionHandler]) != nil)
 		{
-			placeholderCompletionHandler(nil, _placeholderItem);
+			OCItem *placeholderItem = _placeholderItem;
+
+			// Run completion handler only after database updates have been performed, so the returned item is immediately usable
+			[syncContext addContextActionsCompletionHandler:^{
+				placeholderCompletionHandler(nil, placeholderItem);
+			}];
+
 			self.ephermalParameters = nil;
 		}