1 files changed, 16 insertions, 11 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 1bfe05e7ac..845f7c5e8d 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java
@@ -20,12 +20,12 @@ import android.util.DisplayMetrics;
 
 class QtExtractedText
 {
-    public int partialEndOffset;
-    public int partialStartOffset;
-    public int selectionEnd;
-    public int selectionStart;
-    public int startOffset;
-    public String text;
+    int partialEndOffset;
+    int partialStartOffset;
+    int selectionEnd;
+    int selectionStart;
+    int startOffset;
+    String text;
 }
 
 class QtNativeInputConnection
@@ -77,6 +77,10 @@ class QtInputConnection extends BaseInputConnection
                 Log.w(QtTAG, "HideKeyboardRunnable: The activity reference is null");
                 return;
             }
+            if (m_qtInputConnectionListener == null) {
+                Log.w(QtTAG, "HideKeyboardRunnable: QtInputConnectionListener is null");
+                return;
+            }
 
             Rect r = new Rect();
             activity.getWindow().getDecorView().getWindowVisibleDisplayFrame(r);
@@ -96,7 +100,7 @@ class QtInputConnection extends BaseInputConnection
         }
     }
 
-    public interface QtInputConnectionListener {
+    interface QtInputConnectionListener {
         void onSetClosing(boolean closing);
         void onHideKeyboardRunnableDone(boolean visibility, long hideTimeStamp);
         void onSendKeyEventDefaultCase();
@@ -109,11 +113,11 @@ class QtInputConnection extends BaseInputConnection
     {
         if (closing)
             m_view.postDelayed(new HideKeyboardRunnable(), 100);
-        else
+        else if (m_qtInputConnectionListener != null)
             m_qtInputConnectionListener.onSetClosing(false);
     }
 
-    public QtInputConnection(QtEditText targetView, QtInputConnectionListener listener)
+    QtInputConnection(QtEditText targetView, QtInputConnectionListener listener)
     {
         super(targetView, true);
         m_view = targetView;
@@ -122,7 +126,7 @@ class QtInputConnection extends BaseInputConnection
         m_qtInputConnectionListener = listener;
     }
 
-    public void restartImmInput()
+    void restartImmInput()
     {
         if (QtNativeInputConnection.fullscreenMode()) {
             if (m_imm != null)
@@ -297,7 +301,8 @@ class QtInputConnection extends BaseInputConnection
                     restartImmInput();
                     break;
                 default:
-                    m_qtInputConnectionListener.onSendKeyEventDefaultCase();
+                    if (m_qtInputConnectionListener != null)
+                        m_qtInputConnectionListener.onSendKeyEventDefaultCase();
                     break;
             }
         }