3 files changed, 79 insertions, 20 deletions

diff --git a/src/ios.h b/src/ios.h
index 70b889bf..85177409 100644
--- a/src/ios.h
+++ b/src/ios.h
@@ -37,6 +37,7 @@ iBool   processEvent_iOS        (const SDL_Event *);
 void    playHapticEffect_iOS    (enum iHapticEffect effect);
 void    exportDownloadedFile_iOS(const iString *path);
 void    pickFileForOpening_iOS  (void);
+void    pickFile_iOS            (const char *command); /* ` path:%s` will be appended */
 
 iBool   isPhone_iOS             (void);
 void    safeAreaInsets_iOS      (float *left, float *top, float *right, float *bottom);
diff --git a/src/ios.m b/src/ios.m
index c493e4f9..3fb0af48 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -161,6 +161,7 @@ API_AVAILABLE(ios(13.0))
 
 @interface AppState : NSObject<UIDocumentPickerDelegate> {
     iString *fileBeingSaved;
+    iString *pickFileCommand;
 }
 @property (nonatomic, assign) BOOL isHapticsAvailable;
 @property (nonatomic, strong) NSObject *haptic;
@@ -173,9 +174,17 @@ static AppState *appState_;
 -(instancetype)init {
     self = [super init];
     fileBeingSaved = NULL;
+    pickFileCommand = NULL;
     return self;
 }
 
+-(void)setPickFileCommand:(const char *)command {
+    if (!pickFileCommand) {
+        pickFileCommand = new_String();
+    }
+    setCStr_String(pickFileCommand, command);
+}
+
 -(void)setFileBeingSaved:(const iString *)path {
     fileBeingSaved = copy_String(path);
 }
@@ -213,7 +222,11 @@ didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
         NSURL *url = [urls firstObject];
         iString *path = localFilePathFromUrl_String(collectNewCStr_String([[url absoluteString]
                                                                            UTF8String]));
-        postCommandf_App("file.open temp:1 path:%s", cstrCollect_String(path));
+        postCommandf_App("%s temp:1 path:%s",
+                         cstr_String(pickFileCommand),
+                         cstrCollect_String(path));
+        delete_String(pickFileCommand);
+        pickFileCommand = NULL;
     }
 }
 
@@ -221,6 +234,10 @@ didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
     if (fileBeingSaved) {
         [self removeSavedFile];
     }
