diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-10 20:06:09 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-20 22:53:05 +0200 |
| commit | 255459250d450286a8c5c492dab3f6d3652171c9 (patch) | |
| tree | eba80911d7e278bdd123a9733c7f75a73d6ac004 /src/plugins/networkinformationbackends | |
| parent | 4c6579eacded086ad014b0fd2432095362c1d131 (diff) | |
Add QAndroidApplication as a nativeInterface
QAndroidApplication provides the Android specific app context() and
isActivityContext() to determine whether the context is an Activity or
otherwise a Service.
Task-number: QTBUG-90499
Change-Id: Iae2eef7ec44859a89825b09f52f09506b20b5420
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/networkinformationbackends')
| -rw-r--r-- | src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.cpp b/src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.cpp index c22f16f7b4..1508ff35b8 100644 --- a/src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.cpp +++ b/src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.cpp @@ -39,11 +39,13 @@ #include "androidconnectivitymanager.h" -#include <QtCore/private/qjnihelpers_p.h> +#include <QtCore/qcoreapplication.h> #include <QtCore/qjnienvironment.h> QT_BEGIN_NAMESPACE +using namespace QNativeInterface; + struct AndroidConnectivityManagerInstance { AndroidConnectivityManagerInstance() : connManager(new AndroidConnectivityManager) { } @@ -67,12 +69,12 @@ AndroidConnectivityManager::AndroidConnectivityManager() m_connectivityManager = QJniObject::callStaticObjectMethod( networkInformationClass, "getConnectivityManager", "(Landroid/content/Context;)Landroid/net/ConnectivityManager;", - QtAndroidPrivate::context()); + QAndroidApplication::context()); if (!m_connectivityManager.isValid()) return; QJniObject::callStaticMethod<void>(networkInformationClass, "registerReceiver", - "(Landroid/content/Context;)V", QtAndroidPrivate::context()); + "(Landroid/content/Context;)V", QAndroidApplication::context()); } AndroidConnectivityManager *AndroidConnectivityManager::getInstance() @@ -87,7 +89,7 @@ AndroidConnectivityManager *AndroidConnectivityManager::getInstance() AndroidConnectivityManager::~AndroidConnectivityManager() { QJniObject::callStaticMethod<void>(networkInformationClass, "unregisterReceiver", - "(Landroid/content/Context;)V", QtAndroidPrivate::context()); + "(Landroid/content/Context;)V", QAndroidApplication::context()); } AndroidConnectivityManager::AndroidConnectivity AndroidConnectivityManager::networkConnectivity() |