Android: Fix crash in QBluetoothServer::close()

Java's BluetoothSocketServer.accept() is meant to be interrupted
via BluetoothSocketServer.close(). Unfortunately if the surrounding
thread is a QThread the returning accept call crashes the thread. This
does not happen if it is a Java Thread.

This commit changes the server's private backend to a Java thread.

Task-number: QTBUG-36754
Change-Id: I5aacc5444bbcd1275a11743b6aa04d2b11a5b22b
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

2 files changed, 156 insertions, 1 deletions

diff --git a/src/android/bluetooth/bluetooth.pri b/src/android/bluetooth/bluetooth.pri
index 5c2cb8f8..d3fdd0d0 100644
--- a/src/android/bluetooth/bluetooth.pri
+++ b/src/android/bluetooth/bluetooth.pri
@@ -5,7 +5,9 @@ PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/bluetooth
 
 JAVACLASSPATH += $$PWD/src/
 JAVASOURCES += \
-    $$PATHPREFIX/QtBluetoothBroadcastReceiver.java
+    $$PATHPREFIX/QtBluetoothBroadcastReceiver.java \
+    $$PATHPREFIX/QtBluetoothSocketServer.java
+
 
 # install
 target.path = $$[QT_INSTALL_PREFIX]/jar
diff --git a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothSocketServer.java b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothSocketServer.java
new file mode 100644
index 00000000..ee365a49
--- /dev/null
+++ b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothSocketServer.java
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtBluetooth 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$
+**
+****************************************************************************/
+
+package org.qtproject.qt5.android.bluetooth;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothServerSocket;
+import android.bluetooth.BluetoothSocket;
+import android.util.Log;
+import java.io.IOException;
+import java.util.UUID;
+
+public class QtBluetoothSocketServer extends Thread
+{
+
+    /* Pointer to the Qt object that "owns" the Java object */
+    long qtObject = 0;
+    public boolean logEnabled = false;
+
+    private static final String TAG = "QtBluetooth";
+    private boolean m_isSecure = false;
+    private UUID m_uuid;
+    private String m_serviceName;
+    private BluetoothServerSocket m_serverSocket = null;
+
+    //error codes
+    public static final int QT_NO_BLUETOOTH_SUPPORTED = 0;
+    public static final int QT_LISTEN_FAILED = 1;
+    public static final int QT_ACCEPT_FAILED = 2;
+
+    public QtBluetoothSocketServer()
+    {
+        setName("QtSocketServerThread");
+    }
+
+    public void setServiceDetails(String uuid, String serviceName, boolean isSecure)
+    {
+        m_uuid = UUID.fromString(uuid);
+        m_serviceName = serviceName;
+        m_isSecure = isSecure;
+
+    }
+
+    public void run()
+    {
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter == null) {
+            errorOccurred(qtObject, QT_NO_BLUETOOTH_SUPPORTED);
+            return;
+        }
+
+        try {
+            if (m_isSecure) {
+                m_serverSocket = adapter.listenUsingRfcommWithServiceRecord(m_serviceName, m_uuid);
+                if (logEnabled)
+                    Log.d(TAG, "Using secure socket listener");
+            } else {
+                m_serverSocket = adapter.listenUsingInsecureRfcommWithServiceRecord(m_serviceName, m_uuid);
+                if (logEnabled)
+                    Log.d(TAG, "Using insecure socket listener");
+            }
+        } catch (IOException ex) {
+            if (logEnabled)
+                Log.d(TAG, "Server socket listen() failed:" + ex.toString());
+            ex.printStackTrace();
+            errorOccurred(qtObject, QT_LISTEN_FAILED);
+            return;
+        }
+
+        BluetoothSocket s = null;
+        if (m_serverSocket != null) {
+            try {
+                while (!isInterrupted()) {
+                    //this blocks until we see incoming connection
+                    //or close() is called
+                    if (logEnabled)
+                        Log.d(TAG, "Waiting for new incoming socket");
+                    s = m_serverSocket.accept();
+
+                    if (logEnabled)
+                        Log.d(TAG, "New socket accepted");
+                    newSocket(qtObject, s);
+                }
+            } catch (IOException ex) {
+                if (logEnabled)
+                    Log.d(TAG, "Server socket accept() failed:" + ex.toString());
+                ex.printStackTrace();
+                errorOccurred(qtObject, QT_ACCEPT_FAILED);
+            }
+        }
+
+        Log.d(TAG, "Leaving server socket thread.");
+    }
+
+    public void close()
+    {
+        if (!isAlive())
+            return;
+
+        try {
+            //ensure closing of thread if we are not currently blocking on accept()
+            interrupt();
+
+            //interrupts accept() call above
+            if (m_serverSocket != null)
+                m_serverSocket.close();
+        } catch (IOException ex) {
+            Log.d(TAG, "Closing server socket close() failed:" + ex.toString());
+            ex.printStackTrace();
+        }
+    }
+
+    public static native void errorOccurred(long qtObject, int errorCode);
+    public static native void newSocket(long qtObject, BluetoothSocket socket);
+}