1 files changed, 24 insertions, 6 deletions

diff --git a/src/app.c b/src/app.c
index 4045610e..3e6e9cdc 100644
--- a/src/app.c
+++ b/src/app.c
@@ -124,7 +124,7 @@ struct Impl_App {
     iMimeHooks * mimehooks;
     iGmCerts *   certs;
     iVisited *   visited;
-    iBookmarks * bookmarks;    
+    iBookmarks * bookmarks;
     iMainWindow *window;
     iPtrArray    popupWindows;
     iSortedArray tickers; /* per-frame callbacks, used for animations */
@@ -333,7 +333,9 @@ static const char *dataDir_App_(void) {
 
 static const char *downloadDir_App_(void) {
 #if defined (iPlatformAndroidMobile)
-    return concatPath_CStr(SDL_AndroidGetInternalStoragePath(), "Downloads");
+    const char *dir = concatPath_CStr(SDL_AndroidGetExternalStoragePath(), "Downloads");
+    makeDirs_Path(collectNewCStr_String(dir));
+    return dir;
 #endif
 #if defined (iPlatformLinux) || defined (iPlatformOther)
     /* Parse user-dirs.dirs using the `xdg-user-dir` tool. */
@@ -759,7 +761,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->isSuspended = iFalse;
     d->tempFilesPendingDeletion = new_StringSet();
     init_CommandLine(&d->args, argc, argv);
-    /* Where was the app started from? We ask SDL first because the command line alone 
+    /* Where was the app started from? We ask SDL first because the command line alone
        cannot be relied on (behavior differs depending on OS). */ {
         char *exec = SDL_GetBasePath();
         if (exec) {
@@ -1268,7 +1270,7 @@ static iBool nextEvent_App_(iApp *d, enum iAppEventMode eventMode, SDL_Event *ev
     /* SDL regression circa 2.0.18? SDL_PollEvent() doesn't always return 
        events posted immediately beforehand. Waiting with a very short timeout
        seems to work better. */
-#if defined (iPlatformLinux)
+#if defined (iPlatformLinux) && SDL_VERSION_ATLEAST(2, 0, 18)
     return SDL_WaitEventTimeout(event, 1);
 #else
     return SDL_PollEvent(event);
@@ -1289,9 +1291,10 @@ void processEvents_App(enum iAppEventMode eventMode) {
     iRoot *oldCurrentRoot = current_Root(); /* restored afterwards */
     SDL_Event ev;
     iBool gotEvents = iFalse;
+    iBool gotRefresh = iFalse;
     iPtrArray windows;
     init_PtrArray(&windows);
-    while (nextEvent_App_(d, eventMode, &ev)) {
+    while (nextEvent_App_(d, gotRefresh ? postedEventsOnly_AppEventMode : eventMode, &ev)) {
 #if defined (iPlatformAppleMobile)
         if (processEvent_iOS(&ev)) {
             continue;
@@ -1362,6 +1365,10 @@ void processEvents_App(enum iAppEventMode eventMode) {
                     dispatchCommands_Periodic(&d->periodic);
                     continue;
                 }
+                if (ev.type == SDL_USEREVENT && ev.user.code == refresh_UserEventCode) {
+                    gotRefresh = iTrue;
+                    continue;
+                }
 #if defined (LAGRANGE_ENABLE_IDLE_SLEEP)
                 if (ev.type == SDL_USEREVENT && ev.user.code == asleep_UserEventCode) {
                     if (SDL_GetTicks() - d->lastEventTime > idleThreshold_App_ &&
@@ -1391,6 +1398,16 @@ void processEvents_App(enum iAppEventMode eventMode) {
                     ev.key.keysym.mod = mapMods_Keys(ev.key.keysym.mod & ~KMOD_CAPS);
                 }
 #if defined (iPlatformAndroidMobile)
+                /* Use the system Back button to close panels, if they're open. */
+                if (ev.type == SDL_KEYDOWN && ev.key.keysym.sym == SDLK_AC_BACK) {
+                    SDL_UserEvent panelBackCmd = { .type = SDL_USEREVENT,
+                                                   .code = command_UserEventCode,
+                                                   .data1 = iDupStr("panel.close"),
+                                                   .data2 = d->window->base.keyRoot };
+                    if (dispatchEvent_Window(&d->window->base, (SDL_Event *) &panelBackCmd)) {
+                        continue; /* Was handled by someone. */
+                    }
+                }
                 /* Ignore all mouse events; just use touch. */
                 if (ev.type == SDL_MOUSEBUTTONDOWN ||
                     ev.type == SDL_MOUSEBUTTONUP ||
@@ -2074,7 +2091,6 @@ iDocumentWidget *document_Command(const char *cmd) {
 }
 
 iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNew) {
-    //iApp *d = &app_;
     iWidget *tabs = findWidget_Root("doctabs");
     setFlags_Widget(tabs, hidden_WidgetFlag, iFalse);
     iWidget *newTabButton = findChild_Widget(tabs, "newtab");
@@ -2090,6 +2106,7 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNe
     iRelease(doc); /* now owned by the tabs */
     addTabCloseButton_Widget(tabs, as_Widget(doc), "tabs.close");
     addChild_Widget(findChild_Widget(tabs, "tabs.buttons"), iClob(newTabButton));
+    showOrHideNewTabButton_Root(tabs->root);
     if (switchToNew) {
         postCommandf_App("tabs.switch page:%p", doc);
     }
@@ -2840,6 +2857,7 @@ iBool handleCommand_App(const char *cmd) {
             return iTrue;
         }
         iDocumentWidget *doc = document_Command(cmd);
+        iAssert(doc);
         iDocumentWidget *origin = doc;
         if (hasLabel_Command(cmd, "origin")) {
             iDocumentWidget *cmdOrig = findWidget_App(cstr_Command(cmd, "origin"));