ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable bluetooth RFCOM discovery on iOS

Browse Source
This commit is contained in:
Simon Stürz 2018-07-19 12:30:22 +02:00
parent be1c03d77e
commit 99d3275edc
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libnymea-app-core/discovery/bluetoothservicediscovery.cpp
View File

@ -6,7 +6,6 @@ BluetoothServiceDiscovery::BluetoothServiceDiscovery(DiscoveryModel *discoveryMo
QObject(parent), QObject(parent),
m_discoveryModel(discoveryModel) m_discoveryModel(discoveryModel)
{ {
m_nymeaServiceUuid = QBluetoothUuid(QUuid("997936b5-d2cd-4c57-b41b-c6048320cd2b")); m_nymeaServiceUuid = QBluetoothUuid(QUuid("997936b5-d2cd-4c57-b41b-c6048320cd2b"));
m_localDevice = new QBluetoothLocalDevice(this); m_localDevice = new QBluetoothLocalDevice(this);

13
libnymea-app-core/discovery/nymeadiscovery.cpp
View File

@ -13,7 +13,10 @@ NymeaDiscovery::NymeaDiscovery(QObject *parent) : QObject(parent)
m_upnp = new UpnpDiscovery(m_discoveryModel, this); m_upnp = new UpnpDiscovery(m_discoveryModel, this);
m_zeroConf = new ZeroconfDiscovery(m_discoveryModel, this); m_zeroConf = new ZeroconfDiscovery(m_discoveryModel, this);
#ifndef Q_OS_IOS
m_bluetooth = new BluetoothServiceDiscovery(m_discoveryModel, this); m_bluetooth = new BluetoothServiceDiscovery(m_discoveryModel, this);
#endif
} }
bool NymeaDiscovery::discovering() const bool NymeaDiscovery::discovering() const
@ -30,12 +33,16 @@ void NymeaDiscovery::setDiscovering(bool discovering)
// For zeroconf we'll ignore it as zeroconf doesn't do active discovery but just listens for changes in the net all the time // For zeroconf we'll ignore it as zeroconf doesn't do active discovery but just listens for changes in the net all the time
if (discovering) { if (discovering) {
m_upnp->discover(); m_upnp->discover();
// Note: this is the nymea uuid if (m_bluetooth) {
m_bluetooth->discover(); m_bluetooth->discover();
}
} else { } else {
m_upnp->stopDiscovery(); m_upnp->stopDiscovery();
m_bluetooth->stopDiscovery(); if (m_bluetooth) {
m_bluetooth->stopDiscovery();
}
} }
emit discoveringChanged(); emit discoveringChanged();
} }

3
nymea-app/ui/ConnectPage.qml
View File

@ -194,7 +194,7 @@ Page {
return false return false
} }
} }
progressive: hasSecurePort progressive: true
secondaryIconName: "../images/network-secure.svg" secondaryIconName: "../images/network-secure.svg"
secondaryIconColor: isTrusted ? app.guhAccent : Material.foreground secondaryIconColor: isTrusted ? app.guhAccent : Material.foreground
swipe.enabled: discoveryDeviceDelegate.discoveryDevice.deviceType === DiscoveryDevice.DeviceTypeNetwork swipe.enabled: discoveryDeviceDelegate.discoveryDevice.deviceType === DiscoveryDevice.DeviceTypeNetwork
@ -248,7 +248,6 @@ Page {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
} }
} }
} }
ThinDivider {} ThinDivider {}