Android: Add support for proxies

Pick-to: 5.15
Fixes: QTBUG-78812
Change-Id: Id1f35a5e4ca3d8841edae378df69b65ef599c1ca
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

src/CMakeLists.txt

@@ -31,6 +31,9 @@ if (QT_FEATURE_sql)
 endif()
 if (QT_FEATURE_network)
     add_subdirectory(network)
+    if (ANDROID)
+        add_subdirectory(network/android/jar)
+    endif()
 endif()
 if (QT_FEATURE_xml)
     add_subdirectory(xml)

src/network/.prev_CMakeLists.txt

@@ -238,11 +238,22 @@ qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS
         PkgConfig::Libproxy
 )
 
-qt_extend_target(Network CONDITION UNIX AND NOT MACOS AND NOT QT_FEATURE_libproxy
+qt_extend_target(Network CONDITION ANDROID AND NOT QT_FEATURE_libproxy
+    SOURCES
+        kernel/qnetworkproxy_android.cpp
+)
+
+qt_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS AND NOT QT_FEATURE_libproxy
     SOURCES
         kernel/qnetworkproxy_generic.cpp
 )
 
+if(ANDROID AND (ANDROID))
+    set_property(TARGET Network APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
+        jar/QtAndroidNetwork.jar
+    )
+endif()
+
 qt_extend_target(Network CONDITION QT_FEATURE_socks5
     SOURCES
         socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h

src/network/CMakeLists.txt

@@ -238,11 +238,22 @@ qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS
         PkgConfig::Libproxy
 )
 
-qt_extend_target(Network CONDITION UNIX AND NOT MACOS AND NOT QT_FEATURE_libproxy
+qt_extend_target(Network CONDITION ANDROID
+    SOURCES
+        kernel/qnetworkproxy_android.cpp
+)
+
+qt_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
     SOURCES
         kernel/qnetworkproxy_generic.cpp
 )
 
+if(ANDROID AND (ANDROID))
+    set_property(TARGET Network APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
+        jar/QtAndroidNetwork.jar
+    )
+endif()
+
 qt_extend_target(Network CONDITION QT_FEATURE_socks5
     SOURCES
         socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h

src/network/android/jar/CMakeLists.txt

@@ -0,0 +1,16 @@
+# Generated from jar.pro.
+
+set(java_sources
+    src/org/qtproject/qt5/android/network/QtNetwork.java
+)
+
+add_jar(QtAndroidNetwork
+    INCLUDE_JARS ${QT_ANDROID_JAR}
+    SOURCES ${java_sources}
+)
+
+install_jar(QtAndroidNetwork
+    DESTINATION jar
+    COMPONENT Devel
+)
+

src/network/android/jar/jar.pro

@@ -0,0 +1,15 @@
+CONFIG += single_arch
+
+TARGET = QtAndroidNetwork
+
+load(qt_build_paths)
+CONFIG += java
+DESTDIR = $$MODULE_BASE_OUTDIR/jar
+
+JAVACLASSPATH += $$PWD/src
+
+JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/network/QtNetwork.java
+
+# install
+target.path = $$[QT_INSTALL_PREFIX]/jar
+INSTALLS += target

src/network/android/jar/src/org/qtproject/qt5/android/network/QtNetwork.java

@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins 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$
+**
+****************************************************************************/
+
+package org.qtproject.qt5.android.network;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.util.Log;
+import android.net.ConnectivityManager;
+import android.net.Proxy;
+import android.net.ProxyInfo;
+
+public class QtNetwork
+{
+    private static final String LOG_TAG = "QtNetwork";
+    private static ProxyReceiver m_proxyReceiver = null;
+    private static final Object m_lock = new Object();
+    private static ProxyInfo m_proxyInfo = null;
+
+    private static class ProxyReceiver extends BroadcastReceiver
+    {
+        @Override
+        public void onReceive(Context context, Intent intent)
+        {
+            m_proxyInfo = null;
+        }
+    }
+
+    private QtNetwork() {}
+
+    public static void registerReceiver(final Context context)
+    {
+        synchronized (m_lock) {
+            if (m_proxyReceiver == null) {
+                m_proxyReceiver = new ProxyReceiver();
+                IntentFilter intentFilter = new IntentFilter(Proxy.PROXY_CHANGE_ACTION);
+                context.registerReceiver(m_proxyReceiver, intentFilter);
+            }
+        }
+    }
+
+    public static void unregisterReceiver(final Context context)
+    {
+        synchronized (m_lock) {
+            if (m_proxyReceiver == null)
+                return;
+
+            context.unregisterReceiver(m_proxyReceiver);
+        }
+    }
+
+    public static ConnectivityManager getConnectivityManager(final Context context)
+    {
+        return (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+    }
+
+    public static ProxyInfo getProxyInfo(final Context context)
+    {
+        if (m_proxyInfo == null)
+            m_proxyInfo = (ProxyInfo)getConnectivityManager(context).getDefaultProxy();
+        return m_proxyInfo;
+    }
+}

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

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

src/src.pro

@@ -165,6 +165,7 @@ win32:SUBDIRS += src_winmain
 qtConfig(network) {
     SUBDIRS += src_network
     src_plugins.depends += src_network
+    android: SUBDIRS += network/android/jar
 }
 qtConfig(sql) {
     SUBDIRS += src_sql