diff options
| author | Peter Rustler <peter.rustler@basyskom.com> | 2015-03-06 12:16:28 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-19 08:10:04 +0000 |
| commit | 24a9b68c8eba782fee2e040113fe8afe783ba8ec (patch) | |
| tree | eb14aeafe3358765b32cf12fe8dd97f245cd92de /src/nfc/qnearfieldmanager_android_p.h | |
| parent | 55aab6b68bf4991fb133b5f7066a07554e3c5b3e (diff) | |
Using QtAndroidExtras instead of Andoid JNI for NFC
Some functions in QNearfieldtarget_android are missing.
They will be ported to QtAndroidExtras in a later
commit.
Change-Id: Ib68f91f394f28c8b19ccea4335c8f0292929f003
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/nfc/qnearfieldmanager_android_p.h')
| -rw-r--r-- | src/nfc/qnearfieldmanager_android_p.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nfc/qnearfieldmanager_android_p.h b/src/nfc/qnearfieldmanager_android_p.h index 8c6a0fb4..3d45b700 100644 --- a/src/nfc/qnearfieldmanager_android_p.h +++ b/src/nfc/qnearfieldmanager_android_p.h @@ -41,6 +41,8 @@ #include <QHash> #include <QMap> +#include <QtAndroidExtras/QAndroidJniObject> +#include <QtAndroidExtras/QAndroidJniEnvironment> QT_BEGIN_NAMESPACE @@ -64,11 +66,11 @@ public: virtual bool unregisterNdefMessageHandler(int handlerId); virtual void requestAccess(QNearFieldManager::TargetAccessModes accessModes); virtual void releaseAccess(QNearFieldManager::TargetAccessModes accessModes); - virtual void newIntent(jobject intent); - QByteArray getUid(jobject intent); + virtual void newIntent(QAndroidJniObject intent); + QByteArray getUid(const QAndroidJniObject &intent); public slots: - void onTargetDiscovered(jobject intent); + void onTargetDiscovered(QAndroidJniObject intent); void onTargetDestroyed(const QByteArray &uid); void handlerTargetDetected(QNearFieldTarget *target); void handlerTargetLost(QNearFieldTarget *target); @@ -77,7 +79,7 @@ public slots: void handlerError(QNearFieldTarget::Error error, const QNearFieldTarget::RequestId &id); protected: - static QByteArray getUid(JNIEnv *env, jobject tag); + static QByteArray getUidforTag(const QAndroidJniObject &tag); void updateReceiveState(); private: |