[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=6fe1399

The following commit has been merged in the master branch:
commit 6fe1399a18788664f127084dcfa2e90c8c0d4159
Author: Vineet Garg <grgvineet at gmail.com>
Date:   Thu Aug 13 14:56:28 2015 +0530

    Fixed minor issues in pairing handler
---
 core/backends/lan/landevicelink.h             |  4 ++--
 core/backends/lan/lanpairinghandler.cpp       | 14 +++++++++++---
 core/backends/loopback/loopbackdevicelink.cpp |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/backends/lan/landevicelink.h b/core/backends/lan/landevicelink.h
index 4d59f92..1931ce9 100644
--- a/core/backends/lan/landevicelink.h
+++ b/core/backends/lan/landevicelink.h
@@ -38,9 +38,9 @@ class LanDeviceLink
 public:
     LanDeviceLink(const QString& deviceId, LinkProvider* parent, QSslSocket* socket);
 
-    virtual QString name();
+    virtual QString name() Q_DECL_OVERRIDE;
     void setOnSsl(bool value);
-    virtual PairingHandler* createPairingHandler(Device* device);
+    virtual PairingHandler* createPairingHandler(Device* device) Q_DECL_OVERRIDE;
     bool sendPackage(NetworkPackage& np);
     bool sendPackageEncrypted(QCA::PublicKey& key, NetworkPackage& np);
     UploadJob* sendPayload(NetworkPackage&);
diff --git a/core/backends/lan/lanpairinghandler.cpp b/core/backends/lan/lanpairinghandler.cpp
index fd74d44..794f0ff 100644
--- a/core/backends/lan/lanpairinghandler.cpp
+++ b/core/backends/lan/lanpairinghandler.cpp
@@ -67,11 +67,14 @@ void LanPairingHandler::packageReceived(const NetworkPackage& np)
         if (m_pairStatus == PairStatus ::Requested) {
             m_pairStatus = PairStatus ::NotPaired;
             Q_EMIT pairingFailed(i18n("Canceled by other peer"));
+            return;
         } else if (m_pairStatus == PairStatus ::Paired) {
-            // Auto accept pairing for the link if device is paired
-            acceptPairing();
+            /**
+             * If wants pair is true and is paired is true, this means other device is trying to pair again, might be because it unpaired this device somehow
+             * and we don't know it, unpair it internally
+             */
+            Q_EMIT unpairingDone();
         }
-        return;
     }
 
     if (wantsPair) {
@@ -95,6 +98,11 @@ void LanPairingHandler::packageReceived(const NetworkPackage& np)
         } else {
             qCDebug(KDECONNECT_CORE) << "Pair request";
 
+            if (m_device->isPaired()) {
+                acceptPairing();
+                return;
+            }
+
             Daemon::instance()->requestPairing(m_device);
 
             m_pairStatus = PairStatus ::RequestedByPeer;
diff --git a/core/backends/loopback/loopbackdevicelink.cpp b/core/backends/loopback/loopbackdevicelink.cpp
index b95cffa..b5d181a 100644
--- a/core/backends/loopback/loopbackdevicelink.cpp
+++ b/core/backends/loopback/loopbackdevicelink.cpp
@@ -31,7 +31,7 @@ LoopbackDeviceLink::LoopbackDeviceLink(const QString& deviceId, LoopbackLinkProv
 
 QString LoopbackDeviceLink::name()
 {
-    return "LoopbackDeviceLink";
+    return "LoopbackLink"; // Should be similar to android
 }
 
 PairingHandler* LoopbackDeviceLink::createPairingHandler(Device *device)

-- 
kdeconnect packaging