Android BT: generalize pairing data

This adds a list of paired BT devices to the QMLManager class. In addition,
a very simple implementation is made of getting the paired BT devices on
Linux, so that we can test further processing of selecting the proper
devices, in a mobile-on-desktop situation.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>

mobile-widgets/qmlmanager.cpp

@@ -96,17 +96,23 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
 #if defined(BT_SUPPORT)
 	if (localBtDevice.isValid() &&
 	    localBtDevice.hostMode() == QBluetoothLocalDevice::HostConnectable) {
-		QStringList pairedBT = getBluetoothDevices();
+		btPairedDevices.clear();
-
-		for (int i = 0; i < pairedBT.length(); i++) {
-			qDebug() << "Paired = " << pairedBT[i];
-		}
-
 		QString localDeviceName = "localDevice " + localBtDevice.name() + " is valid, starting discovery";
 		appendTextToLog(localDeviceName.toUtf8().data());
+#if defined(Q_OS_LINUX)
 		discoveryAgent = new QBluetoothDeviceDiscoveryAgent(this);
 		connect(discoveryAgent, &QBluetoothDeviceDiscoveryAgent::deviceDiscovered, this, &QMLManager::btDeviceDiscovered);
 		discoveryAgent->start();
+#endif
+#if defined(Q_OS_ANDROID)
+		getBluetoothDevices();
+#endif
+		for (int i = 0; i < btPairedDevices.length(); i++) {
+			qDebug() << "Paired =" << btPairedDevices[i].name << btPairedDevices[i].address.toString();
+		}
+#if defined(Q_OS_LINUX)
+		discoveryAgent->stop();
+#endif
 	} else {
 		appendTextToLog("localBtDevice isn't valid");
 	}
@@ -219,7 +225,13 @@ extern void addBtUuid(QBluetoothUuid uuid);
 
 void QMLManager::btDeviceDiscovered(const QBluetoothDeviceInfo &device)
 {
+	btPairedDevice this_d;
+	this_d.address = device.address();
+	this_d.name = device.name();
+	btPairedDevices.append(this_d);
+
 	QString newDevice = device.name();
+
 	// all the HW OSTC BT computers show up as "OSTC" + some other text, depending on model
 	if (newDevice.startsWith("OSTC"))
 		newDevice = "OSTC 3";
@@ -1608,29 +1620,27 @@ QStringList QMLManager::getDCListFromVendor(const QString& vendor)
 	return productList[vendor];
 }
 
-//
+// Android: As Qt is not able to pull the pairing data from a device, i
-// As Qt is not able to pull the pairing data from a device, a lengthy
+// a lengthy discovery process is needed to see what devices are paired. On
-// discovery process is needed to see what devices are paired. On
 // https://forum.qt.io/topic/46075/solved-bluetooth-list-paired-devices
 // user s.frings74 does, however, present a solution to this using JNI.
 // Currently, this code is taken "as is".
-//
+
-QStringList QMLManager::getBluetoothDevices()
+void QMLManager::getBluetoothDevices()
 {
-	QStringList result;
+#if defined(Q_OS_ANDROID) && defined(BT_SUPPORT)
-#if defined(Q_OS_ANDROID)
+	struct QMLManager::btPairedDevice result;
-	QString fmt("%1 %2");
 	// Query via Android Java API.
 
 	// returns a BluetoothAdapter
 	QAndroidJniObject adapter=QAndroidJniObject::callStaticObjectMethod("android/bluetooth/BluetoothAdapter","getDefaultAdapter","()Landroid/bluetooth/BluetoothAdapter;");
 	if (checkException("BluetoothAdapter.getDefaultAdapter()", &adapter)) {
-		return result;
+		return;
 	}
 	// returns a Set<BluetoothDevice>
 	QAndroidJniObject pairedDevicesSet=adapter.callObjectMethod("getBondedDevices","()Ljava/util/Set;");
 	if (checkException("BluetoothAdapter.getBondedDevices()", &pairedDevicesSet)) {
-		return result;
+		return;
 	}
 	jint size=pairedDevicesSet.callMethod<jint>("size");
 	checkException("Set<BluetoothDevice>.size()", &pairedDevicesSet);
@@ -1638,7 +1648,7 @@ QStringList QMLManager::getBluetoothDevices()
 		// returns an Iterator<BluetoothDevice>
 		QAndroidJniObject iterator=pairedDevicesSet.callObjectMethod("iterator","()Ljava/util/Iterator;");
 		if (checkException("Set<BluetoothDevice>.iterator()", &iterator)) {
-			return result;
+			return;
 		}
 		for (int i = 0; i < size; i++) {
 			// returns a BluetoothDevice
@@ -1646,13 +1656,14 @@ QStringList QMLManager::getBluetoothDevices()
 			if (checkException("Iterator<BluetoothDevice>.next()", &dev)) {
 				continue;
 		}
-		QString address=dev.callObjectMethod("getAddress","()Ljava/lang/String;").toString(); // returns a String
+
-		QString name=dev.callObjectMethod("getName", "()Ljava/lang/String;").toString(); // returns a String
+		result.address = QBluetoothAddress(dev.callObjectMethod("getAddress","()Ljava/lang/String;").toString());
-		result.append(fmt.arg(address).arg(name));
+		result.name = dev.callObjectMethod("getName", "()Ljava/lang/String;").toString();
+
+		btPairedDevices.append(result);
 	}
 }
 #endif
-	return result;
 }
 
 #if defined(Q_OS_ANDROID)

mobile-widgets/qmlmanager.h

@@ -126,9 +126,13 @@ public:
 	Q_INVOKABLE int getProductIndex();
 	Q_INVOKABLE QString getBtAddress();
 #if defined(BT_SUPPORT)
+	struct btPairedDevice {
+		QBluetoothAddress address;
+		QString name;
+	};
 	void btDeviceDiscovered(const QBluetoothDeviceInfo &device);
+	void getBluetoothDevices();
 #endif
-	QStringList getBluetoothDevices();
 
 public slots:
 	void applicationStateChanged(Qt::ApplicationState state);
@@ -217,6 +221,7 @@ private:
 #endif
 
 #if defined(BT_SUPPORT)
+	QList<struct btPairedDevice> btPairedDevices;
 	QBluetoothLocalDevice localBtDevice;
 	QBluetoothDeviceDiscoveryAgent *discoveryAgent;
 	struct btVendorProduct {