[feature/shortcuts] iOS 13 Add Shortcut parameter support

.swiftlint.yml

@@ -1,5 +1,6 @@
 excluded:
     - ownCloudTests
+    - ownCloudScreenshotsTests
     - external
 
 function_body_length: 100

CHANGELOG.md

@@ -6,6 +6,20 @@
 - Fixed background crash (PR #462)
 - Log file improvements (#444)
 
+## TestFlight Build 129 (July 2019)
+
+- Import files from Share Sheet (#76)
+- Create Folder in Directory Picker (#443)
+
+## TestFlight Build 126 (July 2019)
+
+- Native Media Player, with support for streaming (#395)
+- Name Conflict Detection (#377)
+- Activity Indicator for deleting offline copies (#393)
+- Improved Log File (#446)
+- Image Gallery improvement (#322)
+- Error handling for corrupted files (#357)
+
 ## Release version 1.0.3 (July 2019)
 
 - Add support for local user names with @ inside in sharing (PR #453)

fastlane/Fastfile

@@ -37,7 +37,8 @@ platform :ios do
         provisioningProfiles: {
           "com.owncloud.ios-app" => "match AdHoc com.owncloud.ios-app",
 	        "com.owncloud.ios-app.ownCloud-File-Provider" => "match AdHoc com.owncloud.ios-app.ownCloud-File-Provider",
-	        "com.owncloud.ios-app.ownCloud-File-ProviderUI" => "match AdHoc com.owncloud.ios-app.ownCloud-File-ProviderUI"
+	        "com.owncloud.ios-app.ownCloud-File-ProviderUI" => "match AdHoc com.owncloud.ios-app.ownCloud-File-ProviderUI",
+	        "com.owncloud.ios-app.ownCloud-File-Intents" => "match AdHoc com.owncloud.ios-app.ownCloud-Intents"
           #Add more Provisioning Profiles when extensions are added
         }
       }
@@ -71,6 +72,8 @@ platform :ios do
     ENTERPRISE_FP_PROFILE = "Enterprise Distribution iOS Neo File Provider"
     ENTERPRISE_FP_UI_ID = "com.owncloud.enterprise.ios-app.ownCloud-File-ProviderUI"
     ENTERPRISE_FP_UI_PROFILE = "Enterprise Distribution iOS Neo File ProviderUI"
+    ENTERPRISE_INTENT_ID = "com.owncloud.enterprise.ios-app.ownCloud-Intents"
+    ENTERPRISE_INTENT_PROFILE = "Enterprise Distribution iOS Neo Intent"
     ENTERPRISE_APP_FW_ID = "com.owncloud.enterprise.ownCloudApp"
     ENTERPRISE_TEAM = "5QNK8L2PSC"
     ENTERPRISE_IDENTITY = "iPhone Distribution: ownCloud GmbH"
@@ -95,10 +98,16 @@ platform :ios do
 
     update_app_identifier(
       xcodeproj: "ownCloud.xcodeproj",
-      plist_path: "ownCloudAppFramework/Info.plist",
+      plist_path: "ownCloudAppFramework/Resources/Info.plist",
       app_identifier: ENTERPRISE_APP_FW_ID
     )
 
+    update_app_identifier(
+      xcodeproj: "ownCloud.xcodeproj",
+      plist_path: "ownCloud Intents/Info.plist",
+      app_identifier: ENTERPRISE_INTENT_ID
+    )
+
     update_app_group_identifiers(
       entitlements_file: "ownCloud/ownCloud.entitlements",
       app_group_identifiers: ["group.com.owncloud.enterprise.ios-app"]
@@ -109,10 +118,18 @@ platform :ios do
       app_group_identifiers: ["group.com.owncloud.enterprise.ios-app"]
     )
 
+    update_app_group_identifiers(
+      entitlements_file: "ownCloud Intents/ownCloud Intents.entitlements",
+      app_group_identifiers: ["group.com.owncloud.enterprise.ios-app"]
+    )
+
     set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "OCAppGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")
     set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")
     set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "NSExtension", subkey: "NSExtensionFileProviderDocumentGroup", value: "group.com.owncloud.enterprise.ios-app")
 
+    set_info_plist_value(path: "ownCloud Intents/Info.plist", key: "OCAppGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")
+    set_info_plist_value(path: "ownCloud Intents/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")
+
     automatic_code_signing(
       path: "ownCloud.xcodeproj",
       use_automatic_signing: false,
@@ -143,6 +160,16 @@ platform :ios do
       targets: ["ownCloud File ProviderUI"]
     )
 
+    automatic_code_signing(
+      path: "ownCloud.xcodeproj",
+      use_automatic_signing: false,
+      team_id: ENTERPRISE_TEAM,
+      code_sign_identity: ENTERPRISE_IDENTITY,
+      profile_name: ENTERPRISE_INTENT_PROFILE,
+      bundle_identifier: ENTERPRISE_INTENT_ID,
+      targets: ["ownCloud Intents"]
+    )
+
     automatic_code_signing(
       path: "ownCloud.xcodeproj",
       use_automatic_signing: false,
@@ -155,7 +182,10 @@ platform :ios do
     # Add a badge with the latest short commit hash to the app icon
     commit = last_git_commit
     short_hash = commit[:abbreviated_commit_hash] # short sha of commit
-    add_badge(shield: "Bitrise-" + short_hash + "-blue", no_badge: true)
+    sh "curl https://badgen.net/badge/Bitrise/" + short_hash + "/blue > badge.svg"
+    sh "brew install librsvg"
+    sh "rsvg-convert badge.svg > badge.png"
+    sh "badge --custom badge.png --glob /../**/*.appiconset/*.{png,PNG}"
 
     #Create the build
     gym(
@@ -169,7 +199,8 @@ platform :ios do
         provisioningProfiles: {
           ENTERPRISE_APP_ID => ENTERPRISE_APP_PROFILE,
 	        ENTERPRISE_FP_ID => ENTERPRISE_FP_PROFILE,
-	        ENTERPRISE_FP_UI_ID => ENTERPRISE_FP_UI_PROFILE
+	        ENTERPRISE_FP_UI_ID => ENTERPRISE_FP_UI_PROFILE,
+	        ENTERPRISE_INTENT_ID => ENTERPRISE_INTENT_PROFILE
         }
       }
     )

ownCloud File Provider/FileProviderExtension.h

@@ -30,6 +30,8 @@
 
 @end
 
+extern OCClaimExplicitIdentifier OCClaimExplicitIdentifierFileProvider;
+
 #define FPLogCmdBegin(command, format,...) \
 	NSString *actionLogCmdUUID = nil; \
 	NSArray *actionLogTags = nil; \

ownCloud File Provider/FileProviderExtension.m

@@ -17,7 +17,7 @@
  */
 
 #import <ownCloudSDK/ownCloudSDK.h>
-#import <libzip/libzip.h>
+#import <ownCloudApp/ownCloudApp.h>
 
 #import "FileProviderExtension.h"
 #import "FileProviderEnumerator.h"
@@ -223,7 +223,11 @@ - (void)startProvidingItemAtURL:(NSURL *)provideAtURL completionHandler:(void (^
 		 {
 			FPLogCmdBegin(@"StartProviding", @"Downloading %@", item);
 
-			[self.core downloadItem:(OCItem *)item options:nil resultHandler:^(NSError *error, OCCore *core, OCItem *item, OCFile *file) {
+			[self.core downloadItem:(OCItem *)item options:@{
+
+				OCCoreOptionAddFileClaim : [OCClaim claimForLifetimeOfCore:core explicitIdentifier:OCClaimExplicitIdentifierFileProvider]
+
+			} resultHandler:^(NSError *error, OCCore *core, OCItem *item, OCFile *file) {
 				OCLogDebug(@"Starting to provide file:\nPAU: %@\nFURL: %@\nID: %@\nErr: %@\nlocalRelativePath: %@", provideAtURL, file.url, item.itemIdentifier, error, item.localRelativePath);
 
 				if ([error isOCErrorWithCode:OCErrorCancelled])
@@ -330,6 +334,9 @@ - (void)stopProvidingItemAtURL:(NSURL *)url
 			}
 
 			FPLogCmd(@"Item %@ is downloading %d: %@", item, item.isDownloading, downloadProgress);
+
+			// Remove temporary FileProvider claim
+			[core removeClaimsWithExplicitIdentifier:OCClaimExplicitIdentifierFileProvider onItem:(OCItem *)item refreshItem:YES completionHandler:nil];
 		 }
 	}
 
@@ -503,102 +510,6 @@ - (void)deleteItemWithIdentifier:(NSFileProviderItemIdentifier)itemIdentifier co
 	}
 }
 
-+ (NSError *)compressContentsOf:(NSURL *)sourceDirectory asZipFile:(NSURL *)zipFileURL
-{
-	zip_t *zipArchive = NULL;
-	int zipError = ZIP_ER_OK;
-	NSError *error = nil;
-	NSErrorDomain LibZipErrorDomain = @"LibZIPErrorDomain";
-	NSError *(^ErrorFromZipArchive)(zip_t *zipArchive) = ^(zip_t *zipArchive) {
-		zip_error_t *zipError = zip_get_error(zipArchive);
-
-		return ([NSError errorWithDomain:LibZipErrorDomain code:zipError->zip_err userInfo:nil]);
-	};
-
-	if ((zipArchive = zip_open(zipFileURL.path.UTF8String, ZIP_CREATE, &zipError)) != NULL)
-	{
-		NSDirectoryEnumerator<NSURL *> *directoryEnumerator;
-
-		NSUInteger basePathLength = sourceDirectory.path.length;
-
-		if (![sourceDirectory.path hasSuffix:@"/"])
-		{
-			basePathLength++;
-		}
-
-		if ((directoryEnumerator = [[NSFileManager defaultManager] enumeratorAtURL:sourceDirectory includingPropertiesForKeys:@[NSURLFileSizeKey,NSURLIsDirectoryKey] options:0 errorHandler:nil]) != nil)
-		{
-			for (NSURL *addURL in directoryEnumerator)
-			{
-				zip_source_t *fileSource = NULL;
-				NSNumber *isDirectory = nil, *size = nil;
-				NSString *relativePath = [addURL.path substringFromIndex:basePathLength];
-
-				if (relativePath.length == 0)
-				{
-					continue;
-				}
-
-				[addURL getResourceValue:&isDirectory forKey:NSURLIsDirectoryKey error:nil];
-				[addURL getResourceValue:&size forKey:NSURLFileSizeKey error:nil];
-
-				if (isDirectory.boolValue)
-				{
-					// Add directory
-					OCLogDebug(@"Adding directory %@ from %@", relativePath, addURL);
-
-					if (zip_dir_add(zipArchive, relativePath.UTF8String, ZIP_FL_ENC_UTF_8) < 0)
-					{
-						// Error
-						error = ErrorFromZipArchive(zipArchive);
-						OCLogError(@"Error adding directory %@: %@", relativePath, error);
-					}
-				}
-				else
-				{
-					// Add file
-					OCLogDebug(@"Adding file %@ from %@", relativePath, addURL);
-
-					if ((fileSource = zip_source_file(zipArchive, addURL.path.UTF8String, 0, (zip_int64_t)size.unsignedIntegerValue)) != NULL)
-					{
-						if (zip_file_add(zipArchive, relativePath.UTF8String, fileSource, ZIP_FL_ENC_UTF_8) < 0)
-						{
-							// Error
-							error = ErrorFromZipArchive(zipArchive);
-							OCLogError(@"Error compressing %@: %@", relativePath, error);
-
-							zip_source_free(fileSource);
-						}
-					}
-					else
-					{
-						// Error
-						error = ErrorFromZipArchive(zipArchive);
-						OCLogError(@"Error adding directory %@: %@", relativePath, error);
-					}
-				}
-			}
-		}
-
-		if (zip_close(zipArchive) < 0)
-		{
-			// Error
-			error = ErrorFromZipArchive(zipArchive);
-			OCLogError(@"Error closing zip archive %@: %@", zipFileURL.path, error);
-
-			zip_discard(zipArchive);
-		}
-	}
-	else
-	{
-		// Error
-		error = [NSError errorWithDomain:LibZipErrorDomain code:zipError userInfo:nil];
-		OCLogError(@"Error opening zip archive %@: %@", zipFileURL.path, error);
-	}
-
-	return (error);
-}
-
 - (void)importDocumentAtURL:(NSURL *)fileURL toParentItemIdentifier:(NSFileProviderItemIdentifier)parentItemIdentifier completionHandler:(void (^)(NSFileProviderItem _Nullable, NSError * _Nullable))completionHandler
 {
 	NSError *error = nil;
@@ -629,7 +540,6 @@ - (void)importDocumentAtURL:(NSURL *)fileURL toParentItemIdentifier:(NSFileProvi
 	{
 		// Detect name collissions
 		OCItem *existingItem;
-		OCCoreImportTransformation transformation = nil;
 
 		if ((existingItem = [self.core cachedItemInParent:parentItem withName:importFileName isDirectory:NO error:NULL]) != nil)
 		{
@@ -641,63 +551,10 @@ - (void)importDocumentAtURL:(NSURL *)fileURL toParentItemIdentifier:(NSFileProvi
 
 		FPLogCmd(@"Importing %@ at %@ fromURL %@", importFileName, parentItem, fileURL);
 
-		NSString *resourceType=nil;
-		if ([fileURL getResourceValue:&resourceType forKey:NSURLFileResourceTypeKey error:&error])
-		{
-			FPLogCmd(@"Importing resourceType=%@", resourceType);
-
-			if ([resourceType isEqual:NSURLFileResourceTypeDirectory])
-			{
-				NSString *bundleType = fileURL.pathExtension.lowercaseString;
-
-				if ([bundleType isEqual:@"pages"] || 	// Pages
-				    [bundleType isEqual:@"key"])	// Keynote
-				{
-					// Special handling for Pages and Keynote files
-					FPLogCmd(@"Importing with transformer for bundle-document of type=%@", bundleType);
-
-					transformation = ^(NSURL *sourceURL) {
-						NSError *error = nil;
-						NSURL *zipURL = [sourceURL URLByAppendingPathExtension:@".zip"];
-
-						if ((error = [FileProviderExtension compressContentsOf:sourceURL asZipFile:zipURL]) == nil)
-						{
-							if ([[NSFileManager defaultManager] removeItemAtURL:sourceURL error:&error])
-							{
-								if (![[NSFileManager defaultManager] moveItemAtURL:zipURL toURL:sourceURL error:&error])
-								{
-									FPLogCmd(@"Moving %@ to %@ failed with error=%@", OCLogPrivate(zipURL), OCLogPrivate(sourceURL), OCLogPrivate(error));
-								}
-							}
-							else
-							{
-								FPLogCmd(@"Removing %@ failed with error=%@", OCLogPrivate(sourceURL), OCLogPrivate(error));
-							}
-						}
-						else
-						{
-							FPLogCmd(@"Compressing %@ as %@ failed with error=%@", OCLogPrivate(sourceURL), OCLogPrivate(zipURL), OCLogPrivate(error));
-						}
-
-						FPLogCmd(@"Import transformation finished with error=%@", error);
-
-						return (error);
-					};
-				}
-				else
-				{
-					// Import of directories not supported
-					completionHandler(nil, [OCError(OCErrorFeatureNotSupportedForItem) resolvedError]);
-					return;
-				}
-			}
-		}
-
-		// Start import
-		[self.core importFileNamed:importFileName at:parentItem fromURL:fileURL isSecurityScoped:YES options:[NSDictionary dictionaryWithObjectsAndKeys:
-			@(importByCopying),    OCCoreOptionImportByCopying,
-			[transformation copy], OCCoreOptionImportTransformation,
-		nil] placeholderCompletionHandler:^(NSError *error, OCItem *item) {
+		// Import item
+		[self.core importItemNamed: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 resolvedError]);
 		} resultHandler:^(NSError *error, OCCore *core, OCItem *item, id parameter) {
@@ -1037,3 +894,5 @@ - (void)core:(OCCore *)core handleError:(NSError *)error issue:(OCIssue *)issue
 }
 
 @end
+
+OCClaimExplicitIdentifier OCClaimExplicitIdentifierFileProvider = @"fileProvider";

ownCloud File Provider/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(APP_SHORT_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>130</string>
+	<string>137</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderDocumentGroup</key>

ownCloud File ProviderUI/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(APP_SHORT_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>130</string>
+	<string>137</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderActions</key>