[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=8f9fde8

The following commit has been merged in the master branch:
commit 8f9fde8f40210dbd9f9b42991c91cb2fa43e381e
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Wed Mar 2 16:38:03 2016 -0800

    Fixed crash when pairing old Android apps.
---
 core/backends/lan/landevicelink.cpp   | 5 +++++
 core/backends/lan/lanlinkprovider.cpp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
index 50c8dcb..324cd18 100644
--- a/core/backends/lan/landevicelink.cpp
+++ b/core/backends/lan/landevicelink.cpp
@@ -140,6 +140,11 @@ void LanDeviceLink::userRequestsUnpair()
 
 void LanDeviceLink::setPairStatus(PairStatus status)
 {
+    if (status == Paired && mSocketLineReader->peerCertificate().isNull()) {
+        Q_EMIT pairingError(i18n("This device can't be paired because is running an old version of KDE Connect."));
+        return;
+    }
+
     DeviceLink::setPairStatus(status);
     if (status == Paired) {
         Q_ASSERT(KdeConnectConfig::instance()->trustedDevices().contains(deviceId()));
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index 9389f89..4e63013 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -235,7 +235,7 @@ void LanLinkProvider::connected()
             return; // Return statement prevents from deleting received package, needed in slot "encrypted"
         } else {
             qWarning() << "Incompatible protocol version, this won't work";
-            addLink(deviceId, socket, receivedPackage, LanDeviceLink::Remotely);
+            //addLink(deviceId, socket, receivedPackage, LanDeviceLink::Remotely);
         }
 
     } else {

-- 
kdeconnect packaging