[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=13dcd01

The following commit has been merged in the master branch:
commit 13dcd01819da08dde21b545be8bb27a90c43a2aa
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Mon Sep 9 22:50:27 2013 +0200

    Added some comments and todos
---
 kded/backends/lan/CMakeLists.txt              |  2 +-
 kded/backends/loopback/CMakeLists.txt         |  2 +-
 kded/backends/loopback/loopbackdevicelink.cpp |  3 +--
 kded/networkpackage.cpp                       | 13 ++++++++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/kded/backends/lan/CMakeLists.txt b/kded/backends/lan/CMakeLists.txt
index d30d8a0..599675a 100644
--- a/kded/backends/lan/CMakeLists.txt
+++ b/kded/backends/lan/CMakeLists.txt
@@ -7,4 +7,4 @@ set(kded_kdeconnect_SRCS
     #landevicelinktransfer.cpp
 
     PARENT_SCOPE
-)
\ No newline at end of file
+)
diff --git a/kded/backends/loopback/CMakeLists.txt b/kded/backends/loopback/CMakeLists.txt
index 0fe90a7..26beff0 100644
--- a/kded/backends/loopback/CMakeLists.txt
+++ b/kded/backends/loopback/CMakeLists.txt
@@ -6,4 +6,4 @@ set(kded_kdeconnect_SRCS
     backends/loopback/loopbackdevicelink.cpp
 
     PARENT_SCOPE
-)
\ No newline at end of file
+)
diff --git a/kded/backends/loopback/loopbackdevicelink.cpp b/kded/backends/loopback/loopbackdevicelink.cpp
index 737e93c..defbbef 100644
--- a/kded/backends/loopback/loopbackdevicelink.cpp
+++ b/kded/backends/loopback/loopbackdevicelink.cpp
@@ -30,12 +30,11 @@ LoopbackDeviceLink::LoopbackDeviceLink(const QString& deviceId, LoopbackLinkProv
 
 bool LoopbackDeviceLink::sendPackage(const NetworkPackage& input)
 {
-    qDebug() << "loopbacksendpackage";
     NetworkPackage output("");
     NetworkPackage::unserialize(input.serialize(), &output);
 
+    //LoopbackDeviceLink does not need deviceTransferInfo
     if (input.hasPayload()) {
-        //Loopback does not need payloadTransferInfo
         QIODevice* device = input.payload();
         device->open(QIODevice::ReadOnly);
         output.setPayload(device);
diff --git a/kded/networkpackage.cpp b/kded/networkpackage.cpp
index a485b85..b82e070 100644
--- a/kded/networkpackage.cpp
+++ b/kded/networkpackage.cpp
@@ -44,7 +44,6 @@ NetworkPackage::NetworkPackage(const QString& type)
     mPayload = 0;
 }
 
-
 void NetworkPackage::createIdentityPackage(NetworkPackage* np)
 {
     KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnectrc");
@@ -69,6 +68,7 @@ QByteArray NetworkPackage::serialize() const
     QVariantMap variant = QJson::QObjectHelper::qobject2qvariant(this);
 
     if (hasPayload()) {
+        //qDebug() << "Serializing payloadTransferInfo";
         variant["payloadTransferInfo"] = mPayloadTransferInfo;
     }
 
@@ -103,6 +103,7 @@ bool NetworkPackage::unserialize(const QByteArray& a, NetworkPackage* np)
     QJson::QObjectHelper::qvariant2qobject(variant,np);
 
     if (variant.contains("payloadTransferInfo")) {
+        //qDebug() << "Unserializing payloadTransferInfo";
         np->mPayloadTransferInfo = variant["payloadTransferInfo"].toMap();
     }
 
@@ -110,9 +111,10 @@ bool NetworkPackage::unserialize(const QByteArray& a, NetworkPackage* np)
 
 }
 
-void NetworkPackage::encrypt (QCA::PublicKey& key)
+void NetworkPackage::encrypt(QCA::PublicKey& key)
 {
 
+    //TODO: Implement payload encryption somehow (create an intermediate iodevice to encrypt the payload here?)
     QByteArray serialized = serialize();
 
     int chunkSize = key.maximumEncryptSize(NetworkPackage::EncryptionAlgorithm);
@@ -134,8 +136,9 @@ void NetworkPackage::encrypt (QCA::PublicKey& key)
 
 }
 
-bool NetworkPackage::decrypt (QCA::PrivateKey& key, NetworkPackage* out) const
+bool NetworkPackage::decrypt(QCA::PrivateKey& key, NetworkPackage* out) const
 {
+
     const QStringList& chunks = mBody["data"].toStringList();
 
     QByteArray decryptedJson;
@@ -147,7 +150,11 @@ bool NetworkPackage::decrypt (QCA::PrivateKey& key, NetworkPackage* out) const
             return false;
         }
         decryptedJson.append(decryptedChunk.toByteArray());
+    }
 
+    //TODO: Implement payload encryption somehow (create an intermediate iodevice to decrypt the payload here?)
+    if (hasPayload()) {
+        out->setPayload(mPayload);
     }
 
     return unserialize(decryptedJson, out);

-- 
kdeconnect packaging