Merge lp:~cyphermox/ubuntu-system-settings/agent-rework into lp:ubuntu-system-settings

[Sebastien Bacher]

register an agent on the adapter as well, that's needed for pairing initiated by the other side (in which case no device is selected in the settings which means not device agent is created)

[Sebastien Bacher (seb128)]

urg, sorry Mathieu, I tried to rebase on trunk and by mistake wiped out the previous version with the earlier review comments... going to test the CI build on that one when it shows up and comment back today though

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1337
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mathieu-tl/ubuntu-system-settings/agent-rework/+merge/250889/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2002/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1516
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1514
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1514/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18328

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Works great, tested on a bluetooth audio receiver (that requires no input), a displaypasskey keyboard and a car with pin confirmation, they all work without issue!

review: Approve

[Ricardo Salveti (rsalveti)]

Works great.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-23 19:58:56 +0000
+++ debian/changelog	2015-02-25 08:41:15 +0000
@@ -1,3 +1,10 @@
+ubuntu-system-settings (0.3+15.04.20150223-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Make an adapter-wide agent available for pairing requests initiated from
+    a remote device. (LP: #1366061)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 24 Feb 2015 13:39:09 -0500
+
 ubuntu-system-settings (0.3+15.04.20150223-0ubuntu1) vivid; urgency=medium
 
   [ Leo Arias ]

=== modified file 'plugins/bluetooth/bluetooth.cpp'
--- plugins/bluetooth/bluetooth.cpp	2015-02-10 11:19:53 +0000
+++ plugins/bluetooth/bluetooth.cpp	2015-02-25 08:41:15 +0000
@@ -39,8 +39,8 @@
 {
     // export our Agent to handle pairing requests
     new AgentAdaptor(&m_agent);
-    if(!m_dbus.registerObject(DBUS_AGENT_PATH, &m_agent))
-        qCritical() << "Couldn't register agent at" << DBUS_AGENT_PATH;
+    if(!m_dbus.registerObject(DBUS_ADAPTER_AGENT_PATH, &m_agent))
+        qCritical() << "Couldn't register agent at" << DBUS_ADAPTER_AGENT_PATH;
 
     m_connectedDevices.filterOnConnections(Device::Connection::Connected |
                                            Device::Connection::Connecting |
@@ -212,7 +212,7 @@
         device->connect(connMode);
     } else {
         m_devices.addConnectAfterPairing(address, connMode);
-        m_devices.createDevice(address);
+        m_devices.createDevice(address, &m_agent);
     }
 }
 

=== modified file 'plugins/bluetooth/dbus-shared.h'
--- plugins/bluetooth/dbus-shared.h	2013-09-23 02:55:58 +0000
+++ plugins/bluetooth/dbus-shared.h	2015-02-25 08:41:15 +0000
@@ -21,6 +21,7 @@
 #define USS_DBUS_SHARED_H
 
 #define DBUS_AGENT_PATH "/com/canonical/SettingsBluetoothAgent"
+#define DBUS_ADAPTER_AGENT_PATH "/com/canonical/SettingsBluetoothAgent/adapteragent"
 #define DBUS_AGENT_CAPABILITY "DisplayYesNo"
 
 #endif // USS_DBUS_SHARED_H

=== modified file 'plugins/bluetooth/devicemodel.cpp'
--- plugins/bluetooth/devicemodel.cpp	2015-02-18 15:13:40 +0000
+++ plugins/bluetooth/devicemodel.cpp	2015-02-25 08:41:15 +0000
@@ -194,6 +194,12 @@
         connect(&m_discoverableTimer, SIGNAL(timeout()), this, SLOT(slotEnableDiscoverable()));
         m_discoverableTimer.start(1000);
 
+        // With the agent registered on the bus, make it known by the adapter
+        QDBusReply<void > reply = m_bluezAdapter->call("RegisterAgent",
+                                                       qVariantFromValue(QDBusObjectPath(DBUS_ADAPTER_AGENT_PATH)),
+                                                       QString(DBUS_AGENT_CAPABILITY));
+        if (!reply.isValid())
+                qWarning() << "Error registering agent for the default adapter:" << reply.error();
     }
 }
 
@@ -462,12 +468,20 @@
     call->deleteLater();
 }
 
-void DeviceModel::createDevice (const QString &address)
+void DeviceModel::createDevice (const QString &address, QObject *agent)
 {
     if (m_bluezAdapter) {
+        QString agent_path(DBUS_AGENT_PATH);
+        agent_path.append("/");
+        agent_path.append(address);
+        agent_path.replace(":", "_");
+
+        if(!m_dbus.registerObject(agent_path, agent))
+            qCritical() << "Couldn't register agent at" << agent_path;
+
         QDBusPendingCall pcall = m_bluezAdapter->asyncCall("CreatePairedDevice",
                                                            address,
-                                                           qVariantFromValue(QDBusObjectPath(DBUS_AGENT_PATH)),
+                                                           qVariantFromValue(QDBusObjectPath(agent_path)),
                                                            QString(DBUS_AGENT_CAPABILITY));
 
         QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);

=== modified file 'plugins/bluetooth/devicemodel.h'
--- plugins/bluetooth/devicemodel.h	2014-08-11 09:18:12 +0000
+++ plugins/bluetooth/devicemodel.h	2015-02-25 08:41:15 +0000
@@ -69,7 +69,7 @@
     bool isDiscovering() const { return m_isDiscovering; }
     bool isDiscoverable() const { return m_isDiscoverable; }
     void addConnectAfterPairing(const QString &address, Device::ConnectionMode mode);
-    void createDevice(const QString &address);
+    void createDevice(const QString &address, QObject *agent);
     void removeDevice(const QString &path);
     void stopDiscovery();
     void startDiscovery();