1 files changed, 10 insertions, 9 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
index 97ae5064bd..2b9a1194d2 100644
--- a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
+++ b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
@@ -19,7 +19,7 @@ static jclass g_messageDialogHelperClass = nullptr;
 
 QAndroidPlatformMessageDialogHelper::QAndroidPlatformMessageDialogHelper()
     : m_javaMessageDialog(g_messageDialogHelperClass, "(Landroid/app/Activity;)V",
-                          QtAndroid::activity())
+                          QtAndroidPrivate::activity().object())
 {
 }
 
@@ -54,7 +54,10 @@ bool QAndroidPlatformMessageDialogHelper::show(Qt::WindowFlags windowFlags,
     if (!opt.data())
         return false;
 
-    m_javaMessageDialog.callMethod<void>("setIcon", "(I)V", opt->icon());
+    if (!opt->checkBoxLabel().isNull())
+        return false; // Can't support
+
+    m_javaMessageDialog.callMethod<void>("setStandardIcon", "(I)V", opt->standardIcon());
 
     QString str = htmlText(opt->windowTitle());
     if (!str.isEmpty()) {
@@ -147,7 +150,7 @@ static void dialogResult(JNIEnv * /*env*/, jobject /*thiz*/, jlong handler, int
     QMetaObject::invokeMethod(object, "dialogResult", Qt::QueuedConnection, Q_ARG(int, buttonID));
 }
 
-static JNINativeMethod methods[] = {
+static const JNINativeMethod methods[] = {
     {"dialogResult", "(JI)V", (void *)dialogResult}
 };
 
@@ -159,21 +162,19 @@ static JNINativeMethod methods[] = {
         return false; \
     }
 
-bool registerNatives(JNIEnv *env)
+bool registerNatives(QJniEnvironment &env)
 {
     const char QtMessageHandlerHelperClassName[] = "org/qtproject/qt/android/QtMessageDialogHelper";
-    QJniEnvironment qenv;
-    jclass clazz = qenv.findClass(QtMessageHandlerHelperClassName);
+    jclass clazz = env.findClass(QtMessageHandlerHelperClassName);
     if (!clazz) {
         __android_log_print(ANDROID_LOG_FATAL, QtAndroid::qtTagText(), QtAndroid::classErrorMsgFmt()
                             , QtMessageHandlerHelperClassName);
         return false;
     }
     g_messageDialogHelperClass = static_cast<jclass>(env->NewGlobalRef(clazz));
-    FIND_AND_CHECK_CLASS("org/qtproject/qt/android/QtNativeDialogHelper");
-    jclass appClass = static_cast<jclass>(env->NewGlobalRef(clazz));
 
-    if (env->RegisterNatives(appClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) {
+    if (!env.registerNativeMethods("org/qtproject/qt/android/QtNativeDialogHelper",
+                                  methods, sizeof(methods) / sizeof(methods[0]))) {
         __android_log_print(ANDROID_LOG_FATAL, "Qt", "RegisterNatives failed");
         return false;
     }