[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=79a55d8

The following commit has been merged in the master branch:
commit 79a55d8ec0fb364659a6a0db819c7da516b604d2
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Wed Sep 18 18:35:50 2013 +0200

    Fixed landevice link not setting the payload to the proper package
    
    Wrong variable name
---
 kded/backends/lan/landevicelink.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/kded/backends/lan/landevicelink.cpp b/kded/backends/lan/landevicelink.cpp
index ac764d8..1b159c2 100644
--- a/kded/backends/lan/landevicelink.cpp
+++ b/kded/backends/lan/landevicelink.cpp
@@ -89,29 +89,31 @@ void LanDeviceLink::dataReceived()
 
         if (package.length() < 3) continue;
 
-        NetworkPackage np(QString::null);
-        NetworkPackage::unserialize(package, &np);
-        if (np.type() == PACKAGE_TYPE_ENCRYPTED) {
-
-            if (mPrivateKey.isNull()) {
-                //TODO: Emit the problem?
-                return;
-            }
+        NetworkPackage unserialized(QString::null);
+        NetworkPackage::unserialize(package, &unserialized);
+        if (unserialized.isEncrypted()) {
 
+            //mPrivateKey should always be set when device link is added to device, no null-checking done here
             NetworkPackage decrypted(QString::null);
-            np.decrypt(mPrivateKey, &decrypted);
+            unserialized.decrypt(mPrivateKey, &decrypted);
 
-            if (np.hasPayloadTransferInfo()) {
-                DownloadJob* job = new DownloadJob(mSocket->peerAddress(), np.payloadTransferInfo());
+            if (decrypted.hasPayloadTransferInfo()) {
+                qDebug() << "HasPayloadTransferInfo";
+                DownloadJob* job = new DownloadJob(mSocket->peerAddress(), decrypted.payloadTransferInfo());
                 job->start();
-                np.setPayload(job->getPayload());
+                decrypted.setPayload(job->getPayload());
             }
 
             Q_EMIT receivedPackage(decrypted);
 
         } else {
 
-            Q_EMIT receivedPackage(np);
+            if (unserialized.hasPayloadTransferInfo()) {
+                //Lets ignore unencrypted payloads
+            }
+
+
+            Q_EMIT receivedPackage(unserialized);
 
         }
 

-- 
kdeconnect packaging