Merge lp:~rsalveti/ubuntu-system-settings/bluetooth-device-visibility-tweak-14.09 into lp:ubuntu-system-settings/rtm-14.09

[Ricardo Salveti]

bluetooth: disable device visiblity when switching out, that way it's not
staying on if the settings are closed from the switcher or if the user switch
to another software

bluetooth: disable device visiblity when switching out, that way it's not
staying on if the settings are closed from the switcher or if the user switch
to another software

[Ricardo Mendoza (ricmm)]

Code LGTM !

review: Approve

[Ken VanDine (ken-vandine)]

Looks good, thanks!

review: Approve

[lp:~rsalveti/ubuntu-system-settings/bluetooth-device-visibility-tweak-14.09]

1001. By Ricardo Salveti on 2015-03-06

We don't have Qt.ApplicationSuspended with RTM's Qt, so use application.active instead

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2014-11-18 19:37:24 +0000
+++ plugins/bluetooth/PageComponent.qml	2015-03-06 23:52:32 +0000
@@ -33,6 +33,24 @@
 
     UbuntuBluetoothPanel { id: backend }
 
+    Timer {
+        id: discoverableTimer
+        onTriggered: backend.trySetDiscoverable(true)
+    }
+
+    /* Disable bt visiblity when switching out */
+    Connections {
+        target: Qt.application
+        onActiveChanged: {
+            if (Qt.application.active === false) {
+                backend.trySetDiscoverable(false)
+            }
+            else {
+                discoverableTimer.start()
+            }
+        }
+    }
+
     Component {
         id: confirmPasskeyDialog
         ConfirmPasskeyDialog { }

=== modified file 'plugins/bluetooth/bluetooth.cpp'
--- plugins/bluetooth/bluetooth.cpp	2015-02-27 05:53:33 +0000
+++ plugins/bluetooth/bluetooth.cpp	2015-03-06 23:52:32 +0000
@@ -88,6 +88,11 @@
     m_devices.stopDiscovery();
 }
 
+void Bluetooth::trySetDiscoverable(bool discoverable)
+{
+    m_devices.trySetDiscoverable(discoverable);
+}
+
 bool Bluetooth::isSupportedType(const int type)
 {
     switch((Device::Type)type) {

=== modified file 'plugins/bluetooth/bluetooth.h'
--- plugins/bluetooth/bluetooth.h	2014-08-28 07:22:28 +0000
+++ plugins/bluetooth/bluetooth.h	2015-03-06 23:52:32 +0000
@@ -82,6 +82,7 @@
     Q_INVOKABLE void startDiscovery();
     Q_INVOKABLE void stopDiscovery();
     Q_INVOKABLE static bool isSupportedType(const int type);
+    Q_INVOKABLE void trySetDiscoverable(bool discoverable);
 
 public:
     Agent * getAgent();

=== modified file 'plugins/bluetooth/devicemodel.h'
--- plugins/bluetooth/devicemodel.h	2015-02-27 05:53:33 +0000
+++ plugins/bluetooth/devicemodel.h	2015-03-06 23:52:32 +0000
@@ -74,6 +74,7 @@
     void stopDiscovery();
     void startDiscovery();
     void toggleDiscovery();
+    void trySetDiscoverable(bool discoverable);
 
 Q_SIGNALS: 
     void poweredChanged(bool powered);
@@ -96,7 +97,6 @@
     QTimer m_timer;
     QTimer m_discoverableTimer;
     void restartTimer();
-    void trySetDiscoverable(bool discoverable);
     void setDiscoverable(bool discoverable);
     void setPowered(bool powered);