Squashed code contribtion for QtNfc on Android

The code was contributed by
Juhana Jauhiainen <juhana.jauhiainen@gmail.com>
osaukko <osaukko@gmail.com>
waz <markus.liuska@gmail.fi>

List of squashed commits:

Preliminary Android support to QtNFC.

Only receiving Ndef messages to QNearFieldManager.

QNearFieldTarget and LLCP classes need to be implemented for Android

------------------

Added Android buildsettings to nfc.pro
Including Android implementation in QNearFieldManager.h

------------------

QtNfc namespace removed.

------------------

Added Android support to QNearFieldManager::isAvailable() method

------------------

Improved isAvailable method

------------------

Fix QtNfc java module

Added checking for NfcAdapter object so that calling QNearFieldManager::startTargetDetection()
and QNearFieldManager::stopTargetDetection() methods will not crash application.

------------------

Added support for tag types.

NFC tag type is now included in onNdefDiscovered() method call.
Only showing information in debug messages for now.

------------------

Fixing missing return values and releasing acquired resources.

------------------

First proof of concept version of target creation for android.

------------------

Fix for include guards.

------------------

Added QHash container for NearFieldmanager

Added QHash container for NearFieldManager which holds each discovered targets.
Also added setters for NearFieldTarget.

------------------

Using signals and slots to move target information to main thread.

Fixes problem when creating new targets as child of manager.

------------------

Fix for tag detection for tags without NDEF messages

Tag type checking is not working if there is no NDEF messages currently.
Need to find way to check tag type without Ndef object.

------------------

Added error reporting for QNearFieldTarget::readNdefMessages (Android)

------------------

Registering type name for QNearFieltTarget.

Small refactoring for QNearFieldTarget android implementation.

------------------

Sending UID as bytearray.

Also debug messages to show tech list added into QtNfc.java.

------------------

Trying different approach for android version of QtNfc module.

In this approach we pass through intent object(Java) to NearFieldTarget object(c++).

------------------

	Fixed nfc.pro so QtNfc.jar is built.

------------------

Added tech list into android version of QNearFieldTarget

Could be used to detect availability of NDEF messages and also to detect tag type.

------------------

	Fixed build files so both the C++ and Java libraries are built correctly.

------------------

	Support for writing Ndef messages.

------------------

Implementation for NearFieldTarget::hasNdefMessage().

Also nice debug messages to show available technologies for current tag.

------------------

	Support for NdefFormatable tags.

------------------

	Support for writing NdefFormatable tags.

------------------

	Removed debug messages.

------------------

    Implemented type() method to Android's QNearFieldTarget.

Conflicts:
	src/nfc/qnearfieldtarget_android.cpp
	src/nfc/qnearfieldtarget_android_p.h

------------------

Small fixes to remove some of the warnings.

Conflicts:
	src/nfc/qnearfieldtarget_android.cpp
	src/nfc/qnearfieldtarget_android_p.h

------------------

Committing test code for targetLost signal (Because of Merge)

Conflicts:
	src/nfc/qnearfieldtarget_android.cpp
	src/nfc/qnearfieldtarget_android_p.h

------------------

Added support for target lost signal

------------------

    Using QString::fromUtf8 instead of QString()

Conflicts:
	src/nfc/qnearfieldtarget_android.cpp

------------------

    Fixed bug with targetLost not emitting when reading or writing Ndef
    messages.

    Added some untested code for sendCommand.

------------------

Refactoring.

Conflicts:
	src/nfc/qnearfieldtarget_android_p.h

------------------

Refactoring and fixes.

------------------

Less debug messages.

------------------

Refactoring and cleaning.

Conflicts:
	src/android/android.pro
	src/nfc/neard/neard_helper_p.h
	src/nfc/nfc.pro
	src/nfc/qdeclarativendefrecord.cpp
	src/nfc/qdeclarativendefrecord.h
	src/nfc/qllcpserver_p.h
	src/nfc/qllcpsocket.h
	src/nfc/qndefmessage.h
	src/nfc/qndefnfcsmartposterrecord_p.h
	src/nfc/qnearfieldmanager.cpp
	src/nfc/qnearfieldmanager_neard_p.h
	src/nfc/qnearfieldtarget.h
	src/nfc/qnfcglobal.h
	src/src.pro
	tests/nfctestserver/socketcontroller.h

Change-Id: Ideb4c8c8064f46b431532ea4870207691bc49c99
Reviewed-by: Peter Rustler <peter.rustler@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 33 insertions, 1 deletions

diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro
index 7c6b6ff7..30bf26c5 100644
--- a/src/nfc/nfc.pro
+++ b/src/nfc/nfc.pro
@@ -148,6 +148,37 @@ simulator {
         qnearfieldsharetargetimpl_p.cpp
 }
 
+# not supported for now
+0 {
+android {
+    NFC_BACKEND_AVAILABLE = yes
+    ANDROID_BUNDLED_JAR_DEPENDENCIES = \
+        jar/QtNfc-bundled.jar:org.qtproject.qt5.android.nfc.QtNfc
+    ANDROID_JAR_DEPENDENCIES = \
+        jar/QtNfc.jar:org.qtproject.qt5.android.nfc.QtNfc
+    DEFINES += ANDROID_NFC #QQNXNFC_DEBUG
+
+    PRIVATE_HEADERS += \
+        qllcpserver_android_p.h \
+        qllcpsocket_android_p.h \
+        android/androidjninfc_p.h \
+        qnearfieldmanager_android_p.h \
+        qnearfieldtarget_android_p.h \
+        qnearfieldsharemanagerimpl_p.h \
+        qnearfieldsharetargetimpl_p.h
+
+
+    SOURCES += \
+        qllcpserver_android_p.cpp \
+        qllcpsocket_android_p.cpp \
+        android/androidjninfc.cpp \
+        qnearfieldmanager_android.cpp \
+        qnearfieldtarget_android.cpp \
+        qnearfieldsharemanagerimpl_p.cpp \
+        qnearfieldsharetargetimpl_p.cpp
+}
+}
+
 isEmpty(NFC_BACKEND_AVAILABLE) {
     message("Unsupported NFC platform, will not build a working QtNfc library.")
 
@@ -166,4 +197,5 @@ isEmpty(NFC_BACKEND_AVAILABLE) {
         qnearfieldsharetargetimpl_p.cpp
 }
 
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS \
+    android/androidglobal.h