From aeeae7bc92f19778a73fb10a09b8949b2c384d39 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Fri, 7 Jul 2017 13:15:51 +0200
Subject: [PATCH] winrt: Ensure that
QLowEnergyController::RemoteHostClosedError is emitted
As there is no Windows API to disconnect from a BTLE device, we just set
the internal state in QLowEnergyController::disconnectFromDevice. By
removing the callback registration in disconnectFromDevice we can be sure,
that every state change from connected to disconnected is caused by the
remote host closing the connection and thus implement
RemoteHostClosedError.
Change-Id: I7dcacaffce68784cb297b02df2e9f9356bf14d9d
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
---
src/bluetooth/qlowenergycontroller_winrt.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/bluetooth/qlowenergycontroller_winrt.cpp b/src/bluetooth/qlowenergycontroller_winrt.cpp
index d6fc4952..8d3d85d8 100644
--- a/src/bluetooth/qlowenergycontroller_winrt.cpp
+++ b/src/bluetooth/qlowenergycontroller_winrt.cpp
@@ -338,6 +338,7 @@ void QLowEnergyControllerPrivate::connectToDevice()
emit q->connected();
} else if (state == QLowEnergyController::ConnectedState
&& status == BluetoothConnectionStatus::BluetoothConnectionStatus_Disconnected) {
+ setError(QLowEnergyController::RemoteHostClosedError);
setState(QLowEnergyController::UnconnectedState);
emit q->disconnected();
}
@@ -419,6 +420,10 @@ void QLowEnergyControllerPrivate::disconnectFromDevice()
Q_Q(QLowEnergyController);
setState(QLowEnergyController::UnconnectedState);
emit q->disconnected();
+ if (mDevice && mStatusChangedToken.value) {
+ mDevice->remove_ConnectionStatusChanged(mStatusChangedToken);
+ mStatusChangedToken.value = 0;
+ }
}
ComPtr<IGattDeviceService> QLowEnergyControllerPrivate::getNativeService(const QBluetoothUuid &serviceUuid)
--
GitLab