[feature/reduce-mem-footprint] Reduce memory footprint

ownCloud File Provider/FileProviderContentEnumerator.m

@@ -16,7 +16,11 @@
  *
  */
 
-#import <ownCloudApp/ownCloudApp.h>
+#import <ownCloudSDK/ownCloudSDK.h>
+
+// BEGIN: Shared with ownCloudApp.framework
+#import "DisplaySettings.h"
+// END: shared with ownCloudApp.framework
 
 #import "FileProviderContentEnumerator.h"
 #import "FileProviderEnumeratorObserver.h"

ownCloud File Provider/FileProviderExtension.h

@@ -33,7 +33,6 @@
 
 extern OCClaimExplicitIdentifier OCClaimExplicitIdentifierFileProvider;
 
-extern OCClassSettingsIdentifier OCClassSettingsIdentifierFileProvider;
 extern OCClassSettingsKey OCClassSettingsKeyFileProviderSkipLocalErrorChecks;
 
 #define FPLogCmdBegin(command, format,...) \

ownCloud File Provider/FileProviderExtension.m

@@ -17,7 +17,21 @@
  */
 
 #import <ownCloudSDK/ownCloudSDK.h>
-#import <ownCloudApp/ownCloudApp.h>
+
+// BEGIN: Shared with ownCloudApp.framework
+#import "Branding.h"
+#import "BrandingClassSettingsSource.h"
+#import "NotificationManager.h"
+#import "NotificationMessagePresenter.h"
+#import "NotificationAuthErrorForwarder.h"
+#import "OCBookmark+AppExtensions.h"
+#import "OCBookmark+FPServices.h"
+#import "OCCore+BundleImport.h"
+#import "OCFileProviderSettings.h"
+#import "VFSManager.h"
+#import "AppLockSettings.h"
+#import "ZIPArchive.h"
+// END: shared with ownCloudApp.framework
 
 #import "FileProviderExtension.h"
 #import "OCItem+FileProviderItem.h"
