From 067ccd93559e4bf51efac46ee4db76b4b9c4ab7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Hu=CC=88hne?= <github@hosy.de>
Date: Mon, 23 Sep 2019 10:16:51 +0200
Subject: [PATCH] added optional parameter "filename" for SaveFileIntent

---
 ownCloud/Resources/Info.plist                 |  4 +-
 .../Intent/Intents.intentdefinition           | 38 ++++++++++++++++++-
 .../Intent/SaveFileIntentHandler.swift        | 18 ++++++++-
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/ownCloud/Resources/Info.plist b/ownCloud/Resources/Info.plist
index 4fc5394f5..2c257ca04 100644
--- a/ownCloud/Resources/Info.plist
+++ b/ownCloud/Resources/Info.plist
@@ -54,14 +54,14 @@
 	</dict>
 	<key>NSAppleMusicUsageDescription</key>
 	<string>This permission is needed for uploading media files to your server.</string>
+	<key>NSCameraUsageDescription</key>
+	<string>This permission is needed to scan documents.</string>
 	<key>NSFaceIDUsageDescription</key>
 	<string>Unlock the app without entering the passcode.</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
 	<string>This permission is needed to upload photos and videos from your photo library.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>This permission is needed to upload photos and videos from your photo library.</string>
-	<key>NSCameraUsageDescription</key>
-	<string>This permission is needed to scan documents.</string>
 	<key>NSUserActivityTypes</key>
 	<array>
 		<string>CreateFolderIntent</string>
diff --git a/ownCloudAppShared/Intent/Intents.intentdefinition b/ownCloudAppShared/Intent/Intents.intentdefinition
index f40db9dab..4b8aefc82 100644
--- a/ownCloudAppShared/Intent/Intents.intentdefinition
+++ b/ownCloudAppShared/Intent/Intents.intentdefinition
@@ -840,10 +840,10 @@
 			<key>INIntentKeyParameter</key>
 			<string>file</string>
 			<key>INIntentLastParameterTag</key>
-			<integer>7</integer>
+			<integer>8</integer>
 			<key>INIntentManagedParameterCombinations</key>
 			<dict>
-				<key>path,file,account</key>
+				<key>path,file,account,filename</key>
 				<dict>
 					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
 					<true/>
@@ -1007,6 +1007,40 @@
 					<key>INIntentParameterType</key>
 					<string>Object</string>
 				</dict>
+				<dict>
+					<key>INIntentParameterDisplayName</key>
+					<string>File Name (without file extension)</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>B1lmXQ</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>4</integer>
+					<key>INIntentParameterMetadata</key>
+					<dict>
+						<key>INIntentParameterMetadataCapitalization</key>
+						<string>Sentences</string>
+					</dict>
+					<key>INIntentParameterName</key>
+					<string>filename</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>Optinal file name for saving file</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>b4VIz0</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+					</array>
+					<key>INIntentParameterSupportsResolution</key>
+					<true/>
+					<key>INIntentParameterTag</key>
+					<integer>8</integer>
+					<key>INIntentParameterType</key>
+					<string>String</string>
+				</dict>
 			</array>
 			<key>INIntentResponse</key>
 			<dict>
diff --git a/ownCloudAppShared/Intent/SaveFileIntentHandler.swift b/ownCloudAppShared/Intent/SaveFileIntentHandler.swift
index aa3773f67..43d7dcfbf 100644
--- a/ownCloudAppShared/Intent/SaveFileIntentHandler.swift
+++ b/ownCloudAppShared/Intent/SaveFileIntentHandler.swift
@@ -37,7 +37,15 @@ public class SaveFileIntentHandler: NSObject, SaveFileIntentHandling {
 						if error == nil, let core = core {
 							self.itemTracking = core.trackItem(atPath: path, trackingHandler: { (error, item, isInitial) in
 								if let targetItem = item {
-									if core.importFileNamed(file.filename,
+									var newFilename = file.filename
+									if let filename = intent.filename as NSString?, filename.length > 0, let defaultFilename = file.filename as NSString? {
+										let pathExtention = defaultFilename.pathExtension
+										if let changedFilename = filename.appendingPathExtension(pathExtention) {
+											newFilename = changedFilename
+										}
+									}
+
+									if core.importFileNamed(newFilename,
 															at: targetItem,
 															from: fileURL,
 															isSecurityScoped: true,
@@ -106,6 +114,14 @@ public class SaveFileIntentHandler: NSObject, SaveFileIntentHandling {
 			completion(INFileResolutionResult.needsValue())
 		}
 	}
+
+	public func resolveFilename(for intent: SaveFileIntent, with completion: @escaping (INStringResolutionResult) -> Void) {
+		if let filename = intent.filename {
+			completion(INStringResolutionResult.success(with: filename))
+		} else {
+			completion(INStringResolutionResult.needsValue())
+		}
+	}
 }
 
 @available(iOS 13.0, watchOS 6.0, *)