Merge lp:~seb128/ubuntu-system-settings/rtm-bluetooth-simple-secure into lp:ubuntu-system-settings/rtm-14.09

[Sebastien Bacher]

bluetooth: implement simple secure pairing dialog

bluetooth: implement simple secure pairing dialog

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:980
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/54/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/55/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/33
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17790

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

review: Needs Fixing (continuous-integration)

[lp:~seb128/ubuntu-system-settings/rtm-bluetooth-simple-secure]

981. By Michael Zanetti on 2015-02-05

Enable support for Bluetooth Input devices

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:981
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/55/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/56/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/34
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17801

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

review: Needs Fixing (continuous-integration)

[lp:~seb128/ubuntu-system-settings/rtm-bluetooth-simple-secure]

982. By Mathieu Trudel-Lapierre on 2015-02-05

Re-enable all device types.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:982
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/56/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/57/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/35
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17816

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks fine, approving based on testing from the trunk branch.

review: Approve

[Sebastien Bacher (seb128)]

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

982. By Mathieu Trudel-Lapierre on 2015-02-05

Re-enable all device types.

981. By Michael Zanetti on 2015-02-05

Enable support for Bluetooth Input devices

980. By Sebastien Bacher on 2015-02-05

bluetooth: implement simple secure pairing dialog

979. By CI Train Bot Account on 2015-02-03

Releasing 0.3+15.04.20150203.1~rtm-0ubuntu1

978. By Ken VanDine on 2015-02-03

Use device-state from indicator-power to determine charging status. QtSystemsInfo doesn't support UPower 0.99. Fixes: #1416096
Approved by: Jonas G. Drange

977. By Ken VanDine on 2015-02-03

initialize m_lastFullCharge as NULL

Approved by: Sebastien Bacher, PS Jenkins bot

=== modified file 'plugins/bluetooth/CMakeLists.txt'
--- plugins/bluetooth/CMakeLists.txt	2013-10-22 14:44:44 +0000
+++ plugins/bluetooth/CMakeLists.txt	2015-02-05 17:32:38 +0000
@@ -3,6 +3,7 @@
 set(QML_SOURCES
 ProvidePinCodeDialog.qml
 ConfirmPasskeyDialog.qml
+DisplayPasskeyDialog.qml
 ProvidePasskeyDialog.qml
 PageComponent.qml 
 )

=== added file 'plugins/bluetooth/DisplayPasskeyDialog.qml'
--- plugins/bluetooth/DisplayPasskeyDialog.qml	1970-01-01 00:00:00 +0000
+++ plugins/bluetooth/DisplayPasskeyDialog.qml	2015-02-05 17:32:38 +0000
@@ -0,0 +1,56 @@
+/*
+ * This file is part of ubuntu-system-settings
+ *
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Dialog {
+    id: root
+    title: i18n.tr("Bluetooth Pairing Request")
+
+    property string name: "Unknown"
+    property string passkey: "000000"
+    property string entered: "0"
+
+    signal canceled
+
+    // TRANSLATORS: %1 is the name of the bluetooth device being paired
+    text: i18n.tr("Please enter the following PIN on %1 and press “Enter” on the keyboard:").arg(root.name)
+
+    Label {
+        /* display the number of chars that remain to be typed */
+        text: root.passkey.slice(entered)+"⏎"
+        fontSize: "x-large"
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+    }
+
+    Row {
+        spacing: units.gu(1)
+        Button {
+            text: i18n.tr("Cancel")
+            onClicked: {
+                root.canceled()
+                PopupUtils.close(root)
+            }
+            width: (parent.width - parent.spacing)
+        }
+    }
+}

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2014-11-18 19:37:24 +0000
+++ plugins/bluetooth/PageComponent.qml	2015-02-05 17:32:38 +0000
@@ -31,6 +31,8 @@
     id: root
     title: i18n.tr("Bluetooth")
 
+    property var dialogPopupId
+
     UbuntuBluetoothPanel { id: backend }
 
     Component {
@@ -48,6 +50,11 @@
         ProvidePinCodeDialog { }
     }
 
