mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core/bt: ensure that BT/BLE addresses with name sort first

Browse source 
We don't order the list of addresses alphabetically, but we want to ensure
that devices that offer us a name are listed before those that don't. This
should only be relevant if the user selects the option to show all BT/BLE
devices, not just recognized dive computer, because if we recognize a computer
we always have the product name prepended to the address.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-05-14 17:37:45 -07:00 • committed by Lubomir I. Ivanov
parent a1a51e5d89
commit 34ebaf6599
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/connectionlistmodel.cpp
View file

@ -1,6 +1,9 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "core/connectionlistmodel.h" #include "core/connectionlistmodel.h"
#if defined(BT_SUPPORT)
#include "core/btdiscovery.h"
#endif
ConnectionListModel::ConnectionListModel(QObject *parent) : ConnectionListModel::ConnectionListModel(QObject *parent) :
QAbstractListModel(parent) QAbstractListModel(parent)
@ -31,8 +34,18 @@ int ConnectionListModel::rowCount(const QModelIndex&) const
void ConnectionListModel::addAddress(const QString &address) void ConnectionListModel::addAddress(const QString &address)
{ {
if (!m_addresses.contains(address)) { if (!m_addresses.contains(address)) {
beginInsertRows(QModelIndex(), rowCount(), rowCount()); int idx = rowCount();
m_addresses.append(address); #if defined(BT_SUPPORT)
// make sure that addresses that are just a BT/BLE address without name stay at the end of the list
if (address != extractBluetoothAddress(address)) {
for (idx = 0; idx < rowCount(); idx++)
if (m_addresses[idx] == extractBluetoothAddress(m_addresses[idx]))
// found the first name-less BT/BLE address, insert before that
break;
}
#endif
beginInsertRows(QModelIndex(), idx, idx);
m_addresses.insert(idx, address);
endInsertRows(); endInsertRows();
} }
} }