settings: bluetooth: qml: cleanup onPoweredChanged slot

Move enabling of discovery + discoverablity to the respective slot
to avoid race conditions from the adapter powering on

Bug-AGL: SPEC-2295 SPEC-2290
Change-Id: I16c04d7bcd880ef5dcc5352d0da52ce2fe8b2447
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>

diff --git a/app/bluetooth/Bluetooth.qml b/app/bluetooth/Bluetooth.qml
index efc2374..b2b3308 100644 (file)
--- a/app/bluetooth/Bluetooth.qml
+++ b/app/bluetooth/Bluetooth.qml
@@ -33,7 +33,14 @@ SettingPage {
             bluetooth.send_confirmation(data.pincode)
         }
 
-        onPowerChanged: if (!root.checked) root.checked = state
+        onPowerChanged: {
+            if (state) {
+                bluetooth.start_discovery()
+                bluetooth.discoverable = true;
+            }
+            root.checked = state
+        }
+
     }
 
     Text {
@@ -46,12 +53,7 @@ SettingPage {
 
     onCheckedChanged: {
         console.log("Bluetooth set to", checked)
-
-        bluetooth.power = checked;
-        bluetooth.discoverable = checked;
-
-        if (checked == true)
-            bluetooth.start_discovery()
+        bluetooth.power = checked
     }
 
     Rectangle {