[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=af43a21

The following commit has been merged in the master branch:
commit af43a21864c2c3f2118b07bec01dd1f6f7c313db
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Dec 17 06:53:29 2015 -0800

    Propagate pairingError
---
 core/backends/lan/lanlinkprovider.cpp | 23 +++++++++++------------
 core/backends/lan/lanlinkprovider.h   |  3 ++-
 core/device.cpp                       |  9 +++++++++
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index 504dff9..aab269c 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -460,28 +460,27 @@ void LanLinkProvider::addLink(const QString& deviceId, QSslSocket* socket, Netwo
 
 }
 
-void LanLinkProvider::userRequestsPair(const QString& deviceId)
+LanPairingHandler* LanLinkProvider::createPairingHandler(DeviceLink* link)
 {
-    LanPairingHandler* ph = mPairingHandlers.value(deviceId);
+    LanPairingHandler* ph = mPairingHandlers.value(link->deviceId());
     if (!ph) {
-        LanDeviceLink* link = mLinks.value(deviceId);
-        qDebug() << "Creating LanPairingHandler with link " << link;
         ph = new LanPairingHandler(link);
-        mPairingHandlers[deviceId] = ph;
+        qDebug() << "creating pairing handler for" << link->deviceId();
+        connect (ph, &LanPairingHandler::pairingError, link, &DeviceLink::pairingError);
+        mPairingHandlers[link->deviceId()] = ph;
     }
+    return ph;
+}
 
+void LanLinkProvider::userRequestsPair(const QString& deviceId)
+{
+    LanPairingHandler* ph = createPairingHandler(mLinks.value(deviceId));
     ph->requestPairing();
 }
 
 void LanLinkProvider::incomingPairPackage(DeviceLink* deviceLink, const NetworkPackage& np)
 {
-    const QString deviceId = deviceLink->deviceId();
-    LanPairingHandler* ph = mPairingHandlers.value(deviceId);
-    if (!ph) {
-        ph = new LanPairingHandler(deviceLink);
-        mPairingHandlers[deviceId] = ph;
-    }
-
+    LanPairingHandler* ph = createPairingHandler(deviceLink);
     ph->packageReceived(np);
 }
 
diff --git a/core/backends/lan/lanlinkprovider.h b/core/backends/lan/lanlinkprovider.h
index db82e63..42bcb68 100644
--- a/core/backends/lan/lanlinkprovider.h
+++ b/core/backends/lan/lanlinkprovider.h
@@ -64,9 +64,10 @@ private Q_SLOTS:
 
 private:
     static void configureSocket(QSslSocket* socket);
+    LanPairingHandler* createPairingHandler(DeviceLink* link);
+
     void onNetworkConfigurationChanged(const QNetworkConfiguration &config);
     void addLink(const QString& deviceId, QSslSocket* socket, NetworkPackage* receivedPackage, DeviceLink::ConnectionStarted connectionOrigin);
-    void refreshPairingHandler(const QString &deviceId);
 
     Server* mServer;
     QUdpSocket* mUdpServer;
diff --git a/core/device.cpp b/core/device.cpp
index afeff20..1074c03 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -47,6 +47,11 @@
 
 Q_LOGGING_CATEGORY(KDECONNECT_CORE, "kdeconnect.core")
 
+static void warn(const QString &info)
+{
+    qWarning() << "Device pairing error" << info;
+}
+
 Device::Device(QObject* parent, const QString& id)
     : QObject(parent)
     , m_deviceId(id)
@@ -59,6 +64,8 @@ Device::Device(QObject* parent, const QString& id)
 
     //Register in bus
     QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
+
+    connect(this, &Device::pairingError, this, &warn);
 }
 
 Device::Device(QObject* parent, const NetworkPackage& identityPackage, DeviceLink* dl)
@@ -72,6 +79,8 @@ Device::Device(QObject* parent, const NetworkPackage& identityPackage, DeviceLin
 
     //Register in bus
     QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
+
+    connect(this, &Device::pairingError, this, &warn);
 }
 
 Device::~Device()

-- 
kdeconnect packaging