From 66783af554176c68cb58726aeff4ae6a23224234 Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Mon, 5 Jun 2023 10:38:25 +0800
Subject: Update Android port

* java/org/gnu/emacs/EmacsNative.java (EmacsNative): New
function clearInputFlags.
* java/org/gnu/emacs/EmacsView.java (onCreateInputConnection):
Stop reporting changes after a new input method connection is
established.
* src/androidterm.c (android_handle_ime_event): Implement that
change.
(JNICALL): New function.
---
 java/org/gnu/emacs/EmacsNative.java | 1 +
 java/org/gnu/emacs/EmacsView.java   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'java/org/gnu')

diff --git a/java/org/gnu/emacs/EmacsNative.java b/java/org/gnu/emacs/EmacsNative.java
index f03736fe614..cb1c6caa79a 100644
--- a/java/org/gnu/emacs/EmacsNative.java
+++ b/java/org/gnu/emacs/EmacsNative.java
@@ -221,6 +221,7 @@ public final class EmacsNative
 						       int flags);
   public static native void requestSelectionUpdate (short window);
   public static native void requestCursorUpdates (short window, int mode);
+  public static native void clearInputFlags (short window);
 
 
   /* Return the current value of the selection, or -1 upon
diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index c223dfa7911..a78dec08839 100644
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -627,6 +627,10 @@ public final class EmacsView extends ViewGroup
 	return null;
       }
 
+    /* Reset flags set by the previous input method.  */
+
+    EmacsNative.clearInputFlags (window.handle);
+
     /* Obtain the current position of point and set it as the
        selection.  Don't do this under one specific situation: if
        `android_update_ic' is being called in the main thread, trying
@@ -663,10 +667,6 @@ public final class EmacsView extends ViewGroup
 
     if (inputConnection == null)
       inputConnection = new EmacsInputConnection (this);
-    else
-      /* Reset the composing region, in case there is still composing
-	 text.  */
-      inputConnection.finishComposingText ();
 
     /* Return the input connection.  */
     return inputConnection;
-- 
cgit v1.2.1