1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NetworkInformation/Android: Delete member only used for validity check

Browse Source 
And instead base the isValid function on the success of registering
callbacks.
The registerReceiver call has no way to report failures so I assume it
always succeeds.

Task-number: QTBUG-104188
Change-Id: I2b002f791d03f2ebc72fe5cfa215f8f8a1dabdf8
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
Mårten Nordheim 2022-08-08 15:57:24 +02:00
parent ba36f7947a
commit 72cfcf13c5
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.cpp
View File

@ -55,11 +55,6 @@ AndroidConnectivityManager::AndroidConnectivityManager()
if (!registerNatives()) if (!registerNatives())
return; return;
m_connectivityManager = QJniObject::callStaticObjectMethod<QtJniTypes::ConnectivityManager>(
networkInformationClass, "getConnectivityManager", QAndroidApplication::context());
if (!m_connectivityManager.isValid())
return;
QJniObject::callStaticMethod<void>(networkInformationClass, "registerReceiver", QJniObject::callStaticMethod<void>(networkInformationClass, "registerReceiver",
QAndroidApplication::context()); QAndroidApplication::context());
} }
@ -73,15 +68,20 @@ AndroidConnectivityManager *AndroidConnectivityManager::getInstance()
: nullptr; : nullptr;
} }
bool AndroidConnectivityManager::isValid() const
{
return registerNatives();
}
AndroidConnectivityManager::~AndroidConnectivityManager() AndroidConnectivityManager::~AndroidConnectivityManager()
{ {
QJniObject::callStaticMethod<void>(networkInformationClass, "unregisterReceiver", QJniObject::callStaticMethod<void>(networkInformationClass, "unregisterReceiver",
QAndroidApplication::context()); QAndroidApplication::context());
} }
bool AndroidConnectivityManager::registerNatives() bool AndroidConnectivityManager::registerNatives() const
{ {
static bool registered = []() { static const bool registered = []() {
QJniEnvironment env; QJniEnvironment env;
return env.registerNativeMethods(networkInformationClass, { return env.registerNativeMethods(networkInformationClass, {
Q_JNI_NATIVE_METHOD(networkConnectivityChanged), Q_JNI_NATIVE_METHOD(networkConnectivityChanged),

5
src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.h
View File

@ -33,7 +33,7 @@ public:
static AndroidConnectivityManager *getInstance(); static AndroidConnectivityManager *getInstance();
~AndroidConnectivityManager(); ~AndroidConnectivityManager();
inline bool isValid() const { return m_connectivityManager.isValid(); } inline bool isValid() const;
Q_SIGNALS: Q_SIGNALS:
void connectivityChanged(AndroidConnectivity connectivity); void connectivityChanged(AndroidConnectivity connectivity);
@ -44,8 +44,7 @@ Q_SIGNALS:
private: private:
friend struct AndroidConnectivityManagerInstance; friend struct AndroidConnectivityManagerInstance;
AndroidConnectivityManager(); AndroidConnectivityManager();
bool registerNatives(); bool registerNatives() const;
QJniObject m_connectivityManager;
Q_DISABLE_COPY_MOVE(AndroidConnectivityManager); Q_DISABLE_COPY_MOVE(AndroidConnectivityManager);
}; };