core/bt: always add bt name for devices

If the user asks to have all BT/BLE devices shown, we should behave
consistently to the case of a recognized dive computer and always show the
device name. In almost all cases the BT/BLE address (and even worse on
iOS/macOS the weird uuids) are completely meaningless.

If there isn't a name, don't add a leading space in order to make it easy to
detect if we have an address without a name (which almost certainly isn't a
dive computer, so it should be towards the end of the list of addresses - which
will be handled in a later commit).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-05-14 17:37:24 -07:00 committed by Lubomir I. Ivanov
parent 658089d763
commit a1a51e5d89
2 changed files with 7 additions and 3 deletions

View file

@ -1,4 +1,5 @@
Mobile: fix failure to recognize several Aqualung BLE dive computers
Core: always include BT/BLE name, even for devices no recognized as dive computer
Core: fix failure to recognize several Aqualung BLE dive computers
Mobile: show dive tags on dive details page
Desktop: update SAC fields and other statistics when editing cylinders
Desktop: Reconnect the variations checkbox in planner

View file

@ -274,8 +274,11 @@ void BTDiscovery::btDeviceDiscoveredMain(const btPairedDevice &device)
return;
}
// Do we want only devices we recognize as dive computers?
if (m_showNonDiveComputers)
connectionListModel.addAddress(device.address);
if (m_showNonDiveComputers) {
if (!newDevice.isEmpty())
newDevice += " ";
connectionListModel.addAddress(newDevice + device.address);
}
qDebug() << "Not recognized as dive computer";
}