diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java index 6f15a7326eb..1b5eac55ed2 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java @@ -44,6 +44,10 @@ class QtActivityLoader extends QtLoader { } private void showErrorDialog() { + if (m_activity == null) { + Log.w(QtTAG, "cannot show the error dialog from a null activity object"); + return; + } Resources resources = m_activity.getResources(); String packageName = m_activity.getPackageName(); AlertDialog errorDialog = new AlertDialog.Builder(m_activity).create(); @@ -57,6 +61,10 @@ class QtActivityLoader extends QtLoader { @Override protected void finish() { + if (m_activity == null) { + Log.w(QtTAG, "finish() called when activity object is null"); + return; + } showErrorDialog(); m_activity.finish(); } diff --git a/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java index 281c871e929..f54627466d9 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java @@ -36,7 +36,10 @@ class QtServiceLoader extends QtLoader { @Override protected void finish() { - m_service.stopSelf(); + if (m_service != null) + m_service.stopSelf(); + else + Log.w(QtTAG, "finish() called when service object is null"); } @Override