diff options
author | Andy Shaw <andy.shaw@qt.io> | 2020-05-04 15:03:09 +0200 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2020-06-16 11:06:42 +0200 |
commit | 68387e485c954d6db2cf423723883a0b6dae222c (patch) | |
tree | 41f6ca9b2be639f815156967c5a8a2c276e31e67 /src/network/kernel | |
parent | d979f0a8c8cecb37d731c00d128627f711a83ce0 (diff) |
Android: Add support for proxies
Pick-to: 5.15
Fixes: QTBUG-78812
Change-Id: Id1f35a5e4ca3d8841edae378df69b65ef599c1ca
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/network/kernel')
-rw-r--r-- | src/network/kernel/kernel.pri | 6 | ||||
-rw-r--r-- | src/network/kernel/qnetworkproxy_android.cpp | 118 |
2 files changed, 123 insertions, 1 deletions
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index d7d0dd522c..c726515d15 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -93,4 +93,8 @@ else: qtConfig(libproxy) { SOURCES += kernel/qnetworkproxy_libproxy.cpp QMAKE_USE_PRIVATE += libproxy libdl } -else:SOURCES += kernel/qnetworkproxy_generic.cpp +else:android: SOURCES += kernel/qnetworkproxy_android.cpp +else: SOURCES += kernel/qnetworkproxy_generic.cpp + +android: ANDROID_BUNDLED_JAR_DEPENDENCIES = \ + jar/QtAndroidNetwork.jar diff --git a/src/network/kernel/qnetworkproxy_android.cpp b/src/network/kernel/qnetworkproxy_android.cpp new file mode 100644 index 0000000000..ddfe86960f --- /dev/null +++ b/src/network/kernel/qnetworkproxy_android.cpp @@ -0,0 +1,118 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#include "qnetworkproxy.h" +#include <QtCore/private/qjni_p.h> +#include <QtCore/private/qjnihelpers_p.h> + +#ifndef QT_NO_NETWORKPROXY + +QT_BEGIN_NAMESPACE + +struct ProxyInfoObject +{ +public: + ProxyInfoObject(); + ~ProxyInfoObject(); +}; + +Q_GLOBAL_STATIC(ProxyInfoObject, proxyInfoInstance) + +static const char networkClass[] = "org/qtproject/qt5/android/network/QtNetwork"; + +ProxyInfoObject::ProxyInfoObject() +{ + QJNIObjectPrivate::callStaticMethod<void>(networkClass, + "registerReceiver", + "(Landroid/content/Context;)V", + QtAndroidPrivate::context()); +} + +ProxyInfoObject::~ProxyInfoObject() +{ + QJNIObjectPrivate::callStaticMethod<void>(networkClass, + "unregisterReceiver", + "(Landroid/content/Context;)V", + QtAndroidPrivate::context()); +} + +QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkProxyQuery &query) +{ + QList<QNetworkProxy> proxyList; + if (!proxyInfoInstance) + return proxyList; + + QJNIObjectPrivate proxyInfo = QJNIObjectPrivate::callStaticObjectMethod(networkClass, + "getProxyInfo", + "(Landroid/content/Context;)Landroid/net/ProxyInfo;", + QtAndroidPrivate::context()); + if (proxyInfo.isValid()) { + QJNIObjectPrivate exclusionList = proxyInfo.callObjectMethod("getExclusionList", + "()[Ljava/lang/String;"); + bool exclude = false; + if (exclusionList.isValid()) { + jobjectArray listObject = static_cast<jobjectArray>(exclusionList.object()); + QJNIEnvironmentPrivate env; + QJNIObjectPrivate entry; + const int size = env->GetArrayLength(listObject); + QUrl host = QUrl(query.url().host()); + for (int i = 0; i < size; ++i) { + entry = env->GetObjectArrayElement(listObject, i); + if (host.matches(QUrl(entry.toString()), QUrl::RemoveScheme)) { + exclude = true; + break; + } + } + } + if (!exclude) { + QJNIObjectPrivate hostName = proxyInfo.callObjectMethod<jstring>("getHost"); + const int port = proxyInfo.callMethod<jint>("getPort"); + QNetworkProxy proxy(QNetworkProxy::HttpProxy, hostName.toString(), port); + proxyList << proxy; + } + } + if (proxyList.isEmpty()) + proxyList << QNetworkProxy::NoProxy; + + return proxyList; +} + +QT_END_NAMESPACE + +#endif |