From 0ad6b1fc702b56bed96077d540366a9a96903da7 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 21 Apr 2015 12:47:07 +0200 Subject: Check if Bluetooth is on before reconnecting Don't try to reconnect to the watch if Bluetooth is switched off, instead start an extended reconnect timer (which has been refactored) --- daemon/watchconnector.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'daemon/watchconnector.cpp') diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp index 0ccd089..891625b 100644 --- a/daemon/watchconnector.cpp +++ b/daemon/watchconnector.cpp @@ -158,6 +158,16 @@ void WatchConnector::handleWatch(const QString &name, const QString &address) { qCDebug(l) << "handleWatch" << name << address; reconnectTimer.stop(); + + // Check if bluetooth is on + QBluetoothLocalDevice host; + bool btOff = host.hostMode() == QBluetoothLocalDevice::HostPoweredOff; + if (btOff) { + qCDebug(l) << "Bluetooth switched off."; + setIncreasedReconnectTimer(); + return; + } + if (socket != nullptr) { socket->close(); socket->deleteLater(); @@ -323,6 +333,12 @@ void WatchConnector::onDisconnected() writeData.clear(); // 3rd time around - user is not here, do not bother with resending last message } + setIncreasedReconnectTimer(); + +} + +void WatchConnector::setIncreasedReconnectTimer() +{ if (reconnectTimer.interval() < 10 * RECONNECT_TIMEOUT) { reconnectTimer.setInterval(reconnectTimer.interval() + RECONNECT_TIMEOUT); } -- cgit v1.2.3