Android: fix inputmethod race conditions

focusObjectInputMethodQuery() and sendInputMethodEvent() were not
thread safe. Remove them, and replace with thread safe versions
based on the same principle as queryFocusObjectThreadSafe().

Task-number: QTBUG-40995
Change-Id: Idb6f0c6d3963b7e8e73e029e83d0367088146ca8
Reviewed-by: Christian Stromme <[email protected]>
Reviewed-by: BogDan Vatra <[email protected]>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/plugins/platforms/android/qandroidinputcontext.h b/src/plugins/platforms/android/qandroidinputcontext.h
index a467e4849ef..ffadacaad48 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.h
+++ b/src/plugins/platforms/android/qandroidinputcontext.h
@@ -121,16 +121,15 @@ public slots:
     void updateCursorPosition();
 
 private:
-    QSharedPointer<QInputMethodQueryEvent> focusObjectInputMethodQuery(Qt::InputMethodQueries queries = Qt::ImQueryAll);
-    void sendInputMethodEvent(QInputMethodEvent *event);
+    void sendInputMethodEventThreadSafe(QInputMethodEvent *event);
+    Q_INVOKABLE void sendInputMethodEventUnsafe(QInputMethodEvent *event);
+
+    QSharedPointer<QInputMethodQueryEvent> focusObjectInputMethodQueryThreadSafe(Qt::InputMethodQueries queries = Qt::ImQueryAll);
+    Q_INVOKABLE QInputMethodQueryEvent *focusObjectInputMethodQueryUnsafe(Qt::InputMethodQueries queries);
 
     Q_INVOKABLE QVariant queryFocusObjectUnsafe(Qt::InputMethodQuery query, QVariant argument);
     QVariant queryFocusObjectThreadSafe(Qt::InputMethodQuery query, QVariant argument);
 
-private slots:
-    virtual void sendEvent(QObject *receiver, QInputMethodEvent *event);
-    virtual void sendEvent(QObject *receiver, QInputMethodQueryEvent *event);
-
 private:
     ExtractedText m_extractedText;
     QString m_composingText;