diff options
| -rw-r--r-- | src/nfc/android/androidmainnewintentlistener.cpp | 5 | ||||
| -rw-r--r-- | src/nfc/qnearfieldmanager_android.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nfc/android/androidmainnewintentlistener.cpp b/src/nfc/android/androidmainnewintentlistener.cpp index 2076453d..1b510539 100644 --- a/src/nfc/android/androidmainnewintentlistener.cpp +++ b/src/nfc/android/androidmainnewintentlistener.cpp @@ -39,6 +39,7 @@ #include "androidmainnewintentlistener_p.h" +#include "android/androidjninfc_p.h" #include "qdebug.h" #include <QtGui/QGuiApplication> #include <QtAndroidExtras/QAndroidJniObject> @@ -60,6 +61,10 @@ MainNfcNewIntentListener::~MainNfcNewIntentListener() bool MainNfcNewIntentListener::handleNewIntent(JNIEnv */*env*/, jobject intent) { + // Only intents with a tag are relevant + if (!AndroidNfc::getTag(intent).isValid()) + return false; + listenersLock.lockForRead(); for (AndroidNfc::AndroidNfcListenerInterface *listener : qAsConst(listeners)) { listener->newIntent(QAndroidJniObject(intent)); diff --git a/src/nfc/qnearfieldmanager_android.cpp b/src/nfc/qnearfieldmanager_android.cpp index 0b305501..e5f04cee 100644 --- a/src/nfc/qnearfieldmanager_android.cpp +++ b/src/nfc/qnearfieldmanager_android.cpp @@ -304,10 +304,6 @@ QByteArray QNearFieldManagerPrivateImpl::getUid(const QAndroidJniObject &intent) void QNearFieldManagerPrivateImpl::onTargetDiscovered(QAndroidJniObject intent) { - // Only intents with a tag are relevant - if (!AndroidNfc::getTag(intent).isValid()) - return; - // Getting UID QByteArray uid = getUid(intent); |