From 63f0458096024a53a0d5d94a6095a387905ea66e Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Mon, 16 Sep 2013 15:24:21 +0200
Subject: [PATCH 01/22] Refactor to move backend to its own package

Matching kde project structure
---
 KdeConnect/KdeConnect.iml                     |  2 +-
 .../BaseComputerLink.java                     |  3 +-
 .../BaseLinkProvider.java                     |  4 +-
 .../LanBackend}/LanComputerLink.java          |  5 +-
 .../LanBackend}/LanLinkProvider.java          |  4 +-
 .../LoopbackComputerLink.java                 |  8 +--
 .../LoopbackBackend/LoopbackLinkProvider.java | 43 ++++++++++++
 .../org/kde/kdeconnect/BackgroundService.java |  8 +--
 .../main/java/org/kde/kdeconnect/Device.java  |  2 +-
 .../LinkProviders/LoopbackLinkProvider.java   | 65 -------------------
 .../Plugins/MprisPlugin/MprisActivity.java    |  4 +-
 11 files changed, 62 insertions(+), 86 deletions(-)
 rename KdeConnect/src/main/java/org/kde/kdeconnect/{ComputerLinks => Backends}/BaseComputerLink.java (92%)
 rename KdeConnect/src/main/java/org/kde/kdeconnect/{LinkProviders => Backends}/BaseLinkProvider.java (93%)
 rename KdeConnect/src/main/java/org/kde/kdeconnect/{ComputerLinks => Backends/LanBackend}/LanComputerLink.java (85%)
 rename KdeConnect/src/main/java/org/kde/kdeconnect/{LinkProviders => Backends/LanBackend}/LanLinkProvider.java (99%)
 rename KdeConnect/src/main/java/org/kde/kdeconnect/{ComputerLinks => Backends/LoopbackBackend}/LoopbackComputerLink.java (71%)
 create mode 100644 KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
 delete mode 100644 KdeConnect/src/main/java/org/kde/kdeconnect/LinkProviders/LoopbackLinkProvider.java

diff --git a/KdeConnect/KdeConnect.iml b/KdeConnect/KdeConnect.iml
index 2666b857..79344f5d 100644
--- a/KdeConnect/KdeConnect.iml
+++ b/KdeConnect/KdeConnect.iml
@@ -6,7 +6,7 @@
         <option name="SELECTED_BUILD_VARIANT" value="Debug" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="TODO" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/ComputerLinks/BaseComputerLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseComputerLink.java
similarity index 92%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/ComputerLinks/BaseComputerLink.java
rename to KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseComputerLink.java
index 36ffddda..2dc741f7 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/ComputerLinks/BaseComputerLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseComputerLink.java
@@ -1,6 +1,5 @@
-package org.kde.kdeconnect.ComputerLinks;
+package org.kde.kdeconnect.Backends;
 
-import org.kde.kdeconnect.LinkProviders.BaseLinkProvider;
 import org.kde.kdeconnect.NetworkPackage;
 
 import java.util.ArrayList;
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/LinkProviders/BaseLinkProvider.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
similarity index 93%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/LinkProviders/BaseLinkProvider.java
rename to KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
index 21d4f73e..aadd7084 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/LinkProviders/BaseLinkProvider.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
@@ -1,8 +1,8 @@
-package org.kde.kdeconnect.LinkProviders;
+package org.kde.kdeconnect.Backends;
 
 import android.util.Log;
 
-import org.kde.kdeconnect.ComputerLinks.BaseComputerLink;
+import org.kde.kdeconnect.Backends.BaseComputerLink;
 import org.kde.kdeconnect.NetworkPackage;
 
 import java.util.ArrayList;
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/ComputerLinks/LanComputerLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanComputerLink.java
similarity index 85%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/ComputerLinks/LanComputerLink.java
rename to KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanComputerLink.java
index a73ccb6b..ff645604 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/ComputerLinks/LanComputerLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanComputerLink.java
@@ -1,9 +1,10 @@
-package org.kde.kdeconnect.ComputerLinks;
+package org.kde.kdeconnect.Backends.LanBackend;
 
 import android.util.Log;
 
 import org.apache.mina.core.session.IoSession;