+    Component {
+        id: displayPasskeyDialog
+        DisplayPasskeyDialog { }
+    }
+
     Connections {
         target: backend.agent
         onPasskeyConfirmationNeeded: {
@@ -68,6 +75,24 @@
             popup.canceled.connect(function() {target.providePinCode(request_tag, false, "")})
             popup.provided.connect(function(pinCode) {target.providePinCode(request_tag, true, pinCode)})
         }
+        onDisplayPasskeyNeeded: {
+            if (!root.dialogPopupId)
+            {
+                var request_tag = tag
+                root.dialogPopupId  = PopupUtils.open(displayPasskeyDialog, root, {passkey: passkey, name: device.name,
+                                                 entered: entered})
+                root.dialogPopupId.canceled.connect(function() {root.dialogPopupId = null;
+                    target.displayPasskeyCallback(request_tag)})
+            }
+            else
+            {
+                root.dialogPopupId.entered = entered
+            }
+        }
+        onPairingDone: {
+            if (root.dialogPopupId)
+                PopupUtils.close(root.dialogPopupId)
+        }
     }
 
     function getDisplayName(type, displayName) {
@@ -265,7 +290,6 @@
                         iconSource: iconPath
                         iconFrame: false
                         text: getDisplayName(type, displayName)
-                        enabled: backend.isSupportedType(type)
                         onClicked: {
                             backend.setSelectedDevice(addressName);
                             pageStack.push(connectedDevicePage);

=== modified file 'plugins/bluetooth/agent.cpp'
--- plugins/bluetooth/agent.cpp	2014-07-23 13:37:06 +0000
+++ plugins/bluetooth/agent.cpp	2015-02-05 17:32:38 +0000
@@ -22,7 +22,6 @@
 
 #include <cassert>
 
-
 /***
 ****
 ***/
@@ -54,7 +53,7 @@
  */
 void Agent::Release()
 {
-    Q_EMIT(onPairingDone());
+    Q_EMIT(pairingDone());
 }
 
 /***
@@ -219,20 +218,59 @@
     }
 }
 
-/***
-****
-***/
+/** This method gets called when the service daemon
+ * needs to display a passkey for an authentication.
+ * The entered parameter indicates the number of already
+ * typed keys on the remote side.
+ * An empty reply should be returned. When the passkey
+ * needs no longer to be displayed, the Cancel method
+ * of the agent will be called.
+ * During the pairing process this method might be
+ * called multiple times to update the entered value.
+ * Note that the passkey will always be a 6-digit number,
+ * so the display should be zero-padded at the start if
+ * the value contains less than 6 digits.
+ */
 
-void Agent::DisplayPasskey(const QDBusObjectPath &objectPath, uint passkey, uchar entered)
+void Agent::DisplayPasskey(const QDBusObjectPath &objectPath, uint passkey, ushort entered)
 {
-    Q_UNUSED(objectPath);
-    Q_UNUSED(passkey);
-    Q_UNUSED(entered);
-
-    // unimplemented -- unneeded for headsets
+    auto device = m_devices.getDeviceFromPath(objectPath.path());
+    if (device) {
+        const uint tag = m_tag++;
+
+        setDelayedReply(true);
+        assert(!m_delayedReplies.contains(tag));
+        m_delayedReplies[tag] = message();
+
+        QString passkeyStr = QString("%1").arg(passkey, 6, 10, QChar('0'));
+        Q_EMIT(displayPasskeyNeeded(tag, device.data(), passkeyStr, entered));
+    } else { // confirmation requested for an unknown device..?!
+        reject(message(), __func__);
+    }
 }
 
+/**
+ * This method gets called to indicate that the agent
+ * request failed before a reply was returned.
+ */
 void Agent::Cancel()
 {
-    // unimplemented -- companion function for DisplayPasskey
+    qWarning() << "Cancel callback called";
+}
+
+/**
+ * Invoked by the user-facing code after it prompts the user to cancel
+ * the passkey passed from an Agent::displayPasskeyNeeded signal.
+ *
+ * @param tag: the tag from the Agent::displayPasskeyNeeded signal
+ */
+void Agent::displayPasskeyCallback(uint tag)
+{
+    if (m_delayedReplies.contains(tag)) {
+        QDBusMessage message = m_delayedReplies[tag];
+
+        cancel(message, __func__);
+
+        m_delayedReplies.remove(tag);
+    }
 }

=== modified file 'plugins/bluetooth/agent.h'
--- plugins/bluetooth/agent.h	2014-08-20 12:50:09 +0000
+++ plugins/bluetooth/agent.h	2015-02-05 17:32:38 +0000
@@ -41,10 +41,11 @@
     Q_INVOKABLE void confirmPasskey(uint tag, bool confirmed);
     Q_INVOKABLE void providePasskey(uint tag, bool provided, uint passkey);
     Q_INVOKABLE void providePinCode(uint tag, bool provided, QString pinCode);
+    Q_INVOKABLE void displayPasskeyCallback(uint tag);
 
 public Q_SLOTS: // received from the system's bluez service
     void Cancel();
-    void DisplayPasskey(const QDBusObjectPath &path, uint passkey, uchar entered);
+    void DisplayPasskey(const QDBusObjectPath &path, uint passkey, ushort entered);
     void Release();
     void RequestConfirmation(const QDBusObjectPath &path, uint passkey);
     uint RequestPasskey(const QDBusObjectPath &path);
@@ -54,7 +55,8 @@
     void pinCodeNeeded(int tag, Device* device);
     void passkeyNeeded(int tag, Device* device);
     void passkeyConfirmationNeeded(int tag, Device* device, QString passkey);
-    void onPairingDone();
+    void displayPasskeyNeeded(int tag, Device* device, QString passkey, ushort entered);
+    void pairingDone();
 
 private:
     Q_DISABLE_COPY(Agent)

=== modified file 'plugins/bluetooth/agent.xml'
--- plugins/bluetooth/agent.xml	2013-09-23 02:50:33 +0000
+++ plugins/bluetooth/agent.xml	2015-02-05 17:32:38 +0000
@@ -18,7 +18,7 @@
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg type="o" name="device"/>
       <arg type="u" name="passkey"/>
-      <arg type="y" name="entered"/>
+      <arg type="q" name="entered"/>
     </method>
 
     <method name="RequestConfirmation">

=== modified file 'plugins/bluetooth/agentadaptor.cpp'
--- plugins/bluetooth/agentadaptor.cpp	2013-09-23 02:50:33 +0000
+++ plugins/bluetooth/agentadaptor.cpp	2015-02-05 17:32:38 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp agent.xml -a agentadaptor
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -39,10 +39,10 @@
     QMetaObject::invokeMethod(parent(), "Cancel");
 }
 
-void AgentAdaptor::DisplayPasskey(const QDBusObjectPath &device, uint passkey, uchar entered)
+void AgentAdaptor::DisplayPasskey(const QDBusObjectPath &device, uint passkey, ushort entered)
 {
     // handle method call org.bluez.Agent.DisplayPasskey
-    QMetaObject::invokeMethod(parent(), "DisplayPasskey", Q_ARG(QDBusObjectPath, device), Q_ARG(uint, passkey), Q_ARG(uchar, entered));
+    QMetaObject::invokeMethod(parent(), "DisplayPasskey", Q_ARG(QDBusObjectPath, device), Q_ARG(uint, passkey), Q_ARG(ushort, entered));
 }
 
 void AgentAdaptor::Release()

=== modified file 'plugins/bluetooth/agentadaptor.h'
--- plugins/bluetooth/agentadaptor.h	2014-07-23 13:37:06 +0000
+++ plugins/bluetooth/agentadaptor.h	2015-02-05 17:32:38 +0000
@@ -2,15 +2,15 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp agent.xml -a agentadaptor
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
  * before re-generating it.
  */
 
-#ifndef AGENTADAPTOR_H_1379893589
-#define AGENTADAPTOR_H_1379893589
+#ifndef AGENTADAPTOR_H_1423046874
+#define AGENTADAPTOR_H_1423046874
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
@@ -46,7 +46,7 @@
 "      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
 "      <arg type=\"o\" name=\"device\"/>\n"
 "      <arg type=\"u\" name=\"passkey\"/>\n"
-"      <arg type=\"y\" name=\"entered\"/>\n"
+"      <arg type=\"q\" name=\"entered\"/>\n"
 "    </method>\n"
 "    <method name=\"RequestConfirmation\">\n"
 "      <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
@@ -62,13 +62,13 @@
 "  </interface>\n"
         "")
 public:
