Fix menu and popup race conditions on Android

* java/org/gnu/emacs/EmacsActivity.java (onContextMenuClosed):
* java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu)
(onMenuItemClick, run):
* java/org/gnu/emacs/EmacsDialog.java (EmacsDialog, onClick)
(createDialog, onDismiss): Take menu event serial, and pass it
along in context menu events.
* java/org/gnu/emacs/EmacsNative.java (sendContextMenu): New
argument.
* src/android.c (sendContextMenu): Pass serial number in event.

* src/androidgui.h (struct android_menu_event): New field
`menu_event_serial'.
* src/androidmenu.c (FIND_METHOD_STATIC)
(android_init_emacs_context_menu): Adjust method declarations.
(android_menu_show, android_dialog_show):
* src/androidterm.c (handle_one_android_event): Expect serial in
context menu events.
* src/androidterm.h: Update prototypes.

4 files changed, 29 insertions, 11 deletions

diff --git a/java/org/gnu/emacs/EmacsActivity.java b/java/org/gnu/emacs/EmacsActivity.java
index 692d8a14e22..735a464be8e 100644
--- a/java/org/gnu/emacs/EmacsActivity.java
+++ b/java/org/gnu/emacs/EmacsActivity.java
@@ -315,6 +315,8 @@ public class EmacsActivity extends Activity
   public final void
   onContextMenuClosed (Menu menu)
   {
+    int serial;
+
     Log.d (TAG, "onContextMenuClosed: " + menu);
 
     /* See the comment inside onMenuItemClick.  */
@@ -335,7 +337,11 @@ public class EmacsActivity extends Activity
     /* Send a context menu event given that no menu item has already
        been selected.  */
     if (!EmacsContextMenu.itemAlreadySelected)
-      EmacsNative.sendContextMenu ((short) 0, 0);
+      {
+        serial = EmacsContextMenu.lastMenuEventSerial;
+        EmacsNative.sendContextMenu ((short) 0, 0,
+                                     serial);
+      }
 
     super.onContextMenuClosed (menu);
   }
diff --git a/java/org/gnu/emacs/EmacsContextMenu.java b/java/org/gnu/emacs/EmacsContextMenu.java
index 0553ff9d4a3..abc1869ac6a 100644
--- a/java/org/gnu/emacs/EmacsContextMenu.java
+++ b/java/org/gnu/emacs/EmacsContextMenu.java
@@ -49,6 +49,9 @@ public final class EmacsContextMenu
   /* Whether or not a submenu was selected.  */
   public static boolean wasSubmenuSelected;
 
+  /* The serial ID of the last context menu to be displayed.  */
+  public static int lastMenuEventSerial;
+
   private static class Item implements MenuItem.OnMenuItemClickListener
   {
     public int itemID;
@@ -106,7 +109,8 @@ public final class EmacsContextMenu
         }
 
       /* Send a context menu event.  */
-      EmacsNative.sendContextMenu ((short) 0, itemID);
+      EmacsNative.sendContextMenu ((short) 0, itemID,
+                                   lastMenuEventSerial);
 
       /* Say that an item has already been selected.  */
       itemAlreadySelected = true;
@@ -293,12 +297,13 @@ public final class EmacsContextMenu
                                   false);
   }
 
-  /* Display this context menu on WINDOW, at xPosition and
-     yPosition.  */
+  /* Display this context menu on WINDOW, at xPosition and yPosition.
+     SERIAL is a number that will be returned in any menu event
+     generated to identify this context menu.  */
 
   public boolean
   display (final EmacsWindow window, final int xPosition,
-           final int yPosition)
+           final int yPosition, final int serial)
   {
     Runnable runnable;
     final Holder<Boolean> rc;
@@ -312,6 +317,7 @@ public final class EmacsContextMenu
         {
           synchronized (this)
             {
+              lastMenuEventSerial = serial;
               rc.thing = display1 (window, xPosition, yPosition);
               notify ();
             }
diff --git a/java/org/gnu/emacs/EmacsDialog.java b/java/org/gnu/emacs/EmacsDialog.java
index 80a5e5f7369..aed84de29e5 100644
--- a/java/org/gnu/emacs/EmacsDialog.java
+++ b/java/org/gnu/emacs/EmacsDialog.java
@@ -57,6 +57,9 @@ public final class EmacsDialog implements DialogInterface.OnDismissListener
   /* Dialog to dismiss after click.  */
   private AlertDialog dismissDialog;
 
+  /* The menu serial associated with this dialog box.  */
+  private int menuEventSerial;
+
   private class EmacsButton implements View.OnClickListener,
                             DialogInterface.OnClickListener
   {
@@ -76,7 +79,7 @@ public final class EmacsDialog implements DialogInterface.OnDismissListener
       Log.d (TAG, "onClicked " + this);
 
       wasButtonClicked = true;
-      EmacsNative.sendContextMenu ((short) 0, id);
+      EmacsNative.sendContextMenu ((short) 0, id, menuEventSerial);
       dismissDialog.dismiss ();
     }
 
@@ -87,15 +90,16 @@ public final class EmacsDialog implements DialogInterface.OnDismissListener
       Log.d (TAG, "onClicked " + this);
 
       wasButtonClicked = true;
-      EmacsNative.sendContextMenu ((short) 0, id);
+      EmacsNative.sendContextMenu ((short) 0, id, menuEventSerial);
     }
   };
 
   /* Create a popup dialog with the title TITLE and the text TEXT.
-     TITLE may be NULL.  */
+     TITLE may be NULL.  MENUEVENTSERIAL is a number which will
+     identify this popup dialog inside events it sends.  */
 
   public static EmacsDialog
-  createDialog (String title, String text)
+  createDialog (String title, String text, int menuEventSerial)
   {
     EmacsDialog dialog;
 
@@ -103,6 +107,7 @@ public final class EmacsDialog implements DialogInterface.OnDismissListener
     dialog.buttons = new ArrayList<EmacsButton> ();
     dialog.title = title;
     dialog.text = text;
+    dialog.menuEventSerial = menuEventSerial;
 
     return dialog;
   }
@@ -330,6 +335,6 @@ public final class EmacsDialog implements DialogInterface.OnDismissListener
     if (wasButtonClicked)
       return;
 
-    EmacsNative.sendContextMenu ((short) 0, 0);
+    EmacsNative.sendContextMenu ((short) 0, 0, menuEventSerial);
   }
 };
diff --git a/java/org/gnu/emacs/EmacsNative.java b/java/org/gnu/emacs/EmacsNative.java
index 8e626b9534b..11da5db8746 100644
--- a/java/org/gnu/emacs/EmacsNative.java
+++ b/java/org/gnu/emacs/EmacsNative.java
@@ -155,7 +155,8 @@ public final class EmacsNative
   public static native long sendDeiconified (short window);
 
   /* Send an ANDROID_CONTEXT_MENU event.  */
-  public static native long sendContextMenu (short window, int menuEventID);
+  public static native long sendContextMenu (short window, int menuEventID,
+                                             int menuEventSerial);
 
   /* Send an ANDROID_EXPOSE event.  */
   public static native long sendExpose (short window, int x, int y,