copy opened files instead of moving

zydeco · Apr 28, 2018 · 49fa9c0 · 49fa9c0
1 parent f597a5a
commit 49fa9c0
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/Mini vMac/AppDelegate.m b/Mini vMac/AppDelegate.m
@@ -304,7 +304,7 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceAppl
     return [self application:application openURL:url options:options];
 }
 
-- (BOOL)importFileToDocuments:(NSURL *)url {
+- (BOOL)importFileToDocuments:(NSURL *)url copy:(BOOL)copy {
     if (url.fileURL) {
         // opening file
         NSFileManager *fileManager = [NSFileManager defaultManager];
@@ -322,7 +322,11 @@ - (BOOL)importFileToDocuments:(NSURL *)url {
             destinationPath = [self.documentsPath stringByAppendingPathComponent:newFileName];
             tries++;
         }
-        [fileManager moveItemAtPath:url.path toPath:destinationPath error:&error];
+        if (copy) {
+            [fileManager copyItemAtPath:url.path toPath:destinationPath error:&error];
+        } else {
+            [fileManager moveItemAtPath:url.path toPath:destinationPath error:&error];
+        }
         if (error) {
             [self showAlertWithTitle:fileName message:error.localizedFailureReason];
         } else {
@@ -337,16 +341,22 @@ - (BOOL)importFileToDocuments:(NSURL *)url {
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
     if (url.fileURL) {
         // opening file
-        if ([url.path.stringByStandardizingPath hasPrefix:self.documentsPath]) {
+        NSString *inboxPath = [self.documentsPath stringByAppendingPathComponent:@"Inbox"];
+        if ([url.path.stringByStandardizingPath hasPrefix:inboxPath]) {
+            // pre-iOS 11 import through inbox
+            [url startAccessingSecurityScopedResource];
+            [self importFileToDocuments:url copy:NO];
+            [url stopAccessingSecurityScopedResource];
+        } else if ([url.path.stringByStandardizingPath hasPrefix:self.documentsPath]) {
             // already in documents - mount
             [sharedEmulator insertDisk:url.path];
         } else if ([options[UIApplicationOpenURLOptionsOpenInPlaceKey] boolValue]) {
             // not in documents - copy
             [url startAccessingSecurityScopedResource];
-            [self importFileToDocuments:url];
+            [self importFileToDocuments:url copy:YES];
             [url stopAccessingSecurityScopedResource];
         } else {
-            return [self importFileToDocuments:url];
+            return [self importFileToDocuments:url copy:NO];
         }
     }
     return YES;