From 4b7c5fb85a6e74b2e8dbef5a8bb15804ecd025a9 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Wed, 6 Jul 2016 18:43:41 +0200
Subject: [PATCH] Fixed loopback link

---
 .../Backends/BasePairingHandler.java          |  2 -
 .../LanBackend/LanPairingHandler.java         |  4 +-
 .../LoopbackPairingHandler.java               | 40 +++++++++++++++++--
 src/org/kde/kdeconnect/BackgroundService.java | 10 +----
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/org/kde/kdeconnect/Backends/BasePairingHandler.java b/src/org/kde/kdeconnect/Backends/BasePairingHandler.java
index 902bb1d2..ee54ee71 100644
--- a/src/org/kde/kdeconnect/Backends/BasePairingHandler.java
+++ b/src/org/kde/kdeconnect/Backends/BasePairingHandler.java
@@ -81,12 +81,10 @@ public abstract class BasePairingHandler {
     }
 
     /* To be implemented by respective pairing handler */
-    public abstract NetworkPackage createPairPackage();
     public abstract void packageReceived(NetworkPackage np) throws Exception;
     public abstract void requestPairing();
     public abstract void acceptPairing();
     public abstract void rejectPairing();
-    public abstract void pairingDone();
     public abstract void unpair();
 
 }
diff --git a/src/org/kde/kdeconnect/Backends/LanBackend/LanPairingHandler.java b/src/org/kde/kdeconnect/Backends/LanBackend/LanPairingHandler.java
index 34bed62d..605d63c8 100644
--- a/src/org/kde/kdeconnect/Backends/LanBackend/LanPairingHandler.java
+++ b/src/org/kde/kdeconnect/Backends/LanBackend/LanPairingHandler.java
@@ -49,8 +49,7 @@ public class LanPairingHandler extends BasePairingHandler {
         }
     }
 
-    @Override
-    public NetworkPackage createPairPackage() {
+    private NetworkPackage createPairPackage() {
         NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_PAIR);
         np.set("pair", true);
         SharedPreferences globalSettings = PreferenceManager.getDefaultSharedPreferences(mDevice.getContext());
@@ -196,7 +195,6 @@ public class LanPairingHandler extends BasePairingHandler {
         mDevice.sendPackage(np);
     }
 
-    @Override
     public void pairingDone() {
         // Store device information needed to create a Device object in a future
         //Log.e("KDE/PairingDone", "Pairing Done");
diff --git a/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackPairingHandler.java b/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackPairingHandler.java
index 7b0c2d30..154429f8 100644
--- a/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackPairingHandler.java
+++ b/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackPairingHandler.java
@@ -20,13 +20,45 @@
 
 package org.kde.kdeconnect.Backends.LoopbackBackend;
 
-import org.kde.kdeconnect.Backends.LanBackend.LanPairingHandler;
-import org.kde.kdeconnect.Device;
+import android.util.Log;
 
-public class LoopbackPairingHandler extends LanPairingHandler{
+import org.kde.kdeconnect.Backends.BasePairingHandler;
+import org.kde.kdeconnect.Device;
+import org.kde.kdeconnect.NetworkPackage;
+
+public class LoopbackPairingHandler extends BasePairingHandler {
 
     public LoopbackPairingHandler(Device device, PairingHandlerCallback callback) {
         super(device, callback);
     }
-    // Extending from LanPairingHandler, as it is similar to it
+
+    @Override
+    public void packageReceived(NetworkPackage np) throws Exception {
+
+    }
+
+    @Override
+    public void requestPairing() {
+        Log.i("LoopbackPairing", "requestPairing");
+        mCallback.pairingDone();
+    }
+
+    @Override
+    public void acceptPairing() {
+        Log.i("LoopbackPairing", "acceptPairing");
+        mCallback.pairingDone();
+    }
+
+    @Override
+    public void rejectPairing() {
+        Log.i("LoopbackPairing", "rejectPairing");
+        mCallback.unpaired();
+    }
+
+    @Override
+    public void unpair() {
+        Log.i("LoopbackPairing", "unpair");
+        mCallback.unpaired();
+    }
+
 }
diff --git a/src/org/kde/kdeconnect/BackgroundService.java b/src/org/kde/kdeconnect/BackgroundService.java
index 051f76fe..af35b1f5 100644
--- a/src/org/kde/kdeconnect/BackgroundService.java
+++ b/src/org/kde/kdeconnect/BackgroundService.java
@@ -142,15 +142,9 @@ public class BackgroundService extends Service {
 
     private void registerLinkProviders() {
 
-        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
+        //linkProviders.add(new LoopbackLinkProvider(this));
 
-        //if (settings.getBoolean("loopback_link", true)) {
-        //    linkProviders.add(new LoopbackLinkProvider(this));
-        //}
-
-        if (settings.getBoolean("lan_link", true)) {
-            linkProviders.add(new LanLinkProvider(this));
-        }
+        linkProviders.add(new LanLinkProvider(this));
 
     }