-    explicit AgentAdaptor(QObject *parent);
+    AgentAdaptor(QObject *parent);
     virtual ~AgentAdaptor();
 
 public: // PROPERTIES
 public Q_SLOTS: // METHODS
     void Cancel();
-    void DisplayPasskey(const QDBusObjectPath &device, uint passkey, uchar entered);
+    void DisplayPasskey(const QDBusObjectPath &device, uint passkey, ushort entered);
     void Release();
     void RequestConfirmation(const QDBusObjectPath &device, uint passkey);
     uint RequestPasskey(const QDBusObjectPath &device);

=== modified file 'plugins/bluetooth/bluetooth.cpp'
--- plugins/bluetooth/bluetooth.cpp	2014-09-24 17:09:48 +0000
+++ plugins/bluetooth/bluetooth.cpp	2015-02-05 17:32:38 +0000
@@ -88,22 +88,6 @@
     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:
-        return true;
-
-    default:
-        return false;
-    }
-}
-
 /***
 ****
 ***/
@@ -164,6 +148,10 @@
         case Device::Type::Carkit:
             m_selectedDevice->disconnect(Device::ConnectionMode::Audio);
             break;
+        case Device::Type::Keyboard:
+        case Device::Type::Mouse:
+            m_selectedDevice->disconnect(Device::ConnectionMode::Input);
+            break;
         default:
             qWarning() << "Nothing to disconnect: Unsupported device type.";
             break;