@@ -362,6 +376,12 @@ - (void)startProvidingItemAtURL:(NSURL *)provideAtURL completionHandler:(void (^
 		 {
 			FPLogCmdBegin(@"StartProviding", @"Downloading %@", item);
 
+			if (((OCItem *)item).type == OCItemTypeCollection) {
+				// Can't download folders
+				completionHandler([NSError errorWithDomain:NSCocoaErrorDomain code:NSFeatureUnsupportedError userInfo:@{}]);
+				return;
+			}
+
 			[self.core downloadItem:(OCItem *)item options:@{
 
 				OCCoreOptionAddFileClaim : [OCClaim claimForLifetimeOfCore:core explicitIdentifier:OCClaimExplicitIdentifierFileProvider withLockType:OCClaimLockTypeRead]
@@ -487,7 +507,7 @@ - (void)stopProvidingItemAtURL:(NSURL *)url
 		 	// Cancel download if the item is currently downloading
 		 	if (item.isDownloading)
 		 	{
-		 		if ((downloadProgress = [self.core progressForItem:(OCItem *)item matchingEventType:OCEventTypeDownload]) != nil)
+		 		if ((downloadProgress = [self.core progressForItemWithLocalID:((OCItem *)item).localID matchingEventType:OCEventTypeDownload]) != nil)
 		 		{
 		 			[downloadProgress makeObjectsPerformSelector:@selector(cancel)];
 				}
@@ -786,6 +806,7 @@ - (void)importDocumentAtURL:(NSURL *)fileURL toParentItemIdentifier:(NSFileProvi
 				OCCoreOptionImportByCopying : @(importByCopying)
 			} placeholderCompletionHandler:^(NSError *error, OCItem *item) {
 				FPLogCmd(@"Completed with placeholderItem=%@, error=%@", item, error);
+				item.bookmarkUUID = self.core.bookmark.uuid.UUIDString; // ensure bookmarkUUID is present so that vfsItemID / itemIdentifier succeed
 				completionHandler(item, [error translatedError]);
 			} resultHandler:^(NSError *error, OCCore *core, OCItem *item, id parameter) {
 				if ([error.domain isEqual:OCHTTPStatusErrorDomain] && (error.code == OCHTTPStatusCodePRECONDITION_FAILED))
@@ -1382,7 +1403,6 @@ - (BOOL)skipLocalErrorChecks
 @end
 
 OCClaimExplicitIdentifier OCClaimExplicitIdentifierFileProvider = @"fileProvider";
-OCClassSettingsIdentifier OCClassSettingsIdentifierFileProvider = @"file-provider";
 OCClassSettingsKey OCClassSettingsKeyFileProviderSkipLocalErrorChecks = @"skip-local-error-checks";
 
 /*

ownCloud File Provider/FileProviderServiceSource.m

@@ -17,7 +17,12 @@
  */
 
 #import "FileProviderServiceSource.h"
-#import <ownCloudApp/ownCloudApp.h>
+
+// BEGIN: Shared with ownCloudApp.framework
+#import "OCFileProviderService.h"
+#import "OCCore+BundleImport.h"
+// END: Shared with ownCloudApp.framework
+
 #import <ownCloudSDK/ownCloudSDK.h>
 
 @interface OCCore (setNeedsToProcessSyncRecords)

ownCloud Intents/Base.lproj/Intents.intentdefinition

@@ -126,11 +126,11 @@
 	<key>INIntentDefinitionNamespace</key>
 	<string>K5U8aR</string>
 	<key>INIntentDefinitionSystemVersion</key>
-	<string>21E230</string>
+	<string>23G93</string>
 	<key>INIntentDefinitionToolsBuildVersion</key>
-	<string>13E113</string>
+	<string>16A5230g</string>
 	<key>INIntentDefinitionToolsVersion</key>
-	<string>13.3</string>
+	<string>16.0</string>
 	<key>INIntents</key>
 	<array>
 		<dict>
@@ -943,7 +943,7 @@
 			<integer>13</integer>
 			<key>INIntentManagedParameterCombinations</key>
 			<dict>
-				<key>path,file,account,filename,fileextension,shouldOverwrite,waitForCompletion</key>
+				<key>path,file,account,filename,fileextension,shouldOverwrite</key>
 				<dict>
 					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
 					<true/>
@@ -1219,54 +1219,6 @@
 					<key>INIntentParameterType</key>
 					<string>Boolean</string>
 				</dict>
-				<dict>
-					<key>INIntentParameterConfigurable</key>
-					<true/>
-					<key>INIntentParameterDisplayName</key>
-					<string>Wait for upload to complete</string>
-					<key>INIntentParameterDisplayNameID</key>
-					<string>X18VvP</string>
-					<key>INIntentParameterDisplayPriority</key>
-					<integer>7</integer>
-					<key>INIntentParameterMetadata</key>
-					<dict>
-						<key>INIntentParameterMetadataFalseDisplayName</key>
-						<string>false</string>
-						<key>INIntentParameterMetadataFalseDisplayNameID</key>
-						<string>7Zv2I0</string>
-						<key>INIntentParameterMetadataTrueDisplayName</key>
-						<string>true</string>
-						<key>INIntentParameterMetadataTrueDisplayNameID</key>
-						<string>w1TCyX</string>
-					</dict>
-					<key>INIntentParameterName</key>
-					<string>waitForCompletion</string>
-					<key>INIntentParameterPromptDialogs</key>
-					<array>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>Configuration</string>
-						</dict>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>Wait for upload to complete before continuing</string>
-							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>Wt9Wgt</string>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>Primary</string>
-						</dict>
-					</array>
-					<key>INIntentParameterSupportsResolution</key>
-					<true/>
-					<key>INIntentParameterTag</key>
-					<integer>13</integer>
-					<key>INIntentParameterType</key>
-					<string>Boolean</string>
-				</dict>
 			</array>
 			<key>INIntentResponse</key>
 			<dict>

ownCloud Intents/SaveFileIntentHandler.swift

@@ -102,7 +102,6 @@ public class SaveFileIntentHandler: NSObject, SaveFileIntentHandling, OCCoreDele
 			}
 		}
 		let filePath = path + newFilename
-		let waitForCompletion = (intent.waitForCompletion as? Bool) ?? false
 		let shouldOverwrite = (intent.shouldOverwrite as? Bool) ?? false
 
 		let completeWithCode = { (code: SaveFileIntentResponseCode) in
@@ -132,7 +131,7 @@ public class SaveFileIntentHandler: NSObject, SaveFileIntentHandling, OCCoreDele
 			if error == nil, let targetItem = item {
 				// Check if file already exists
 				OCItemTracker(for: bookmark, at: .legacyRootPath(filePath), waitOnlineTimeout: 5) { (error, core, fileItem) in
-					if let core = core {
+					if core != nil {
 						if error == nil, let fileItem = fileItem {
 							// File already exists
 							if !shouldOverwrite {
@@ -147,26 +146,10 @@ public class SaveFileIntentHandler: NSObject, SaveFileIntentHandling, OCCoreDele
 
 										OnBackgroundQueue {
 											if let parentItem = fileItem.parentItem(from: core) {
-												if waitForCompletion {
-													// Wait for completion: report local modification from extension
-													core.reportLocalModification(of: fileItem, parentItem: parentItem, withContentsOfFileAt: fileURL, isSecurityScoped: true, options: [OCCoreOption.importByCopying : true], placeholderCompletionHandler: nil, resultHandler: { (error, _, item, _) in
-														completeWithResult(error, item?.path)
-													})
-												} else {
-													// Delegate local modification report to File Provider
-													let fpServiceSession = OCFileProviderServiceSession(vault: core.vault)
-													self.fpServiceSession = fpServiceSession
-
-													let didStartSecurityScopedResource = fileURL.startAccessingSecurityScopedResource()
-
-													fpServiceSession.reportModificationThroughFileProvider(url: fileURL, as: fileItem.name, for: fileItem, to: parentItem, lastModifiedDate: nil, completion: { (error) in
-														completeWithResult(error, fileItem.path)
-
-														if didStartSecurityScopedResource {
-															fileURL.stopAccessingSecurityScopedResource()
-														}
-													})
-												}
+												// Wait for completion: report local modification from extension
+												core.reportLocalModification(of: fileItem, parentItem: parentItem, withContentsOfFileAt: fileURL, isSecurityScoped: true, options: [OCCoreOption.importByCopying : true], placeholderCompletionHandler: nil, resultHandler: { (error, _, item, _) in
+													completeWithResult(error, item?.path)
+												})
 											} else {
 												completeWithCode(.pathFailure)
 											}
@@ -178,39 +161,22 @@ public class SaveFileIntentHandler: NSObject, SaveFileIntentHandling, OCCoreDele
 							}
 						} else {
 							// File does NOT exist => import file
-							if waitForCompletion {
-								// Wait for completion: import from extension
-								OCCoreManager.shared.requestCore(for: bookmark, setup: { (core, error) in
-									core?.delegate = self
-								}, completionHandler: { (core, error) in
-									if let core = core {
-										self.core = core
-
-										OnBackgroundQueue {
-											core.importFileNamed(newFilename, at: targetItem, from: fileURL, isSecurityScoped: true, options: [OCCoreOption.importByCopying : true], placeholderCompletionHandler: nil, resultHandler: { (error, _, item, _) in
-												completeWithResult(error, item?.path)
-											})
-										}
-									} else {
-										completeWithResult(error, nil)
+							// Wait for completion: import from extension
+							OCCoreManager.shared.requestCore(for: bookmark, setup: { (core, error) in
+								core?.delegate = self
+							}, completionHandler: { (core, error) in
+								if let core = core {
+									self.core = core
+
+									OnBackgroundQueue {
+										core.importFileNamed(newFilename, at: targetItem, from: fileURL, isSecurityScoped: true, options: [OCCoreOption.importByCopying : true], placeholderCompletionHandler: nil, resultHandler: { (error, _, item, _) in
+											completeWithResult(error, item?.path)
+										})
 									}
-								})
-							} else {
-								// Delegate import to File Provider
-								let fpServiceSession = OCFileProviderServiceSession(vault: core.vault)
-								self.fpServiceSession = fpServiceSession
-
-								let didStartSecurityScopedResource = fileURL.startAccessingSecurityScopedResource()
-
-								fpServiceSession.importThroughFileProvider(url: fileURL, as: newFilename, to: targetItem, completion: { (error, _) in
-									let itemPath = (targetItem.path as NSString? ?? path as NSString?)?.appendingPathComponent(newFilename)
-									completeWithResult(error, itemPath)
-
-									if didStartSecurityScopedResource {
-										fileURL.stopAccessingSecurityScopedResource()
-									}
-								})
-							}
+								} else {
+									completeWithResult(error, nil)
+								}
+							})
 						}
 					} else {
 						failWithError(error)
@@ -276,14 +242,6 @@ public class SaveFileIntentHandler: NSObject, SaveFileIntentHandling, OCCoreDele
 		}
 		completion(INBooleanResolutionResult.success(with: shouldOverwrite))
 	}
-
-	func resolveWaitForCompletion(for intent: SaveFileIntent, with completion: @escaping (INBooleanResolutionResult) -> Void) {
-		var waitForCompletion = false
-		if let doWait = intent.waitForCompletion?.boolValue {
-			waitForCompletion = doWait
-		}
-		completion(INBooleanResolutionResult.success(with: waitForCompletion))
-	}
 }
 
 @available(iOS 13.0, *)