diff options
author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2018-04-27 14:30:14 +0200 |
---|---|---|
committer | Lars Schmertmann <lars.schmertmann@governikus.de> | 2018-05-30 17:28:59 +0000 |
commit | c8e6dae2d9749179327df460755282cf5102e902 (patch) | |
tree | 27cccae4d5975163ec65019b67df479ab95232de /src/nfc/qnearfieldmanager_android.cpp | |
parent | 7ecded9968550011fb4d4d2e2dd02dd29c1054b3 (diff) |
Use Android broadcast ACTION_ADAPTER_STATE_CHANGED
To avoid polling of the NFC adapter state
a signal is added to the QNearFieldManager.
Change-Id: If9e1e8025cca2deb1338fa7db255ebe171cab823
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/nfc/qnearfieldmanager_android.cpp')
-rw-r--r-- | src/nfc/qnearfieldmanager_android.cpp | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/nfc/qnearfieldmanager_android.cpp b/src/nfc/qnearfieldmanager_android.cpp index dd814787..ecefa801 100644 --- a/src/nfc/qnearfieldmanager_android.cpp +++ b/src/nfc/qnearfieldmanager_android.cpp @@ -48,22 +48,52 @@ #include "qdebug.h" #include "qlist.h" +#include <QScopedPointer> #include <QtCore/QMetaType> #include <QtCore/QMetaMethod> +#include <QtCore/private/qjnihelpers_p.h> QT_BEGIN_NAMESPACE +Q_GLOBAL_STATIC(QAndroidJniObject, broadcastReceiver) +Q_GLOBAL_STATIC(QList<QNearFieldManagerPrivateImpl *>, broadcastListener) + +extern "C" +{ + JNIEXPORT void JNICALL Java_org_qtproject_qt5_android_nfc_QtNfcBroadcastReceiver_jniOnReceive( + JNIEnv */*env*/, jobject /*javaObject*/, jint state) + { + QNearFieldManager::AdapterState adapterState = static_cast<QNearFieldManager::AdapterState>((int) state); + + for (const auto listener : *broadcastListener) { + Q_EMIT listener->adapterStateChanged(adapterState); + } + } +} + QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl() : m_detecting(false), m_handlerID(0) { qRegisterMetaType<QAndroidJniObject>("QAndroidJniObject"); qRegisterMetaType<QNdefMessage>("QNdefMessage"); + + if (!broadcastReceiver->isValid()) { + *broadcastReceiver = QAndroidJniObject("org/qtproject/qt5/android/nfc/QtNfcBroadcastReceiver", + "(Landroid/content/Context;)V", QtAndroidPrivate::context()); + } + broadcastListener->append(this); + connect(this, SIGNAL(targetDetected(QNearFieldTarget*)), this, SLOT(handlerTargetDetected(QNearFieldTarget*))); connect(this, SIGNAL(targetLost(QNearFieldTarget*)), this, SLOT(handlerTargetLost(QNearFieldTarget*))); } QNearFieldManagerPrivateImpl::~QNearFieldManagerPrivateImpl() { + broadcastListener->removeOne(this); + if (broadcastListener->isEmpty()) { + broadcastReceiver->callMethod<void>("unregisterReceiver"); + *broadcastReceiver = QAndroidJniObject(); + } } void QNearFieldManagerPrivateImpl::handlerTargetDetected(QNearFieldTarget *target) |