-import org.kde.kdeconnect.LinkProviders.BaseLinkProvider;
+import org.kde.kdeconnect.Backends.BaseComputerLink;
+import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.NetworkPackage;
 
 public class LanComputerLink extends BaseComputerLink {
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/LinkProviders/LanLinkProvider.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
similarity index 99%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/LinkProviders/LanLinkProvider.java
rename to KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
index 37c94249..b453e033 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/LinkProviders/LanLinkProvider.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
@@ -1,4 +1,4 @@
-package org.kde.kdeconnect.LinkProviders;
+package org.kde.kdeconnect.Backends.LanBackend;
 
 import android.content.Context;
 import android.os.AsyncTask;
@@ -16,7 +16,7 @@ import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
 import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
 import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
-import org.kde.kdeconnect.ComputerLinks.LanComputerLink;
+import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.NetworkPackage;
 
 import java.net.DatagramPacket;
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/ComputerLinks/LoopbackComputerLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackComputerLink.java
similarity index 71%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/ComputerLinks/LoopbackComputerLink.java
rename to KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackComputerLink.java
index fe43d101..e1baa4a6 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/ComputerLinks/LoopbackComputerLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackComputerLink.java
@@ -1,9 +1,7 @@
-package org.kde.kdeconnect.ComputerLinks;
+package org.kde.kdeconnect.Backends.LoopbackBackend;
 
-import android.util.Log;
-
-import org.apache.mina.core.session.IoSession;
-import org.kde.kdeconnect.LinkProviders.BaseLinkProvider;
+import org.kde.kdeconnect.Backends.BaseComputerLink;
+import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.NetworkPackage;
 
 public class LoopbackComputerLink extends BaseComputerLink {
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
new file mode 100644
index 00000000..9385ab9c
--- /dev/null
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
@@ -0,0 +1,43 @@
+package org.kde.kdeconnect.Backends.LoopbackBackend;
+
+import android.content.Context;
+
+import org.kde.kdeconnect.Backends.BaseLinkProvider;
+import org.kde.kdeconnect.NetworkPackage;
+
+public class LoopbackLinkProvider extends BaseLinkProvider {
+
+    private Context context;
+
+    public LoopbackLinkProvider(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public void onStart() {
+        onNetworkChange();
+    }
+
+    @Override
+    public void onStop() {
+
+    }
+
+    @Override
+    public void onNetworkChange() {
+
+        NetworkPackage np = NetworkPackage.createIdentityPackage(context);
+        connectionAccepted(np, new LoopbackComputerLink(this));
+
+    }
+
+    @Override
+    public int getPriority() {
+        return 0;
+    }
+
+    @Override
+    public String getName() {
+        return "LoopbackLinkProvider";
+    }
+}
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java b/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
index 481b4694..5581fd0e 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
@@ -11,10 +11,10 @@ import android.preference.PreferenceManager;
 import android.util.Base64;
 import android.util.Log;
 
-import org.kde.kdeconnect.ComputerLinks.BaseComputerLink;
-import org.kde.kdeconnect.LinkProviders.BaseLinkProvider;
-import org.kde.kdeconnect.LinkProviders.LanLinkProvider;
-import org.kde.kdeconnect.LinkProviders.LoopbackLinkProvider;
+import org.kde.kdeconnect.Backends.BaseComputerLink;
+import org.kde.kdeconnect.Backends.BaseLinkProvider;
+import org.kde.kdeconnect.Backends.LanBackend.LanLinkProvider;
+import org.kde.kdeconnect.Backends.LoopbackBackend.LoopbackLinkProvider;
 
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
index faef43af..a9e29d3d 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
@@ -15,7 +15,7 @@ import android.support.v4.app.NotificationCompat;
 import android.util.Base64;
 import android.util.Log;
 
-import org.kde.kdeconnect.ComputerLinks.BaseComputerLink;
+import org.kde.kdeconnect.Backends.BaseComputerLink;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect.Plugins.PluginFactory;
 import org.kde.kdeconnect.UserInterface.PairActivity;
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/LinkProviders/LoopbackLinkProvider.java b/KdeConnect/src/main/java/org/kde/kdeconnect/LinkProviders/LoopbackLinkProvider.java
deleted file mode 100644
index 8e7d23f8..00000000
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/LinkProviders/LoopbackLinkProvider.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.kde.kdeconnect.LinkProviders;
-
-import android.content.Context;
-import android.os.AsyncTask;
-import android.util.Log;
-
-import org.apache.mina.core.future.ConnectFuture;
-import org.apache.mina.core.future.IoFuture;
-import org.apache.mina.core.future.IoFutureListener;
-import org.apache.mina.core.service.IoHandler;
-import org.apache.mina.core.service.IoHandlerAdapter;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.mina.filter.codec.textline.LineDelimiter;
-import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
-import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
-import org.apache.mina.transport.socket.nio.NioSocketConnector;
-import org.kde.kdeconnect.ComputerLinks.LanComputerLink;
-import org.kde.kdeconnect.ComputerLinks.LoopbackComputerLink;
-import org.kde.kdeconnect.NetworkPackage;
-
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-
-public class LoopbackLinkProvider extends BaseLinkProvider {
-
-    private Context context;
-
-    public LoopbackLinkProvider(Context context) {
-        this.context = context;
-    }
-
-    @Override
-    public void onStart() {
-        onNetworkChange();
-    }
-
-    @Override
-    public void onStop() {
-
-    }
-
-    @Override
-    public void onNetworkChange() {
-
-        NetworkPackage np = NetworkPackage.createIdentityPackage(context);
-        connectionAccepted(np, new LoopbackComputerLink(this));
-
-    }
-
-    @Override
-    public int getPriority() {
-        return 0;
-    }
-
-    @Override
-    public String getName() {
-        return "LoopbackLinkProvider";
-    }
-}
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
index e2b5e356..b55e00b6 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
@@ -14,9 +14,9 @@ import android.widget.Spinner;
 import android.widget.TextView;
 
 import org.kde.kdeconnect.BackgroundService;
-import org.kde.kdeconnect.ComputerLinks.BaseComputerLink;
+import org.kde.kdeconnect.Backends.BaseComputerLink;
 import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.LinkProviders.BaseLinkProvider;
+import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.NetworkPackage;
 import org.kde.kdeconnect_tp.R;
 

From e735e0ecf372fa75e83b5c08a36e708d283114f6 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Mon, 16 Sep 2013 17:36:26 +0200
Subject: [PATCH 02/22] Moved cryptography layer down from Device to Backend

Matching KDED structure
---
 .../{BaseComputerLink.java => BaseLink.java}  | 18 ++++-
 .../kdeconnect/Backends/BaseLinkProvider.java |  9 ++-
 .../Backends/LanBackend/LanComputerLink.java  | 38 ----------
 .../Backends/LanBackend/LanLink.java          | 70 +++++++++++++++++++
 .../Backends/LanBackend/LanLinkProvider.java  | 16 ++---
 .../LoopbackBackend/LoopbackComputerLink.java | 21 ------
 .../LoopbackBackend/LoopbackLink.java         | 41 +++++++++++
 .../LoopbackBackend/LoopbackLinkProvider.java |  2 +-
 .../org/kde/kdeconnect/BackgroundService.java |  6 +-
 .../main/java/org/kde/kdeconnect/Device.java  | 70 ++++++++-----------
 .../Plugins/MprisPlugin/MprisActivity.java    |  6 +-
 11 files changed, 177 insertions(+), 120 deletions(-)
 rename KdeConnect/src/main/java/org/kde/kdeconnect/Backends/{BaseComputerLink.java => BaseLink.java} (65%)
 delete mode 100644 KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanComputerLink.java
 create mode 100644 KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
 delete mode 100644 KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackComputerLink.java
 create mode 100644 KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseComputerLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLink.java
similarity index 65%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseComputerLink.java
rename to KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLink.java
index 2dc741f7..59d13e8b 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseComputerLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLink.java
@@ -1,17 +1,26 @@
 package org.kde.kdeconnect.Backends;
 
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.util.Base64;
+
 import org.kde.kdeconnect.NetworkPackage;
 
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.ArrayList;
 
 
-public abstract class BaseComputerLink {
+public abstract class BaseLink {
 
     private BaseLinkProvider linkProvider;
     private String deviceId;
     private ArrayList<PackageReceiver> receivers = new ArrayList<PackageReceiver>();
+    protected PrivateKey privateKey;
 
-    protected BaseComputerLink(String deviceId, BaseLinkProvider linkProvider) {
+    protected BaseLink(String deviceId, BaseLinkProvider linkProvider) {
         this.linkProvider = linkProvider;
         this.deviceId = deviceId;
     }
@@ -20,6 +29,10 @@ public abstract class BaseComputerLink {
         return deviceId;
     }
 
+    public void setPrivateKey(PrivateKey key) {
+        privateKey = key;
+    }
+
     public BaseLinkProvider getLinkProvider() {
         return linkProvider;
     }
@@ -45,5 +58,6 @@ public abstract class BaseComputerLink {
 
     //TO OVERRIDE
     public abstract boolean sendPackage(NetworkPackage np);
+    public abstract boolean sendPackageEncrypted(NetworkPackage np, PublicKey key);
 
 }
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
index aadd7084..a755bc8c 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
@@ -2,7 +2,6 @@ package org.kde.kdeconnect.Backends;
 
 import android.util.Log;
 
-import org.kde.kdeconnect.Backends.BaseComputerLink;
 import org.kde.kdeconnect.NetworkPackage;
 
 import java.util.ArrayList;
@@ -12,8 +11,8 @@ public abstract class BaseLinkProvider {
     private ArrayList<ConnectionReceiver> connectionReceivers = new ArrayList<ConnectionReceiver>();
 
     public interface ConnectionReceiver {
-        public void onConnectionReceived(NetworkPackage identityPackage, BaseComputerLink link);
-        public void onConnectionLost(BaseComputerLink link);
+        public void onConnectionReceived(NetworkPackage identityPackage, BaseLink link);
+        public void onConnectionLost(BaseLink link);
     }
 
     public void addConnectionReceiver(ConnectionReceiver cr) {
@@ -25,13 +24,13 @@ public abstract class BaseLinkProvider {
     }
 
     //These two should be called when the provider links to a new computer
-    protected void connectionAccepted(NetworkPackage identityPackage, BaseComputerLink link) {
+    protected void connectionAccepted(NetworkPackage identityPackage, BaseLink link) {
         Log.i("LinkProvider", "connectionAccepted");
         for(ConnectionReceiver cr : connectionReceivers) {
             cr.onConnectionReceived(identityPackage, link);
         }
     }
-    protected void connectionLost(BaseComputerLink link) {
+    protected void connectionLost(BaseLink link) {
         Log.i("LinkProvider", "connectionLost");
         for(ConnectionReceiver cr : connectionReceivers) {
             cr.onConnectionLost(link);
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanComputerLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanComputerLink.java
deleted file mode 100644
index ff645604..00000000
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanComputerLink.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.kde.kdeconnect.Backends.LanBackend;
-
-import android.util.Log;
-
-import org.apache.mina.core.session.IoSession;
-import org.kde.kdeconnect.Backends.BaseComputerLink;
-import org.kde.kdeconnect.Backends.BaseLinkProvider;
-import org.kde.kdeconnect.NetworkPackage;
-
-public class LanComputerLink extends BaseComputerLink {
-
-    private IoSession session = null;
-
-    public void disconnect() {
-        Log.i("LanComputerLink","Disconnect: "+session.getRemoteAddress().toString());
-        session.close(true);
-    }
-
-    public LanComputerLink(IoSession session, String deviceId, BaseLinkProvider linkProvider) {
-        super(deviceId, linkProvider);
-        this.session = session;
-    }
-
-    @Override
-    public boolean sendPackage(NetworkPackage np) {
-        if (session == null) {
-            Log.e("LanComputerLink","sendPackage failed: not yet connected");
-            return false;
-        } else {
-            session.write(np.serialize());
-            return true;
-        }
-    }
-
-    public void injectNetworkPackage(NetworkPackage np) {
-        packageReceived(np);
-    }
-}
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
new file mode 100644
index 00000000..8eff723a
--- /dev/null
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
@@ -0,0 +1,70 @@
+package org.kde.kdeconnect.Backends.LanBackend;
+
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.util.Base64;
+import android.util.Log;
+
+import org.apache.mina.core.session.IoSession;
+import org.kde.kdeconnect.Backends.BaseLink;
+import org.kde.kdeconnect.Backends.BaseLinkProvider;
+import org.kde.kdeconnect.NetworkPackage;
+
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+
+public class LanLink extends BaseLink {
+
+    private IoSession session = null;
+
+    public void disconnect() {
+        Log.i("LanLink","Disconnect: "+session.getRemoteAddress().toString());
+        session.close(true);
+    }
+
+    public LanLink(IoSession session, String deviceId, BaseLinkProvider linkProvider) {
+        super(deviceId, linkProvider);
+        this.session = session;
+    }
+
+    @Override
+    public boolean sendPackage(NetworkPackage np) {
+        if (session == null) {
+            Log.e("LanLink","sendPackage failed: not yet connected");
+            return false;
+        } else {
+            session.write(np.serialize());
+            return true;
+        }
+    }
+
+    @Override
+    public boolean sendPackageEncrypted(NetworkPackage np, PublicKey key) {
+        try {
+            np.encrypt(key);
+            return sendPackage(np);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.e("LanLink", "Encryption exception");
+        }
+        return false;
+    }
+
+    public void injectNetworkPackage(NetworkPackage np) {
+
+        if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_ENCRYPTED)) {
+
+            try {
+                np = np.decrypt(privateKey);
+            } catch(Exception e) {
+                e.printStackTrace();
+                Log.e("onPackageReceived","Exception reading the key needed to decrypt the package");
+            }
+
+        }
+
+        packageReceived(np);
+    }
+}
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
index b453e033..f44cfa01 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
@@ -31,8 +31,8 @@ public class LanLinkProvider extends BaseLinkProvider {
     private final static int port = 1714;
 
     private Context context;
-    private HashMap<String, LanComputerLink> visibleComputers = new HashMap<String, LanComputerLink>();
-    private HashMap<Long, LanComputerLink> nioSessions = new HashMap<Long, LanComputerLink>();
+    private HashMap<String, LanLink> visibleComputers = new HashMap<String, LanLink>();
+    private HashMap<Long, LanLink> nioSessions = new HashMap<Long, LanLink>();
 
     private NioSocketAcceptor tcpAcceptor = null;
     private NioDatagramAcceptor udpAcceptor = null;
@@ -41,7 +41,7 @@ public class LanLinkProvider extends BaseLinkProvider {
         @Override
         public void sessionClosed(IoSession session) throws Exception {
 
-            LanComputerLink brokenLink = nioSessions.remove(session.getId());
+            LanLink brokenLink = nioSessions.remove(session.getId());
             if (brokenLink != null) {
                 connectionLost(brokenLink);
                 brokenLink.disconnect();
@@ -62,14 +62,14 @@ public class LanLinkProvider extends BaseLinkProvider {
             String theMessage = (String) message;
             NetworkPackage np = NetworkPackage.unserialize(theMessage);
 
-            LanComputerLink prevLink = nioSessions.get(session.getId());
+            LanLink prevLink = nioSessions.get(session.getId());
 
             if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
                 String myId = NetworkPackage.createIdentityPackage(context).getString("deviceId");
                 if (np.getString("deviceId").equals(myId)) {
                     return;
                 }
-                LanComputerLink link = new LanComputerLink(session, np.getString("deviceId"), LanLinkProvider.this);
+                LanLink link = new LanLink(session, np.getString("deviceId"), LanLinkProvider.this);
                 nioSessions.put(session.getId(),link);
                 addLink(np, link);
             } else {
@@ -138,7 +138,7 @@ public class LanLinkProvider extends BaseLinkProvider {
 
                             Log.i("LanLinkProvider", "Connection successful: " + session.isConnected());
 
-                            LanComputerLink link = new LanComputerLink(session, identityPackage.getString("deviceId"), LanLinkProvider.this);
+                            LanLink link = new LanLink(session, identityPackage.getString("deviceId"), LanLinkProvider.this);
 
                             NetworkPackage np2 = NetworkPackage.createIdentityPackage(context);
                             link.sendPackage(np2);
@@ -157,10 +157,10 @@ public class LanLinkProvider extends BaseLinkProvider {
         }
     };
 
-    private void addLink(NetworkPackage identityPackage, LanComputerLink link) {
+    private void addLink(NetworkPackage identityPackage, LanLink link) {
         String deviceId = identityPackage.getString("deviceId");
         Log.i("LanLinkProvider","addLink to "+deviceId);
-        LanComputerLink oldLink = visibleComputers.get(deviceId);
+        LanLink oldLink = visibleComputers.get(deviceId);
         visibleComputers.put(deviceId, link);
         connectionAccepted(identityPackage, link);
         if (oldLink != null) {
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackComputerLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackComputerLink.java
deleted file mode 100644
index e1baa4a6..00000000
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackComputerLink.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.kde.kdeconnect.Backends.LoopbackBackend;
-
-import org.kde.kdeconnect.Backends.BaseComputerLink;
-import org.kde.kdeconnect.Backends.BaseLinkProvider;
-import org.kde.kdeconnect.NetworkPackage;
-
-public class LoopbackComputerLink extends BaseComputerLink {
-
-    public LoopbackComputerLink(BaseLinkProvider linkProvider) {
-        super("loopback", linkProvider);
-    }
-
-    @Override
-    public boolean sendPackage(NetworkPackage in) {
-        String s = in.serialize();
-        NetworkPackage out= NetworkPackage.unserialize(s);
-        packageReceived(out);
-        return true;
-    }
-
-}
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
new file mode 100644
index 00000000..5ee31be7
--- /dev/null
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
@@ -0,0 +1,41 @@
+package org.kde.kdeconnect.Backends.LoopbackBackend;
+
+import android.util.Log;
+
+import org.kde.kdeconnect.Backends.BaseLink;
+import org.kde.kdeconnect.Backends.BaseLinkProvider;
+import org.kde.kdeconnect.NetworkPackage;
+
+import java.security.PublicKey;
+
+public class LoopbackLink extends BaseLink {
+
+    public LoopbackLink(BaseLinkProvider linkProvider) {
+        super("loopback", linkProvider);
+    }
+
+    @Override
+    public boolean sendPackage(NetworkPackage in) {
+        String s = in.serialize();
+        NetworkPackage out= NetworkPackage.unserialize(s);
+        packageReceived(out);
+        return true;
+    }
+
+    @Override
+    public boolean sendPackageEncrypted(NetworkPackage in, PublicKey key) {
+        try {
+            in.encrypt(key);
+            String s = in.serialize();
+            NetworkPackage out= NetworkPackage.unserialize(s);
+            out.decrypt(privateKey);
+            packageReceived(out);
+            return true;
+        } catch(Exception e) {
+            e.printStackTrace();
+            Log.e("LoopbackLink", "Encryption exception");
+            return false;
+        }
+
+    }
+}
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
index 9385ab9c..766881b2 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
@@ -27,7 +27,7 @@ public class LoopbackLinkProvider extends BaseLinkProvider {
     public void onNetworkChange() {
 
         NetworkPackage np = NetworkPackage.createIdentityPackage(context);
-        connectionAccepted(np, new LoopbackComputerLink(this));
+        connectionAccepted(np, new LoopbackLink(this));
 
     }
 
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java b/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
index 5581fd0e..d21c7caf 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
@@ -11,7 +11,7 @@ import android.preference.PreferenceManager;
 import android.util.Base64;
 import android.util.Log;
 
-import org.kde.kdeconnect.Backends.BaseComputerLink;
+import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.Backends.LanBackend.LanLinkProvider;
 import org.kde.kdeconnect.Backends.LoopbackBackend.LoopbackLinkProvider;
@@ -81,7 +81,7 @@ public class BackgroundService extends Service {
 
     private BaseLinkProvider.ConnectionReceiver deviceListener = new BaseLinkProvider.ConnectionReceiver() {
         @Override
-        public void onConnectionReceived(final NetworkPackage identityPackage, final BaseComputerLink link) {
+        public void onConnectionReceived(final NetworkPackage identityPackage, final BaseLink link) {
 
             Log.i("BackgroundService", "Connection accepted!");
 
@@ -104,7 +104,7 @@ public class BackgroundService extends Service {
         }
 
         @Override
-        public void onConnectionLost(BaseComputerLink link) {
+        public void onConnectionLost(BaseLink link) {
             Device d = devices.get(link.getDeviceId());
             Log.i("onConnectionLost", "removeLink, deviceId: " + link.getDeviceId());
             if (d != null) {
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
index a9e29d3d..0ea450d6 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
@@ -15,7 +15,7 @@ import android.support.v4.app.NotificationCompat;
 import android.util.Base64;
 import android.util.Log;
 
-import org.kde.kdeconnect.Backends.BaseComputerLink;
+import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect.Plugins.PluginFactory;
 import org.kde.kdeconnect.UserInterface.PairActivity;
@@ -34,7 +34,7 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
-public class Device implements BaseComputerLink.PackageReceiver {
+public class Device implements BaseLink.PackageReceiver {
 
     private Context context;
 
@@ -61,7 +61,7 @@ public class Device implements BaseComputerLink.PackageReceiver {
     private ArrayList<PairingCallback> pairingCallback = new ArrayList<PairingCallback>();
     private Timer pairingTimer;
 
-    private ArrayList<BaseComputerLink> links = new ArrayList<BaseComputerLink>();
+    private ArrayList<BaseLink> links = new ArrayList<BaseLink>();
     private HashMap<String, Plugin> plugins = new HashMap<String, Plugin>();
     private HashMap<String, Plugin> failedPlugins = new HashMap<String, Plugin>();
 
@@ -90,7 +90,7 @@ public class Device implements BaseComputerLink.PackageReceiver {
     }
 
     //Device known via an incoming connection sent to us via a devicelink, we know everything but we don't trust it yet
-    Device(Context context, String deviceId, String name, BaseComputerLink dl) {
+    Device(Context context, String deviceId, String name, BaseLink dl) {
         settings = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
 
         //Log.e("Device","Constructor B");
@@ -255,15 +255,25 @@ public class Device implements BaseComputerLink.PackageReceiver {
         return !links.isEmpty();
     }
 
-    public void addLink(BaseComputerLink link) {
+    public void addLink(BaseLink link) {
 
         links.add(link);
 
+        try {
+            SharedPreferences globalSettings = PreferenceManager.getDefaultSharedPreferences(context);
+            byte[] privateKeyBytes = Base64.decode(globalSettings.getString("privateKey", ""), 0);
+            PrivateKey privateKey = KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(privateKeyBytes));
+            link.setPrivateKey(privateKey);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.e("Device", "Exception reading our own private key"); //Should not happen
+        }
+
         Log.i("Device","addLink "+link.getLinkProvider().getName()+" -> "+getName() + " active links: "+ links.size());
 
-        Collections.sort(links, new Comparator<BaseComputerLink>() {
+        Collections.sort(links, new Comparator<BaseLink>() {
             @Override
-            public int compare(BaseComputerLink o, BaseComputerLink o2) {
+            public int compare(BaseLink o, BaseLink o2) {
                 return o2.getLinkProvider().getPriority() - o.getLinkProvider().getPriority();
             }
         });
@@ -275,7 +285,7 @@ public class Device implements BaseComputerLink.PackageReceiver {
         }
     }
 
-    public void removeLink(BaseComputerLink link) {
+    public void removeLink(BaseLink link) {
         link.removePackageReceiver(this);
         links.remove(link);
         Log.i("Device","removeLink: "+link.getLinkProvider().getName() + " -> "+getName() + " active links: "+ links.size());
@@ -398,23 +408,6 @@ public class Device implements BaseComputerLink.PackageReceiver {
             Log.e("onPackageReceived","Device not paired, ignoring package!");
 
         } else {
-            if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_ENCRYPTED)) {
-
-                try {
-                    //TODO: Do not read the key every time
-                    SharedPreferences globalSettings = PreferenceManager.getDefaultSharedPreferences(context);
-                    byte[] privateKeyBytes = Base64.decode(globalSettings.getString("privateKey",""), 0);
-                    PrivateKey privateKey = KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(privateKeyBytes));
-                    np = np.decrypt(privateKey);
-                } catch(Exception e) {
-                    e.printStackTrace();
-                    Log.e("onPackageReceived","Exception reading the key needed to decrypt the package");
-                }
-
-            } else {
-                //TODO: The other side doesn't know that we are already paired, do something
-                Log.e("onPackageReceived","WARNING: Received unencrypted package from paired device!");
-            }
 
             for (Plugin plugin : plugins.values()) {
                 plugin.onPackageReceived(np);
@@ -426,27 +419,26 @@ public class Device implements BaseComputerLink.PackageReceiver {
 
     public boolean sendPackage(final NetworkPackage np) {
 
-        if (!np.getType().equals(NetworkPackage.PACKAGE_TYPE_PAIR) && isPaired()) {
-            try {
-                np.encrypt(publicKey);
-            } catch(Exception e) {
-                e.printStackTrace();
-                Log.e("Device","sendPackage exception - could not encrypt");
-            }
-        }
-
         new AsyncTask<Void,Void,Void>() {
             @Override
             protected Void doInBackground(Void... voids) {
-                for(BaseComputerLink link : links) {
-                    //Log.e("sendPackage","Trying "+link.getLinkProvider().getName());
-                    if (link.sendPackage(np)) {
-                        //Log.e("sent using", link.getLinkProvider().getName());
-                        return null;
+
+                boolean useEncryption = (!np.getType().equals(NetworkPackage.PACKAGE_TYPE_PAIR) && isPaired());
+
+                for(BaseLink link : links) {
+
+                    if (useEncryption) {
+                        if (link.sendPackageEncrypted(np, publicKey)) return null;
+                    } else {
+                        if (link.sendPackage(np)) return null;
                     }
+
                 }
+
                 Log.e("sendPackage","Error: Package could not be sent ("+links.size()+" links available)");
+
                 return null;
+
             }
         }.execute();
 
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
index b55e00b6..6389255c 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
@@ -13,8 +13,8 @@ import android.widget.SeekBar;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.BackgroundService;
-import org.kde.kdeconnect.Backends.BaseComputerLink;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.NetworkPackage;
@@ -121,12 +121,12 @@ public class MprisActivity extends Activity {
 
     BaseLinkProvider.ConnectionReceiver connectionReceiver = new BaseLinkProvider.ConnectionReceiver() {
         @Override
-        public void onConnectionReceived(NetworkPackage identityPackage, BaseComputerLink link) {
+        public void onConnectionReceived(NetworkPackage identityPackage, BaseLink link) {
             connectToPlugin();
         }
 
         @Override
-        public void onConnectionLost(BaseComputerLink link) {
+        public void onConnectionLost(BaseLink link) {
 
         }
     };

From 5200ceaab512f333c25f28ce8a065be3faa03c96 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Tue, 10 Sep 2013 11:56:57 +0200
Subject: [PATCH 03/22] Commented loopbacklinkprovider

---
 .../src/main/java/org/kde/kdeconnect/BackgroundService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java b/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
index d21c7caf..6cb3b7b4 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
@@ -65,9 +65,9 @@ public class BackgroundService extends Service {
 
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
 
-        if (settings.getBoolean("loopback_link", true)) {
-            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));

From 8800c4503cf995d7dc658c64db99ef71b2f18e6f Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Wed, 18 Sep 2013 17:27:52 +0200
Subject: [PATCH 04/22] Parent activities where not correctly set

BUG: 325060
---
 KdeConnect/src/main/AndroidManifest.xml | 67 +++++++++++++------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/KdeConnect/src/main/AndroidManifest.xml b/KdeConnect/src/main/AndroidManifest.xml
index 916a36ba..ebbcddb5 100644
--- a/KdeConnect/src/main/AndroidManifest.xml
+++ b/KdeConnect/src/main/AndroidManifest.xml
@@ -32,6 +32,11 @@
         android:label="KDE Connect"
         >
 
+        <service
+            android:enabled="true"
+            android:name="org.kde.kdeconnect.BackgroundService">
+        </service>
+
         <activity
             android:theme="@style/Theme.AppCompat"
             android:name="org.kde.kdeconnect.UserInterface.MainActivity"
@@ -48,57 +53,33 @@
                 android:theme="@style/Theme.AppCompat"
                 android:name="org.kde.kdeconnect.UserInterface.DeviceActivity"
                 android:label="@string/device"
-                android:parentActivityName="org.kde.connect.UserInterface.MainActivity"
+                android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
                 >
             <meta-data android:name="android.support.PARENT_ACTIVITY"
-                       android:value="org.kde.connect.UserInterface.MainActivity" />
+                       android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
 
                 </activity>
 
-
-
         <activity
             android:theme="@style/Theme.AppCompat"
             android:name="org.kde.kdeconnect.UserInterface.PairActivity"
             android:label="@string/pair_device"
-            android:parentActivityName="org.kde.connect.UserInterface.MainActivity"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
             >
             <meta-data android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.connect.UserInterface.MainActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
 
         </activity>
 
-
-
-        <activity
-            android:theme="@style/Theme.AppCompat"
-            android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
-            android:label="@string/remote_control"
-            >
-        <meta-data android:name="android.support.PARENT_ACTIVITY"
-                   android:value=".DeviceActivity" />
-        </activity>
-
         <activity
-                android:name="org.kde.kdeconnect.UserInterface.SettingsActivity"
-                android:label="@string/settings"
-                >
+            android:name="org.kde.kdeconnect.UserInterface.SettingsActivity"
+            android:label="@string/settings"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
+            >
             <meta-data android:name="android.support.PARENT_ACTIVITY"
-                       android:value=".DeviceActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
         </activity>
 
-        <service
-            android:enabled="true"
-            android:name="org.kde.kdeconnect.BackgroundService">
-        </service>
-
-        <service android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
-             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
-            <intent-filter>
-                <action android:name="android.service.notification.NotificationListenerService" />
-            </intent-filter>
-        </service>
-
         <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
@@ -124,6 +105,26 @@
             </intent-filter>-->
         </receiver>
 
+        <!-- Plugin-related activities and services -->
+
+        <activity
+            android:theme="@style/Theme.AppCompat"
+            android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
+            android:label="@string/remote_control"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
+            >
+        <meta-data android:name="android.support.PARENT_ACTIVITY"
+                   android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
+        </activity>
+
+        <service android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
+             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationListenerService" />
+            </intent-filter>
+        </service>
+
+
     </application>
 
 </manifest>

From 34fe3ac272b5f5696e30a3023ba079722657aaa8 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Mon, 16 Sep 2013 15:24:21 +0200
Subject: [PATCH 05/22] Refactor to move backend to its own package

Matching kde project structure
---
 .../main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
index a755bc8c..b1d621b6 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
@@ -2,6 +2,7 @@ package org.kde.kdeconnect.Backends;
 
 import android.util.Log;
 
+import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.NetworkPackage;
 
 import java.util.ArrayList;

From 66766e8ab026eac3ec32c23d539f58fa4633cca9 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Tue, 17 Sep 2013 15:55:00 +0200
Subject: [PATCH 06/22] Added payload to NetworkPackage

Matching KDED's implementation
---
 .../org/kde/kdeconnect/NetworkPackage.java    | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
index daf35177..f70e73c4 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
@@ -11,6 +11,10 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.charset.Charset;
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -35,6 +39,8 @@ public class NetworkPackage {
     private long mId;
     private String mType;
     private JSONObject mBody;
+    private InputStream mPayload;
+    private JSONObject mPayloadTransferInfo;
 
     private NetworkPackage() {
     }
@@ -43,6 +49,7 @@ public class NetworkPackage {
         mId = System.currentTimeMillis();
         mType = type;
         mBody = new JSONObject();
+        mPayloadTransferInfo = new JSONObject();
     }
 
     public String getType() {
@@ -116,14 +123,17 @@ public class NetworkPackage {
             np.mId = jo.getLong("id");
             np.mType = jo.getString("type");
             np.mBody = jo.getJSONObject("body");
+            if (jo.has("payloadTransferInfo")) {
+                np.mPayloadTransferInfo = jo.getJSONObject("payloadTransferInfo");
+            } else {
+                np.mPayloadTransferInfo = new JSONObject();
+            }
         } catch (Exception e) {
             return null;
         }
         return np;
     }
 
-
-
     public void encrypt(PublicKey publicKey) throws Exception {
 
         String serialized = serialize();
@@ -177,7 +187,6 @@ public class NetworkPackage {
         return unserialize(decryptedJson);
     }
 
-
     static public NetworkPackage createIdentityPackage(Context context) {
 
         NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_IDENTITY);
@@ -208,4 +217,24 @@ public class NetworkPackage {
 
     }
 
+    public void setPayload(byte[] data) {
+        mPayload = new ByteArrayInputStream(data);
+    }
+
+    public void setPayload(InputStream stream) {
+        mPayload = stream;
+    }
+
+    public InputStream getPayload() {
+        return mPayload;
+    }
+
+    public boolean hasPayload() {
+        return (mPayload == null);
+    }
+
+    public boolean hasPayloadTransferInfo() {
+        return (mPayloadTransferInfo.length() > 0);
+    }
+
 }

From 46ad74f5390f4e9e15f5b2f71da354786118471a Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Tue, 17 Sep 2013 15:56:35 +0200
Subject: [PATCH 07/22] Payload transfer in loopback link (not tested)

---
 .../kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
index 5ee31be7..9818c924 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
@@ -18,6 +18,9 @@ public class LoopbackLink extends BaseLink {
     public boolean sendPackage(NetworkPackage in) {
         String s = in.serialize();
         NetworkPackage out= NetworkPackage.unserialize(s);
+        if (in.hasPayload()) {
+            out.setPayload(in.getPayload());
+        }
         packageReceived(out);
         return true;
     }

From 593cf8cac07cd574f0b826116c86713ff52536c7 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Tue, 17 Sep 2013 16:05:03 +0200
Subject: [PATCH 08/22] Added missing getter and setter in NetworkPackage

---
 .../src/main/java/org/kde/kdeconnect/NetworkPackage.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
index f70e73c4..f8381f1f 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
@@ -43,6 +43,7 @@ public class NetworkPackage {
     private JSONObject mPayloadTransferInfo;
 
     private NetworkPackage() {
+
     }
 
     public NetworkPackage(String type) {
@@ -237,4 +238,11 @@ public class NetworkPackage {
         return (mPayloadTransferInfo.length() > 0);
     }
 
+    public JSONObject getpayloadTransferInfo() {
+        return payloadTransferInfo;
+    }
+
+    public void setpayloadTransferInfo(JSONObject payloadTransferInfo) {
+        this.mPayloadTransferInfo = payloadTransferInfo;
+    }
 }

From 6dbe7bac9111919867001422200fe25f71a87a72 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Wed, 18 Sep 2013 17:23:53 +0200
Subject: [PATCH 09/22] Implemented payload transfer in LanLink (untested)

Some silly fixes to NetworkPackage added too
---
 .../Backends/LanBackend/LanLink.java          | 125 ++++++++++++++++--
 .../org/kde/kdeconnect/NetworkPackage.java    |  29 ++--
 2 files changed, 136 insertions(+), 18 deletions(-)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
index 8eff723a..5030ab9f 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
@@ -5,11 +5,28 @@ import android.preference.PreferenceManager;
 import android.util.Base64;
 import android.util.Log;
 
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.service.IoHandlerAdapter;
 import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.filter.codec.textline.LineDelimiter;
+import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
+import org.json.JSONObject;
 import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.NetworkPackage;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.nio.charset.Charset;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -29,29 +46,102 @@ public class LanLink extends BaseLink {
         this.session = session;
     }
 
-    @Override
-    public boolean sendPackage(NetworkPackage np) {
-        if (session == null) {
-            Log.e("LanLink","sendPackage failed: not yet connected");
-            return false;
-        } else {
-            session.write(np.serialize());
-            return true;
+    private JSONObject sendPayload(final InputStream stream) {
+
+        try {
+
+            final ServerSocket server = new ServerSocket();
+            boolean success = false;
+            int tcpPort = 1764;
+            while(!success) {
+                try {
+                    server.bind(new InetSocketAddress(tcpPort));
+                    success = true;
+                } catch(Exception e) {
+                    tcpPort++;
+                }
+            }
+
+            JSONObject payloadTransferInfo = new JSONObject();
+            payloadTransferInfo.put("port", tcpPort);
+
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        OutputStream socket = server.accept().getOutputStream();
+                        byte[] buffer = new byte[2048];
+                        int bytesRead;
+                        Log.e("LanLink","Beginning to send payload");
+                        while ((bytesRead = stream.read(buffer)) != -1) {
+                            Log.e("ok",""+bytesRead);
+                            socket.write(buffer, 0, bytesRead);
+                        }
+                        Log.e("LanLink","Finished sending payload");
+                    } catch(Exception e) {
+                        e.printStackTrace();
+                        Log.e("LanLink", "Exception with payload upload socket");
+                    }
+                }
+            }).start();
+
+            return payloadTransferInfo;
+
+        } catch(Exception e) {
+
+            e.printStackTrace();
+            Log.e("LanLink", "Exception with payload upload socket");
+
+            return null;
         }
+
+    }
+    @Override
+    public boolean sendPackage(final NetworkPackage np) {
+        if (session == null) {
+            Log.e("LanLink", "sendPackage failed: not yet connected");
+            return false;
+        }
+
+        if (np.hasPayload()) {
+            JSONObject transferInfo = sendPayload(np.getPayload());
+            np.setPayloadTransferInfo(transferInfo);
+        }
+
+        session.write(np.serialize());
+
+        return true;
     }
 
     @Override
     public boolean sendPackageEncrypted(NetworkPackage np, PublicKey key) {
+        if (session == null) {
+            Log.e("LanLink","sendPackage failed: not yet connected");
+            return false;
+        }
+
         try {
+
+            if (np.hasPayload()) {
+                JSONObject transferInfo = sendPayload(np.getPayload());
+                np.setPayloadTransferInfo(transferInfo);
+            }
+
             np.encrypt(key);
-            return sendPackage(np);
+
+            session.write(np.serialize());
+
+            return true;
+
         } catch (Exception e) {
             e.printStackTrace();
             Log.e("LanLink", "Encryption exception");
+            return false;
         }
-        return false;
+
     }
 
+
     public void injectNetworkPackage(NetworkPackage np) {
 
         if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_ENCRYPTED)) {
@@ -65,6 +155,21 @@ public class LanLink extends BaseLink {
 
         }
 
+        if (np.hasPayloadTransferInfo()) {
+
+            try {
+                Socket socket = new Socket();
+                int tcpPort = np.getPayloadTransferInfo().getInt("port");
+                InetSocketAddress address = (InetSocketAddress)session.getRemoteAddress();
+                socket.connect(new InetSocketAddress(address.getAddress(), tcpPort));
+                np.setPayload(socket.getInputStream());
+            } catch (Exception e) {
+                e.printStackTrace();
+                Log.e("LanLink", "Exception connecting to payload remote socket");
+            }
+
+        }
+
         packageReceived(np);
     }
 }
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
index f8381f1f..a637760c 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
@@ -50,6 +50,7 @@ public class NetworkPackage {
         mId = System.currentTimeMillis();
         mType = type;
         mBody = new JSONObject();
+        mPayload = null;
         mPayloadTransferInfo = new JSONObject();
     }
 
@@ -105,19 +106,29 @@ public class NetworkPackage {
     public String serialize() {
         JSONObject jo = new JSONObject();
         try {
-            jo.put("id",mId);
-            jo.put("type",mType);
-            jo.put("body",mBody);
+            jo.put("id", mId);
+            jo.put("type", mType);
+            jo.put("body", mBody);
+            if (hasPayload()) {
+                jo.put("payloadTransferInfo", mPayloadTransferInfo);
+            }
         } catch(Exception e) {
+            e.printStackTrace();
+            Log.e("NetworkPackage", "Serialization exception");
         }
+
         //QJSon does not escape slashes, but Java JSONObject does. Converting to QJson format.
         String json = jo.toString().replace("\\/","/")+"\n";
+
         //Log.e("NetworkPackage.serialize",json);
+
         return json;
     }
 
     static public NetworkPackage unserialize(String s) {
+
         //Log.e("NetworkPackage.unserialize", s);
+
         NetworkPackage np = new NetworkPackage();
         try {
             JSONObject jo = new JSONObject(s);
@@ -130,6 +141,8 @@ public class NetworkPackage {
                 np.mPayloadTransferInfo = new JSONObject();
             }
         } catch (Exception e) {
+            e.printStackTrace();
+            Log.e("NetworkPackage", "Unserialization exception");
             return null;
         }
         return np;
@@ -231,18 +244,18 @@ public class NetworkPackage {
     }
 
     public boolean hasPayload() {
-        return (mPayload == null);
+        return (mPayload != null);
     }
 
     public boolean hasPayloadTransferInfo() {
         return (mPayloadTransferInfo.length() > 0);
     }
 
-    public JSONObject getpayloadTransferInfo() {
-        return payloadTransferInfo;
+    public JSONObject getPayloadTransferInfo() {
+        return mPayloadTransferInfo;
     }
 
-    public void setpayloadTransferInfo(JSONObject payloadTransferInfo) {
-        this.mPayloadTransferInfo = payloadTransferInfo;
+    public void setPayloadTransferInfo(JSONObject payloadTransferInfo) {
+        mPayloadTransferInfo = payloadTransferInfo;
     }
 }

From aabd06f5cb0bc7a207a0d9820edb16ac36577d2e Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Wed, 18 Sep 2013 17:31:42 +0200
Subject: [PATCH 10/22] Notifications plugin now uses payloads to send app
 icons (untested)

---
 .../NotificationsPlugin/NotificationsPlugin.java      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
index a7d3627b..b524ed7a 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
@@ -172,10 +172,10 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
 
     @Override
     public void onNotificationPosted(StatusBarNotification statusBarNotification) {
-        onNotificationPosted(statusBarNotification, false);
+        sendNotification(statusBarNotification, false);
     }
 
-    public void onNotificationPosted(StatusBarNotification statusBarNotification, boolean requestAnswer) {
+    public void sendNotification(StatusBarNotification statusBarNotification, boolean requestAnswer) {
 
         Notification notification = statusBarNotification.getNotification();
         NotificationId id = NotificationId.fromNotification(statusBarNotification);
@@ -191,10 +191,11 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
             ByteArrayOutputStream outStream = new ByteArrayOutputStream();
             appIcon.compress(Bitmap.CompressFormat.PNG, 90, outStream);
             byte[] bitmapData = outStream.toByteArray();
-            byte[] serializedBitmapData = Base64.encode(bitmapData, Base64.NO_WRAP);
-            String stringBitmapData = new String(serializedBitmapData, Charset.defaultCharset());
+            //byte[] serializedBitmapData = Base64.encode(bitmapData, Base64.NO_WRAP);
+            //String stringBitmapData = new String(serializedBitmapData, Charset.defaultCharset());
             //The icon is super big, better sending it as a file transfer when we support that
             //np.set("base64icon", stringBitmapData);
+            np.setPayload(bitmapData);
         } catch(Exception e) {
             e.printStackTrace();
             Log.e("NotificationsPlugin","Error retrieving icon");
@@ -224,7 +225,7 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
                 private void sendCurrentNotifications(NotificationReceiver service) {
                     StatusBarNotification[] notifications = service.getActiveNotifications();
                     for (StatusBarNotification notification : notifications) {
-                        onNotificationPosted(notification, true);
+                        sendNotification(notification, true);
                     }
                 }
 

From 0d8f84037bac493cd77b3f02c974ced6af89ede6 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Wed, 18 Sep 2013 17:31:56 +0200
Subject: [PATCH 11/22] Added a send to activity (untested at all)

---
 KdeConnect/src/main/AndroidManifest.xml       | 12 ++++
 .../FileTransferPlugin/ShareToReceiver.java   | 55 +++++++++++++++++++
 KdeConnect/src/main/res/values/strings.xml    |  2 +
 3 files changed, 69 insertions(+)
 create mode 100644 KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/FileTransferPlugin/ShareToReceiver.java

diff --git a/KdeConnect/src/main/AndroidManifest.xml b/KdeConnect/src/main/AndroidManifest.xml
index ebbcddb5..f3f5aba7 100644
--- a/KdeConnect/src/main/AndroidManifest.xml
+++ b/KdeConnect/src/main/AndroidManifest.xml
@@ -117,6 +117,18 @@
                    android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
         </activity>
 
+        <activity
+            android:theme="@style/Theme.AppCompat"
+            android:name="org.kde.kdeconnect.Plugins.FileTransferPlugin.ShareToReceiver"
+            android:label="@string/share_to"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+        </activity>
+
         <service android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
              android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/FileTransferPlugin/ShareToReceiver.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/FileTransferPlugin/ShareToReceiver.java
new file mode 100644
index 00000000..55cfed1a
--- /dev/null
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/FileTransferPlugin/ShareToReceiver.java
@@ -0,0 +1,55 @@
+package org.kde.kdeconnect.Plugins.FileTransferPlugin;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import org.apache.mina.util.Base64;
+
+import java.io.InputStream;
+
+
+public class ShareToReceiver extends Activity {
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        Bundle extras = intent.getExtras();
+        String action = intent.getAction();
+
+        // if this is from the share menu
+        if (Intent.ACTION_SEND.equals(action))
+        {
+            if (extras.containsKey(Intent.EXTRA_STREAM))
+            {
+                try
+                {
+                    // Get resource path from intent callee
+                    Uri uri = (Uri) extras.getParcelable(Intent.EXTRA_STREAM);
+
+                    // Query gallery for camera picture via
+                    // Android ContentResolver interface
+                    ContentResolver cr = getContentResolver();
+                    InputStream inputStream = cr.openInputStream(uri);
+
+                    //TODO: Send inputStream as payload
+
+                    return;
+                } catch (Exception e)
+                {
+                    Log.e(this.getClass().getName(), e.toString());
+                }
+
+            } else if (extras.containsKey(Intent.EXTRA_TEXT))
+            {
+                //TODO: Send text
+                return;
+            }
+        }
+
+    }
+}
diff --git a/KdeConnect/src/main/res/values/strings.xml b/KdeConnect/src/main/res/values/strings.xml
index 2d00ed92..a86cde60 100644
--- a/KdeConnect/src/main/res/values/strings.xml
+++ b/KdeConnect/src/main/res/values/strings.xml
@@ -52,5 +52,7 @@
     <string name="mpris_previous">Previous</string>
     <string name="mpris_next">Next</string>
     <string name="mpris_volume">Volume</string>
+    <string name="share_to">Share To...</string>
+
 
 </resources>

From 091836646abc3b6ee2d4739c067504b1cdcd1e18 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Fri, 20 Sep 2013 14:46:03 +0200
Subject: [PATCH 12/22] Added a simple kind of item (only a title) for the
 generic item list

---
 .../UserInterface/List/EntryItem.java         | 33 +++++++++++++++++++
 .../UserInterface/List/SectionItem.java       |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java
new file mode 100644
index 00000000..263006fb
--- /dev/null
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java
@@ -0,0 +1,33 @@
+package org.kde.kdeconnect.UserInterface.List;
+
+
+import android.app.Activity;
+import android.content.Intent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import org.kde.kdeconnect.Device;
+import org.kde.kdeconnect.UserInterface.DeviceActivity;
+import org.kde.kdeconnect.UserInterface.PairActivity;
+import org.kde.kdeconnect_tp.R;
+
+public class EntryItem implements ListAdapter.Item {
+
+	private final String title;
+
+	public EntryItem(String title) {
+		this.title = title;
+	}
+
+    @Override
+    public View inflateView(LayoutInflater layoutInflater) {
+        View v = layoutInflater.inflate(R.layout.list_item_entry, null);
+
+        TextView titleView = (TextView)v.findViewById(R.id.list_item_entry_title);
+        if (titleView != null) titleView.setText(title);
+
+        return v;
+    }
+
+}
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
index a5c0e05b..7e0124b8 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
@@ -13,6 +13,7 @@ public class SectionItem implements ListAdapter.Item {
 	
 	public SectionItem(String title) {
 		this.title = title;
+        this.isEmpty = false;
 	}
 
     @Override

From 1757b2e650199d1e9acda1ad0816783b6d0bd60f Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Fri, 20 Sep 2013 14:46:54 +0200
Subject: [PATCH 13/22] Share menu now displays "KDE Connect" instead of "Share
 to"

---
 KdeConnect/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KdeConnect/src/main/AndroidManifest.xml b/KdeConnect/src/main/AndroidManifest.xml
index f3f5aba7..05e4803f 100644
--- a/KdeConnect/src/main/AndroidManifest.xml
+++ b/KdeConnect/src/main/AndroidManifest.xml
@@ -120,7 +120,7 @@
         <activity
             android:theme="@style/Theme.AppCompat"
             android:name="org.kde.kdeconnect.Plugins.FileTransferPlugin.ShareToReceiver"
-            android:label="@string/share_to"
+            android:label="KDE Connect"
             >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />

From 513a2b32f44900675787a4cfdacc39e06ef1302f Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Fri, 20 Sep 2013 15:44:58 +0200
Subject: [PATCH 14/22] Fixed file transfer (both lan and loopback)

Added file size to protocol (optional)
Increased protocol version to 5
---
 .../Backends/LanBackend/LanLink.java          | 11 +++---
 .../LoopbackBackend/LoopbackLink.java         |  5 ++-
 .../org/kde/kdeconnect/NetworkPackage.java    | 36 +++++++++++++++----
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
index 5030ab9f..ccd44477 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
@@ -68,6 +68,7 @@ public class LanLink extends BaseLink {
             new Thread(new Runnable() {
                 @Override
                 public void run() {
+                    //TODO: Timeout when waiting for a connection and close the socket
                     try {
                         OutputStream socket = server.accept().getOutputStream();
                         byte[] buffer = new byte[2048];
@@ -77,6 +78,8 @@ public class LanLink extends BaseLink {
                             Log.e("ok",""+bytesRead);
                             socket.write(buffer, 0, bytesRead);
                         }
+                        socket.close();
+                        server.close();
                         Log.e("LanLink","Finished sending payload");
                     } catch(Exception e) {
                         e.printStackTrace();
@@ -121,18 +124,13 @@ public class LanLink extends BaseLink {
         }
 
         try {
-
             if (np.hasPayload()) {
                 JSONObject transferInfo = sendPayload(np.getPayload());
                 np.setPayloadTransferInfo(transferInfo);
             }
-
             np.encrypt(key);
-
             session.write(np.serialize());
-
             return true;
-
         } catch (Exception e) {
             e.printStackTrace();
             Log.e("LanLink", "Encryption exception");
@@ -141,7 +139,6 @@ public class LanLink extends BaseLink {
 
     }
 
-
     public void injectNetworkPackage(NetworkPackage np) {
 
         if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_ENCRYPTED)) {
@@ -162,7 +159,7 @@ public class LanLink extends BaseLink {
                 int tcpPort = np.getPayloadTransferInfo().getInt("port");
                 InetSocketAddress address = (InetSocketAddress)session.getRemoteAddress();
                 socket.connect(new InetSocketAddress(address.getAddress(), tcpPort));
-                np.setPayload(socket.getInputStream());
+                np.setPayload(socket.getInputStream(), np.getPayloadSize());
             } catch (Exception e) {
                 e.printStackTrace();
                 Log.e("LanLink", "Exception connecting to payload remote socket");
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
index 9818c924..96c056e9 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
@@ -18,9 +18,7 @@ public class LoopbackLink extends BaseLink {
     public boolean sendPackage(NetworkPackage in) {
         String s = in.serialize();
         NetworkPackage out= NetworkPackage.unserialize(s);
-        if (in.hasPayload()) {
-            out.setPayload(in.getPayload());
-        }
+        if (in.hasPayload()) out.setPayload(in.getPayload(), in.getPayloadSize());
         packageReceived(out);
         return true;
     }
@@ -33,6 +31,7 @@ public class LoopbackLink extends BaseLink {
             NetworkPackage out= NetworkPackage.unserialize(s);
             out.decrypt(privateKey);
             packageReceived(out);
+            if (in.hasPayload()) out.setPayload(in.getPayload(), in.getPayloadSize());
             return true;
         } catch(Exception e) {
             e.printStackTrace();
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
index a637760c..49e342a6 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
@@ -24,7 +24,7 @@ import javax.crypto.Cipher;
 
 public class NetworkPackage {
 
-    public final static int ProtocolVersion = 3;
+    public final static int ProtocolVersion = 5;
 
     public final static String PACKAGE_TYPE_IDENTITY = "kdeconnect.identity";
     public final static String PACKAGE_TYPE_PAIR = "kdeconnect.pair";
@@ -35,12 +35,14 @@ public class NetworkPackage {
     public final static String PACKAGE_TYPE_NOTIFICATION = "kdeconnect.notification";
     public final static String PACKAGE_TYPE_CLIPBOARD = "kdeconnect.clipboard";
     public final static String PACKAGE_TYPE_MPRIS = "kdeconnect.mpris";
+    public final static String PACKAGE_TYPE_FILETRANSFER = "kdeconnect.filetransfer";
 
     private long mId;
     private String mType;
     private JSONObject mBody;
     private InputStream mPayload;
     private JSONObject mPayloadTransferInfo;
+    private int mPayloadSize;
 
     private NetworkPackage() {
 
@@ -51,6 +53,7 @@ public class NetworkPackage {
         mType = type;
         mBody = new JSONObject();
         mPayload = null;
+        mPayloadSize = 0;
         mPayloadTransferInfo = new JSONObject();
     }
 
@@ -103,6 +106,8 @@ public class NetworkPackage {
 
     public boolean has(String key) { return mBody.has(key); }
 
+    public boolean isEncrypted() { return mType.equals(PACKAGE_TYPE_ENCRYPTED); }
+
     public String serialize() {
         JSONObject jo = new JSONObject();
         try {
@@ -110,6 +115,7 @@ public class NetworkPackage {
             jo.put("type", mType);
             jo.put("body", mBody);
             if (hasPayload()) {
+                jo.put("payloadSize", mPayloadSize);
                 jo.put("payloadTransferInfo", mPayloadTransferInfo);
             }
         } catch(Exception e) {
@@ -120,31 +126,38 @@ public class NetworkPackage {
         //QJSon does not escape slashes, but Java JSONObject does. Converting to QJson format.
         String json = jo.toString().replace("\\/","/")+"\n";
 
-        //Log.e("NetworkPackage.serialize",json);
+        if (!isEncrypted()) {
+            Log.e("NetworkPackage.serialize", json);
+        }
 
         return json;
     }
 
     static public NetworkPackage unserialize(String s) {
 
-        //Log.e("NetworkPackage.unserialize", s);
-
         NetworkPackage np = new NetworkPackage();
         try {
             JSONObject jo = new JSONObject(s);
             np.mId = jo.getLong("id");
             np.mType = jo.getString("type");
             np.mBody = jo.getJSONObject("body");
-            if (jo.has("payloadTransferInfo")) {
+            if (jo.has("payloadSize")) {
                 np.mPayloadTransferInfo = jo.getJSONObject("payloadTransferInfo");
+                np.mPayloadSize = jo.getInt("payloadSize");
             } else {
                 np.mPayloadTransferInfo = new JSONObject();
+                np.mPayloadSize = 0;
             }
         } catch (Exception e) {
             e.printStackTrace();
             Log.e("NetworkPackage", "Unserialization exception");
             return null;
         }
+
+        if (!np.isEncrypted()) {
+            Log.e("NetworkPackage.unserialize", s);
+        }
+
         return np;
     }
 
@@ -232,17 +245,26 @@ public class NetworkPackage {
     }
 
     public void setPayload(byte[] data) {
-        mPayload = new ByteArrayInputStream(data);
+        setPayload(new ByteArrayInputStream(data), data.length);
     }
 
-    public void setPayload(InputStream stream) {
+    public void setPayload(InputStream stream, int size) {
         mPayload = stream;
+        mPayloadSize = size;
     }
 
+    /*public void setPayload(InputStream stream) {
+        setPayload(stream, -1);
+    }*/
+
     public InputStream getPayload() {
         return mPayload;
     }
 
+    public int getPayloadSize() {
+        return mPayloadSize;
+    }
+
     public boolean hasPayload() {
         return (mPayload != null);
     }

From 50cb2b9f7f7769fe9979d8ec12e5799848da7033 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Fri, 20 Sep 2013 15:57:44 +0200
Subject: [PATCH 15/22] Implemented ShareToReceiver to send files

---
 .../FileTransferPlugin/ShareToReceiver.java   | 112 ++++++++++++++----
 1 file changed, 86 insertions(+), 26 deletions(-)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/FileTransferPlugin/ShareToReceiver.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/FileTransferPlugin/ShareToReceiver.java
index 55cfed1a..28f08ba6 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/FileTransferPlugin/ShareToReceiver.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/FileTransferPlugin/ShareToReceiver.java
@@ -3,53 +3,113 @@ package org.kde.kdeconnect.Plugins.FileTransferPlugin;
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Intent;
+import android.content.res.Resources;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.provider.MediaStore;
 import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
 
 import org.apache.mina.util.Base64;
+import org.kde.kdeconnect.BackgroundService;
+import org.kde.kdeconnect.Device;
+import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.UserInterface.List.DeviceItem;
+import org.kde.kdeconnect.UserInterface.List.EntryItem;
+import org.kde.kdeconnect.UserInterface.List.ListAdapter;
+import org.kde.kdeconnect.UserInterface.List.SectionItem;
+import org.kde.kdeconnect_tp.R;
 
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
 
 
 public class ShareToReceiver extends Activity {
+
     public void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
 
-        Intent intent = getIntent();
-        Bundle extras = intent.getExtras();
-        String action = intent.getAction();
+        setContentView(R.layout.activity_main);
 
-        // if this is from the share menu
-        if (Intent.ACTION_SEND.equals(action))
-        {
-            if (extras.containsKey(Intent.EXTRA_STREAM))
-            {
-                try
-                {
-                    // Get resource path from intent callee
-                    Uri uri = (Uri) extras.getParcelable(Intent.EXTRA_STREAM);
+        final Intent intent = getIntent();
 
-                    // Query gallery for camera picture via
-                    // Android ContentResolver interface
-                    ContentResolver cr = getContentResolver();
-                    InputStream inputStream = cr.openInputStream(uri);
+        if (!Intent.ACTION_SEND.equals(intent.getAction())) {
+            finish();
+            return;
+        }
 
-                    //TODO: Send inputStream as payload
+        BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
+            @Override
+            public void onServiceStart(final BackgroundService service) {
 
-                    return;
-                } catch (Exception e)
-                {
-                    Log.e(this.getClass().getName(), e.toString());
+                Collection<Device> devices = service.getDevices().values();
+                final ArrayList<Device> devicesList = new ArrayList<Device>();
+                final ArrayList<ListAdapter.Item> items = new ArrayList<ListAdapter.Item>();
+
+                items.add(new SectionItem(getString(R.string.share_to)));
+
+                for (Device d : devices) {
+                    if (d.isReachable() && d.isPaired()) {
+                        devicesList.add(d);
+                        items.add(new EntryItem(d.getName()));
+                    }
                 }
 
-            } else if (extras.containsKey(Intent.EXTRA_TEXT))
-            {
-                //TODO: Send text
-                return;
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        ListView list = (ListView) findViewById(R.id.listView1);
+                        list.setAdapter(new ListAdapter(ShareToReceiver.this, items));
+                        list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                            @Override
+                            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+
+                                Device device = devicesList.get(i-1); //-1 because of the title!
+
+                                NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_FILETRANSFER);
+
+                                Bundle extras = intent.getExtras();
+                                if (extras.containsKey(Intent.EXTRA_STREAM)) {
+                                    try {
+                                        Uri uri = extras.getParcelable(Intent.EXTRA_STREAM);
+
+                                        ContentResolver cr = getContentResolver();
+                                        Cursor c = cr.query(intent.getData(), null, null, null, null);
+                                        c.moveToFirst();
+                                        final int fileNameColumnId = c.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
+                                        if (fileNameColumnId >= 0) {
+                                            np.set("filename", c.getString(fileNameColumnId));
+                                        } else {
+                                            Log.e("ShareToReceiver", "No filename found");
+                                        }
+
+                                        InputStream inputStream = cr.openInputStream(uri);
+
+                                        //TODO: Figure out a way to find the file size, so we can show a progress bar in KDE
+                                        np.setPayload(inputStream, -1);
+
+                                    } catch (Exception e) {
+                                        Log.e(this.getClass().getName(), e.toString());
+                                    }
+                                } else if (extras.containsKey(Intent.EXTRA_TEXT)) {
+                                    np.set("content",extras.getString(Intent.EXTRA_TEXT));
+                                }
+
+                                device.sendPackage(np);
+
+                            }
+                        });
+                    }
+                });
+
             }
-        }
+        });
+
 
     }
 }

From 7cd5b905beba47576367914ced548090315c4f14 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Fri, 20 Sep 2013 19:05:04 +0200
Subject: [PATCH 16/22] Moved sharetoreceiver

Removed buggish cursor code, causing null pointer exception
---
 .../ShareToReceiver.java                      | 122 +++++++++++++++---
 1 file changed, 103 insertions(+), 19 deletions(-)
 rename KdeConnect/src/main/java/org/kde/kdeconnect/{Plugins/FileTransferPlugin => UserInterface}/ShareToReceiver.java (51%)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/FileTransferPlugin/ShareToReceiver.java b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
similarity index 51%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/FileTransferPlugin/ShareToReceiver.java
rename to KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
index 28f08ba6..acb71340 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/FileTransferPlugin/ShareToReceiver.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
@@ -1,23 +1,25 @@
-package org.kde.kdeconnect.Plugins.FileTransferPlugin;
+package org.kde.kdeconnect.UserInterface;
 
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-import org.apache.mina.util.Base64;
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.NetworkPackage;
-import org.kde.kdeconnect.UserInterface.List.DeviceItem;
 import org.kde.kdeconnect.UserInterface.List.EntryItem;
 import org.kde.kdeconnect.UserInterface.List.ListAdapter;
 import org.kde.kdeconnect.UserInterface.List.SectionItem;
@@ -28,13 +30,57 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 
-public class ShareToReceiver extends Activity {
+public class ShareToReceiver extends ActionBarActivity {
 
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.activity_main);
+    //
+    // Action bar
+    //
+
+    private MenuItem menuProgress;
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.main, menu);
+        menuProgress = menu.findItem(R.id.menu_progress);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_refresh:
+                updateComputerList();
+                BackgroundService.RunCommand(ShareToReceiver.this, new BackgroundService.InstanceCallback() {
+                    @Override
+                    public void onServiceStart(BackgroundService service) {
+                        service.onNetworkChange();
+                    }
+                });
+                item.setVisible(false);
+                menuProgress.setVisible(true);
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try { Thread.sleep(1500); } catch (InterruptedException e) { }
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                menuProgress.setVisible(false);
+                                item.setVisible(true);
+                            }
+                        });
+                    }
+                }).start();
+                break;
+            default:
+                break;
+        }
+        return true;
+    }
+
+    private void updateComputerList() {
 
         final Intent intent = getIntent();
 
@@ -69,7 +115,7 @@ public class ShareToReceiver extends Activity {
                             @Override
                             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
 
-                                Device device = devicesList.get(i-1); //-1 because of the title!
+                                Device device = devicesList.get(i-1); //NOTE: -1 because of the title!
 
                                 NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_FILETRANSFER);
 
@@ -79,14 +125,6 @@ public class ShareToReceiver extends Activity {
                                         Uri uri = extras.getParcelable(Intent.EXTRA_STREAM);
 
                                         ContentResolver cr = getContentResolver();
-                                        Cursor c = cr.query(intent.getData(), null, null, null, null);
-                                        c.moveToFirst();
-                                        final int fileNameColumnId = c.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
-                                        if (fileNameColumnId >= 0) {
-                                            np.set("filename", c.getString(fileNameColumnId));
-                                        } else {
-                                            Log.e("ShareToReceiver", "No filename found");
-                                        }
 
                                         InputStream inputStream = cr.openInputStream(uri);
 
@@ -97,11 +135,12 @@ public class ShareToReceiver extends Activity {
                                         Log.e(this.getClass().getName(), e.toString());
                                     }
                                 } else if (extras.containsKey(Intent.EXTRA_TEXT)) {
-                                    np.set("content",extras.getString(Intent.EXTRA_TEXT));
+                                    np.set("text",extras.getString(Intent.EXTRA_TEXT));
                                 }
 
                                 device.sendPackage(np);
 
+                                finish();
                             }
                         });
                     }
@@ -109,7 +148,52 @@ public class ShareToReceiver extends Activity {
 
             }
         });
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM);
+
+        setContentView(R.layout.activity_main);
+    }
 
 
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
+            @Override
+            public void onServiceStart(BackgroundService service) {
+                service.onNetworkChange();
+                service.setDeviceListChangedCallback(new BackgroundService.DeviceListChangedCallback() {
+                    @Override
+                    public void onDeviceListChanged() {
+                        updateComputerList();
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    protected void onStop() {
+        BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
+            @Override
+            public void onServiceStart(BackgroundService service) {
+                service.setDeviceListChangedCallback(null);
+            }
+        });
+        super.onStop();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        updateComputerList();
     }
 }

From 754123b9c552c9c8c86d448bcd9471c91747bcdd Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Fri, 27 Sep 2013 00:07:14 +0200
Subject: [PATCH 17/22] Fixed bugs with file transfers

Finding open ports was not working (socked became closed after first try)
AsyncTask on Device's sendPackage was blocking execution when stuck sending
---
 KdeConnect/KdeConnect.iml                     |  8 +-
 .../Backends/LanBackend/LanLink.java          | 32 +++++---
 .../Backends/LanBackend/LanLinkProvider.java  | 77 +++++++++----------
 .../main/java/org/kde/kdeconnect/Device.java  | 22 +++---
 .../org/kde/kdeconnect/NetworkPackage.java    |  2 +-
 kdeconnect-android.iml                        |  2 +-
 6 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/KdeConnect/KdeConnect.iml b/KdeConnect/KdeConnect.iml
index 79344f5d..22a89c1c 100644
--- a/KdeConnect/KdeConnect.iml
+++ b/KdeConnect/KdeConnect.iml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="Debug" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebug" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -60,7 +61,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/exploded-bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
@@ -70,10 +70,10 @@
     <orderEntry type="jdk" jdkName="Android 4.3 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="android-support-v4" level="project" />
-    <orderEntry type="library" exported="" name="mina-core-2.0.7" level="project" />
-    <orderEntry type="library" exported="" name="slf4j-api-1.6.6" level="project" />
     <orderEntry type="library" exported="" name="support-v4-18.0.0" level="project" />
     <orderEntry type="library" exported="" name="ComAndroidSupportAppcompatV71800.aar" level="project" />
+    <orderEntry type="library" exported="" name="slf4j-api-1.6.6" level="project" />
+    <orderEntry type="library" exported="" name="mina-core-2.0.7" level="project" />
   </component>
 </module>
 
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
index ccd44477..647d766e 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
@@ -37,7 +37,7 @@ public class LanLink extends BaseLink {
     private IoSession session = null;
 
     public void disconnect() {
-        Log.i("LanLink","Disconnect: "+session.getRemoteAddress().toString());
+        Log.i("LanLink", "Disconnect: "+session.getRemoteAddress().toString());
         session.close(true);
     }
 
@@ -50,40 +50,47 @@ public class LanLink extends BaseLink {
 
         try {
 
-            final ServerSocket server = new ServerSocket();
+            ServerSocket candidateServer = null;
             boolean success = false;
-            int tcpPort = 1764;
+            int tcpPort = 1739;
             while(!success) {
                 try {
-                    server.bind(new InetSocketAddress(tcpPort));
+                    candidateServer = new ServerSocket();
+                    candidateServer.bind(new InetSocketAddress(tcpPort));
                     success = true;
                 } catch(Exception e) {
+                    Log.e("LanLink", "Exception openning serversocket: "+e);
                     tcpPort++;
+                    if (tcpPort >= 1764) return new JSONObject();
                 }
             }
-
             JSONObject payloadTransferInfo = new JSONObject();
             payloadTransferInfo.put("port", tcpPort);
 
+            final ServerSocket server = candidateServer;
             new Thread(new Runnable() {
                 @Override
                 public void run() {
                     //TODO: Timeout when waiting for a connection and close the socket
+                    OutputStream socket = null;
                     try {
-                        OutputStream socket = server.accept().getOutputStream();
-                        byte[] buffer = new byte[2048];
+                        socket = server.accept().getOutputStream();
+                        byte[] buffer = new byte[4096];
                         int bytesRead;
                         Log.e("LanLink","Beginning to send payload");
                         while ((bytesRead = stream.read(buffer)) != -1) {
-                            Log.e("ok",""+bytesRead);
+                            //Log.e("ok",""+bytesRead);
                             socket.write(buffer, 0, bytesRead);
                         }
-                        socket.close();
-                        server.close();
                         Log.e("LanLink","Finished sending payload");
                     } catch(Exception e) {
                         e.printStackTrace();
                         Log.e("LanLink", "Exception with payload upload socket");
+                    } finally {
+                        if (socket != null) {
+                            try { socket.close(); } catch(Exception e) { }
+                        }
+                        try { server.close(); } catch(Exception e) { }
                     }
                 }
             }).start();
@@ -118,18 +125,23 @@ public class LanLink extends BaseLink {
 
     @Override
     public boolean sendPackageEncrypted(NetworkPackage np, PublicKey key) {
+
         if (session == null) {
             Log.e("LanLink","sendPackage failed: not yet connected");
             return false;
         }
 
         try {
+
             if (np.hasPayload()) {
                 JSONObject transferInfo = sendPayload(np.getPayload());
                 np.setPayloadTransferInfo(transferInfo);
             }
+
             np.encrypt(key);
+
             session.write(np.serialize());
+
             return true;
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
index f44cfa01..5cd57e80 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
@@ -65,10 +65,14 @@ public class LanLinkProvider extends BaseLinkProvider {
             LanLink prevLink = nioSessions.get(session.getId());
 
             if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
+
                 String myId = NetworkPackage.createIdentityPackage(context).getString("deviceId");
                 if (np.getString("deviceId").equals(myId)) {
                     return;
                 }
+
+                //Log.e("LanLinkProvider", "Identity package received from "+np.getString("deviceName"));
+
                 LanLink link = new LanLink(session, np.getString("deviceId"), LanLinkProvider.this);
                 nioSessions.put(session.getId(),link);
                 addLink(np, link);
@@ -90,70 +94,59 @@ public class LanLinkProvider extends BaseLinkProvider {
 
             //Log.e("LanLinkProvider", "Udp message received (" + message.getClass() + ") " + message.toString());
 
-            NetworkPackage np = null;
-
             try {
                 //We should receive a string thanks to the TextLineCodecFactory filter
                 String theMessage = (String) message;
-                np = NetworkPackage.unserialize(theMessage);
-            } catch (Exception e) {
-                e.printStackTrace();
-                Log.e("LanLinkProvider", "Could not unserialize package");
-            }
+                final NetworkPackage identityPackage = NetworkPackage.unserialize(theMessage);
 
-            if (np != null) {
-
-                final NetworkPackage identityPackage = np;
-                if (!np.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
+                if (!identityPackage.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
                     Log.e("LanLinkProvider", "1 Expecting an identity package");
                     return;
                 } else {
                     String myId = NetworkPackage.createIdentityPackage(context).getString("deviceId");
-                    if (np.getString("deviceId").equals(myId)) {
+                    if (identityPackage.getString("deviceId").equals(myId)) {
                         return;
                     }
                 }
 
                 Log.i("LanLinkProvider", "Identity package received, creating link");
 
-                try {
-                    final InetSocketAddress address = (InetSocketAddress) udpSession.getRemoteAddress();
+                final InetSocketAddress address = (InetSocketAddress) udpSession.getRemoteAddress();
 
-                    final NioSocketConnector connector = new NioSocketConnector();
-                    connector.setHandler(tcpHandler);
-                    //TextLineCodecFactory will split incoming data delimited by the given string
-                    connector.getFilterChain().addLast("codec",
-                            new ProtocolCodecFilter(
-                                    new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX)
-                            )
-                    );
-                    connector.getSessionConfig().setKeepAlive(true);
+                final NioSocketConnector connector = new NioSocketConnector();
+                connector.setHandler(tcpHandler);
+                //TextLineCodecFactory will split incoming data delimited by the given string
+                connector.getFilterChain().addLast("codec",
+                        new ProtocolCodecFilter(
+                                new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX)
+                        )
+                );
+                connector.getSessionConfig().setKeepAlive(true);
 
-                    int tcpPort = np.getInt("tcpPort",port);
-                    ConnectFuture future = connector.connect(new InetSocketAddress(address.getAddress(), tcpPort));
-                    future.addListener(new IoFutureListener<IoFuture>() {
-                        @Override
-                        public void operationComplete(IoFuture ioFuture) {
-                            IoSession session = ioFuture.getSession();
+                int tcpPort = identityPackage.getInt("tcpPort",port);
+                ConnectFuture future = connector.connect(new InetSocketAddress(address.getAddress(), tcpPort));
+                future.addListener(new IoFutureListener<IoFuture>() {
+                    @Override
+                    public void operationComplete(IoFuture ioFuture) {
+                        IoSession session = ioFuture.getSession();
 
-                            Log.i("LanLinkProvider", "Connection successful: " + session.isConnected());
+                        Log.i("LanLinkProvider", "Connection successful: " + session.isConnected());
 
-                            LanLink link = new LanLink(session, identityPackage.getString("deviceId"), LanLinkProvider.this);
+                        LanLink link = new LanLink(session, identityPackage.getString("deviceId"), LanLinkProvider.this);
 
-                            NetworkPackage np2 = NetworkPackage.createIdentityPackage(context);
-                            link.sendPackage(np2);
+                        NetworkPackage np2 = NetworkPackage.createIdentityPackage(context);
+                        link.sendPackage(np2);
 
-                            nioSessions.put(session.getId(), link);
-                            addLink(identityPackage, link);
-                        }
-                    });
-
-                } catch (Exception e) {
-                    Log.e("LanLinkProvider","Exception!!");
-                    e.printStackTrace();
-                }
+                        nioSessions.put(session.getId(), link);
+                        addLink(identityPackage, link);
+                    }
+                });
 
+            } catch (Exception e) {
+                Log.e("LanLinkProvider","Exception receiving udp package!!");
+                e.printStackTrace();
             }
+
         }
     };
 
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
index 0ea450d6..d32d3758 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
@@ -419,30 +419,34 @@ public class Device implements BaseLink.PackageReceiver {
 
     public boolean sendPackage(final NetworkPackage np) {
 
-        new AsyncTask<Void,Void,Void>() {
+        new Thread(new Runnable() {
             @Override
-            protected Void doInBackground(Void... voids) {
+            public void run() {
 
                 boolean useEncryption = (!np.getType().equals(NetworkPackage.PACKAGE_TYPE_PAIR) && isPaired());
 
+                //Log.e("sendPackage", "Sending...");
+
                 for(BaseLink link : links) {
 
                     if (useEncryption) {
-                        if (link.sendPackageEncrypted(np, publicKey)) return null;
+                        if (link.sendPackageEncrypted(np, publicKey)) {
+                            //Log.e("sendPackage", "Sent");
+                            return;
+                        }
                     } else {
-                        if (link.sendPackage(np)) return null;
+                        if (link.sendPackage(np)) {
+                            //Log.e("sendPackage", "Sent");
+                            return;
+                        }
                     }
 
                 }
 
                 Log.e("sendPackage","Error: Package could not be sent ("+links.size()+" links available)");
 
-                return null;
-
             }
-        }.execute();
-
-        //TODO: Detect when unable to send a package and try again somehow
+        }).start();
 
         return !links.isEmpty();
     }
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
index 49e342a6..a2240cec 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
@@ -150,7 +150,7 @@ public class NetworkPackage {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            Log.e("NetworkPackage", "Unserialization exception");
+            Log.e("NetworkPackage", "Unserialization exception unserializing "+s);
             return null;
         }
 
diff --git a/kdeconnect-android.iml b/kdeconnect-android.iml
index c2318111..94f1c61c 100644
--- a/kdeconnect-android.iml
+++ b/kdeconnect-android.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

From 37c2a0e112b06cbb89045ba36b273708e944ab0f Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Fri, 27 Sep 2013 02:58:16 +0200
Subject: [PATCH 18/22] Added multi-file transfer and query for filename and
 file size

---
 KdeConnect/src/main/AndroidManifest.xml       |   5 +
 .../Backends/LanBackend/LanLink.java          |   2 +-
 .../main/java/org/kde/kdeconnect/Device.java  |  66 +++++++-----
 .../UserInterface/ShareToReceiver.java        | 101 ++++++++++++++++--
 4 files changed, 136 insertions(+), 38 deletions(-)

diff --git a/KdeConnect/src/main/AndroidManifest.xml b/KdeConnect/src/main/AndroidManifest.xml
index b9e13acc..c4eb6fe6 100644
--- a/KdeConnect/src/main/AndroidManifest.xml
+++ b/KdeConnect/src/main/AndroidManifest.xml
@@ -127,6 +127,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="*/*" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
         </activity>
 
         <service android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
index 647d766e..3cc7106c 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
@@ -127,7 +127,7 @@ public class LanLink extends BaseLink {
     public boolean sendPackageEncrypted(NetworkPackage np, PublicKey key) {
 
         if (session == null) {
-            Log.e("LanLink","sendPackage failed: not yet connected");
+            Log.e("LanLink", "sendPackage failed: not yet connected");
             return false;
         }
 
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
index d32d3758..cb99ac67 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
@@ -158,23 +158,32 @@ public class Device implements BaseLink.PackageReceiver {
 
         //Send our own public key
         NetworkPackage np = NetworkPackage.createPublicKeyPackage(context);
-        boolean success = sendPackage(np);
+        sendPackage(np, new SendPackageFinishedCallback(){
 
-        if (!success) {
-            for (PairingCallback cb : pairingCallback) cb.pairingFailed(res.getString(R.string.error_could_not_send_package));
-            return;
-        }
-
-        pairingTimer = new Timer();
-        pairingTimer.schedule(new TimerTask() {
             @Override
-            public void run() {
-                for (PairingCallback cb : pairingCallback) cb.pairingFailed(context.getString(R.string.error_timed_out));
+            public void sendSuccessful() {
+                pairingTimer = new Timer();
+                pairingTimer.schedule(new TimerTask() {
+                    @Override
+                    public void run() {
+                        for (PairingCallback cb : pairingCallback) {
+                            cb.pairingFailed(context.getString(R.string.error_timed_out));
+                        }
+                        pairStatus = PairStatus.NotPaired;
+                    }
+                }, 20*1000);
+                pairStatus = PairStatus.Requested;
+            }
+
+            @Override
+            public void sendFailed() {
+                for (PairingCallback cb : pairingCallback) {
+                    cb.pairingFailed(context.getString(R.string.error_could_not_send_package));
+                }
                 pairStatus = PairStatus.NotPaired;
             }
-        }, 20*1000);
 
-        pairStatus = PairStatus.Requested;
+        });
 
     }
 
@@ -207,9 +216,7 @@ public class Device implements BaseLink.PackageReceiver {
 
         //Send our own public key
         NetworkPackage np = NetworkPackage.createPublicKeyPackage(context);
-        boolean success = sendPackage(np);
-
-        if (!success) return;
+        sendPackage(np); //TODO: Set a callback
 
         pairStatus = PairStatus.Paired;
 
@@ -416,8 +423,16 @@ public class Device implements BaseLink.PackageReceiver {
 
     }
 
+    public interface SendPackageFinishedCallback {
+        void sendSuccessful();
+        void sendFailed();
+    }
 
-    public boolean sendPackage(final NetworkPackage np) {
+    public void sendPackage(NetworkPackage np) {
+        sendPackage(np,null);
+    }
+
+    public void sendPackage(final NetworkPackage np, final SendPackageFinishedCallback callback) {
 
         new Thread(new Runnable() {
             @Override
@@ -429,26 +444,25 @@ public class Device implements BaseLink.PackageReceiver {
 
                 for(BaseLink link : links) {
 
+                    boolean success;
                     if (useEncryption) {
-                        if (link.sendPackageEncrypted(np, publicKey)) {
-                            //Log.e("sendPackage", "Sent");
-                            return;
-                        }
+                        success = link.sendPackageEncrypted(np, publicKey);
                     } else {
-                        if (link.sendPackage(np)) {
-                            //Log.e("sendPackage", "Sent");
-                            return;
-                        }
+                        success = link.sendPackage(np);
+                    }
+                    if (success) {
+                        //Log.e("sendPackage", "Sent");
+                        if (callback != null) callback.sendSuccessful();
+                        return;
                     }
-
                 }
 
+                if (callback != null) callback.sendFailed();
                 Log.e("sendPackage","Error: Package could not be sent ("+links.size()+" links available)");
 
             }
         }).start();
 
-        return !links.isEmpty();
     }
 
 
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
index acb71340..64be6f75 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
@@ -17,6 +17,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import org.apache.http.client.utils.URIUtils;
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.NetworkPackage;
@@ -26,6 +27,7 @@ import org.kde.kdeconnect.UserInterface.List.SectionItem;
 import org.kde.kdeconnect_tp.R;
 
 import java.io.InputStream;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 
@@ -84,7 +86,8 @@ public class ShareToReceiver extends ActionBarActivity {
 
         final Intent intent = getIntent();
 
-        if (!Intent.ACTION_SEND.equals(intent.getAction())) {
+        String action = intent.getAction();
+        if (!Intent.ACTION_SEND.equals(action) && !Intent.ACTION_SEND_MULTIPLE.equals(action)) {
             finish();
             return;
         }
@@ -117,28 +120,45 @@ public class ShareToReceiver extends ActionBarActivity {
 
                                 Device device = devicesList.get(i-1); //NOTE: -1 because of the title!
 
-                                NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_FILETRANSFER);
-
                                 Bundle extras = intent.getExtras();
                                 if (extras.containsKey(Intent.EXTRA_STREAM)) {
+
                                     try {
-                                        Uri uri = extras.getParcelable(Intent.EXTRA_STREAM);
 
-                                        ContentResolver cr = getContentResolver();
+                                        ArrayList<Uri> uriList;
+                                        if (!Intent.ACTION_SEND.equals(intent.getAction())) {
+                                            uriList = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
+                                        } else {
+                                            Uri uri = extras.getParcelable(Intent.EXTRA_STREAM);
+                                            uriList = new ArrayList<Uri>();
+                                            uriList.add(uri);
+                                        }
 
-                                        InputStream inputStream = cr.openInputStream(uri);
-
-                                        //TODO: Figure out a way to find the file size, so we can show a progress bar in KDE
-                                        np.setPayload(inputStream, -1);
+                                        queuedSendUriList(device, uriList);
 
                                     } catch (Exception e) {
                                         Log.e(this.getClass().getName(), e.toString());
                                     }
+
                                 } else if (extras.containsKey(Intent.EXTRA_TEXT)) {
-                                    np.set("text",extras.getString(Intent.EXTRA_TEXT));
+                                    String text = extras.getString(Intent.EXTRA_TEXT);
+                                    boolean isUrl;
+                                    try {
+                                        new URL(text);
+                                        isUrl = true;
+                                    } catch(Exception e) {
+                                        isUrl = false;
+                                    }
+                                    NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_FILETRANSFER);
+                                    if (isUrl) {
+                                        np.set("url", text);
+                                    } else {
+                                        np.set("text", text);
+                                    }
+                                    device.sendPackage(np);
                                 }
 
-                                device.sendPackage(np);
+
 
                                 finish();
                             }
@@ -150,6 +170,65 @@ public class ShareToReceiver extends ActionBarActivity {
         });
     }
 
+    private void queuedSendUriList(final Device device, final ArrayList<Uri> uriList) {
+        try {
+            Uri uri = uriList.remove(0);
+            ContentResolver cr = getContentResolver();
+            InputStream inputStream = cr.openInputStream(uri);
+
+            NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_FILETRANSFER);
+
+            String[] proj = { MediaStore.MediaColumns.DATA, MediaStore.MediaColumns.SIZE, MediaStore.MediaColumns.DISPLAY_NAME };
+            Cursor cursor = managedQuery(uri, proj, null, null, null);
+
+            int size = -1;
+            try {
+                int column_index = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.SIZE);
+                cursor.moveToFirst();
+                size = cursor.getInt(column_index);
+            } catch(Exception e) {
+                e.printStackTrace();
+                Log.e("ShareToReceiver", "Could not obtain file size");
+            }
+
+            //Log.e("ShareToReceiver", "Size "+size);
+            np.setPayload(inputStream, size);
+
+            try {
+                int column_index = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DATA);
+                cursor.moveToFirst();
+                String path = cursor.getString(column_index);
+                np.set("filename", Uri.parse(path).getLastPathSegment());
+            } catch(Exception _) {
+                try {
+                    int column_index = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DISPLAY_NAME);
+                    cursor.moveToFirst();
+                    String name = cursor.getString(column_index);
+                    np.set("filename", name);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    Log.e("ShareToReceiver", "Could not obtain file name");
+                }
+            }
+
+            device.sendPackage(np, new Device.SendPackageFinishedCallback() {
+                @Override
+                public void sendSuccessful() {
+                    if (!uriList.isEmpty()) queuedSendUriList(device, uriList);
+                    else Log.e("ShareToReceiver", "All files sent");
+                }
+
+                @Override
+                public void sendFailed() {
+                    Log.e("ShareToReceiver", "Failed to send attachment");
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.e("ShareToReceiver", "Failed to send attachment");
+        }
+
+    }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

From 35170356059991544419065912eeb7be8e681e69 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Tue, 1 Oct 2013 03:24:42 +0200
Subject: [PATCH 19/22] Store device's protocol version and show a warning if
 it doesn't match

---
 .../org/kde/kdeconnect/BackgroundService.java |  6 +--
 .../main/java/org/kde/kdeconnect/Device.java  | 19 +++++--
 .../UserInterface/List/DeviceItem.java        | 11 ++++
 .../src/main/res/layout/list_item_entry.xml   | 52 +++++++------------
 KdeConnect/src/main/res/values/strings.xml    |  2 +
 5 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java b/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
index 6cb3b7b4..d68db4ac 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
@@ -54,7 +54,7 @@ public class BackgroundService extends Service {
         Set<String> trustedDevices = preferences.getAll().keySet();
         for(String deviceId : trustedDevices) {
             if (preferences.getBoolean(deviceId, false)) {
-                Device device = new Device(getBaseContext(), deviceId);
+                Device device = new Device(this, deviceId);
                 devices.put(deviceId,device);
                 device.addPairingCallback(devicePairingCallback);
             }
@@ -91,11 +91,11 @@ public class BackgroundService extends Service {
 
             if (device != null) {
                 Log.i("BackgroundService", "addLink, known device: " + deviceId);
-                device.addLink(link);
+                device.addLink(identityPackage, link);
             } else {
                 Log.i("BackgroundService", "addLink,unknown device: " + deviceId);
                 String name = identityPackage.getString("deviceName");
-                device = new Device(getBaseContext(), deviceId, name, link);
+                device = new Device(BackgroundService.this, identityPackage, link);
                 devices.put(deviceId, device);
                 device.addPairingCallback(devicePairingCallback);
             }
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
index cb99ac67..7c6f0b62 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
@@ -42,6 +42,7 @@ public class Device implements BaseLink.PackageReceiver {
     private String name;
     private PublicKey publicKey;
     private int notificationId;
+    private int protocolVersion;
 
     private enum PairStatus {
         NotPaired,
@@ -77,6 +78,7 @@ public class Device implements BaseLink.PackageReceiver {
         this.deviceId = deviceId;
         this.name = settings.getString("deviceName", "unknown device");
         this.pairStatus = PairStatus.Paired;
+        this.protocolVersion = NetworkPackage.ProtocolVersion; //We don't know it yet
 
         try {
             byte[] publicKeyBytes = Base64.decode(settings.getString("publicKey", ""), 0);
@@ -90,18 +92,19 @@ public class Device implements BaseLink.PackageReceiver {
     }
 
     //Device known via an incoming connection sent to us via a devicelink, we know everything but we don't trust it yet
-    Device(Context context, String deviceId, String name, BaseLink dl) {
+    Device(Context context, NetworkPackage np, BaseLink dl) {
         settings = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
 
         //Log.e("Device","Constructor B");
 
         this.context = context;
-        this.deviceId = deviceId;
-        this.name = name;
+        this.deviceId = np.getString("deviceId");
+        this.name = np.getString("deviceName");
+        this.protocolVersion = np.getInt("protocolVersion");
         this.pairStatus = PairStatus.NotPaired;
         this.publicKey = null;
 
-        addLink(dl);
+        addLink(np, dl);
     }
 
     public String getName() {
@@ -112,6 +115,10 @@ public class Device implements BaseLink.PackageReceiver {
         return deviceId;
     }
 
+    //Returns 0 if the version matches, < 0 if it is older or > 0 if it is newer
+    public int compareProtocolVersion() {
+        return protocolVersion - NetworkPackage.ProtocolVersion;
+    }
 
 
 
@@ -262,7 +269,9 @@ public class Device implements BaseLink.PackageReceiver {
         return !links.isEmpty();
     }
 
-    public void addLink(BaseLink link) {
+    public void addLink(NetworkPackage identityPackage, BaseLink link) {
+
+        this.protocolVersion = identityPackage.getInt("protocolVersion");
 
         links.add(link);
 
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java
index b708b833..79bcdcce 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java
@@ -28,6 +28,17 @@ public class DeviceItem implements ListAdapter.Item {
 
         TextView titleView = (TextView)v.findViewById(R.id.list_item_entry_title);
         if (titleView != null) titleView.setText(device.getName());
+        if (device.compareProtocolVersion() != 0) {
+            TextView summaryView = (TextView)v.findViewById(R.id.list_item_entry_summary);
+            summaryView.setVisibility(View.VISIBLE);
+            if (device.compareProtocolVersion() > 0) {
+                summaryView.setText(R.string.protocol_version_newer);
+            } else {
+                summaryView.setText(R.string.protocol_version_older);
+            }
+        } else {
+            v.findViewById(R.id.list_item_entry_summary).setVisibility(View.GONE);
+        }
 
         v.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/KdeConnect/src/main/res/layout/list_item_entry.xml b/KdeConnect/src/main/res/layout/list_item_entry.xml
index 61f2ed2a..fd4fd3ba 100644
--- a/KdeConnect/src/main/res/layout/list_item_entry.xml
+++ b/KdeConnect/src/main/res/layout/list_item_entry.xml
@@ -6,43 +6,27 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
-    <!--
-    <ImageView
-        android:id="@+id/list_item_entry_drawable"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:orientation="vertical">
+
+
+    <TextView android:id="@+id/list_item_entry_title"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:src="@android:drawable/ic_menu_preferences"
-        android:paddingLeft="9dp"/>
-
-    <RelativeLayout
-        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="6dip"
-        android:layout_marginTop="3dip"
-        android:layout_marginBottom="3dip"
-        android:layout_weight="0">
-        -->
-        <TextView android:id="@+id/list_item_entry_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal"
+        android:text="" />
 
-        <!--
-        <TextView android:id="@+id/list_item_entry_summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/list_item_entry_title"
-            android:layout_alignLeft="@id/list_item_entry_title"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:singleLine="true"
-            android:textColor="?android:attr/textColorSecondary" />
+    <TextView android:id="@+id/list_item_entry_summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:singleLine="true"
+        android:textColor="#CC2222"
+        android:visibility="gone"
+        android:text="" />
 
 
-    </RelativeLayout>
-            -->
 </LinearLayout>
diff --git a/KdeConnect/src/main/res/values/strings.xml b/KdeConnect/src/main/res/values/strings.xml
index a86cde60..7dc5a994 100644
--- a/KdeConnect/src/main/res/values/strings.xml
+++ b/KdeConnect/src/main/res/values/strings.xml
@@ -53,6 +53,8 @@
     <string name="mpris_next">Next</string>
     <string name="mpris_volume">Volume</string>
     <string name="share_to">Share To...</string>
+    <string name="protocol_version_older">This device uses an old protocol version</string>
+    <string name="protocol_version_newer">This device uses a newer protocol version</string>
 
 
 </resources>

From 87174cfb28f6251ae5249d0e9d65edd596374b85 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Tue, 1 Oct 2013 03:25:18 +0200
Subject: [PATCH 20/22] Renamed kdeconnect.filetransfer to kdeconnect.share

---
 .../src/main/java/org/kde/kdeconnect/NetworkPackage.java    | 2 +-
 .../org/kde/kdeconnect/UserInterface/ShareToReceiver.java   | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
index a2240cec..3549fb5f 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
@@ -35,7 +35,7 @@ public class NetworkPackage {
     public final static String PACKAGE_TYPE_NOTIFICATION = "kdeconnect.notification";
     public final static String PACKAGE_TYPE_CLIPBOARD = "kdeconnect.clipboard";
     public final static String PACKAGE_TYPE_MPRIS = "kdeconnect.mpris";
-    public final static String PACKAGE_TYPE_FILETRANSFER = "kdeconnect.filetransfer";
+    public final static String PACKAGE_TYPE_SHARE = "kdeconnect.share";
 
     private long mId;
     private String mType;
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
index 64be6f75..a9f113cc 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
@@ -1,6 +1,5 @@
 package org.kde.kdeconnect.UserInterface;
 
-import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.database.Cursor;
@@ -17,7 +16,6 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-import org.apache.http.client.utils.URIUtils;
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.NetworkPackage;
@@ -149,7 +147,7 @@ public class ShareToReceiver extends ActionBarActivity {
                                     } catch(Exception e) {
                                         isUrl = false;
                                     }
-                                    NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_FILETRANSFER);
+                                    NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_SHARE);
                                     if (isUrl) {
                                         np.set("url", text);
                                     } else {
@@ -176,7 +174,7 @@ public class ShareToReceiver extends ActionBarActivity {
             ContentResolver cr = getContentResolver();
             InputStream inputStream = cr.openInputStream(uri);
 
-            NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_FILETRANSFER);
+            NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_SHARE);
 
             String[] proj = { MediaStore.MediaColumns.DATA, MediaStore.MediaColumns.SIZE, MediaStore.MediaColumns.DISPLAY_NAME };
             Cursor cursor = managedQuery(uri, proj, null, null, null);

From 4b3af91c711a8a66b2e3f13600cafa97dc0a83d1 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Tue, 1 Oct 2013 03:27:48 +0200
Subject: [PATCH 21/22] Commented app icon sending code of notifications plugin

Because it was not used from desktop
---
 .../Plugins/NotificationsPlugin/NotificationsPlugin.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
index b524ed7a..96f32f6b 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
@@ -185,21 +185,21 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
         String packageName = statusBarNotification.getPackageName();
         String appName = AppsHelper.appNameLookup(context, packageName);
 
+        //TODO: Add support for displaying app icons to desktop plasmoid and uncomment this piece of code
+        /*
         try {
+            //TODO: Scale down app icon if too big and compress as JPG
             Drawable drawableAppIcon = AppsHelper.appIconLookup(context, packageName);
             Bitmap appIcon = ImagesHelper.drawableToBitmap(drawableAppIcon);
             ByteArrayOutputStream outStream = new ByteArrayOutputStream();
             appIcon.compress(Bitmap.CompressFormat.PNG, 90, outStream);
             byte[] bitmapData = outStream.toByteArray();
-            //byte[] serializedBitmapData = Base64.encode(bitmapData, Base64.NO_WRAP);
-            //String stringBitmapData = new String(serializedBitmapData, Charset.defaultCharset());
-            //The icon is super big, better sending it as a file transfer when we support that
-            //np.set("base64icon", stringBitmapData);
             np.setPayload(bitmapData);
         } catch(Exception e) {
             e.printStackTrace();
             Log.e("NotificationsPlugin","Error retrieving icon");
         }
+        */
 
         np.set("id", id.serialize());
         np.set("appName", appName == null? packageName : appName);

From d66f8442faf7ae6564afcb657a594b0886a8e616 Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Tue, 1 Oct 2013 03:28:12 +0200
Subject: [PATCH 22/22] Commented raw json debug output

---
 .../src/main/java/org/kde/kdeconnect/NetworkPackage.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
index 3549fb5f..bf1843c6 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
@@ -127,7 +127,7 @@ public class NetworkPackage {
         String json = jo.toString().replace("\\/","/")+"\n";
 
         if (!isEncrypted()) {
-            Log.e("NetworkPackage.serialize", json);
+            //Log.e("NetworkPackage.serialize", json);
         }
 
         return json;
@@ -155,7 +155,7 @@ public class NetworkPackage {
         }
 
         if (!np.isEncrypted()) {
-            Log.e("NetworkPackage.unserialize", s);
+            //Log.e("NetworkPackage.unserialize", s);
         }
 
         return np;