4 files changed, 54 insertions, 27 deletions

diff --git a/src/ui/certimportwidget.c b/src/ui/certimportwidget.c
index 65cb6654..f4dfdefa 100644
--- a/src/ui/certimportwidget.c
+++ b/src/ui/certimportwidget.c
@@ -31,6 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "text.h"
 #include "ui/util.h"
 
+#if defined (iPlatformAppleMobile)
+#   include "ios.h"
+#endif
+
 #include <the_Foundation/file.h>
 #include <the_Foundation/tlsrequest.h>
 #include <the_Foundation/path.h>
@@ -75,7 +79,7 @@ static iBool tryImport_CertImportWidget_(iCertImportWidget *d, const iBlock *dat
     deinit_String(&pem);
     /* Update the labels. */ {
         if (d->cert && !isEmpty_TlsCertificate(d->cert)) {
-            setTextCStr_LabelWidget(
+            updateTextCStr_LabelWidget(
                 d->crtLabel,
                 format_CStr("%s%s",
                             uiTextAction_ColorEscape,
@@ -83,19 +87,19 @@ static iBool tryImport_CertImportWidget_(iCertImportWidget *d, const iBlock *dat
             setFrameColor_Widget(as_Widget(d->crtLabel), uiTextAction_ColorId);
         }
         else {
-            setTextCStr_LabelWidget(d->crtLabel, uiTextCaution_ColorEscape "${dlg.certimport.nocert}");
+            updateTextCStr_LabelWidget(d->crtLabel, uiTextCaution_ColorEscape "${dlg.certimport.nocert}");
             setFrameColor_Widget(as_Widget(d->crtLabel), uiTextCaution_ColorId);
         }
         if (d->cert && hasPrivateKey_TlsCertificate(d->cert)) {
             iString *fng = collect_String(
                 hexEncode_Block(collect_Block(privateKeyFingerprint_TlsCertificate(d->cert))));
             insertData_Block(&fng->chars, size_String(fng) / 2, "\n", 1);
-            setTextCStr_LabelWidget(
+            updateTextCStr_LabelWidget(
                 d->keyLabel, format_CStr("%s%s", uiTextAction_ColorEscape, cstr_String(fng)));
             setFrameColor_Widget(as_Widget(d->keyLabel), uiTextAction_ColorId);
         }
         else {
-            setTextCStr_LabelWidget(d->keyLabel, uiTextCaution_ColorEscape "${dlg.certimport.nokey}");
+            updateTextCStr_LabelWidget(d->keyLabel, uiTextCaution_ColorEscape "${dlg.certimport.nokey}");
             setFrameColor_Widget(as_Widget(d->keyLabel), uiTextCaution_ColorId);
         }
     }
@@ -133,6 +137,8 @@ void init_CertImportWidget(iCertImportWidget *d) {
         d->crtLabel = findChild_Widget(w, "certimport.crt");
         d->keyLabel = findChild_Widget(w, "certimport.key");
         d->notes    = findChild_Widget(w, "certimport.notes");
+        setFont_LabelWidget(d->crtLabel, uiContent_FontId);
+        setFont_LabelWidget(d->keyLabel, uiContent_FontId);
         setFixedSize_Widget(as_Widget(d->crtLabel), init_I2(-1, gap_UI * 12));
         setFixedSize_Widget(as_Widget(d->keyLabel), init_I2(-1, gap_UI * 12));
     }
@@ -213,6 +219,25 @@ static iBool tryImportFromClipboard_CertImportWidget_(iCertImportWidget *d) {
     return tryImport_CertImportWidget_(d, collect_Block(newCStr_Block(SDL_GetClipboardText())));
 }
 
+static iBool tryImportFromFile_CertImportWidget_(iCertImportWidget *d, const iString *path) {
+    iBool success = iFalse;
+    iFile *f = new_File(path);
+    if (open_File(f, readOnly_FileMode | text_FileMode)) {
+        if (tryImport_CertImportWidget_(d, collect_Block(readAll_File(f)))) {
+            success = iTrue;
+            if (isComplete_CertImportWidget_(d)) {
+                setFocus_Widget(as_Widget(d->notes));
+            }
+        }
+        else {
+            makeSimpleMessage_Widget(uiTextCaution_ColorEscape "${heading.certimport.dropped}",
+                                     "${dlg.certimport.notfound}");
+        }
+    }
+    iRelease(f);
+    return success;
+}
+
 static iBool processEvent_CertImportWidget_(iCertImportWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     if (ev->type == SDL_KEYDOWN) {
@@ -254,21 +279,22 @@ static iBool processEvent_CertImportWidget_(iCertImportWidget *d, const SDL_Even
         }
         return iTrue;
     }
-    if (ev->type == SDL_DROPFILE) {
-        const iString *name = collectNewCStr_String(ev->drop.file);
-        iFile *f = new_File(name);
-        if (open_File(f, readOnly_FileMode | text_FileMode)) {
-            if (tryImport_CertImportWidget_(d, collect_Block(readAll_File(f)))) {
-                if (isComplete_CertImportWidget_(d)) {
-                    setFocus_Widget(as_Widget(d->notes));
-                }
-            }
-            else {
-                makeSimpleMessage_Widget(uiTextCaution_ColorEscape "${heading.certimport.dropped}",
-                                         "${dlg.certimport.notfound}");
-            }
+#if defined (iPlatformAppleMobile)
+    if (isCommand_UserEvent(ev, "certimport.pickfile")) {
+        const char *cmd = command_UserEvent(ev);
+        if (hasLabel_Command(cmd, "path")) {
+            const iString *path = collect_String(suffix_Command(cmd, "path"));
+            tryImportFromFile_CertImportWidget_(d, path);
+            remove(cstr_String(path)); /* it is a temporary copy */
         }
-        iRelease(f);
+        else {
+            pickFile_iOS("certimport.pickfile");
+        }
+        return iTrue;
+    }
+#endif
+    if (ev->type == SDL_DROPFILE) {
+        tryImportFromFile_CertImportWidget_(d, collectNewCStr_String(ev->drop.file));
         return iTrue;
     }
     return processEvent_Widget(w, ev);
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index c8010fc6..c9c170cd 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -2314,7 +2314,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
     };
     const iRangei visLines       = visibleLineRange_InputWidget_(d);
     const int     visLineOffsetY = visLineOffsetY_InputWidget_(d);
-    iRect         markerRects[2];
+    iRect         markerRects[2] = { zero_Rect(), zero_Rect() };
     /* If buffered, just draw the buffered copy. */
     if (d->buffered && !isFocused) {
         /* Most input widgets will use this, since only one is focused at a time. */
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index ec324d02..c3c5fbe5 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -504,6 +504,14 @@ void setText_LabelWidget(iLabelWidget *d, const iString *text) {
     }
 }
 
+void setTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
+    updateTextCStr_LabelWidget(d, text);
+    updateSize_LabelWidget(d);
+    if (isWrapped_LabelWidget(d)) {
+        sizeChanged_LabelWidget_(d);
+    }
+}
+
 void setAlignVisually_LabelWidget(iLabelWidget *d, iBool alignVisual) {
     d->flags.alignVisual = alignVisual;
 }
@@ -565,13 +573,6 @@ void updateTextAndResizeWidthCStr_LabelWidget(iLabelWidget *d, const char *text)
     d->widget.rect.size.x = defaultSize_LabelWidget(d).x;
 }
 
-void setTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
-    setCStr_String(&d->label, text);
-    set_String(&d->srcLabel, &d->label);
-    replaceVariables_LabelWidget_(d);
-    updateSize_LabelWidget(d);
-}
-
 void setCommand_LabelWidget(iLabelWidget *d, const iString *command) {
     set_String(&d->command, command);
 }
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 3f8b78dc..c199990e 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -328,7 +328,7 @@ static void updateFileInfo_UploadWidget_(iUploadWidget *d) {
                            (iMenuItem[]){ "${dlg.message.ok}", 0, 0, "message.ok" }, 1);
         clear_String(&d->filePath);
         d->fileSize = 0;
-        return iTrue;
+        return;
     }
     d->fileSize = size_FileInfo(info);
 #if defined (iPlatformMobile)