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, 326 insertions, 0 deletions

diff --git a/src/nfc/qllcpsocket_android_p.cpp b/src/nfc/qllcpsocket_android_p.cpp
new file mode 100644
index 00000000..db1bb972
--- /dev/null
+++ b/src/nfc/qllcpsocket_android_p.cpp
@@ -0,0 +1,326 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Centria research and development
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtNfc module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qllcpsocket_android_p.h"
+#include <unistd.h>
+
+QT_BEGIN_NAMESPACE
+
+QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q)
+    :   q_ptr(q), m_state(QLlcpSocket::UnconnectedState), m_server(false)
+{
+}
+
+QLlcpSocketPrivate::~QLlcpSocketPrivate()
+{
+    disconnectFromService();
+}
+
+void QLlcpSocketPrivate::connectToService(QNearFieldTarget *target, const QString &serviceUri)
+{
+    Q_UNUSED(target)
+    Q_UNUSED(serviceUri)
+    /*if (m_state != QLlcpSocket::UnconnectedState) {
+        qWarning() << Q_FUNC_INFO << "socket is already connected";
+        return;
+    }
+
+    m_state = QLlcpSocket::ConnectingState;
+    if (nfc_llcp_register_connection_listener(NFC_LLCP_CLIENT, 0, serviceUri.toLocal8Bit().constData(),
+                                              &m_conListener) != NFC_RESULT_SUCCESS) {
+        qWarning() << Q_FUNC_INFO << "could not register for connection listener";
+        return;
+    }
+
+    QNXNFCManager::instance()->registerLLCPConnection(m_conListener, this);
+
+    qQNXNFCDebug() << "Connecting client socket" << serviceUri << m_conListener;
+    connect(QNXNFCManager::instance(), SIGNAL(llcpDisconnected()), this, SLOT(disconnectFromService()));*/
+}
+
+void QLlcpSocketPrivate::disconnectFromService()
+{
+    /*Q_Q(QLlcpSocket);
+    QNXNFCManager::instance()->unregisterTargetLost(this);
+    qQNXNFCDebug() << "Shutting down LLCP socket";
+    if (!m_server && nfc_llcp_unregister_connection_listener(m_conListener) != NFC_RESULT_SUCCESS) {
+        qWarning() << Q_FUNC_INFO << "Error when trying to close LLCP socket";
+    }
+    QNXNFCManager::instance()->unregisterLLCPConnection(m_conListener);
+    disconnect(QNXNFCManager::instance(), SIGNAL(llcpDisconnected()), this, SLOT(disconnectFromService()));
+
+    q->disconnected();
+    m_conListener = 0;
+    m_state = QLlcpSocket::UnconnectedState;*/
+}
+
+bool QLlcpSocketPrivate::bind(quint8 port)
+{
+    Q_UNUSED(port);
+
+    /*m_state = QLlcpSocket::ConnectedState;
+    m_server = true;
+    connect(QNXNFCManager::instance(), SIGNAL(llcpDisconnected()), this, SLOT(disconnectFromService()));
+    connected(QNXNFCManager::instance()->getLastTarget());*/
+
+    return true;
+}
+
+bool QLlcpSocketPrivate::hasPendingDatagrams() const
+{
+    return !m_receivedDatagrams.isEmpty();
+}
+
+qint64 QLlcpSocketPrivate::pendingDatagramSize() const
+{
+    if (m_receivedDatagrams.isEmpty())
+        return -1;
+
+    return m_receivedDatagrams.first().length();
+}
+
+qint64 QLlcpSocketPrivate::writeDatagram(const char *data, qint64 size)
+{
+    if (m_state == QLlcpSocket::ConnectedState)
+        return writeData(data, size);
+
+    return -1;
+}
+
+qint64 QLlcpSocketPrivate::writeDatagram(const QByteArray &datagram)
+{
+    return writeDatagram(datagram.constData(), datagram.size());
+}
+
+qint64 QLlcpSocketPrivate::readDatagram(char *data, qint64 maxSize,
+                                        QNearFieldTarget **target, quint8 *port)
+{
+    Q_UNUSED(target);
+    Q_UNUSED(port);
+
+    if (m_state == QLlcpSocket::ConnectedState)
+        return readData(data, maxSize);
+
+    return -1;
+}
+
+qint64 QLlcpSocketPrivate::writeDatagram(const char *data, qint64 size,
+                                         QNearFieldTarget *target, quint8 port)
+{
+    Q_UNUSED(target);
+    Q_UNUSED(port);
+
+    return writeDatagram(data, size);
+}
+
+qint64 QLlcpSocketPrivate::writeDatagram(const QByteArray &datagram,
+                                         QNearFieldTarget *target, quint8 port)
+{
+    Q_UNUSED(datagram);
+    Q_UNUSED(target);
+    Q_UNUSED(port);
+
+    return writeDatagram(datagram.constData(), datagram.size()-1);
+}
+
+QLlcpSocket::SocketError QLlcpSocketPrivate::error() const
+{
+    return QLlcpSocket::UnknownSocketError;
+}
+
+QLlcpSocket::SocketState QLlcpSocketPrivate::state() const
+{
+    return m_state;
+}
+
+qint64 QLlcpSocketPrivate::readData(char *data, qint64 maxlen)
+{
+    Q_UNUSED(data);
+    Q_UNUSED(maxlen);
+    if (m_receivedDatagrams.isEmpty())
+        return 0;
+
+    /*const QByteArray datagram = m_receivedDatagrams.takeFirst();
+    qint64 size = qMin(maxlen, qint64(datagram.length()));
+    memcpy(data, datagram.constData(), size);
+    return size;*/
+    return 0;
+}
+
+qint64 QLlcpSocketPrivate::writeData(const char *data, qint64 len)
+{
+    Q_UNUSED(data);
+    Q_UNUSED(len);
+    /*if (socketState != Idle) {
+        m_writeQueue.append(QByteArray(data, len));
+        return len;
+    } else {
+        socketState = Writing;
+        qQNXNFCDebug() << "LLCP write";
+        nfc_result_t res = nfc_llcp_write(m_target, (uchar_t*)data, (size_t)len);
+        if (res == NFC_RESULT_SUCCESS) {
+            return len;
+        } else {
+            qWarning() << Q_FUNC_INFO << "Error writing to LLCP socket. Error" << res;
+            enteringIdle();
+            return -1;
+        }
+    }*/
+    return -1;
+}
+
+qint64 QLlcpSocketPrivate::bytesAvailable() const
+{
+    /*qint64 available = 0;
+    foreach (const QByteArray &datagram, m_receivedDatagrams)
+        available += datagram.length();
+
+    return available;*/
+    return 0;
+}
+
+bool QLlcpSocketPrivate::canReadLine() const
+{
+    /*foreach (const QByteArray &datagram, m_receivedDatagrams) {
+        if (datagram.contains('\n'))
+            return true;
+    }*/
+
+    return false;
+}
+
+bool QLlcpSocketPrivate::waitForReadyRead(int msecs)
+{
+    Q_UNUSED(msecs);
+
+    return false;
+}
+
+bool QLlcpSocketPrivate::waitForBytesWritten(int msecs)
+{
+    Q_UNUSED(msecs);
+
+    return false;
+}
+
+bool QLlcpSocketPrivate::waitForConnected(int msecs)
+{
+    Q_UNUSED(msecs);
+
+    return false;
+}
+
+bool QLlcpSocketPrivate::waitForDisconnected(int msecs)
+{
+    Q_UNUSED(msecs);
+
+    return false;
+}
+
+/*void QLlcpSocketPrivate::connected(nfc_target_t *target)
+{
+    Q_Q(QLlcpSocket);
+    m_target = target;
+
+    m_state = QLlcpSocket::ConnectedState;
+    emit q->connected();
+    qQNXNFCDebug() << "Socket connected";
+
+    unsigned int targetId;
+    nfc_get_target_connection_id(target, &targetId);
+    QNXNFCManager::instance()->requestTargetLost(this, targetId);
+    enteringIdle();
+}*/
+
+void QLlcpSocketPrivate::targetLost()
+{
+    disconnectFromService();
+    //qQNXNFCDebug() << "LLCP target lost...socket disconnected";
+}
+
+void QLlcpSocketPrivate::dataRead(QByteArray& data)
+{
+    Q_UNUSED(data);
+    /*Q_Q(QLlcpSocket);
+    if (!data.isEmpty()) {
+        m_receivedDatagrams.append(data);
+        emit q->readyRead();
+    }
+    socketState = Idle;
+    enteringIdle();*/
+}
+
+void QLlcpSocketPrivate::dataWritten()
+{
+    //enteringIdle();
+}
+
+void QLlcpSocketPrivate::read()
+{
+    /*if (socketState != Idle) {
+        qQNXNFCDebug() << "Trying to read but socket state not in idle..abort";
+        return;
+    }
+    socketState = Reading;
+    qQNXNFCDebug() << "LLCP read";
+    if (nfc_llcp_read(m_target, 128) != NFC_RESULT_SUCCESS) {
+        qWarning() << Q_FUNC_INFO << "Could not register for reading";
+        socketState = Idle;
+    }*/
+}
+
+void QLlcpSocketPrivate::enteringIdle()
+{
+    /*qQNXNFCDebug() << "entering idle; Socket state:" << socketState;
+    socketState = Idle;
+    if (m_state == QLlcpSocket::ConnectedState) {
+        if (m_writeQueue.isEmpty()) {
+            qQNXNFCDebug() << "Write queue empty, reading in 50ms";
+            QTimer::singleShot(50, this, SLOT(read()));
+        } else {
+            qQNXNFCDebug() << "Write first package in queue";
+            writeDatagram(m_writeQueue.takeFirst());
+        }
+    }*/
+}
+
+QT_END_NAMESPACE
+