3 files changed, 46 insertions, 33 deletions

diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index c199990e..b8591b8f 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -106,7 +106,7 @@ static void updateInputMaxHeight_UploadWidget_(iUploadWidget *d) {
 
 static const iArray *makeIdentityItems_UploadWidget_(const iUploadWidget *d) {
     iArray *items = collectNew_Array(sizeof(iMenuItem));
-    const iGmIdentity *urlId = identityForUrl_GmCerts(certs_App(), &d->url);        
+    const iGmIdentity *urlId = identityForUrl_GmCerts(certs_App(), &d->url);
     pushBack_Array(items, &(iMenuItem){ format_CStr("${dlg.upload.id.default} (%s)",
                                                     urlId ? cstr_String(name_GmIdentity(urlId)) : "${dlg.upload.id.none}"),
                                         0, 0, "upload.setid arg:1" });
@@ -260,6 +260,22 @@ void deinit_UploadWidget(iUploadWidget *d) {
     iRelease(d->request);
 }
 
+static void remakeIdentityItems_UploadWidget_(iUploadWidget *d) {
+    iWidget *dropMenu= findChild_Widget(findChild_Widget(as_Widget(d), "upload.id"), "menu");
+    releaseChildren_Widget(dropMenu);
+    const iArray *items = makeIdentityItems_UploadWidget_(d);
+    makeMenuItems_Widget(dropMenu, constData_Array(items), size_Array(items));
+}
+
+static void updateIdentityDropdown_UploadWidget_(iUploadWidget *d) {
+    updateDropdownSelection_LabelWidget(
+        findChild_Widget(as_Widget(d), "upload.id"),
+        d->idMode == none_UploadIdentity ? " arg:0"
+        : d->idMode == defaultForUrl_UploadIdentity
+            ? " arg:1"
+            : format_CStr(" fp:%s", cstrCollect_String(hexEncode_Block(&d->idFingerprint))));
+}
+
 static uint16_t titanPortForUrl_(const iString *url) {
     uint16_t port = 0;
     const iString *root = collectNewRange_String(urlRoot_String(url));
@@ -289,6 +305,8 @@ static void setUrlPort_UploadWidget_(iUploadWidget *d, const iString *url, uint1
 
 void setUrl_UploadWidget(iUploadWidget *d, const iString *url) {
     setUrlPort_UploadWidget_(d, url, 0);
+    remakeIdentityItems_UploadWidget_(d);
+    updateIdentityDropdown_UploadWidget_(d);
 }
 
 void setResponseViewer_UploadWidget(iUploadWidget *d, iDocumentWidget *doc) {
@@ -311,15 +329,6 @@ static void requestFinished_UploadWidget_(iUploadWidget *d, iGmRequest *req) {
     postCommand_Widget(d, "upload.request.finished reqid:%u", id_GmRequest(req));
 }
 
-static void updateIdentityDropdown_UploadWidget_(iUploadWidget *d) {
-    updateDropdownSelection_LabelWidget(
-        findChild_Widget(as_Widget(d), "upload.id"),
-        d->idMode == none_UploadIdentity ? " arg:0"
-        : d->idMode == defaultForUrl_UploadIdentity
-            ? " arg:1"
-            : 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)) {
diff --git a/src/ui/util.c b/src/ui/util.c
index eb3d1cf2..b78cd6c6 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -683,29 +683,11 @@ static iWidget *makeMenuSeparator_(void) {
     return sep;
 }
 
-iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
-    iWidget *menu = new_Widget();
-    setDrawBufferEnabled_Widget(menu, iTrue);
-    setBackgroundColor_Widget(menu, uiBackgroundMenu_ColorId);
-    if (deviceType_App() != desktop_AppDeviceType) {
-        setPadding1_Widget(menu, 2 * gap_UI);
-    }
-    else {
-        setPadding1_Widget(menu, gap_UI / 2);
-    }
+void makeMenuItems_Widget(iWidget *menu, const iMenuItem *items, size_t n) {
     const iBool isPortraitPhone = (deviceType_App() == phone_AppDeviceType && isPortrait_App());
-    int64_t itemFlags = (deviceType_App() != desktop_AppDeviceType ? 0 : 0) |
-                        (isPortraitPhone ? extraPadding_WidgetFlag : 0);
-    setFlags_Widget(menu,
-                    keepOnTop_WidgetFlag | collapse_WidgetFlag | hidden_WidgetFlag |
-                        arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag |
-                        resizeChildrenToWidestChild_WidgetFlag | overflowScrollable_WidgetFlag |
-                        (isPortraitPhone ? drawBackgroundToVerticalSafeArea_WidgetFlag : 0),
-                    iTrue);
-    if (!isPortraitPhone) {
-        setFrameColor_Widget(menu, uiSeparator_ColorId);
-    }
-    iBool haveIcons = iFalse;
+    int64_t     itemFlags       = (deviceType_App() != desktop_AppDeviceType ? 0 : 0) |
+                                  (isPortraitPhone ? extraPadding_WidgetFlag : 0);
+    iBool    haveIcons  = iFalse;
     iWidget *horizGroup = NULL;
     for (size_t i = 0; i < n; ++i) {
         const iMenuItem *item = &items[i];
@@ -739,7 +721,7 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
                 iClob(newKeyMods_LabelWidget(labelText, item->key, item->kmods, item->command)),
                 noBackground_WidgetFlag | frameless_WidgetFlag | alignLeft_WidgetFlag |
                 drawKey_WidgetFlag | itemFlags);
-            setWrap_LabelWidget(label, isInfo);            
+            setWrap_LabelWidget(label, isInfo);
             haveIcons |= checkIcon_LabelWidget(label);
             updateSize_LabelWidget(label); /* drawKey was set */
             if (isInfo) {
@@ -765,7 +747,28 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
                 }
             }
         }
+    }}
+
+iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
+    iWidget *menu = new_Widget();
+    setDrawBufferEnabled_Widget(menu, iTrue);
+    setBackgroundColor_Widget(menu, uiBackgroundMenu_ColorId);
+    if (deviceType_App() != desktop_AppDeviceType) {
+        setPadding1_Widget(menu, 2 * gap_UI);
+    }
+    else {
+        setPadding1_Widget(menu, gap_UI / 2);
+    }
+    setFlags_Widget(menu,
+                    keepOnTop_WidgetFlag | collapse_WidgetFlag | hidden_WidgetFlag |
+                        arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag |
+                        resizeChildrenToWidestChild_WidgetFlag | overflowScrollable_WidgetFlag |
+                        (isPortraitPhone_App() ? drawBackgroundToVerticalSafeArea_WidgetFlag : 0),
+                    iTrue);
+    if (!isPortraitPhone_App()) {
+        setFrameColor_Widget(menu, uiSeparator_ColorId);
     }
+    makeMenuItems_Widget(menu, items, n);
     addChild_Widget(parent, menu);
     iRelease(menu); /* owned by parent now */
     setCommandHandler_Widget(menu, menuHandler_);
diff --git a/src/ui/util.h b/src/ui/util.h
index 74a95827..938a200d 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -227,6 +227,7 @@ struct Impl_MenuItem {
 };
 
 iWidget *   makeMenu_Widget     (iWidget *parent, const iMenuItem *items, size_t n); /* returns no ref */
+void        makeMenuItems_Widget(iWidget *menu, const iMenuItem *items, size_t n);
 void        openMenu_Widget     (iWidget *, iInt2 windowCoord);
 void        openMenuFlags_Widget(iWidget *, iInt2 windowCoord, iBool postCommands);
 void        closeMenu_Widget    (iWidget *);