[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=945da8a

The following commit has been merged in the master branch:
commit 945da8a84f9c0a99a6874a02ffb54bd24afaa1ff
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Dec 10 17:12:08 2015 -0800

    Removed encrypted package type define
---
 core/networkpackage.cpp    | 8 ++++----
 core/networkpackage.h      | 2 +-
 core/networkpackagetypes.h | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/networkpackage.cpp b/core/networkpackage.cpp
index f56929f..9fa850c 100644
--- a/core/networkpackage.cpp
+++ b/core/networkpackage.cpp
@@ -98,9 +98,9 @@ QByteArray NetworkPackage::serialize() const
     if (json.isEmpty()) {
         qCDebug(KDECONNECT_CORE) << "Serialization error:";
     } else {
-        if (!isEncrypted()) {
+        /*if (!isEncrypted()) {
             //qCDebug(KDECONNECT_CORE) << "Serialized package:" << json;
-        }
+        }*/
         json.append('
');
     }
 
@@ -138,9 +138,9 @@ bool NetworkPackage::unserialize(const QByteArray& a, NetworkPackage* np)
     auto variant = parser.toVariant().toMap();
     qvariant2qobject(variant, np);
 
-    if (!np->isEncrypted()) {
+    /*if (!np->isEncrypted()) {
         //qCDebug(KDECONNECT_CORE) << "Unserialized: " << a;
-    }
+    }*/
 
     np->mPayloadSize = variant["payloadSize"].toInt(); //Will return 0 if was not present, which is ok
     if (np->mPayloadSize == -1) {
diff --git a/core/networkpackage.h b/core/networkpackage.h
index a73448d..60a5f79 100644
--- a/core/networkpackage.h
+++ b/core/networkpackage.h
@@ -59,7 +59,7 @@ public:
 
     //void encrypt(QCA::PublicKey& key);
     //bool decrypt(QCA::PrivateKey& key, NetworkPackage* out) const;
-    bool isEncrypted() const { return mType == PACKAGE_TYPE_ENCRYPTED; }
+    //bool isEncrypted() const { return mType == PACKAGE_TYPE_ENCRYPTED; }
 
     const QString& id() const { return mId; }
     const QString& type() const { return mType; }
diff --git a/core/networkpackagetypes.h b/core/networkpackagetypes.h
index 19d4dec..02f0e8b 100644
--- a/core/networkpackagetypes.h
+++ b/core/networkpackagetypes.h
@@ -24,6 +24,5 @@
 #define PACKAGE_TYPE_IDENTITY QLatin1String("kdeconnect.identity")
 #define PACKAGE_TYPE_PAIR QLatin1String("kdeconnect.pair")
 #define PACKAGE_TYPE_CAPABILITIES QLatin1String("kdeconnect.capabilities")
-#define PACKAGE_TYPE_ENCRYPTED QLatin1String("kdeconnect.encrypted")
 
 #endif // NETWORKPACKAGETYPES_H

-- 
kdeconnect packaging