diff options
Diffstat (limited to 'src/network/kernel/qnetworkproxy_android.cpp')
| -rw-r--r-- | src/network/kernel/qnetworkproxy_android.cpp | 83 |
1 files changed, 25 insertions, 58 deletions
diff --git a/src/network/kernel/qnetworkproxy_android.cpp b/src/network/kernel/qnetworkproxy_android.cpp index 1a6fe2b70e..3d37266b70 100644 --- a/src/network/kernel/qnetworkproxy_android.cpp +++ b/src/network/kernel/qnetworkproxy_android.cpp @@ -1,45 +1,11 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtNetwork module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qnetworkproxy.h" -#include <QtCore/private/qjni_p.h> -#include <QtCore/private/qjnihelpers_p.h> + +#include <QtCore/qcoreapplication_platform.h> +#include <QtCore/qjnienvironment.h> +#include <QtCore/qjniobject.h> #ifndef QT_NO_NETWORKPROXY @@ -52,24 +18,27 @@ public: ~ProxyInfoObject(); }; +using namespace QNativeInterface; + Q_GLOBAL_STATIC(ProxyInfoObject, proxyInfoInstance) static const char networkClass[] = "org/qtproject/qt/android/network/QtNetwork"; +Q_DECLARE_JNI_CLASS(ProxyInfo, "android/net/ProxyInfo") +Q_DECLARE_JNI_TYPE(JStringArray, "[Ljava/lang/String;") + ProxyInfoObject::ProxyInfoObject() { - QJNIObjectPrivate::callStaticMethod<void>(networkClass, - "registerReceiver", - "(Landroid/content/Context;)V", - QtAndroidPrivate::context()); + QJniObject::callStaticMethod<void>(networkClass, + "registerReceiver", + QAndroidApplication::context()); } ProxyInfoObject::~ProxyInfoObject() { - QJNIObjectPrivate::callStaticMethod<void>(networkClass, - "unregisterReceiver", - "(Landroid/content/Context;)V", - QtAndroidPrivate::context()); + QJniObject::callStaticMethod<void>(networkClass, + "unregisterReceiver", + QAndroidApplication::context()); } QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkProxyQuery &query) @@ -78,18 +47,16 @@ QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro if (!proxyInfoInstance) return proxyList; - QJNIObjectPrivate proxyInfo = QJNIObjectPrivate::callStaticObjectMethod(networkClass, - "getProxyInfo", - "(Landroid/content/Context;)Landroid/net/ProxyInfo;", - QtAndroidPrivate::context()); + QJniObject proxyInfo = QJniObject::callStaticObjectMethod<QtJniTypes::ProxyInfo>( + networkClass, "getProxyInfo", QAndroidApplication::context()); if (proxyInfo.isValid()) { - QJNIObjectPrivate exclusionList = proxyInfo.callObjectMethod("getExclusionList", - "()[Ljava/lang/String;"); + QJniObject exclusionList = + proxyInfo.callObjectMethod<QtJniTypes::JStringArray>("getExclusionList"); bool exclude = false; if (exclusionList.isValid()) { - jobjectArray listObject = static_cast<jobjectArray>(exclusionList.object()); - QJNIEnvironmentPrivate env; - QJNIObjectPrivate entry; + jobjectArray listObject = exclusionList.object<jobjectArray>(); + 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 +68,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; |