Merge lp:~cyphermox/ubuntu-system-settings/fix-1369964 into lp:ubuntu-system-settings

[Mathieu Trudel-Lapierre]

[bluetooth] Properly handle device types for connection and disconnection.

[bluetooth] Properly handle device types for connection and disconnection.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1067
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1548/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6403
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6403/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13699
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4067
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4067/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, that issue is already in the current code but in the default case you end up calling "device->connect(connMode)" or "m_devices.addConnectAfterPairing(address, connMode)" on an un-initialized "connMode", isn't that an issue?

review: Needs Information

[Mathieu Trudel-Lapierre (cyphermox)]

Hum, doesn't the default case for connect return, so these calls wouldn't get made?

[Sebastien Bacher (seb128)]

oh right, looks fine then ;-)

review: Approve

=== modified file 'plugins/bluetooth/bluetooth.cpp'
--- plugins/bluetooth/bluetooth.cpp	2014-09-08 18:43:00 +0000
+++ plugins/bluetooth/bluetooth.cpp	2014-09-24 17:17:21 +0000
@@ -156,12 +156,18 @@
 {
     if (m_selectedDevice) {
         auto type = m_selectedDevice->getType();
-        if (type == Device::Type::Headset)
-            m_selectedDevice->disconnect(Device::ConnectionMode::Audio);
-        else if (type == Device::Type::Headphones)
-            m_selectedDevice->disconnect(Device::ConnectionMode::Audio);
-        else if (type == Device::Type::OtherAudio)
-            m_selectedDevice->disconnect(Device::ConnectionMode::Audio);
+        switch ((Device::Type)type) {
+        case Device::Type::Headset:
+        case Device::Type::Headphones:
+        case Device::Type::OtherAudio:
+        case Device::Type::Speakers:
+        case Device::Type::Carkit:
+            m_selectedDevice->disconnect(Device::ConnectionMode::Audio);
+            break;
+        default:
+            qWarning() << "Nothing to disconnect: Unsupported device type.";
+            break;
+        }
     } else {
         qWarning() << "No selected device to disconnect";
     }
@@ -179,12 +185,18 @@
     }
 
     type = device->getType();
-    if (type == Device::Type::Headset)
-        connMode = Device::ConnectionMode::Audio;
-    else if (type == Device::Type::Headphones)
-        connMode = Device::ConnectionMode::Audio;
-    else if (type == Device::Type::OtherAudio)
-        connMode = Device::ConnectionMode::Audio;
+    switch (type) {
+    case Device::Type::Headset:
+    case Device::Type::Headphones:
+    case Device::Type::OtherAudio:
+    case Device::Type::Speakers:
+    case Device::Type::Carkit:
+        connMode = Device::ConnectionMode::Audio;
+        break;
+    default:
+        qWarning() << "Nothing to connect: Unsupported device type.";
+        return;
+    }
 
     if (device->isTrusted()) {
         device->connect(connMode);