From 6837d143b456eb1f253b68704a5ff1b48bef4de4 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@digia.com>
Date: Mon, 1 Sep 2014 13:46:59 +0200
Subject: Add support for random vs public address selection to
 lowenergyscanner

Change-Id: I963f47f0089d072249b73bdfb0c715d43186b08d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 examples/bluetooth/lowenergyscanner/device.cpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'examples/bluetooth/lowenergyscanner/device.cpp')

diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp
index 9ffb4d56..215a7588 100644
--- a/examples/bluetooth/lowenergyscanner/device.cpp
+++ b/examples/bluetooth/lowenergyscanner/device.cpp
@@ -50,7 +50,7 @@
 #include <QTimer>
 
 Device::Device():
-    connected(false), controller(0), m_deviceScanState(false)
+    connected(false), controller(0), m_deviceScanState(false), randomAddress(false)
 {
     //! [les-devicediscovery-1]
     discoveryAgent = new QBluetoothDeviceDiscoveryAgent();
@@ -176,6 +176,10 @@ void Device::scanServices(const QString &address)
                 this, SLOT(serviceScanDone()));
     }
 
+    if (isRandomAddress())
+        controller->setRemoteAddressType(QLowEnergyController::RandomAddress);
+    else
+        controller->setRemoteAddressType(QLowEnergyController::PublicAddress);
     controller->connectToDevice();
     //! [les-controller-1]
 }
@@ -250,7 +254,7 @@ void Device::deviceConnected()
 void Device::errorReceived(QLowEnergyController::Error /*error*/)
 {
     qWarning() << "Error: " << controller->errorString();
-    setUpdate(controller->errorString());
+    setUpdate(QString("Back\n(%1)").arg(controller->errorString()));
 }
 
 void Device::setUpdate(QString message)
@@ -261,8 +265,7 @@ void Device::setUpdate(QString message)
 
 void Device::disconnectFromDevice()
 {
-    if (connected)
-        controller->disconnectFromDevice();
+    controller->disconnectFromDevice();
 }
 
 void Device::deviceDisconnected()
@@ -305,3 +308,14 @@ bool Device::state()
 {
     return m_deviceScanState;
 }
+
+bool Device::isRandomAddress() const
+{
+    return randomAddress;
+}
+
+void Device::setRandomAddress(bool newValue)
+{
+    randomAddress = newValue;
+    emit randomAddressChanged();
+}
-- 
cgit v1.2.3