[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=20e4641

The following commit has been merged in the master branch:
commit 20e46418babef734d22c0a1aff08f059f2ece962
Author: Vineet Garg <grg.vineet at gmail.com>
Date:   Sat Jul 18 18:54:10 2015 +0530

    Encryption info in cli
---
 cli/CMakeLists.txt                    | 2 +-
 cli/kdeconnect-cli.cpp                | 8 ++++++++
 core/backends/lan/lanlinkprovider.cpp | 2 +-
 core/device.cpp                       | 2 +-
 core/device.h                         | 1 +
 core/kdeconnectconfig.cpp             | 3 +--
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index 7ddf635..bc11e46 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 add_executable(kdeconnect-cli kdeconnect-cli.cpp)
 
-target_link_libraries(kdeconnect-cli kdeconnectinterfaces KF5::CoreAddons KF5::I18n)
+target_link_libraries(kdeconnect-cli kdeconnectinterfaces Qt5::Network KF5::CoreAddons KF5::I18n)
 
 install(TARGETS kdeconnect-cli ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp
index 3aa49e5..d0a95cd 100644
--- a/cli/kdeconnect-cli.cpp
+++ b/cli/kdeconnect-cli.cpp
@@ -21,6 +21,7 @@
 #include <QDBusMessage>
 #include <QDBusConnection>
 #include <QCoreApplication>
+#include <QSslCertificate>
 #include <QTextStream>
 
 #include <KAboutData>
@@ -56,6 +57,7 @@ int main(int argc, char** argv)
     parser.addOption(QCommandLineOption("share", i18n("Share a file to a said device"), "path"));
     parser.addOption(QCommandLineOption("list-notifications", i18n("Display the notifications on a said device")));
     parser.addOption(QCommandLineOption(QStringList("device") << "d", i18n("Device ID"), "dev"));
+    parser.addOption(QCommandLineOption("encryption-info", i18n("Get encryption info about said device")));
     about.setupCommandLine(&parser);
 
     parser.addHelpOption();
@@ -145,6 +147,12 @@ int main(int argc, char** argv)
                 QTextStream(stdout) << "- " << idx.data(NotificationsModel::AppNameModelRole).toString()
                     << ": " << idx.data(NotificationsModel::NameModelRole).toString() << endl;
             }
+        } else if(parser.isSet("encryption-info")) {
+            QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+device, "org.kde.kdeconnect.device", "certificate");
+            msg.setArguments(QVariantList() << QSsl::Pem);
+            QDBusMessage reply = QDBusConnection::sessionBus().call(msg);
+            QSslCertificate certificate = QSslCertificate::fromData(reply.arguments().first().toByteArray()).first();
+	        QTextStream(stderr) << certificate.toText() << endl;
         } else {
             QTextStream(stderr) << i18n("Nothing to be done") << endl;
         }
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index eeae140..bfab268 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -66,7 +66,7 @@ LanLinkProvider::LanLinkProvider()
 
 LanLinkProvider::~LanLinkProvider()
 {
-
+    delete m_pairingHandler;
 }
 
 void LanLinkProvider::onStart()
diff --git a/core/device.cpp b/core/device.cpp
index d668d29..327edfe 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -469,7 +469,7 @@ void Device::setAsPaired()
     m_pairingTimeout.stop(); //Just in case it was started
 
     //Save device info in the config
-    KdeConnectConfig::instance()->addTrustedDevice(id(), name(), type2str(m_deviceType), m_publicKey.toPEM(), QString(m_certificate.toPem()));
+    KdeConnectConfig::instance()->addTrustedDevice(id(), name(), type2str(m_deviceType), m_publicKey.toPEM(), QString::fromLatin1(m_certificate.toPem()));
 
     reloadPlugins(); //Will actually load the plugins
 
diff --git a/core/device.h b/core/device.h
index 09ccfce..5d738c1 100644
--- a/core/device.h
+++ b/core/device.h
@@ -87,6 +87,7 @@ public:
     QString type() const { return type2str(m_deviceType); }
     QCA::PublicKey publicKey() const { return m_publicKey; }
     QSslCertificate certificate() const { return m_certificate; }
+    Q_SCRIPTABLE QByteArray certificate(int format) const { return (format == QSsl::Pem) ? m_certificate.toPem() : m_certificate.toDer() ;} // To expose certificate through dbus
     QString iconName() const;
     QString statusIconName() const;
 
diff --git a/core/kdeconnectconfig.cpp b/core/kdeconnectconfig.cpp
index c2f8e05..7f0bf3e 100644
--- a/core/kdeconnectconfig.cpp
+++ b/core/kdeconnectconfig.cpp
@@ -112,8 +112,7 @@ KdeConnectConfig::KdeConnectConfig()
     QFile cert(certPath);
     if (cert.exists() && cert.open(QIODevice::ReadOnly)) {
 
-//        d->certificate = QCA::Certificate::fromPEMFile(certPath);
-        d->certificate = QSslCertificate::fromPath(certPath).value(0);
+        d->certificate = QSslCertificate::fromPath(certPath).first();
 
     } else {
 

-- 
kdeconnect packaging