mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 21:33:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

bluetooth discovery: differentiate discovered and paired devices

Browse source 
We call the same helper from two spots. Once when we report the already
paired BT devices on Android, and once from the deviceDescovered signal
for the discovery agent. Let's make sure we can tell where the info came
from.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-09-29 14:46:47 -07:00
parent 3a9d895ccf
commit ca23147228
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/btdiscovery.cpp
View file

@ -194,7 +194,7 @@ void BTDiscovery::BTDiscoveryReDiscover()
// So behaviour is same on Linux/Bluez stack and
// Android/Java stack with respect to discovery
for (int i = 0; i < btPairedDevices.length(); i++)
btDeviceDiscoveredMain(btPairedDevices[i]);
btDeviceDiscoveredMain(btPairedDevices[i], true);
#endif
for (int i = 0; i < btPairedDevices.length(); i++)
qDebug() << "Paired =" << btPairedDevices[i].name << btPairedDevices[i].address;
@ -268,10 +268,10 @@ void BTDiscovery::btDeviceDiscovered(const QBluetoothDeviceInfo &device)
saveBtDeviceInfo(btDeviceAddress(&device, false), device);
#endif
btDeviceDiscoveredMain(this_d);
btDeviceDiscoveredMain(this_d, false);
}
void BTDiscovery::btDeviceDiscoveredMain(const btPairedDevice &device)
void BTDiscovery::btDeviceDiscoveredMain(const btPairedDevice &device, bool fromPaired)
{
btVendorProduct btVP;
@ -282,7 +282,7 @@ void BTDiscovery::btDeviceDiscoveredMain(const btPairedDevice &device)
else
newDevice = device.name;
qDebug() << "Found new device:" << newDevice << device.address;
qDebug() << (fromPaired ? "Paired device" : "Discovered new device:") << newDevice << device.address;
if (newDC) {
QString vendor = dc_descriptor_get_vendor(newDC);
qDebug() << "this could be a " + vendor + " " + newDevice;

2
core/btdiscovery.h
View file

@ -44,7 +44,7 @@ public:
};
void btDeviceDiscovered(const QBluetoothDeviceInfo &device);
void btDeviceDiscoveredMain(const btPairedDevice &device);
void btDeviceDiscoveredMain(const btPairedDevice &device, bool fromPaired);
bool btAvailable() const;
void showNonDiveComputers(bool show);
void stopAgent();