+    if (pickFileCommand) {
+        delete_String(pickFileCommand);
+        pickFileCommand = NULL;
+    }
 }
 
 -(void)keyboardOnScreen:(NSNotification *)notification {
@@ -454,11 +471,13 @@ void exportDownloadedFile_iOS(const iString *path) {
 }
 
 void pickFileForOpening_iOS(void) {
+    pickFile_iOS("file.open");
+}
+
+void pickFile_iOS(const char *command) {
+    [appState_ setPickFileCommand:command];
     UIDocumentPickerViewController *picker = [[UIDocumentPickerViewController alloc]
-                                              initWithDocumentTypes:@[@"fi.skyjake.lagrange.gemini",
-                                                                      @"public.text",
-                                                                      @"public.image",
-                                                                      @"public.audio"]
+                                              initWithDocumentTypes:@[@"public.data"]
                                               inMode:UIDocumentPickerModeImport];
     picker.delegate = appState_;
     [viewController_(get_Window()) presentViewController:picker animated:YES completion:nil];
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 34cace08..3f8b78dc 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -33,8 +33,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "gmcerts.h"
 #include "app.h"
 
+#if defined (iPlatformAppleMobile)
+#   include "ios.h"
+#endif
+
 #include <the_Foundation/file.h>
 #include <the_Foundation/fileinfo.h>
+#include <the_Foundation/path.h>
 
 iDefineObjectConstruction(UploadWidget)
     
@@ -64,6 +69,16 @@ struct Impl_UploadWidget {
     iAtomicInt       isRequestUpdated;
 };
 
+static void releaseFile_UploadWidget_(iUploadWidget *d) {
+#if defined (iPlatformAppleMobile)
+    if (!isEmpty_String(&d->filePath)) {
+        /* Delete the temporary file that was copied for uploading. */
+        remove(cstr_String(&d->filePath));
+    }
+#endif
+    clear_String(&d->filePath);
+}
+
 static void updateProgress_UploadWidget_(iGmRequest *request, size_t current, size_t total) {
     iUploadWidget *d = userData_Object(request);
     postCommand_Widget(d,
@@ -157,8 +172,8 @@ void init_UploadWidget(iUploadWidget *d) {
         }, actions, iElemCount(actions));
         d->info          = findChild_Widget(w, "upload.info");
         d->input         = findChild_Widget(w, "upload.text");
-        d->filePathLabel = findChild_Widget(w, "upload.file.name");
-        d->fileSizeLabel = findChild_Widget(w, "upload.file.size");
+        d->filePathLabel = findChild_Widget(w, "upload.filepathlabel");
+        d->fileSizeLabel = findChild_Widget(w, "upload.filesizelabel");
         d->mime          = findChild_Widget(w, "upload.mime");
         d->token         = findChild_Widget(w, "upload.token");
         d->counter       = findChild_Widget(w, "upload.counter");
@@ -237,6 +252,7 @@ void init_UploadWidget(iUploadWidget *d) {
 }
 
 void deinit_UploadWidget(iUploadWidget *d) {
+    releaseFile_UploadWidget_(d);
     deinit_Block(&d->idFingerprint);
     deinit_String(&d->filePath);
     deinit_String(&d->url);
@@ -304,6 +320,26 @@ static void updateIdentityDropdown_UploadWidget_(iUploadWidget *d) {
             : format_CStr(" fp:%s", cstrCollect_String(hexEncode_Block(&d->idFingerprint))));
 }
 
+static void updateFileInfo_UploadWidget_(iUploadWidget *d) {
+    iFileInfo *info = iClob(new_FileInfo(&d->filePath));
+    if (isDirectory_FileInfo(info)) {
+        makeMessage_Widget("${heading.upload.error.file}",
+                           "${upload.error.directory}",
+                           (iMenuItem[]){ "${dlg.message.ok}", 0, 0, "message.ok" }, 1);
+        clear_String(&d->filePath);
+        d->fileSize = 0;
+        return iTrue;
+    }
+    d->fileSize = size_FileInfo(info);
+#if defined (iPlatformMobile)
+    setTextCStr_LabelWidget(d->filePathLabel, cstr_Rangecc(baseName_Path(&d->filePath)));
+#else
+    setText_LabelWidget(d->filePathLabel, &d->filePath);
+#endif
+    setTextCStr_LabelWidget(d->fileSizeLabel, formatCStrs_Lang("num.bytes.n", d->fileSize));
+    setTextCStr_InputWidget(d->mime, mediaType_Path(&d->filePath));
+}
+
 static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     const char *cmd = command_UserEvent(ev);
@@ -430,6 +466,7 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
             d->request = NULL; /* DocumentWidget has it now. */
         }
         setupSheetTransition_Mobile(w, iFalse);
+        releaseFile_UploadWidget_(d);
         destroy_Widget(w);
         return iTrue;        
     }
@@ -439,24 +476,26 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
         refresh_Widget(w);
         return iTrue;
     }
+    else if (isCommand_Widget(w, ev, "upload.pickfile")) {
+#if defined (iPlatformAppleMobile)
+        if (hasLabel_Command(cmd, "path")) {
+            releaseFile_UploadWidget_(d);
+            set_String(&d->filePath, collect_String(suffix_Command(cmd, "path")));
+            updateFileInfo_UploadWidget_(d);
+        }
+        else {
+            pickFile_iOS(format_CStr("upload.pickfile ptr:%p", d));
+        }
+#endif
+        return iTrue;
+    }
     if (ev->type == SDL_DROPFILE) {
         /* Switch to File tab. */
         iWidget *tabs = findChild_Widget(w, "upload.tabs");
         showTabPage_Widget(tabs, tabPage_Widget(tabs, 1));
+        releaseFile_UploadWidget_(d);
         setCStr_String(&d->filePath, ev->drop.file);
-        iFileInfo *info = iClob(new_FileInfo(&d->filePath));
-        if (isDirectory_FileInfo(info)) {
-            makeMessage_Widget("${heading.upload.error.file}",
-                               "${upload.error.directory}",
-                               (iMenuItem[]){ "${dlg.message.ok}", 0, 0, "message.ok" }, 1);
-            clear_String(&d->filePath);
-            d->fileSize = 0;
-            return iTrue;
-        }
-        d->fileSize = size_FileInfo(info);
-        setText_LabelWidget(d->filePathLabel, &d->filePath);
-        setTextCStr_LabelWidget(d->fileSizeLabel, formatCStrs_Lang("num.bytes.n", d->fileSize));
-        setTextCStr_InputWidget(d->mime, mediaType_Path(&d->filePath));
+        updateFileInfo_UploadWidget_(d);
         return iTrue;
     }
     return processEvent_Widget(w, ev);