mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android BT: generalize pairing data

Browse source 
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>
This commit is contained in:
Jan Mulder 2017-06-02 14:06:11 +02:00 • committed by Dirk Hohndel
parent 3b4091a0b9
commit dbd1d1f41a
2 changed files with 38 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
mobile-widgets/qmlmanager.cpp
View file

@ -96,17 +96,23 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
#if defined(BT_SUPPORT)
if (localBtDevice.isValid() &&
localBtDevice.hostMode() == QBluetoothLocalDevice::HostConnectable) {
QStringList pairedBT = getBluetoothDevices();
for (int i = 0; i < pairedBT.length(); i++) {
qDebug() << "Paired = " << pairedBT[i];
}
btPairedDevices.clear();
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];
}
//
// As Qt is not able to pull the pairing data from a device, a lengthy
// discovery process is needed to see what devices are paired. On
// Android: As Qt is not able to pull the pairing data from a device, i
// a lengthy 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)
QString fmt("%1 %2");
#if defined(Q_OS_ANDROID) && defined(BT_SUPPORT)
struct QMLManager::btPairedDevice result;
// 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.append(fmt.arg(address).arg(name));
result.address = QBluetoothAddress(dev.callObjectMethod("getAddress","()Ljava/lang/String;").toString());
result.name = dev.callObjectMethod("getName", "()Ljava/lang/String;").toString();
btPairedDevices.append(result);
}
}
#endif
return result;
}
#if defined(Q_OS_ANDROID)

7
mobile-widgets/qmlmanager.h
View file

@ -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 {