diff --git a/libnymea-app-core/discovery/bluetoothservicediscovery.cpp b/libnymea-app-core/discovery/bluetoothservicediscovery.cpp
index 6854725c..a8134651 100644
--- a/libnymea-app-core/discovery/bluetoothservicediscovery.cpp
+++ b/libnymea-app-core/discovery/bluetoothservicediscovery.cpp
@@ -24,6 +24,9 @@ bool BluetoothServiceDiscovery::discovering() const
bool BluetoothServiceDiscovery::available() const
{
+ if (!m_localDevice)
+ return false;
+
return m_localDevice->isValid() && !m_localDevice->hostMode() != QBluetoothLocalDevice::HostPoweredOff;
}
@@ -74,7 +77,7 @@ void BluetoothServiceDiscovery::onHostModeChanged(const QBluetoothLocalDevice::H
void BluetoothServiceDiscovery::onServiceDiscovered(const QBluetoothServiceInfo &serviceInfo)
{
- qDebug() << "BluetoothServiceDiscovery: Service [+]" << serviceInfo.device().name() << serviceInfo.serviceName() << serviceInfo.serviceDescription() << serviceInfo.serviceProvider();
+ qDebug() << "BluetoothServiceDiscovery: Service [+]" << serviceInfo.device().name() << serviceInfo.serviceName() << serviceInfo.serviceProvider();
qDebug() << "Discovered service on"
<< serviceInfo.device().name() << serviceInfo.device().address().toString();
@@ -83,6 +86,8 @@ void BluetoothServiceDiscovery::onServiceDiscovered(const QBluetoothServiceInfo
<< serviceInfo.attribute(QBluetoothServiceInfo::ServiceDescription).toString();
qDebug() << "\tProvider:"
<< serviceInfo.attribute(QBluetoothServiceInfo::ServiceProvider).toString();
+ qDebug() << "\Documentation:"
+ << serviceInfo.attribute(QBluetoothServiceInfo::DocumentationUrl).toString();
qDebug() << "\tL2CAP protocol service multiplexer:"
<< serviceInfo.protocolServiceMultiplexer();
qDebug() << "\tRFCOMM server channel:" << serviceInfo.serverChannel();
@@ -97,7 +102,7 @@ void BluetoothServiceDiscovery::onServiceDiscovered(const QBluetoothServiceInfo
if (!device) {
device = new DiscoveryDevice(DiscoveryDevice::DeviceTypeBluetooth, this);
qDebug() << "BluetoothServiceDiscovery: Adding new bluetooth host to model";
- device->setName(serviceInfo.device().name());
+ device->setName(QString("%1 (%2)").arg(serviceInfo.serviceName()).arg(serviceInfo.device().name()));
device->setBluetoothAddress(serviceInfo.device().address());
m_discoveryModel->addDevice(device);
}
diff --git a/nymea-app/resources.qrc b/nymea-app/resources.qrc
index 14678866..7dececf7 100644
--- a/nymea-app/resources.qrc
+++ b/nymea-app/resources.qrc
@@ -236,5 +236,6 @@
ui/images/sensors/temperature.svg
ui/components/MainPageTile.qml
ui/images/configure.svg
+ ui/images/network-wifi-symbolic.svg
diff --git a/nymea-app/ui/ConnectPage.qml b/nymea-app/ui/ConnectPage.qml
index 86b17a78..310bf242 100644
--- a/nymea-app/ui/ConnectPage.qml
+++ b/nymea-app/ui/ConnectPage.qml
@@ -172,7 +172,7 @@ Page {
return usedConfigIndex
}
- iconName: model.type === DiscoveryDevice.DeviceTypeNetwork ? "../images/network-vpn.svg" : "../images/bluetooth.svg"
+ iconName: model.type === DiscoveryDevice.DeviceTypeNetwork ? "../images/network-wifi-symbolic.svg" : "../images/bluetooth.svg"
text: model.name
subText: model.type === DiscoveryDevice.DeviceTypeNetwork ? model.hostAddress : model.bluetoothAddress
property bool hasSecurePort: {
diff --git a/nymea-app/ui/images/network-wifi-symbolic.svg b/nymea-app/ui/images/network-wifi-symbolic.svg
new file mode 100644
index 00000000..8d1568f1
--- /dev/null
+++ b/nymea-app/ui/images/network-wifi-symbolic.svg
@@ -0,0 +1,17 @@
+
+
+