Merge lp:~seb128/ubuntu-system-settings/bluetooth-device-visibility-tweak into lp:ubuntu-system-settings

[Sebastien Bacher]

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1313
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1975/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/245
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1406
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1406/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18143

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1975/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Do we really want to make it discoverable regardless of the previous state?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1313
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1994/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1302
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1465
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1465/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18239

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1994/rebuild

review: Approve (continuous-integration)

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

1314. By Sebastien Bacher on 2015-02-25

rebase on trunk

1315. By Sebastien Bacher on 2015-02-25

delay the start by a second as described on the spec

[Sebastien Bacher (seb128)]

> Do we really want to make it discoverable regardless of the previous state?

The specification states it should be made discoverable when the view is open, so yes? I've pushed a small update to delay the start by 1s since that's what the spec describes

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

1316. By Sebastien Bacher on 2015-02-25

revert buggy rebase change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1315
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2004/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1520
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/274
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1518
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1518/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18331

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2004/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1316
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2005/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/275
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1354
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1521
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1521/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18334

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2005/rebuild

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

This is still not going to fix the case when the app gets closed before getting suspended.

Same happens if you kill the app.

I think the proper implementation here would be to set a timeout when making the device visible, and only trigger it again (after the timeout) if the bt screen is opened.

review: Needs Fixing

[Ricardo Salveti (rsalveti)]

Silo available at https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-001 as well.

[Ricardo Mendoza (ricmm)]

For this, you could use the DiscoverableTimeout property of bluez, just set it to something reasonable and have a way for the user to make it discoverable again.

Short of this, I don't know how much we can do about the app being closed / crashing case. It's always safer to have the timeout, even if you'd like to make it a 5 minutes one.

[Ricardo Mendoza (ricmm)]

Of course, the timeout being in addition to whats already provided by this MR. The timeout is only to safeguard against the closing/crashing case if it happens while the app is in focus.

[Ricardo Salveti (rsalveti)]

Yeah, after talking over IRC and looking to understand why the default timeout in bluez was 0, it's clear that it should be fixed there instead (which was fixed already in upstream).

So pushed a new bluez in the same silo to change the default timeout value.

review: Approve

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2015-02-10 11:19:53 +0000
+++ plugins/bluetooth/PageComponent.qml	2015-02-25 10:34:54 +0000
@@ -36,6 +36,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.state === Qt.ApplicationSuspended) {
+                backend.trySetDiscoverable(false)
+            }
+            else {
+                discoverableTimer.start()
+            }
+        }
+    }
+
     Component {
         id: confirmPasskeyDialog
         ConfirmPasskeyDialog { }

=== modified file 'plugins/bluetooth/bluetooth.cpp'
--- plugins/bluetooth/bluetooth.cpp	2015-02-10 11:19:53 +0000
+++ plugins/bluetooth/bluetooth.cpp	2015-02-25 10:34:54 +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	2015-02-10 11:19:53 +0000
+++ plugins/bluetooth/bluetooth.h	2015-02-25 10:34:54 +0000
@@ -83,6 +83,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	2014-08-11 09:18:12 +0000
+++ plugins/bluetooth/devicemodel.h	2015-02-25 10:34:54 +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);