From a1a51e5d89013f0423675dfe607cc136f82f727f Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 14 May 2020 17:37:24 -0700 Subject: [PATCH] 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 --- CHANGELOG.md | 3 ++- core/btdiscovery.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e6315761..16878525f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp index 298c0408c..909c55b23 100644 --- a/core/btdiscovery.cpp +++ b/core/btdiscovery.cpp @@ -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"; }