@@ -193,6 +181,10 @@
     case Device::Type::Carkit:
         connMode = Device::ConnectionMode::Audio;
         break;
+    case Device::Type::Keyboard:
+    case Device::Type::Mouse:
+        connMode = Device::ConnectionMode::Input;
+        break;
     default:
         qWarning() << "Nothing to connect: Unsupported device type.";
         return;

=== modified file 'plugins/bluetooth/bluetooth.h'
--- plugins/bluetooth/bluetooth.h	2014-08-28 07:22:28 +0000
+++ plugins/bluetooth/bluetooth.h	2015-02-05 17:32:38 +0000
@@ -81,7 +81,6 @@
     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 'plugins/bluetooth/device.cpp'
--- plugins/bluetooth/device.cpp	2014-08-28 07:22:28 +0000
+++ plugins/bluetooth/device.cpp	2015-02-05 17:32:38 +0000
@@ -59,6 +59,7 @@
     initInterface(m_audioSourceInterface, path, "org.bluez.AudioSource", bus);
     initInterface(m_audioSinkInterface,   path, "org.bluez.AudioSink",   bus);
     initInterface(m_headsetInterface,     path, "org.bluez.Headset",     bus);
+    initInterface(m_inputInterface,       path, "org.bluez.Input",       bus);
 
     Q_EMIT(pathChanged());
 }
@@ -190,6 +191,8 @@
         interface = m_headsetInterface;
     else if (m_audioInterface && (mode == Audio))
         interface = m_audioInterface;
+    else if (m_inputInterface && (mode == Input))
+        interface = m_inputInterface;
     else {
         qWarning() << "Unhandled connection mode" << mode;
         return;
@@ -206,6 +209,8 @@
         interface = m_headsetInterface;
     else if (m_audioInterface && (mode == Audio))
         interface = m_audioInterface;
+    else if (m_inputInterface && (mode == Input))
+        interface = m_inputInterface;
     else {
         qWarning() << "Unhandled connection mode" << mode;
         return;

=== modified file 'plugins/bluetooth/device.h'
--- plugins/bluetooth/device.h	2014-08-11 09:32:31 +0000
+++ plugins/bluetooth/device.h	2015-02-05 17:32:38 +0000
@@ -125,6 +125,7 @@
     QSharedPointer<QDBusInterface> m_audioSourceInterface;
     QSharedPointer<QDBusInterface> m_audioSinkInterface;
     QSharedPointer<QDBusInterface> m_headsetInterface;
+    QSharedPointer<QDBusInterface> m_inputInterface;
     QList<ConnectionMode> m_connectAfterPairing;
 
   protected:

=== modified file 'tests/plugins/bluetooth/tst_bluetooth.cpp'
--- tests/plugins/bluetooth/tst_bluetooth.cpp	2014-08-20 12:50:09 +0000
+++ tests/plugins/bluetooth/tst_bluetooth.cpp	2015-02-05 17:32:38 +0000
@@ -42,7 +42,6 @@
     void testStartDiscovery();
     void testStopDiscovery();
     void testToggleDiscovery();
-    void testIsSupportedType();
     void testIsDiscovering();
     void cleanup();
 
@@ -142,13 +141,6 @@
     QCOMPARE(result.toBool(), false);
 }
 
-void BluetoothTest::testIsSupportedType()
-{
-    QCOMPARE(Bluetooth::isSupportedType(Device::Type::Headset), true);
-    QCOMPARE(Bluetooth::isSupportedType(Device::Type::Mouse), false);
-    QCOMPARE(Bluetooth::isSupportedType(Device::Type::Tablet), false);
-}
-
 void BluetoothTest::testIsDiscovering()
 {
     m_bluetooth->stopDiscovery();