Merge lp:~seb128/ubuntu-system-settings/bluetooth-working-pairing-only into lp:ubuntu-system-settings

[Sebastien Bacher]

bluetooth: disable pairing for unsupported device types, the current UI
let users click on the button but doesn't do anything out of closing
the page, better to show the button as unactive instead

bluetooth: disable pairing for unsupported device types, the current UI
let users click on the button but doesn't do anything out of closing
the page, better to show the button as unactive instead

that sort of revert https://code.launchpad.net/~mathieu-tl/ubuntu-system-settings/unbreak-hid/+merge/243592 but adding the new types to not add the issue the commit was fixing back

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1300
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1966/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1262
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/236
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1260
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1260/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17913

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

review: Needs Fixing (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

It's fine, let's just hope we're not forgetting some other device we want to pair with real soon, but those are indeed the devices currently expected to be working/supported.

review: Approve

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2015-02-04 16:32:54 +0000
+++ plugins/bluetooth/PageComponent.qml	2015-02-10 11:27:22 +0000
@@ -450,6 +450,7 @@
                             pageStack.pop();
                         }
                         visible: backend.selectedDevice ? true : false
+                        enabled: backend.isSupportedType(backend.selectedDevice.type)
                     }
                 }
                 ListItem.SingleControl {

=== modified file 'plugins/bluetooth/bluetooth.cpp'
--- plugins/bluetooth/bluetooth.cpp	2014-12-12 21:00:02 +0000
+++ plugins/bluetooth/bluetooth.cpp	2015-02-10 11:27:22 +0000
@@ -88,6 +88,24 @@
     m_devices.stopDiscovery();
 }
 
+bool Bluetooth::isSupportedType(const int type)
+{
+    switch((Device::Type)type) {
+
+    case Device::Type::Headset:
+    case Device::Type::Headphones:
+    case Device::Type::Speakers:
+    case Device::Type::Carkit:
+    case Device::Type::OtherAudio:
+    case Device::Type::Keyboard:
+    case Device::Type::Mouse:
+        return true;
+
+    default:
+        return false;
+    }
+}
+
 /***
 ****
 ***/

=== modified file 'plugins/bluetooth/bluetooth.h'
--- plugins/bluetooth/bluetooth.h	2014-12-03 20:34:39 +0000
+++ plugins/bluetooth/bluetooth.h	2015-02-10 11:27:22 +0000
@@ -82,6 +82,7 @@
     Q_INVOKABLE void toggleDiscovery();
     Q_INVOKABLE void startDiscovery();
     Q_INVOKABLE void stopDiscovery();
+    Q_INVOKABLE static bool isSupportedType(const int type);
 
 public:
     Agent * getAgent();

=== modified file 'tests/plugins/bluetooth/tst_bluetooth.cpp'
--- tests/plugins/bluetooth/tst_bluetooth.cpp	2014-12-12 21:00:02 +0000
+++ tests/plugins/bluetooth/tst_bluetooth.cpp	2015-02-10 11:27:22 +0000
@@ -42,6 +42,7 @@
     void testStartDiscovery();
     void testStopDiscovery();
     void testToggleDiscovery();
+    void testIsSupportedType();
     void testIsDiscovering();
     void cleanup();
 
@@ -141,6 +142,13 @@
     QCOMPARE(result.toBool(), false);
 }
 
+void BluetoothTest::testIsSupportedType()
+{
+    QCOMPARE(Bluetooth::isSupportedType(Device::Type::Headset), true);
+    QCOMPARE(Bluetooth::isSupportedType(Device::Type::Keyboard), true);
+    QCOMPARE(Bluetooth::isSupportedType(Device::Type::Tablet), false);
+}
+
 void BluetoothTest::testIsDiscovering()
 {
     m_bluetooth->stopDiscovery();