Android: Finish composing text before Key handling

If the sendKeyEvent was invoked, it means that the button not related
with composing text was used. In such case composing text (if it exists)
should be immediately finished.

Fixes: QTBUG-85715
Pick-to: 5.15 6.0
Change-Id: Ifbca067805b8d20f6a90f95b27210595abed964a
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

1 files changed, 11 insertions, 0 deletions

diff --git a/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java b/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java
index dab8ebf324..e90de9e24d 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java
@@ -46,6 +46,7 @@ import android.view.inputmethod.CompletionInfo;
 import android.view.inputmethod.ExtractedText;
 import android.view.inputmethod.ExtractedTextRequest;
 import android.view.inputmethod.InputMethodManager;
+import android.view.KeyEvent;
 import android.graphics.Rect;
 import android.app.Activity;
 import android.util.DisplayMetrics;
@@ -250,6 +251,16 @@ public class QtInputConnection extends BaseInputConnection
     }
 
     @Override
+    public boolean sendKeyEvent(KeyEvent event)
+    {
+        // QTBUG-85715
+        // If the sendKeyEvent was invoked, it means that the button not related with composingText was used
+        // In such case composing text (if it exists) should be finished immediately
+        finishComposingText();
+        return super.sendKeyEvent(event);
+    }
+
+    @Override
     public boolean setComposingText(CharSequence text, int newCursorPosition)
     {
         setClosing(false);