Make QJniObject and QJniEnvironment public API

As part of Qt 6 restructring for the extras modules, this change exposes
the Jni APIs which are very important for Android platform. This patch
adds the APIs QJniObject, QJniEnvironment, QJniExceptionCleaner based
from private QtCore and QtAndroidExtras.

The Jni interface is cross-platform which justifies the name, but
currently, this API is used mainly for Android, and the naming comes
generic without Android keyword to avoid any future limitation on
supporting other platforms.

[ChangeLog][QtCore] Add new QJniObject, QJniEnvironment and
QJniExceptionCleaner APIs.

Task-number: QTBUG-89482
Fixes: QTBUG-89633
Change-Id: I4382dd53a225375759b9d042f6035a4a9810572b
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>

2 files changed, 25 insertions, 22 deletions

diff --git a/src/network/kernel/qnetworkproxy_android.cpp b/src/network/kernel/qnetworkproxy_android.cpp
index 1a6fe2b70e..a09593bf3c 100644
--- a/src/network/kernel/qnetworkproxy_android.cpp
+++ b/src/network/kernel/qnetworkproxy_android.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -38,7 +38,9 @@
 ****************************************************************************/
 
 #include "qnetworkproxy.h"
-#include <QtCore/private/qjni_p.h>
+
+#include <QtCore/QJniEnvironment>
+#include <QtCore/QJniObject>
 #include <QtCore/private/qjnihelpers_p.h>
 
 #ifndef QT_NO_NETWORKPROXY
@@ -58,18 +60,18 @@ static const char networkClass[] = "org/qtproject/qt/android/network/QtNetwork";
 
 ProxyInfoObject::ProxyInfoObject()
 {
-    QJNIObjectPrivate::callStaticMethod<void>(networkClass,
-                                              "registerReceiver",
-                                              "(Landroid/content/Context;)V",
-                                              QtAndroidPrivate::context());
+    QJniObject::callStaticMethod<void>(networkClass,
+                                       "registerReceiver",
+                                       "(Landroid/content/Context;)V",
+                                       QtAndroidPrivate::context());
 }
 
 ProxyInfoObject::~ProxyInfoObject()
 {
-    QJNIObjectPrivate::callStaticMethod<void>(networkClass,
-                                              "unregisterReceiver",
-                                              "(Landroid/content/Context;)V",
-                                              QtAndroidPrivate::context());
+    QJniObject::callStaticMethod<void>(networkClass,
+                                       "unregisterReceiver",
+                                       "(Landroid/content/Context;)V",
+                                       QtAndroidPrivate::context());
 }
 
 QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkProxyQuery &query)
@@ -78,18 +80,18 @@ QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro
     if (!proxyInfoInstance)
         return proxyList;
 
-    QJNIObjectPrivate proxyInfo = QJNIObjectPrivate::callStaticObjectMethod(networkClass,
+    QJniObject proxyInfo = QJniObject::callStaticObjectMethod(networkClass,
                                       "getProxyInfo",
                                       "(Landroid/content/Context;)Landroid/net/ProxyInfo;",
                                       QtAndroidPrivate::context());
     if (proxyInfo.isValid()) {
-        QJNIObjectPrivate exclusionList = proxyInfo.callObjectMethod("getExclusionList",
-                                                                     "()[Ljava/lang/String;");
+        QJniObject exclusionList = proxyInfo.callObjectMethod("getExclusionList",
+                                                              "()[Ljava/lang/String;");
         bool exclude = false;
         if (exclusionList.isValid()) {
             jobjectArray listObject = static_cast<jobjectArray>(exclusionList.object());
-            QJNIEnvironmentPrivate env;
-            QJNIObjectPrivate entry;
+            QJniEnvironment env;
+            QJniObject entry;
             const int size = env->GetArrayLength(listObject);
             QUrl host = QUrl(query.url().host());
             for (int i = 0; i < size; ++i) {
@@ -101,7 +103,7 @@ QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro
             }
         }
         if (!exclude) {
-            QJNIObjectPrivate hostName = proxyInfo.callObjectMethod<jstring>("getHost");
+            QJniObject hostName = proxyInfo.callObjectMethod<jstring>("getHost");
             const int port = proxyInfo.callMethod<jint>("getPort");
             QNetworkProxy proxy(QNetworkProxy::HttpProxy, hostName.toString(), port);
             proxyList << proxy;
diff --git a/src/network/ssl/qsslsocket_openssl_android.cpp b/src/network/ssl/qsslsocket_openssl_android.cpp
index deec1532a2..8d0c9a69ee 100644
--- a/src/network/ssl/qsslsocket_openssl_android.cpp
+++ b/src/network/ssl/qsslsocket_openssl_android.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -53,7 +53,8 @@
 ****************************************************************************/
 
 #include "qsslsocket_openssl_p.h"
-#include <QtCore/private/qjni_p.h>
+#include <QtCore/QJniEnvironment>
+#include <QtCore/QJniObject>
 
 QT_BEGIN_NAMESPACE
 
@@ -61,13 +62,13 @@ QList<QByteArray> QSslSocketPrivate::fetchSslCertificateData()
 {
     QList<QByteArray> certificateData;
 
-    QJNIObjectPrivate certificates = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt/android/QtNative",
-                                                                               "getSSLCertificates",
-                                                                               "()[[B");
+    QJniObject certificates = QJniObject::callStaticObjectMethod("org/qtproject/qt/android/QtNative",
+                                                                 "getSSLCertificates",
+                                                                 "()[[B");
     if (!certificates.isValid())
         return certificateData;
 
-    QJNIEnvironmentPrivate env;
+    QJniEnvironment env;
     jobjectArray jcertificates = static_cast<jobjectArray>(certificates.object());
     const jint nCertificates = env->GetArrayLength(jcertificates);
     certificateData.reserve(static_cast<int>(nCertificates));