Android: Implement QLEC::stateChanged() notification

Change-Id: Id2cabd9df7b5387fe5e6f1c898fe02e40f7c0a3d
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

1 files changed, 48 insertions, 4 deletions

diff --git a/src/bluetooth/qlowenergycontroller_android.cpp b/src/bluetooth/qlowenergycontroller_android.cpp
index 613c2bed..8654fe71 100644
--- a/src/bluetooth/qlowenergycontroller_android.cpp
+++ b/src/bluetooth/qlowenergycontroller_android.cpp
@@ -86,6 +86,8 @@ void QLowEnergyControllerPrivate::init()
         hub = new LowEnergyNotificationHub(remoteDevice, isPeripheral, this);
         // we only connect to the peripheral role specific signals
         // TODO add connections as they get added later on
+        connect(hub, &LowEnergyNotificationHub::connectionUpdated,
+                this, &QLowEnergyControllerPrivate::connectionUpdated);
     } else {
         if (version < 18) {
             qWarning() << "Qt Bluetooth LE Central/Client support not available"
@@ -341,14 +343,56 @@ void QLowEnergyControllerPrivate::connectionUpdated(
         QLowEnergyController::ControllerState newState,
         QLowEnergyController::Error errorCode)
 {
-    Q_Q(QLowEnergyController);
-
-    const QLowEnergyController::ControllerState oldState = state;
     qCDebug(QT_BT_ANDROID) << "Connection updated:"
                            << "error:" << errorCode
-                           << "oldState:" << oldState
+                           << "oldState:" << state
                            << "newState:" << newState;
 
+    if (role == QLowEnergyController::PeripheralRole)
+        peripheralConnectionUpdated(newState, errorCode);
+    else
+        centralConnectionUpdated(newState, errorCode);
+}
+
+// called if server/peripheral
+void QLowEnergyControllerPrivate::peripheralConnectionUpdated(
+        QLowEnergyController::ControllerState newState,
+        QLowEnergyController::Error errorCode)
+{
+    // Java errorCode can be larger than max QLowEnergyController::Error
+    if (errorCode > QLowEnergyController::AdvertisingError)
+        errorCode = QLowEnergyController::UnknownError;
+
+    if (errorCode != QLowEnergyController::NoError)
+        setError(errorCode);
+
+    const QLowEnergyController::ControllerState oldState = state;
+    setState(newState);
+
+    // disconnect implies stop of advertisement
+    if (newState == QLowEnergyController::UnconnectedState)
+        stopAdvertising();
+
+
+    Q_Q(QLowEnergyController);
+    if (oldState == QLowEnergyController::ConnectedState
+            && newState != QLowEnergyController::ConnectedState) {
+        emit q->disconnected();
+    } else if (newState == QLowEnergyController::ConnectedState
+                 && oldState != QLowEnergyController::ConnectedState) {
+        emit q->connected();
+    }
+}
+
+// called if client/central
+void QLowEnergyControllerPrivate::centralConnectionUpdated(
+        QLowEnergyController::ControllerState newState,
+        QLowEnergyController::Error errorCode)
+{
+    Q_Q(QLowEnergyController);
+
+    const QLowEnergyController::ControllerState oldState = state;
+
     if (errorCode != QLowEnergyController::NoError) {
         // ConnectionError if transition from Connecting to Connected
         if (oldState == QLowEnergyController::ConnectingState) {