From 1220a87f8adfcc30cd31a2b1a5bccbee8c394cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Str=C3=B8mme?= <christian.stromme@digia.com>
Date: Wed, 23 Apr 2014 16:22:04 +0200
Subject: [PATCH] Android: Simplify the jni code in QAndroidPlatformServices

Remove the use of QtAndroid::AttachedJNIEnv and lazily cache
the openURL() methodID on first use.

Change-Id: I601d13bc7d644d7cb2f78655ad40c7d9566cf3cb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
---
 .../android/qandroidplatformservices.cpp      | 21 ++++++-------------
 .../android/qandroidplatformservices.h        |  4 ----
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/plugins/platforms/android/qandroidplatformservices.cpp b/src/plugins/platforms/android/qandroidplatformservices.cpp
index 02fe29e576..9c21abe39b 100644
--- a/src/plugins/platforms/android/qandroidplatformservices.cpp
+++ b/src/plugins/platforms/android/qandroidplatformservices.cpp
@@ -43,30 +43,21 @@
 #include <QUrl>
 #include <QDir>
 #include <QDebug>
+#include <QtCore/private/qjni_p.h>
 
 QT_BEGIN_NAMESPACE
 
 QAndroidPlatformServices::QAndroidPlatformServices()
 {
-    QtAndroid::AttachedJNIEnv env;
-    if (!env.jniEnv)
-        return;
-
-    m_openURIMethodID = env.jniEnv->GetStaticMethodID(QtAndroid::applicationClass(),
-                                               "openURL",
-                                               "(Ljava/lang/String;)V");
 }
 
 bool QAndroidPlatformServices::openUrl(const QUrl &url)
 {
-    QtAndroid::AttachedJNIEnv env;
-    if (!env.jniEnv)
-        return false;
-
-    jstring string = env.jniEnv->NewString(reinterpret_cast<const jchar *>(url.toString().constData()),
-                                    url.toString().length());
-    env.jniEnv->CallStaticVoidMethod(QtAndroid::applicationClass(), m_openURIMethodID, string);
-    env.jniEnv->DeleteLocalRef(string);
+    QJNIObjectPrivate urlString = QJNIObjectPrivate::fromString(url.toString());
+    QJNIObjectPrivate::callStaticMethod<void>(QtAndroid::applicationClass(),
+                                              "openURL",
+                                              "(Ljava/lang/String;)V",
+                                              urlString.object());
     return true;
 }
 
diff --git a/src/plugins/platforms/android/qandroidplatformservices.h b/src/plugins/platforms/android/qandroidplatformservices.h
index 08d7773ca4..dd6872b2e9 100644
--- a/src/plugins/platforms/android/qandroidplatformservices.h
+++ b/src/plugins/platforms/android/qandroidplatformservices.h
@@ -44,7 +44,6 @@
 
 #include <qpa/qplatformservices.h>
 #include "androidjnimain.h"
-#include <jni.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -55,9 +54,6 @@ public:
     bool openUrl(const QUrl &url);
     bool openDocument(const QUrl &url);
     QByteArray desktopEnvironment() const;
-private:
-    jmethodID m_openURIMethodID;
-
 };
 
 QT_END_NAMESPACE