1 files changed, 10 insertions, 35 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java b/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java
index 5e6e227c2b..6de66fe512 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java
@@ -61,6 +61,8 @@ class QtExtractedText
 
 class QtNativeInputConnection
 {
+    static native boolean beginBatchEdit();
+    static native boolean endBatchEdit();
     static native boolean commitText(String text, int newCursorPosition);
     static native boolean commitCompletion(String text, int position);
     static native boolean deleteSurroundingText(int leftLength, int rightLength);
@@ -82,18 +84,11 @@ class QtNativeInputConnection
 }
 
 class HideKeyboardRunnable implements Runnable {
-    private QtInputConnection m_connection;
-    HideKeyboardRunnable(QtInputConnection connection)
-    {
-        m_connection = connection;
-    }
+    private long m_hideTimeStamp = System.nanoTime();
 
     @Override
     public void run() {
-        if (m_connection.getInputState() == QtInputConnection.InputStates.Hiding) {
-            QtNative.activityDelegate().setKeyboardVisibility(false);
-            m_connection.reset();
-        }
+        QtNative.activityDelegate().setKeyboardVisibility(false, m_hideTimeStamp);
     }
 }
 
@@ -107,34 +102,14 @@ public class QtInputConnection extends BaseInputConnection
     private static final int ID_SWITCH_INPUT_METHOD = android.R.id.switchInputMethod;
     private static final int ID_ADD_TO_DICTIONARY = android.R.id.addToDictionary;
 
-
-    enum InputStates { Visible, FinishComposing, Hiding };
-
     private QtEditText m_view = null;
-    private InputStates m_inputState = InputStates.Visible;
-
-    public void reset()
-    {
-        m_inputState = InputStates.Visible;
-    }
-
-    public InputStates getInputState()
-    {
-        return m_inputState;
-    }
 
     private void setClosing(boolean closing)
     {
-        if (closing && m_inputState == InputStates.Hiding)
-            return;
-
-        if (closing && m_view.getActivityDelegate().isSoftwareKeyboardVisible()) {
-            m_view.postDelayed(new HideKeyboardRunnable(this), 100);
-            m_inputState = InputStates.Hiding;
+        if (closing) {
+            m_view.postDelayed(new HideKeyboardRunnable(), 100);
         } else {
-            if (m_inputState == InputStates.Hiding)
-                QtNative.activityDelegate().setKeyboardVisibility(true);
-            m_inputState = closing ? InputStates.FinishComposing : InputStates.Visible;
+            QtNative.activityDelegate().setKeyboardVisibility(true, System.nanoTime());
         }
     }
 
@@ -148,14 +123,14 @@ public class QtInputConnection extends BaseInputConnection
     public boolean beginBatchEdit()
     {
         setClosing(false);
-        return true;
+        return QtNativeInputConnection.beginBatchEdit();
     }
 
     @Override
     public boolean endBatchEdit()
     {
-//        setClosing(false);
-        return true;
+        setClosing(false);
+        return QtNativeInputConnection.endBatchEdit();
     }
 
     @Override