[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=d69cdce

The following commit has been merged in the master branch:
commit d69cdce4c11f81384cf73a0ea23a194e06d8ef8f
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Dec 6 02:12:29 2015 +0100

    Make sure incoming Lan pair packages are processed by the LanPairHandler
---
 core/backends/lan/landevicelink.cpp   |  3 ++-
 core/backends/lan/lanlinkprovider.cpp | 13 +++++++++++++
 core/backends/lan/lanlinkprovider.h   |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
index 44f2817..03e7ad1 100644
--- a/core/backends/lan/landevicelink.cpp
+++ b/core/backends/lan/landevicelink.cpp
@@ -95,7 +95,8 @@ void LanDeviceLink::dataReceived()
 
     if (package.type() == PACKAGE_TYPE_PAIR) {
         //TODO: Handle pair/unpair requests and forward them (to the pairing handler?)
-        //qobject_cast<LanLinkProvider*>(provider())->incomingPairRequest(deviceId());
+        qobject_cast<LanLinkProvider*>(provider())->incomingPairPackage(this, package);
+        return;
     }
 
     if (!package.isEncrypted()) {
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index d726c4a..2eef152 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -476,3 +476,16 @@ void LanLinkProvider::refreshPairingHandler(const QString& deviceId) {
         connect(ph, &LanPairingHandler::pairingError, link, &DeviceLink::pairingError);
     }
 }
+
+void LanLinkProvider::incomingPairPackage(DeviceLink* device, const NetworkPackage& np)
+{
+    const QString deviceId = device->deviceId();
+    LanPairingHandler* ph = mPairingHandlers.value(deviceId);
+    if (!ph) {
+        ph = new LanPairingHandler(deviceId);
+        mPairingHandlers[deviceId] = ph;
+        refreshPairingHandler(deviceId);
+    }
+
+    ph->packageReceived(np);
+}
diff --git a/core/backends/lan/lanlinkprovider.h b/core/backends/lan/lanlinkprovider.h
index aff0d19..40e6afc 100644
--- a/core/backends/lan/lanlinkprovider.h
+++ b/core/backends/lan/lanlinkprovider.h
@@ -45,6 +45,7 @@ public:
     int priority() override { return PRIORITY_HIGH; }
 
     void userRequestsPair(const QString &deviceId);
+    void incomingPairPackage(DeviceLink* device, const NetworkPackage& np);
 
 public Q_SLOTS:
     virtual void onNetworkChange() override;

-- 
kdeconnect packaging