Merge lp:~rsalveti/ubuntu-system-settings/agent-rework-rtm into lp:ubuntu-system-settings/rtm-14.09

[Ricardo Salveti]

Make an adapter-wide agent available for pairing requests initiated from a remote device. (LP: #1366061)

Make an adapter-wide agent available for pairing requests initiated from a remote device. (LP: #1366061)

Backport of: https://code.launchpad.net/~mathieu-tl/ubuntu-system-settings/agent-rework/+merge/250889

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:998
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/69
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/69/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/47
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18415

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

I can confirm the built packages in silo 14 finally let me use my car's HFP \o/

It did not connect straight away after pairing, but subsequent connections worked fine.

review: Approve (functional)

=== modified file 'plugins/bluetooth/bluetooth.cpp'
--- plugins/bluetooth/bluetooth.cpp	2014-09-24 17:09:48 +0000
+++ plugins/bluetooth/bluetooth.cpp	2015-02-27 05:55:36 +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 |
@@ -202,7 +202,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-27 05:55:36 +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:10:24 +0000
+++ plugins/bluetooth/devicemodel.cpp	2015-02-27 05:55:36 +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-27 05:55:36 +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();