Upgraded project to new Android SDK

Now using gradle magic imports instead of jar files for libraries
SVN_SILENT made messages (after extraction)
2025-08-31 22:25:08 +00:00 · 2013-11-02 17:46:20 +01:00 · 2013-11-02 01:35:34 +00:00 · 2013-10-31 01:37:52 +00:00 · 2013-10-30 01:42:44 +00:00 · 2013-10-30 01:46:00 +01:00
93 changed files with 1262 additions and 283 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 local.properties
-.gradle
-.idea
-out
+.gradle/
+.idea/
+out/
+build/
+target/
+classes/
--- a/KdeConnect/.gitignore
+++ b/KdeConnect/.gitignore
@@ -1 +0,0 @@
-build/
--- a/KdeConnect/KdeConnect.iml
+++ b/KdeConnect/KdeConnect.iml
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":KdeConnect" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/assets" />
-      <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/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <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="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>
-
--- a/KdeConnect/build.gradle
+++ b/KdeConnect/build.gradle
@@ -1,26 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
-    }
-}
-apply plugin: 'android'
-
-dependencies {
-    compile "com.android.support:appcompat-v7:18.0.+"
-    compile files('libs/android-support-v4.jar')
-    compile files('libs/mina-core-2.0.7.jar')
-    compile files('libs/slf4j-api-1.6.6.jar')
-}
-
-android {
-    compileSdkVersion 18
-    buildToolsVersion "18.0.1"
-
-    defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 18
-    }
-}
--- a/KdeConnect/libs/android-support-v7-appcompat.jar
+++ b/KdeConnect/libs/android-support-v7-appcompat.jar
--- a/KdeConnect/libs/mina-core-2.0.7.jar
+++ b/KdeConnect/libs/mina-core-2.0.7.jar
--- a/KdeConnect/libs/slf4j-api-1.6.6.jar
+++ b/KdeConnect/libs/slf4j-api-1.6.6.jar
--- a/KdeConnect/src/main/res/drawable/action_settings.png
+++ b/KdeConnect/src/main/res/drawable/action_settings.png
--- a/KdeConnect/src/main/res/drawable/navigation_refresh.png
+++ b/KdeConnect/src/main/res/drawable/navigation_refresh.png
--- a/KdeConnect/src/main/res/drawable/volume.png
+++ b/KdeConnect/src/main/res/drawable/volume.png
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-mkdir locale
-a2po export --android KdeConnect/src/main/res/ --gettext locale
-mv locale/template.pot $podir/kdeconnect-android.pot
-rm -rf locale
--- a/StaticMessages.sh
+++ b/StaticMessages.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# The name of catalog we create (without the.pot extension), sourced from the scripty scripts
+FILENAME="kdeconnect-android"
+
+function export_pot_file # First parameter will be the path of the pot file we have to create, includes $FILENAME
+{
+	potfile=$1
+	mkdir outdir
+	a2po export --android src/main/res/ --gettext outdir
+	mv outdir/template.pot $potfile
+	rm -rf outdir
+}
+
+function import_po_files # First parameter will be a path that will contain several .po files with the format LANG.po
+{
+	podir=$1
+	a2po import --android src/main/res/ --gettext $podir
+}
+
+
--- a/build.gradle
+++ b/build.gradle
@@ -1,2 +1,29 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.6.+'
+    }
+}

+apply plugin: 'android'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "19"
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 19
+    }
+}
+
+dependencies {
+    repositories {
+        mavenCentral()
+    }
+    compile "com.android.support:support-v4:19.0.+"
+    compile "com.android.support:appcompat-v7:19.0.+"
+    compile "org.apache.mina:mina-core:2.0.+"
+}
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Tue Oct 29 15:58:14 CET 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip
--- a/kdeconnect-android.iml
+++ b/kdeconnect-android.iml
@@ -1,13 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+  <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" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/debug" />
    <exclude-output />
    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/r/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.git" />
      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
+      <excludeFolder url="file://$MODULE_DIR$/build/apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/assets" />
+      <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/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="slf4j-api-1.6.6" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-19.0.0" level="project" />
+    <orderEntry type="library" exported="" name="mina-core-2.0.7" level="project" />
+    <orderEntry type="library" exported="" name="ComAndroidSupportAppcompatV71900.aar" level="project" />
  </component>
 </module>

--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +0,0 @@
-include ':KdeConnect'
--- a/KdeConnect/src/main/AndroidManifest.xml
+++ b/KdeConnect/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="org.kde.kdeconnect_tp"
-    android:versionCode="5"
-    android:versionName="0.3.0">
+    android:versionCode="9"
+    android:versionName="0.4">

    <uses-sdk android:minSdkVersion="9"
              android:targetSdkVersion="18" />
@@ -18,12 +18,12 @@
    <uses-feature android:name="android.hardware.telephony" android:required="false" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" android:required="false"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" android:required="false" />
    <uses-permission android:name="android.permission.BATTERY_STATS" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" android:required="false"/>
+    <uses-permission android:name="android.permission.RECEIVE_SMS" android:required="false" />
    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <application
@@ -44,11 +44,19 @@

            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
-
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>

+        <activity
+            android:name="org.kde.kdeconnect.UserInterface.MainSettingsActivity"
+            android:label="@string/settings"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
+            >
+            <meta-data android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+        </activity>
+
        <activity
                android:theme="@style/Theme.AppCompat"
                android:name="org.kde.kdeconnect.UserInterface.DeviceActivity"
@@ -57,8 +65,7 @@
                >
            <meta-data android:name="android.support.PARENT_ACTIVITY"
                       android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-
-                </activity>
+        </activity>

        <activity
            android:theme="@style/Theme.AppCompat"
@@ -68,7 +75,6 @@
            >
            <meta-data android:name="android.support.PARENT_ACTIVITY"
                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-
        </activity>

        <activity
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLink.java
@@ -56,7 +56,7 @@ public abstract class BaseLink {
        }
    }

-    //TO OVERRIDE
+    //TO OVERRIDE, should be sync
    public abstract boolean sendPackage(NetworkPackage np);
    public abstract boolean sendPackageEncrypted(NetworkPackage np, PublicKey key);

--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
@@ -1,43 +1,28 @@
 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.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.future.WriteFuture;
 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;
-import java.security.spec.PKCS8EncodedKeySpec;

 public class LanLink extends BaseLink {

    private IoSession session = null;

    public void disconnect() {
-        Log.i("LanLink", "Disconnect: "+session.getRemoteAddress().toString());
+        if (session == null) return;
+        //Log.i("LanLink", "Disconnect: "+session.getRemoteAddress().toString());
        session.close(true);
    }

@@ -46,10 +31,12 @@ public class LanLink extends BaseLink {
        this.session = session;
    }

-    private JSONObject sendPayload(final InputStream stream) {
+    private Thread sendPayload(NetworkPackage np) {

        try {

+            final InputStream stream = np.getPayload();
+
            ServerSocket candidateServer = null;
            boolean success = false;
            int tcpPort = 1739;
@@ -61,14 +48,17 @@ public class LanLink extends BaseLink {
                } catch(Exception e) {
                    Log.e("LanLink", "Exception openning serversocket: "+e);
                    tcpPort++;
-                    if (tcpPort >= 1764) return new JSONObject();
+                    if (tcpPort >= 1764) {
+                        Log.e("LanLink", "No more ports available");
+                        return null;
+                    }
                }
            }
            JSONObject payloadTransferInfo = new JSONObject();
            payloadTransferInfo.put("port", tcpPort);

            final ServerSocket server = candidateServer;
-            new Thread(new Runnable() {
+            Thread thread = new Thread(new Runnable() {
                @Override
                public void run() {
                    //TODO: Timeout when waiting for a connection and close the socket
@@ -93,9 +83,12 @@ public class LanLink extends BaseLink {
                        try { server.close(); } catch(Exception e) { }
                    }
                }
-            }).start();
+            });
+            thread.start();

-            return payloadTransferInfo;
+            np.setPayloadTransferInfo(payloadTransferInfo);
+
+            return thread;

        } catch(Exception e) {

@@ -106,23 +99,41 @@ public class LanLink extends BaseLink {
        }

    }
+
+    //Blocking, do not call from main thread
    @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);
+        try {
+            Thread thread = null;
+            if (np.hasPayload()) {
+                thread = sendPayload(np);
+                if (thread == null) return false;
+            }
+
+            WriteFuture future = session.write(np.serialize());
+            future.awaitUninterruptibly();
+            if (!future.isWritten()) return false;
+
+            if (thread != null) {
+                thread.join(); //Wait for thread to finish
+            }
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.e("LanLink", "sendPackage exception");
+            return false;
        }

-        session.write(np.serialize());
-
-        return true;
    }

+    //Blocking, do not call from main thread
    @Override
    public boolean sendPackageEncrypted(NetworkPackage np, PublicKey key) {

@@ -133,19 +144,25 @@ public class LanLink extends BaseLink {

        try {

+            Thread thread = null;
            if (np.hasPayload()) {
-                JSONObject transferInfo = sendPayload(np.getPayload());
-                np.setPayloadTransferInfo(transferInfo);
+                thread = sendPayload(np);
+                if (thread == null) return false;
            }

-            np.encrypt(key);
+            np = np.encrypt(key);
+            WriteFuture future = session.write(np.serialize());
+            if (!future.await().isWritten()) return false;

-            session.write(np.serialize());
+            if (thread != null) {
+                thread.join(); //Wait for thread to finish
+            }

            return true;
+
        } catch (Exception e) {
            e.printStackTrace();
-            Log.e("LanLink", "Encryption exception");
+            Log.e("LanLink", "sendPackageEncrypted exception");
            return false;
        }

--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
@@ -128,17 +128,23 @@ public class LanLinkProvider extends BaseLinkProvider {
                future.addListener(new IoFutureListener<IoFuture>() {
                    @Override
                    public void operationComplete(IoFuture ioFuture) {
-                        IoSession session = ioFuture.getSession();
+                        final IoSession session = ioFuture.getSession();
+
+                        final LanLink link = new LanLink(session, identityPackage.getString("deviceId"), LanLinkProvider.this);

                        Log.i("LanLinkProvider", "Connection successful: " + session.isConnected());

-                        LanLink link = new LanLink(session, identityPackage.getString("deviceId"), LanLinkProvider.this);
+                        new Thread(new Runnable() {
+                            @Override
+                            public void run() {
+                                NetworkPackage np2 = NetworkPackage.createIdentityPackage(context);
+                                link.sendPackage(np2);

-                        NetworkPackage np2 = NetworkPackage.createIdentityPackage(context);
-                        link.sendPackage(np2);
+                                nioSessions.put(session.getId(), link);
+                                addLink(identityPackage, link);
+                            }
+                        }).start();

-                        nioSessions.put(session.getId(), link);
-                        addLink(identityPackage, link);
                    }
                });

--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
@@ -26,7 +26,7 @@ public class LoopbackLink extends BaseLink {
    @Override
    public boolean sendPackageEncrypted(NetworkPackage in, PublicKey key) {
        try {
-            in.encrypt(key);
+            in = in.encrypt(key);
            String s = in.serialize();
            NetworkPackage out= NetworkPackage.unserialize(s);
            out.decrypt(privateKey);
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
@@ -14,7 +14,7 @@ import android.util.Log;
 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;
+import org.kde.kdeconnect.UserInterface.MainSettingsActivity;

 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
@@ -179,6 +179,7 @@ public class BackgroundService extends Service {
        Log.i("BackgroundService","Service not started yet, initializing...");

        initializeRsaKeys();
+        MainSettingsActivity.initializeDeviceName(this);
        loadRememberedDevicesFromSettings();
        registerLinkProviders();

--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
@@ -7,7 +7,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
@@ -93,17 +92,18 @@ 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, NetworkPackage np, BaseLink dl) {
-        settings = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);

        //Log.e("Device","Constructor B");

        this.context = context;
        this.deviceId = np.getString("deviceId");
-        this.name = np.getString("deviceName");
+        this.name = np.getString("deviceName", "unidentified device");
        this.protocolVersion = np.getInt("protocolVersion");
        this.pairStatus = PairStatus.NotPaired;
        this.publicKey = null;

+        settings = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
+
        addLink(np, dl);
    }

@@ -151,15 +151,21 @@ public class Device implements BaseLink.PackageReceiver {
        Resources res = context.getResources();

        if (pairStatus == PairStatus.Paired) {
-            for (PairingCallback cb : pairingCallback) cb.pairingFailed(res.getString(R.string.error_already_paired));
+            for (PairingCallback cb : pairingCallback) {
+                cb.pairingFailed(res.getString(R.string.error_already_paired));
+            }
            return;
        }
        if (pairStatus == PairStatus.Requested) {
-            for (PairingCallback cb : pairingCallback) cb.pairingFailed(res.getString(R.string.error_already_requested));
+            for (PairingCallback cb : pairingCallback) {
+                cb.pairingFailed(res.getString(R.string.error_already_requested));
+            }
            return;
        }
        if (!isReachable()) {
-            for (PairingCallback cb : pairingCallback) cb.pairingFailed(res.getString(R.string.error_not_reachable));
+            for (PairingCallback cb : pairingCallback) {
+                cb.pairingFailed(res.getString(R.string.error_not_reachable));
+            }
            return;
        }

@@ -178,7 +184,7 @@ public class Device implements BaseLink.PackageReceiver {
                        }
                        pairStatus = PairStatus.NotPaired;
                    }
-                }, 20*1000);
+                }, 30*1000);
                pairStatus = PairStatus.Requested;
            }

@@ -217,13 +223,7 @@ public class Device implements BaseLink.PackageReceiver {

    }

-    public void acceptPairing() {
-
-        Log.i("Device","Accepted pairing");
-
-        //Send our own public key
-        NetworkPackage np = NetworkPackage.createPublicKeyPackage(context);
-        sendPackage(np); //TODO: Set a callback
+    private void pairingDone() {

        pairStatus = PairStatus.Paired;

@@ -240,13 +240,37 @@ public class Device implements BaseLink.PackageReceiver {

        reloadPluginsFromSettings();

-        for (PairingCallback cb : pairingCallback) cb.pairingSuccessful();
+        for (PairingCallback cb : pairingCallback) {
+            cb.pairingSuccessful();
+        }
+
+    }
+
+    public void acceptPairing() {
+
+        Log.i("Device","Accepted pair request started by the other device");
+
+        //Send our own public key
+        NetworkPackage np = NetworkPackage.createPublicKeyPackage(context);
+        sendPackage(np, new SendPackageFinishedCallback() {
+            @Override
+            public void sendSuccessful() {
+                pairingDone();
+            }
+            @Override
+            public void sendFailed() {
+                pairStatus = PairStatus.NotPaired;
+                for (PairingCallback cb : pairingCallback) {
+                    cb.pairingFailed(context.getString(R.string.error_not_reachable));
+                }
+            }
+        });

    }

    public void rejectPairing() {

-        Log.i("Device","Rejected pairing");
+        Log.i("Device","Rejected pair request started by the other device");

        pairStatus = PairStatus.NotPaired;

@@ -254,7 +278,9 @@ public class Device implements BaseLink.PackageReceiver {
        np.set("pair", false);
        sendPackage(np);

-        for (PairingCallback cb : pairingCallback) cb.pairingFailed(context.getString(R.string.error_canceled_by_user));
+        for (PairingCallback cb : pairingCallback) {
+            cb.pairingFailed(context.getString(R.string.error_canceled_by_user));
+        }

    }

@@ -323,7 +349,9 @@ public class Device implements BaseLink.PackageReceiver {
                if (pairStatus == PairStatus.Requested) {
                    pairStatus = PairStatus.NotPaired;
                    pairingTimer.cancel();
-                    for (PairingCallback cb : pairingCallback) cb.pairingFailed(context.getString(R.string.error_canceled_by_other_peer));
+                    for (PairingCallback cb : pairingCallback) {
+                        cb.pairingFailed(context.getString(R.string.error_canceled_by_other_peer));
+                    }
                }
                return;
            }
@@ -338,7 +366,9 @@ public class Device implements BaseLink.PackageReceiver {
                } catch(Exception e) {
                    e.printStackTrace();
                    Log.e("Device","Pairing exception: Received incorrect key");
-                    for (PairingCallback cb : pairingCallback) cb.pairingFailed(context.getString(R.string.error_invalid_key));
+                    for (PairingCallback cb : pairingCallback) {
+                        cb.pairingFailed(context.getString(R.string.error_invalid_key));
+                    }
                    return;
                }

@@ -346,23 +376,9 @@ public class Device implements BaseLink.PackageReceiver {

                    Log.i("Pairing","Pair answer");

-                    pairStatus = PairStatus.Paired;
                    pairingTimer.cancel();

-                    //Store as trusted device
-                    String encodedPublicKey  = Base64.encodeToString(publicKey.getEncoded(), 0);
-                    SharedPreferences preferences = context.getSharedPreferences("trusted_devices", Context.MODE_PRIVATE);
-                    preferences.edit().putBoolean(deviceId,true).commit();
-
-                    //Store device information needed to create a Device object in a future
-                    SharedPreferences.Editor editor = settings.edit();
-                    editor.putString("deviceName", getName());
-                    editor.putString("publicKey", encodedPublicKey);
-                    editor.commit();
-
-                    reloadPluginsFromSettings();
-
-                    for (PairingCallback cb : pairingCallback) cb.pairingSuccessful();
+                    pairingDone();

                } else {

@@ -396,7 +412,7 @@ public class Device implements BaseLink.PackageReceiver {
                            pairStatus = PairStatus.NotPaired;
                            notificationManager.cancel(notificationId);
                        }
-                    }, 19*1000); //Time to show notification
+                    }, 25*1000); //Time to show notification

                    pairStatus = PairStatus.RequestedByPeer;
                    for (PairingCallback cb : pairingCallback) cb.incomingRequest();
@@ -407,7 +423,9 @@ public class Device implements BaseLink.PackageReceiver {

                if (pairStatus == PairStatus.Requested) {
                    pairingTimer.cancel();
-                    for (PairingCallback cb : pairingCallback) cb.pairingFailed(context.getString(R.string.error_canceled_by_other_peer));
+                    for (PairingCallback cb : pairingCallback) {
+                        cb.pairingFailed(context.getString(R.string.error_canceled_by_other_peer));
+                    }
                } else if (pairStatus == PairStatus.Paired) {
                    SharedPreferences preferences = context.getSharedPreferences("trusted_devices", Context.MODE_PRIVATE);
                    preferences.edit().remove(deviceId).commit();
@@ -441,33 +459,44 @@ public class Device implements BaseLink.PackageReceiver {
        sendPackage(np,null);
    }

+    //Async
    public void sendPackage(final NetworkPackage np, final SendPackageFinishedCallback callback) {

+
+        final Exception backtrace = new Exception();
        new Thread(new Runnable() {
            @Override
            public void run() {

+                //Log.e("sendPackage", "Sending package...");
+                //Log.e("sendPackage", np.serialize());
+
                boolean useEncryption = (!np.getType().equals(NetworkPackage.PACKAGE_TYPE_PAIR) && isPaired());

-                //Log.e("sendPackage", "Sending...");
+                //We need a copy to avoid concurrent modification exception if the original list changes
+                ArrayList<BaseLink> mLinks = new ArrayList<BaseLink>(links);

-                for(BaseLink link : links) {
-
-                    boolean success;
+                boolean success = false;
+                for(BaseLink link : mLinks) {
                    if (useEncryption) {
                        success = link.sendPackageEncrypted(np, publicKey);
                    } else {
                        success = link.sendPackage(np);
                    }
-                    if (success) {
-                        //Log.e("sendPackage", "Sent");
-                        if (callback != null) callback.sendSuccessful();
-                        return;
-                    }
+                    if (success) break;
                }

-                if (callback != null) callback.sendFailed();
-                Log.e("sendPackage","Error: Package could not be sent ("+links.size()+" links available)");
+                if (success) {
+                   // Log.e("sendPackage","Package sent");
+                } else {
+                    backtrace.printStackTrace();
+                    Log.e("sendPackage","Error: Package could not be sent ("+mLinks.size()+" links available)");
+                }
+
+                if (callback != null) {
+                    if (success) callback.sendSuccessful();
+                    else callback.sendFailed();
+                }

            }
        }).start();
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java
@@ -35,10 +35,13 @@ public class ContactsHelper {
            if (nameIndex != -1) {
                String name = cursor.getString(nameIndex);
                //Log.e("PhoneNumberLookup", "success: " + name);
+                cursor.close();
                return name;
            }
        }

+        if (cursor != null) cursor.close();
+
        return number;

    }
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/ImagesHelper.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/ImagesHelper.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/HumanDeviceNames.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/HumanDeviceNames.java
@@ -154,7 +154,7 @@ public class HumanDeviceNames {
        humanReadableNames.put("XT907","Motorola Droid Razr M");
    }

-    static String getDeviceName() {
+    public static String getDeviceName() {

        String dictName = humanReadableNames.get(Build.MODEL.replace(' ','_'));
        if (dictName != null) return dictName;
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
@@ -10,6 +10,8 @@ import android.util.Log;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.kde.kdeconnect.UserInterface.MainSettingsActivity;
+import org.kde.kdeconnect_tp.R;

 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -74,6 +76,9 @@ public class NetworkPackage {
    public double getDouble(String key) { return mBody.optDouble(key,Double.NaN); }
    public double getDouble(String key, double defaultValue) { return mBody.optDouble(key,defaultValue); }
    public void set(String key, double value) { try { mBody.put(key,value); } catch(Exception e) { } }
+    public JSONArray getJSONArray(String key) { return mBody.optJSONArray(key); }
+    public void set(String key, JSONArray value) { try { mBody.put(key,value); } catch(Exception e) { } }
+
    public ArrayList<String> getStringList(String key) {
        JSONArray jsonArray = mBody.optJSONArray(key);
        ArrayList<String> list = new ArrayList<String>();
@@ -103,7 +108,6 @@ public class NetworkPackage {

        }
    }
-
    public boolean has(String key) { return mBody.has(key); }

    public boolean isEncrypted() { return mType.equals(PACKAGE_TYPE_ENCRYPTED); }
@@ -161,7 +165,7 @@ public class NetworkPackage {
        return np;
    }

-    public void encrypt(PublicKey publicKey) throws Exception {
+    public NetworkPackage encrypt(PublicKey publicKey) throws Exception {

        String serialized = serialize();

@@ -183,17 +187,11 @@ public class NetworkPackage {
            chunks.put(Base64.encodeToString(encryptedChunk, Base64.NO_WRAP));
        }

-        mId = System.currentTimeMillis();
-        mType = NetworkPackage.PACKAGE_TYPE_ENCRYPTED;
-        mBody = new JSONObject();
-        try {
-            mBody.put("data", chunks);
-        }catch(Exception e){
-            e.printStackTrace();
-            Log.e("NetworkPackage","Exception");
-        }
+        //Log.i("NetworkPackage", "Encrypted " + chunks.length()+" chunks");

-        Log.i("NetworkPackage", "Encrypted " + chunks.length()+" chunks");
+        NetworkPackage encrypted = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_ENCRYPTED);
+        encrypted.set("data", chunks);
+        return encrypted;

    }

@@ -221,7 +219,10 @@ public class NetworkPackage {
        String deviceId = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
        try {
            np.mBody.put("deviceId", deviceId);
-            np.mBody.put("deviceName", HumanDeviceNames.getDeviceName());
+            np.mBody.put("deviceName",
+                    PreferenceManager.getDefaultSharedPreferences(context).getString(
+                            MainSettingsActivity.KEY_DEVICE_NAME_PREFERENCE,
+                            HumanDeviceNames.getDeviceName()));
            np.mBody.put("protocolVersion", NetworkPackage.ProtocolVersion);
        } catch (JSONException e) {
        }
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
@@ -93,8 +93,12 @@ public class MprisActivity extends Activity {
                                        //Spotify doesn't support changing the volume yet...
                                        if (player.equals("Spotify")) {
                                            findViewById(R.id.volume_layout).setVisibility(View.INVISIBLE);
+                                            findViewById(R.id.rew_button).setVisibility(View.GONE);
+                                            findViewById(R.id.ff_button).setVisibility(View.GONE);
                                        } else {
                                            findViewById(R.id.volume_layout).setVisibility(View.VISIBLE);
+                                            findViewById(R.id.rew_button).setVisibility(View.VISIBLE);
+                                            findViewById(R.id.ff_button).setVisibility(View.VISIBLE);
                                        }
                                    }

@@ -187,6 +191,36 @@ public class MprisActivity extends Activity {
            }
        });

+        findViewById(R.id.rew_button).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
+                    @Override
+                    public void onServiceStart(BackgroundService service) {
+                        Device device = service.getDevice(deviceId);
+                        MprisPlugin mpris = (MprisPlugin)device.getPlugin("plugin_mpris");
+                        if (mpris == null) return;
+                        mpris.Seek(-10000000); // -10 seconds. TODO: plugin settings UI?
+                    }
+                });
+            }
+        });
+
+        findViewById(R.id.ff_button).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
+                    @Override
+                    public void onServiceStart(BackgroundService service) {
+                        Device device = service.getDevice(deviceId);
+                        MprisPlugin mpris = (MprisPlugin)device.getPlugin("plugin_mpris");
+                        if (mpris == null) return;
+                        mpris.Seek(10000000); // 10 seconds. TODO: plugin settings UI?
+                    }
+                });
+            }
+        });
+
        findViewById(R.id.next_button).setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
@@ -84,6 +84,13 @@ public class MprisPlugin extends Plugin {
        device.sendPackage(np);
    }

+    public void Seek(int offset) {
+        NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_MPRIS);
+        np.set("player",player);
+        np.set("Seek",offset);
+        device.sendPackage(np);
+    }
+
    @Override
    public boolean onPackageReceived(NetworkPackage np) {
        if (!np.getType().equals(NetworkPackage.PACKAGE_TYPE_MPRIS)) return false;
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/Plugin.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/Plugin.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java
@@ -28,7 +28,7 @@ import java.util.HashMap;

 public class DeviceActivity extends ActionBarActivity {

-    private String deviceId;
+    static private String deviceId; //Static because if we get here by using the back button in the action bar, the extra deviceId will not be set.
    private Device device;

    private Device.PluginsChangedListener pluginsChangedListener = new Device.PluginsChangedListener() {
@@ -58,7 +58,7 @@ public class DeviceActivity extends ActionBarActivity {
                    errorList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                        @Override
                        public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
-                            Plugin p = failedPlugins.get(ids[position - 1]); //Header is position 0, so we have to substract one
+                            Plugin p = failedPlugins.get(ids[position - 1]); //Header is position 0, so we have to subtract one
                            p.getErrorDialog(DeviceActivity.this).show();
                        }
                    });
@@ -91,12 +91,15 @@ public class DeviceActivity extends ActionBarActivity {
        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE);
        actionBar.setDisplayHomeAsUpEnabled(true);

-        deviceId = getIntent().getStringExtra("deviceId");
+        if (getIntent().hasExtra("deviceId")) {
+            deviceId = getIntent().getStringExtra("deviceId");
+        }

        BackgroundService.RunCommand(DeviceActivity.this, new BackgroundService.InstanceCallback() {
            @Override
            public void onServiceStart(BackgroundService service) {
                device = service.getDevice(deviceId);
+                if (device == null) return;
                setTitle(device.getName());
                device.addPluginsChangedListener(pluginsChangedListener);
                pluginsChangedListener.onPluginsChanged(device);
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/ButtonItem.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/ButtonItem.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
@@ -10,7 +10,7 @@ public class SectionItem implements ListAdapter.Item {

 	private final String title;
    public boolean isEmpty;
-	
+
 	public SectionItem(String title) {
 		this.title = title;
        this.isEmpty = false;
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java
@@ -1,6 +1,7 @@
 package org.kde.kdeconnect.UserInterface;


+import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
@@ -66,6 +67,9 @@ public class MainActivity extends ActionBarActivity {
                    }
                }).start();
                break;
+            case R.id.menu_settings:
+                startActivity(new Intent(this,MainSettingsActivity.class));
+                break;
            default:
                break;
        }
@@ -79,7 +83,6 @@ public class MainActivity extends ActionBarActivity {

        ActionBar actionBar = getSupportActionBar();
        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM);
-
    }


--- a/src/main/java/org/kde/kdeconnect/UserInterface/MainSettingsActivity.java
+++ b/src/main/java/org/kde/kdeconnect/UserInterface/MainSettingsActivity.java
@@ -0,0 +1,103 @@
+package org.kde.kdeconnect.UserInterface;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.EditTextPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.kde.kdeconnect.HumanDeviceNames;
+import org.kde.kdeconnect_tp.R;
+
+public class MainSettingsActivity extends PreferenceActivity{
+
+    public static final String KEY_DEVICE_NAME_PREFERENCE = "device_name_preference";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initializeDeviceName(this);
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+            addPreferencesOldApi();
+        } else {
+            getFragmentManager().beginTransaction().
+                    replace(android.R.id.content, new GeneralPrefsFragment()).commit();
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private void addPreferencesOldApi() {
+        addPreferencesFromResource(R.xml.general_preferences);
+        initPreferences((EditTextPreference) findPreference(KEY_DEVICE_NAME_PREFERENCE));
+    }
+
+    private void initPreferences(final EditTextPreference deviceNamePref) {
+        final SharedPreferences sharedPreferences=PreferenceManager.getDefaultSharedPreferences(this);
+        deviceNamePref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newDeviceName) {
+                if (newDeviceName.toString().isEmpty()) {
+                    Toast.makeText(
+                            MainSettingsActivity.this,
+                            getString(R.string.invalid_device_name),
+                            Toast.LENGTH_SHORT).show();
+                    return false;
+                }else{
+                    Log.i("MainSettingsActivity", "New device name: " + newDeviceName);
+                    deviceNamePref.setSummary(getString(
+                            R.string.device_name_preference_summary,
+                            newDeviceName.toString()));
+                    return true;
+                }
+            }
+        });
+        deviceNamePref.setSummary(getString(
+                R.string.device_name_preference_summary,
+                sharedPreferences.getString(KEY_DEVICE_NAME_PREFERENCE,"")));
+    }
+
+    /**
+     * Until now it sets only the default deviceName (if not already set).
+     * It's safe to call this multiple time because doesn't override any previous value.
+     * @param context
+     */
+    public static void initializeDeviceName(Context context){
+        // I could have used getDefaultSharedPreferences(context).contains but we need to check
+        // to checkAgainst empty String also.
+        String deviceName=PreferenceManager.getDefaultSharedPreferences(context).getString(
+                KEY_DEVICE_NAME_PREFERENCE,
+                "");
+        if(deviceName.isEmpty()){
+            Log.i("MainSettingsActivity", "New device name: " + deviceName);
+            PreferenceManager.getDefaultSharedPreferences(context).edit().putString(
+                    KEY_DEVICE_NAME_PREFERENCE,
+                    HumanDeviceNames.getDeviceName()).commit();
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public static class GeneralPrefsFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.general_preferences);
+        }
+
+        @Override
+        public void onActivityCreated(Bundle savedInstanceState) {
+            super.onActivityCreated(savedInstanceState);
+            if (getActivity() != null) {
+                ((MainSettingsActivity)getActivity()).initPreferences(
+                        (EditTextPreference) findPreference(KEY_DEVICE_NAME_PREFERENCE));
+            }
+        }
+    }
+}
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/PreferenceListAdapter.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/PreferenceListAdapter.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
@@ -24,6 +24,7 @@ import org.kde.kdeconnect.UserInterface.List.ListAdapter;
 import org.kde.kdeconnect.UserInterface.List.SectionItem;
 import org.kde.kdeconnect_tp.R;

+import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
@@ -175,38 +176,58 @@ public class ShareToReceiver extends ActionBarActivity {
            InputStream inputStream = cr.openInputStream(uri);

            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);
-
            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 _) {
+            if (uri.getScheme().equals("file")) {
+                // file:// is a non media uri, so we cannot query the ContentProvider
                try {
-                    int column_index = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DISPLAY_NAME);
-                    cursor.moveToFirst();
-                    String name = cursor.getString(column_index);
-                    np.set("filename", name);
+                    size = (int)new File(uri.getPath()).length();
+                    np.setPayload(inputStream, size);
+                } catch(Exception e) {
+                    e.printStackTrace();
+                    Log.e("ShareToReceiver", "Could not obtain file size");
+                }
+                try{
+                    np.set("filename", uri.getLastPathSegment());
                } catch (Exception e) {
                    e.printStackTrace();
                    Log.e("ShareToReceiver", "Could not obtain file name");
                }
+
+            }else{
+                // Probably a content:// uri, so we query the Media content provider
+                String[] proj = { MediaStore.MediaColumns.DATA, MediaStore.MediaColumns.SIZE, MediaStore.MediaColumns.DISPLAY_NAME };
+                Cursor cursor = managedQuery(uri, proj, null, null, null);
+                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");
+                    }
+                }
+
+                cursor.close();
            }

            device.sendPackage(np, new Device.SendPackageFinishedCallback() {
@@ -218,12 +239,13 @@ public class ShareToReceiver extends ActionBarActivity {

                @Override
                public void sendFailed() {
-                    Log.e("ShareToReceiver", "Failed to send attachment");
+                    Log.e("ShareToReceiver", "Failed to send file");
                }
            });
+
        } catch (Exception e) {
            e.printStackTrace();
-            Log.e("ShareToReceiver", "Failed to send attachment");
+            Log.e("ShareToReceiver", "Exception sending files");
        }

    }
--- a/src/main/res/drawable-hdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-hdpi/ic_action_refresh.png
--- a/src/main/res/drawable-hdpi/ic_action_settings.png
+++ b/src/main/res/drawable-hdpi/ic_action_settings.png
--- a/src/main/res/drawable-hdpi/ic_volume.png
+++ b/src/main/res/drawable-hdpi/ic_volume.png
--- a/src/main/res/drawable-mdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-mdpi/ic_action_refresh.png
--- a/src/main/res/drawable-mdpi/ic_action_settings.png
+++ b/src/main/res/drawable-mdpi/ic_action_settings.png
--- a/src/main/res/drawable-mdpi/ic_volume.png
+++ b/src/main/res/drawable-mdpi/ic_volume.png
--- a/src/main/res/drawable-xhdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-xhdpi/ic_action_refresh.png
--- a/src/main/res/drawable-xhdpi/ic_action_settings.png
+++ b/src/main/res/drawable-xhdpi/ic_action_settings.png
--- a/src/main/res/drawable-xhdpi/ic_volume.png
+++ b/src/main/res/drawable-xhdpi/ic_volume.png
--- a/src/main/res/drawable-xxhdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_refresh.png
--- a/src/main/res/drawable-xxhdpi/ic_action_settings.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_settings.png
--- a/src/main/res/drawable-xxhdpi/ic_volume.png
+++ b/src/main/res/drawable-xxhdpi/ic_volume.png
--- a/KdeConnect/src/main/res/drawable/icon.png
+++ b/KdeConnect/src/main/res/drawable/icon.png
--- a/KdeConnect/src/main/res/layout/activity_device.xml
+++ b/KdeConnect/src/main/res/layout/activity_device.xml
--- a/KdeConnect/src/main/res/layout/activity_main.xml
+++ b/KdeConnect/src/main/res/layout/activity_main.xml
--- a/KdeConnect/src/main/res/layout/activity_pair.xml
+++ b/KdeConnect/src/main/res/layout/activity_pair.xml
--- a/KdeConnect/src/main/res/layout/list_item_category.xml
+++ b/KdeConnect/src/main/res/layout/list_item_category.xml
--- a/KdeConnect/src/main/res/layout/list_item_entry.xml
+++ b/KdeConnect/src/main/res/layout/list_item_entry.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-  
-  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
+
+  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:baselineAligned="false"
    android:layout_height="wrap_content"
--- a/KdeConnect/src/main/res/layout/mpris_control.xml
+++ b/KdeConnect/src/main/res/layout/mpris_control.xml
@@ -37,7 +37,7 @@
    <LinearLayout
        android:orientation="horizontal"
        android:layout_width="200dip"
-        android:layout_height="70dip"
+        android:layout_height="50dip"
        android:layout_gravity="center"
    >

@@ -45,19 +45,36 @@
            android:layout_width="match_parent"
            android:layout_height="fill_parent"
            android:id="@+id/prev_button"
-            android:src="@android:drawable/ic_media_rew"
+            android:src="@android:drawable/ic_media_previous"
            android:contentDescription="@string/mpris_previous"
-            android:layout_weight="0.5"
+            android:layout_weight="0.25"
+        />
+
+        <ImageButton
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:id="@+id/rew_button"
+            android:src="@android:drawable/ic_media_rew"
+            android:contentDescription="@string/mpris_rew"
+            android:layout_weight="0.25"
+        />
+
+        <ImageButton
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:id="@+id/ff_button"
+            android:src="@android:drawable/ic_media_ff"
+            android:contentDescription="@string/mpris_ff"
+            android:layout_weight="0.25"
        />

        <ImageButton
            android:layout_width="match_parent"
            android:layout_height="fill_parent"
            android:id="@+id/next_button"
-            android:src="@android:drawable/ic_media_ff"
-            android:layout_gravity="center"
+            android:src="@android:drawable/ic_media_next"
            android:contentDescription="@string/mpris_next"
-            android:layout_weight="0.5"
+            android:layout_weight="0.25"
        />

    </LinearLayout>
@@ -77,7 +94,7 @@
            android:layout_weight="1"
            android:layout_gravity="left|center_vertical"
            android:contentDescription="@string/mpris_volume"
-            android:src="@drawable/volume"
+            android:src="@drawable/ic_volume"
        />


@@ -107,4 +124,4 @@
                android:src="@android:drawable/ic_media_stop"
                android:layout_gravity="center"/>
    -->
-</LinearLayout>
+</LinearLayout>
--- a/KdeConnect/src/main/res/menu/main.xml
+++ b/KdeConnect/src/main/res/menu/main.xml
@@ -1,9 +1,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto">
+    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">

    <item
            android:id="@+id/menu_refresh"
-            android:icon="@drawable/navigation_refresh"
+            android:icon="@drawable/ic_action_refresh"
            android:orderInCategory="200"
            kdeconnect:showAsAction="always"
            android:title="@string/reconnect"
@@ -11,11 +11,17 @@

    <item
            android:id="@+id/menu_progress"
-            android:icon="@drawable/navigation_refresh"
            android:orderInCategory="200"
            android:visible="false"
            kdeconnect:showAsAction="always"
            kdeconnect:actionViewClass="android.widget.ProgressBar"
        />

+    <item
+        android:id="@+id/menu_settings"
+        android:icon="@drawable/ic_action_settings"
+        android:orderInCategory="300"
+        android:title="@string/settings"
+        kdeconnect:showAsAction="never"
+        />
 </menu>
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_battery">Hlášení baterie</string>
+  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_ping_desc">Posílat a přijímat ping</string>
+  <string name="device_list_empty">Žádná zařízení</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Zrušit</string>
+  <string name="open_settings">Otevřít nastavení</string>
+  <string name="send_ping">Poslat ping</string>
+  <string name="category_connected_devices">Připojená zařízení</string>
+  <string name="category_not_paired_devices">Nespárovaná zařízení</string>
+  <string name="category_remembered_devices">Zapamatovaná zařízení</string>
+  <string name="device_menu_plugins">Vyberte moduly</string>
+  <string name="error_timed_out">Čas vypršel</string>
+  <string name="error_canceled_by_user">Přerušeno uživatelem</string>
+  <string name="reconnect">Znovu připojit</string>
+  <string name="pairing_accept">Přijmout</string>
+  <string name="pairing_reject">Odmítnout</string>
+  <string name="device">Zařízení</string>
+  <string name="remote_control">Vzdálené ovládání</string>
+  <string name="mpris_play">Přehrát</string>
+  <string name="mpris_previous">Předchozí</string>
+  <string name="mpris_next">Následující</string>
+  <string name="mpris_volume">Hlasitost</string>
+  <string name="general_settings">Otevřít nastavení</string>
+  <string name="device_name">Zařízení</string>
+</resources>
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Telefon-Benachrichtigung</string>
+  <string name="pref_plugin_telephony_desc">Benachrichtigungen über SMS und Anrufe senden</string>
+  <string name="pref_plugin_battery">Akkubericht</string>
+  <string name="pref_plugin_battery_desc">Akkustatus periodisch berichten</string>
+  <string name="pref_plugin_clipboard">Abgleich der Zwischenablage</string>
+  <string name="pref_plugin_clipboard_desc">Inhalt der Zwischenablage freigeben</string>
+  <string name="pref_plugin_mpris">Multimedia-Fernbedienungen</string>
+  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_ping_desc">Senden und Empfangen von Pings</string>
+  <string name="pref_plugin_notifications">Benachrichtigungs-Abgleich</string>
+  <string name="pref_plugin_notifications_desc">Zugriff auf Ihre Benachrichtigungen von anderen Geräten</string>
+  <string name="plugin_not_available">Diese Funktion ist in Ihrer Android-Version nicht verfügbar</string>
+  <string name="device_list_empty">Keine Geräte</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Abbrechen</string>
+  <string name="open_settings">Einstellungen öffnen</string>
+  <string name="send_ping">Ping senden</string>
+  <string name="open_mpris_controls">Fernbedienung öffnen</string>
+  <string name="category_connected_devices">Verbundene Geräte</string>
+  <string name="category_not_paired_devices">Keine angeschlossenen Geräte</string>
+  <string name="device_menu_plugins">Module auswählen</string>
+  <string name="device_menu_unpair">Verbindung trennen</string>
+  <string name="unknown_device">Unbekanntes Gerät</string>
+  <string name="error_not_reachable">Das Gerät ist nicht erreichbar</string>
+  <string name="error_already_requested">Die Verbindung wurde bereits angefragt</string>
+  <string name="error_already_paired">Das Gerät ist bereits verbunden</string>
+  <string name="error_could_not_send_package">Das Paket kann nicht gesendet werden</string>
+  <string name="error_timed_out">Zeitüberschreitung</string>
+  <string name="error_canceled_by_user">Abbruch durch Benutzer</string>
+  <string name="error_canceled_by_other_peer">Abbruch durch Gegenstelle</string>
+  <string name="error_invalid_key">Ungültiger Schlüssel empfangen</string>
+  <string name="pair_requested">Verbindung angefordert</string>
+  <string name="pairing_request_from">Verbindungsanfrage von %1s</string>
+  <string name="reconnect">Erneut verbinden</string>
+  <string name="device_not_paired">Das Gerät ist nicht verbunden</string>
+  <string name="request_pairing">Verbindung angefordert</string>
+  <string name="pairing_accept">Annehmen</string>
+  <string name="pairing_reject">Ablehnen</string>
+  <string name="device">Gerät</string>
+  <string name="pair_device">Gerät verbinden</string>
+  <string name="remote_control">Fernbedienung</string>
+  <string name="settings">KDE-Verbindungseinstellungen</string>
+  <string name="mpris_play">Wiedergabe</string>
+  <string name="mpris_previous">Zurück</string>
+  <string name="mpris_next">Weiter</string>
+  <string name="mpris_volume">Lautstärke</string>
+  <string name="protocol_version_older">Dieses Gerät verwendet ein alte Protokollversion</string>
+  <string name="protocol_version_newer">Dieses Gerät verwendet ein neuere Protokollversion</string>
+  <string name="general_settings">Allgemeine Einstellungen</string>
+  <string name="device_name">Gerätename</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Ungültiger Gerätename</string>
+</resources>
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Notificador de telefonía</string>
+  <string name="pref_plugin_telephony_desc">Enviar notificaciones de SMS y llamadas</string>
+  <string name="pref_plugin_battery">Informe de la batería</string>
+  <string name="pref_plugin_battery_desc">Informar periódicamente del estado de la batería</string>
+  <string name="pref_plugin_clipboard">Sincronización del portapapeles</string>
+  <string name="pref_plugin_clipboard_desc">Compartir el contenido del portapapeles</string>
+  <string name="pref_plugin_mpris">Controles remotos multimedia</string>
+  <string name="pref_plugin_mpris_desc">Controlar audio y vídeo desde el teléfono</string>
+  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_ping_desc">Enviar y recibir pings</string>
+  <string name="pref_plugin_notifications">Sincronizar notificaciones</string>
+  <string name="pref_plugin_notifications_desc">Acceder a las notificaciones desde otros dispositivos</string>
+  <string name="plugin_not_available">Esta función no está disponible en su versión de Android</string>
+  <string name="device_list_empty">Ningún dispositivo</string>
+  <string name="ok">Aceptar</string>
+  <string name="cancel">Cancelar</string>
+  <string name="open_settings">Abrir preferencias</string>
+  <string name="no_permissions">Debe otorgar permiso para acceder a las notificaciones</string>
+  <string name="send_ping">Enviar ping</string>
+  <string name="open_mpris_controls">Abrir control remoto</string>
+  <string name="category_connected_devices">Dispositivos conectados</string>
+  <string name="category_not_paired_devices">Dispositivos no vinculados</string>
+  <string name="category_remembered_devices">Dispositivos recordados</string>
+  <string name="plugins_failed_to_load">Complementos cuya carga ha fallado (toque para más información):</string>
+  <string name="device_menu_plugins">Seleccionar complementos</string>
+  <string name="device_menu_unpair">Desvincular</string>
+  <string name="unknown_device">Dispositivo desconocido</string>
+  <string name="error_not_reachable">No se encuentra el dispositivo</string>
+  <string name="error_already_requested">Ya ha solicitado vincularse</string>
+  <string name="error_already_paired">Dispositivo ya vinculado</string>
+  <string name="error_could_not_send_package">No se puede enviar el paquete</string>
+  <string name="error_timed_out">Se ha agotado el tiempo</string>
+  <string name="error_canceled_by_user">Cancelado por el usuario</string>
+  <string name="error_canceled_by_other_peer">Cancelado por la otra parte</string>
+  <string name="error_invalid_key">Se ha recibido una clave no valida</string>
+  <string name="pair_requested">Vinculación solicitada</string>
+  <string name="pairing_request_from">Solicitud de vinculación de %1s</string>
+  <string name="tap_to_answer">Toque para responder</string>
+  <string name="reconnect">Reconectar</string>
+  <string name="device_not_paired">Dispositivo no vinculado</string>
+  <string name="request_pairing">Solicitar vinculación</string>
+  <string name="pairing_accept">Aceptar</string>
+  <string name="pairing_reject">Rechazar</string>
+  <string name="device">Dispositivo</string>
+  <string name="pair_device">Vincular dispositivo</string>
+  <string name="remote_control">Control remoto</string>
+  <string name="settings">Preferencias de KDE Connect</string>
+  <string name="mpris_play">Reproducir</string>
+  <string name="mpris_previous">Anterior</string>
+  <string name="mpris_next">Siguiente</string>
+  <string name="mpris_volume">Volumen</string>
+  <string name="share_to">Compartir con...</string>
+  <string name="protocol_version_older">Este dispositivo usa una versión antigua del protocolo</string>
+  <string name="protocol_version_newer">Este dispositivo usa una versión más reciente del protocolo</string>
+  <string name="general_settings">Abrir preferencias</string>
+  <string name="device_name">Dispositivo no vinculado</string>
+  <string name="invalid_device_name">Se ha recibido una clave no valida</string>
+</resources>
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Notificateur de téléphonie</string>
+  <string name="pref_plugin_telephony_desc">Envoie des notifications pour les SMS et les appels</string>
+  <string name="pref_plugin_battery">Rapport sur la batterie</string>
+  <string name="pref_plugin_battery_desc">Rapport périodique sur l\'état de la batterie</string>
+  <string name="pref_plugin_clipboard">Synchronisation avec le presse-papiers</string>
+  <string name="pref_plugin_clipboard_desc">Partage le contenu du presse-papiers</string>
+  <string name="pref_plugin_mpris">Contrôles distants multimédia</string>
+  <string name="pref_plugin_mpris_desc">Contrôle l\'audio / la vidéo depuis votre téléphone</string>
+  <string name="pref_plugin_ping">Commande « Ping »</string>
+  <string name="pref_plugin_ping_desc">Envoie et reçoit des commandes « Ping »</string>
+  <string name="pref_plugin_notifications">Synchronisation des notifications</string>
+  <string name="pref_plugin_notifications_desc">Accédez à vos notifications depuis d\'autres périphériques</string>
+  <string name="plugin_not_available">Cette fonctionnalité n\'est pas disponible dans votre version de Android</string>
+  <string name="device_list_empty">Pas de périphériques</string>
+  <string name="ok">Ok</string>
+  <string name="cancel">Annuler</string>
+  <string name="open_settings">Accéder aux paramètres</string>
+  <string name="no_permissions">Vous devez accorder la permission d\'accéder aux notifications</string>
+  <string name="send_ping">Envoyer un « Ping »</string>
+  <string name="open_mpris_controls">Ouvrir un contrôle distant</string>
+  <string name="category_connected_devices">Périphériques connectés</string>
+  <string name="category_not_paired_devices">Pas de périphériques appariés</string>
+  <string name="category_remembered_devices">Périphériques mémorisés</string>
+  <string name="plugins_failed_to_load">Le chargement des modules externes a échoué (cliquez pour plus d\'informations) :</string>
+  <string name="device_menu_plugins">Sélectionner des modules externes</string>
+  <string name="device_menu_unpair">Désapparier</string>
+  <string name="unknown_device">Périphérique inconnu</string>
+  <string name="error_not_reachable">Périphérique inaccessible</string>
+  <string name="error_already_requested">L\'appariement a déjà été demandé</string>
+  <string name="error_already_paired">Périphérique déjà apparié</string>
+  <string name="error_could_not_send_package">Il est impossible d\'envoyer un paquet</string>
+  <string name="error_timed_out">Délai expiré</string>
+  <string name="error_canceled_by_user">Annulé par l\'utilisateur</string>
+  <string name="error_canceled_by_other_peer">Annulé par un autre homologue</string>
+  <string name="error_invalid_key">Clé reçue non valable</string>
+  <string name="pair_requested">Paire demandée</string>
+  <string name="pairing_request_from">Demande d\'appariement provenant de %1s</string>
+  <string name="tap_to_answer">Cliquer pour répondre</string>
+  <string name="reconnect">Reconnecter</string>
+  <string name="device_not_paired">Périphérique non apparié</string>
+  <string name="request_pairing">Demande d\'appariement</string>
+  <string name="pairing_accept">Accepter</string>
+  <string name="pairing_reject">Rejeter</string>
+  <string name="device">Périphérique</string>
+  <string name="pair_device">Apparier un périphérique</string>
+  <string name="remote_control">Contrôle distant</string>
+  <string name="settings">Paramètres de connexion de KDE</string>
+  <string name="mpris_play">Lire</string>
+  <string name="mpris_previous">Précédent</string>
+  <string name="mpris_next">Suivant</string>
+  <string name="mpris_volume">Volume</string>
+  <string name="general_settings">Accéder aux paramètres</string>
+  <string name="device_name">Périphérique non apparié</string>
+  <string name="invalid_device_name">Clé reçue non valable</string>
+</resources>
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Telefon értesítő</string>
+  <string name="pref_plugin_telephony_desc">Értesítés küldése SMS-hez és hívásokhoz</string>
+  <string name="pref_plugin_battery">Akkumulátor jelentés</string>
+  <string name="pref_plugin_battery_desc">Akkumulátorállapot időszakos jelentése</string>
+  <string name="pref_plugin_clipboard">Vágólap szinkronizáció</string>
+  <string name="pref_plugin_clipboard_desc">A vágólap tartalmának megosztása</string>
+  <string name="pref_plugin_mpris">Multimedia távirányítók</string>
+  <string name="pref_plugin_mpris_desc">Hang vagy videó vezérlése a telefonról</string>
+  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_ping_desc">Pingek küldése és fogadása</string>
+  <string name="pref_plugin_notifications">Értesítés szinkronizáció</string>
+  <string name="pref_plugin_notifications_desc">Hozzáférés az értesítésekhez más eszközökről</string>
+  <string name="plugin_not_available">Ez a funkció nem érhető el az ön Android verziójában</string>
+  <string name="device_list_empty">Nincsenek eszközök</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Mégse</string>
+  <string name="open_settings">Beállítások megnyitása</string>
+  <string name="no_permissions">Jogot kell adnia az értesítésekhez való hozzáféréshez</string>
+  <string name="send_ping">Ping küldése</string>
+  <string name="open_mpris_controls">Távirányító megnyitása</string>
+  <string name="category_connected_devices">Csatlakoztatott eszközök</string>
+  <string name="category_not_paired_devices">Nincsenek párosított eszközök</string>
+  <string name="category_remembered_devices">Megjegyzett eszközök</string>
+  <string name="plugins_failed_to_load">A bővítményeket nem sikerült betölteni (érintse meg a további információkért):</string>
+  <string name="device_menu_plugins">Bővítmények kijelölése</string>
+  <string name="device_menu_unpair">Leválasztás</string>
+  <string name="unknown_device">Ismeretlen eszköz</string>
+  <string name="error_not_reachable">Az eszköz nem érhető el</string>
+  <string name="error_already_requested">A párosítás már kérve lett</string>
+  <string name="error_already_paired">Az eszköz már párosítva van</string>
+  <string name="error_could_not_send_package">Nem sikerült elküldeni a csomagot</string>
+  <string name="error_timed_out">Időtúllépés</string>
+  <string name="error_canceled_by_user">Megszakítva a felhasználó által</string>
+  <string name="error_canceled_by_other_peer">A másik partner megszakította</string>
+  <string name="error_invalid_key">Érvénytelen kulcs érkezett</string>
+  <string name="pair_requested">Párosítás kérve</string>
+  <string name="pairing_request_from">Párosítási kérés innen: %1s</string>
+  <string name="tap_to_answer">Érintse meg a válaszhoz</string>
+  <string name="reconnect">Újracsatlakozás</string>
+  <string name="device_not_paired">Az eszköz nincs párosítva</string>
+  <string name="request_pairing">Párosítás kérése</string>
+  <string name="pairing_accept">Elfogadás</string>
+  <string name="pairing_reject">Elutasítás</string>
+  <string name="device">Eszköz</string>
+  <string name="pair_device">Eszköz párosítása</string>
+  <string name="remote_control">Távirányító</string>
+  <string name="settings">KDE csatlakozás beállítások</string>
+  <string name="mpris_play">Lejátszás</string>
+  <string name="mpris_previous">Előző</string>
+  <string name="mpris_next">Következő</string>
+  <string name="mpris_volume">Hangerő</string>
+  <string name="share_to">Megosztás…</string>
+  <string name="protocol_version_older">Ez az eszköz egy régi protokollverziót használ</string>
+  <string name="protocol_version_newer">Ez az eszköz egy újabb protokollverziót használ</string>
+  <string name="general_settings">Beállítások megnyitása</string>
+  <string name="device_name">Az eszköz nincs párosítva</string>
+  <string name="invalid_device_name">Érvénytelen kulcs érkezett</string>
+</resources>
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Telefoniemelder</string>
+  <string name="pref_plugin_telephony_desc">Stuur meldingen voor SMS en oproepen</string>
+  <string name="pref_plugin_battery">Batterijrapportage</string>
+  <string name="pref_plugin_battery_desc">Rapporteer periodiek de status van de batterij</string>
+  <string name="pref_plugin_clipboard">Klembordsynchronisatie</string>
+  <string name="pref_plugin_clipboard_desc">De inhoud van het klembord delen</string>
+  <string name="pref_plugin_mpris">Afstandsbediening van multimedia</string>
+  <string name="pref_plugin_mpris_desc">Bedien de audio/video vanaf uw telefoon</string>
+  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_ping_desc">Pings verzenden en ontvangen</string>
+  <string name="pref_plugin_notifications">Synchronisatie van meldingen</string>
+  <string name="pref_plugin_notifications_desc">Bekijk uw meldingen van andere apparaten</string>
+  <string name="plugin_not_available">Deze functie is niet beschikbaar in uw versie van Android</string>
+  <string name="device_list_empty">Geen apparaten</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Annuleren</string>
+  <string name="open_settings">Instellingen openen</string>
+  <string name="no_permissions">U moet toestemming geven voor toegang tot meldingen</string>
+  <string name="send_ping">Ping verzenden</string>
+  <string name="open_mpris_controls">Afstandsbediening openen</string>
+  <string name="category_connected_devices">Verbonden apparaten</string>
+  <string name="category_not_paired_devices">Geen gepaarde apparaten</string>
+  <string name="category_remembered_devices">Onthouden apparaten</string>
+  <string name="plugins_failed_to_load">Laden van plug-ins is mislukt (tap voor meer informatie):</string>
+  <string name="device_menu_plugins">Plug-ins selecteren</string>
+  <string name="device_menu_unpair">Paar uit elkaar halen</string>
+  <string name="unknown_device">Onbekend apparaat</string>
+  <string name="error_not_reachable">Apparaat niet bereikbaar</string>
+  <string name="error_already_requested">Paar maken is al gevraagd</string>
+  <string name="error_already_paired">Apparaat is al gepaard</string>
+  <string name="error_could_not_send_package">Kon pakket niet verzenden</string>
+  <string name="error_timed_out">Tijdslimiet overschreden</string>
+  <string name="error_canceled_by_user">Geannuleerd door gebruiker</string>
+  <string name="error_canceled_by_other_peer">Geannuleerd door andere kant</string>
+  <string name="error_invalid_key">Ongeldige sleutel ontvangen</string>
+  <string name="pair_requested">Paar gevraagd</string>
+  <string name="pairing_request_from">Verzoek om een paar te maken van %1s</string>
+  <string name="tap_to_answer">Tap om te antwoorden</string>
+  <string name="reconnect">Opnieuw verbinden</string>
+  <string name="device_not_paired">Apparaat is niet gepaard</string>
+  <string name="request_pairing">Verzoek voor maken van paar</string>
+  <string name="pairing_accept">Accepteren</string>
+  <string name="pairing_reject">Afwijzen</string>
+  <string name="device">Apparaat</string>
+  <string name="pair_device">Apparaat voor paar</string>
+  <string name="remote_control">Afstandsbediening</string>
+  <string name="settings">Instellingen van KDE Connect</string>
+  <string name="mpris_play">Afspelen</string>
+  <string name="mpris_previous">Vorige</string>
+  <string name="mpris_rew">Terugspoelen</string>
+  <string name="mpris_ff">Snel vooruit</string>
+  <string name="mpris_next">Volgende</string>
+  <string name="mpris_volume">Volume</string>
+  <string name="share_to">Delen met...</string>
+  <string name="protocol_version_older">Dit apparaat gebruikt een oude protocolversie</string>
+  <string name="protocol_version_newer">Dit apparaat gebruikt een nieuwere protocolversie</string>
+  <string name="general_settings">Algemene instellingen</string>
+  <string name="device_name">Apparaatnaam</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Ongeldige apparaatnaam</string>
+</resources>
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Notificação telefônica</string>
+  <string name="pref_plugin_telephony_desc">Envia notificações de SMS e chamadas</string>
+  <string name="pref_plugin_battery">Relatório da bateria</string>
+  <string name="pref_plugin_battery_desc">Informa o status da bateria periodicamente</string>
+  <string name="pref_plugin_clipboard">Sincronizar área de transferência</string>
+  <string name="pref_plugin_clipboard_desc">Compartilha o conteúdo da área de transferência</string>
+  <string name="pref_plugin_mpris">Controle remoto multimídia</string>
+  <string name="pref_plugin_mpris_desc">Controla áudio e vídeo a partir do seu telefone</string>
+  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_ping_desc">Envia e recebe pings</string>
+  <string name="pref_plugin_notifications">Sincronização de notificações</string>
+  <string name="pref_plugin_notifications_desc">Acesse suas notificações a partir de outros dispositivos</string>
+  <string name="plugin_not_available">Esta funcionalidade não está disponível na sua versão do Android</string>
+  <string name="device_list_empty">Sem dispositivos</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Cancelar</string>
+  <string name="open_settings">Abrir configurações</string>
+  <string name="no_permissions">Você precisa conceder permissão para acessar as notificações</string>
+  <string name="send_ping">Enviar ping</string>
+  <string name="open_mpris_controls">Abra o controle remoto</string>
+  <string name="category_connected_devices">Dispositivos conectados</string>
+  <string name="category_not_paired_devices">Dispositivos não emparelhados</string>
+  <string name="category_remembered_devices">Dispositivos lembrados</string>
+  <string name="plugins_failed_to_load">Plugins não carregados (toque para mais informações):</string>
+  <string name="device_menu_plugins">Selecionar plugins</string>
+  <string name="device_menu_unpair">Cancelar emparelhamento</string>
+  <string name="unknown_device">Dispositivo desconhecido</string>
+  <string name="error_not_reachable">Dispositivo inacessível</string>
+  <string name="error_already_requested">O emparelhamento já foi solicitado</string>
+  <string name="error_already_paired">Dispositivo já emparelhado</string>
+  <string name="error_could_not_send_package">Não foi possível enviar o pacote</string>
+  <string name="error_timed_out">Tempo limite expirou</string>
+  <string name="error_canceled_by_user">Cancelado pelo usuário</string>
+  <string name="error_canceled_by_other_peer">Cancelado pelo outro dispositivo</string>
+  <string name="error_invalid_key">Chave inválida recebida</string>
+  <string name="pair_requested">Emparelhamento solicitado</string>
+  <string name="pairing_request_from">Emparelhando solicitação de %1s</string>
+  <string name="tap_to_answer">Toque para responder</string>
+  <string name="reconnect">Reconectar</string>
+  <string name="device_not_paired">Dispositivo não emparelhado</string>
+  <string name="request_pairing">Solicitar emparelhamento</string>
+  <string name="pairing_accept">Aceitar</string>
+  <string name="pairing_reject">Rejeitar</string>
+  <string name="device">Dispositivo</string>
+  <string name="pair_device">Emparelhar dispositivo</string>
+  <string name="remote_control">Controle remoto</string>
+  <string name="settings">Configurações do KDE Connect</string>
+  <string name="mpris_play">Reproduzir</string>
+  <string name="mpris_previous">Anterior</string>
+  <string name="mpris_rew">Retornar</string>
+  <string name="mpris_ff">Avançar rapidamente</string>
+  <string name="mpris_next">Próximo</string>
+  <string name="mpris_volume">Volume</string>
+  <string name="share_to">Compartilhar com...</string>
+  <string name="protocol_version_older">Este dispositivo usa uma versão antiga do protocolo</string>
+  <string name="protocol_version_newer">Este dispositivo usa uma versão mais recente do protocolo</string>
+  <string name="general_settings">Configurações gerais</string>
+  <string name="device_name">Nome do dispositivo</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Nome do dispositivo inválido</string>
+</resources>
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Notificação telefónica</string>
+  <string name="pref_plugin_telephony_desc">Enviar notificações para os SMS\'s e chamadas</string>
+  <string name="pref_plugin_battery">Relatório da bateria</string>
+  <string name="pref_plugin_battery_desc">Comunicar periodicamente o estado da bateria</string>
+  <string name="pref_plugin_clipboard">Sincronização da área de transferência</string>
+  <string name="pref_plugin_clipboard_desc">Partilhar o conteúdo da área de transferência</string>
+  <string name="pref_plugin_mpris">Comando à distância multimédia</string>
+  <string name="pref_plugin_mpris_desc">Controlar o áudio/vídeo a partir do seu telefone</string>
+  <string name="pref_plugin_ping">Contacto</string>
+  <string name="pref_plugin_ping_desc">Enviar e receber pedidos de contacto (\'ping\')</string>
+  <string name="pref_plugin_notifications">Sincronização da notificação</string>
+  <string name="pref_plugin_notifications_desc">Aceder às suas notificações a partir de outros dispositivos</string>
+  <string name="plugin_not_available">Esta funcionalidade não está disponível na sua versão do Android</string>
+  <string name="device_list_empty">Sem dispositivos</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Cancelar</string>
+  <string name="open_settings">Abrir a configuração</string>
+  <string name="no_permissions">Precisa de dar permissões de acesso às notificações</string>
+  <string name="send_ping">Enviar um pedido de contacto</string>
+  <string name="open_mpris_controls">Abrir o comando à distância</string>
+  <string name="category_connected_devices">Dispositivos ligados</string>
+  <string name="category_not_paired_devices">Dispositivos não emparelhados</string>
+  <string name="category_remembered_devices">Dispositivos recordados</string>
+  <string name="plugins_failed_to_load">Não foi possível carregar os \'plugin\' (toque para mais informações):</string>
+  <string name="device_menu_plugins">Seleccionar os \'plugins\'</string>
+  <string name="device_menu_unpair">Desemparelhar</string>
+  <string name="unknown_device">Dispositivo desconhecido</string>
+  <string name="error_not_reachable">Dispositivo inacessível</string>
+  <string name="error_already_requested">O emparelhamento já foi pedido</string>
+  <string name="error_already_paired">O dispositivo já foi emparelhado</string>
+  <string name="error_could_not_send_package">Não foi possível enviar o pacote</string>
+  <string name="error_timed_out">Expirou o tempo-limite</string>
+  <string name="error_canceled_by_user">Cancelado pelo utilizador</string>
+  <string name="error_canceled_by_other_peer">Cancelado pela outra máquina</string>
+  <string name="error_invalid_key">Chave inválida recebida</string>
+  <string name="pair_requested">Emparelhamento pedido</string>
+  <string name="pairing_request_from">Pedido de emparelhamento de %1s</string>
+  <string name="tap_to_answer">Toque para responder</string>
+  <string name="reconnect">Ligar de Novo</string>
+  <string name="device_not_paired">Dispositivo não emparelhado</string>
+  <string name="request_pairing">Pedir o emparelhamento</string>
+  <string name="pairing_accept">Aceitar</string>
+  <string name="pairing_reject">Rejeitar</string>
+  <string name="device">Dispositivo</string>
+  <string name="pair_device">Emparelhar o dispositivo</string>
+  <string name="remote_control">Comando à distância</string>
+  <string name="settings">Configuração do KDE Connect</string>
+  <string name="mpris_play">Tocar</string>
+  <string name="mpris_previous">Anterior</string>
+  <string name="mpris_rew">Recuar</string>
+  <string name="mpris_ff">Avançar</string>
+  <string name="mpris_next">Seguinte</string>
+  <string name="mpris_volume">Volume</string>
+  <string name="share_to">Partilhar Com...</string>
+  <string name="protocol_version_older">Este dispositivo usa uma versão antiga do protocolo</string>
+  <string name="protocol_version_newer">Este dispositivo usa uma versão mais recente do protocolo</string>
+  <string name="general_settings">Configuração Geral</string>
+  <string name="device_name">Nome do dispositivo</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Nome do dispositivo inválido</string>
+</resources>
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Уведомления телефонии</string>
+  <string name="pref_plugin_telephony_desc">Отправлять уведомления о SMS и звонках</string>
+  <string name="pref_plugin_battery">Состояние батареи</string>
+  <string name="pref_plugin_battery_desc">Периодически сообщать о состоянии батареи</string>
+  <string name="pref_plugin_clipboard">Синхронизация буфера обмена</string>
+  <string name="pref_plugin_clipboard_desc">Сделать содержимое буфера обмена общим</string>
+  <string name="pref_plugin_mpris">ДУ для мультимедия</string>
+  <string name="pref_plugin_mpris_desc">Управление аудио/видео с устройства</string>
+  <string name="pref_plugin_ping">Пинг</string>
+  <string name="pref_plugin_ping_desc">Посылать и получать пинги</string>
+  <string name="pref_plugin_notifications">Синхронизация уведомлений</string>
+  <string name="pref_plugin_notifications_desc">Доступ к уведомлениям с других устройств</string>
+  <string name="plugin_not_available">Этот функционал недоступен в вашей версии Android</string>
+  <string name="device_list_empty">Нет устройств</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Отмена</string>
+  <string name="open_settings">Открыть настройки</string>
+  <string name="no_permissions">Вы должны разрешить доступ к уведомлениям</string>
+  <string name="send_ping">Послать пинг</string>
+  <string name="open_mpris_controls">Открыть дистанционное управление</string>
+  <string name="category_connected_devices">Подключённые устройства</string>
+  <string name="category_not_paired_devices">Не спаренные устройства</string>
+  <string name="category_remembered_devices">Запомненные устройства</string>
+  <string name="plugins_failed_to_load">Сбой загрузки следующих модулей (прикоснитесь чтобы получить подробности):</string>
+  <string name="device_menu_plugins">Выбрать модули</string>
+  <string name="device_menu_unpair">Разделить спаренные устройства</string>
+  <string name="unknown_device">Неизвестное устройство</string>
+  <string name="error_not_reachable">Устройство недоступно</string>
+  <string name="error_already_requested">Запрос на спаривание уже был сделан</string>
+  <string name="error_already_paired">Устройство уже спарено</string>
+  <string name="error_could_not_send_package">Не удалось послать пакет</string>
+  <string name="error_timed_out">Истекло время ожидания</string>
+  <string name="error_canceled_by_user">Отменено пользователем</string>
+  <string name="error_canceled_by_other_peer">Отменено другим участником</string>
+  <string name="error_invalid_key">Недопустимый получатель ключа</string>
+  <string name="pair_requested">Запрошено спаривание</string>
+  <string name="pairing_request_from">Запрос на спаривание от %1s</string>
+  <string name="tap_to_answer">Коснитесь чтобы ответить</string>
+  <string name="reconnect">Переподключить</string>
+  <string name="device_not_paired">Устройство не спарено</string>
+  <string name="request_pairing">Запросить спаривание</string>
+  <string name="pairing_accept">Принять</string>
+  <string name="pairing_reject">Отклонить</string>
+  <string name="device">Устройство</string>
+  <string name="pair_device">Спарить устройство</string>
+  <string name="remote_control">Дистанционное управление</string>
+  <string name="settings">Настройки KDE Connect</string>
+  <string name="mpris_play">Воспроизвести</string>
+  <string name="mpris_previous">Предыдущий</string>
+  <string name="mpris_next">Следующее</string>
+  <string name="mpris_volume">Громкость</string>
+  <string name="share_to">Сделать общим с...</string>
+  <string name="protocol_version_older">Это устройство использует старую версию протокола</string>
+  <string name="protocol_version_newer">Это устройство использует более свежую версию протокола</string>
+  <string name="general_settings">Открыть настройки</string>
+  <string name="device_name">Устройство не спарено</string>
+  <string name="invalid_device_name">Недопустимый получатель ключа</string>
+</resources>
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Telefónny notifikátor</string>
+  <string name="pref_plugin_telephony_desc">Poslať pripomienky pre SMS a hovory</string>
+  <string name="pref_plugin_battery">Oznam o batérii</string>
+  <string name="pref_plugin_battery_desc">Periodicky oznamovať stav batérie</string>
+  <string name="pref_plugin_clipboard">Synchronizácia schránky</string>
+  <string name="pref_plugin_clipboard_desc">Zdieľať obsah schránky</string>
+  <string name="pref_plugin_mpris">Multimediálne diaľkové ovládače</string>
+  <string name="pref_plugin_mpris_desc">Ovládať audio/video z vášho telefónu</string>
+  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_ping_desc">Poslať a prijať pingy</string>
+  <string name="pref_plugin_notifications">Synchronizácia pripomienok</string>
+  <string name="pref_plugin_notifications_desc">Prístup k vašim pripomienkam z iných zariadení</string>
+  <string name="plugin_not_available">Táto funkcia nie je dostupná vo vašej verzii Androidu</string>
+  <string name="device_list_empty">Žiadne zariadenia</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Zrušiť</string>
+  <string name="open_settings">Otvoriť nastavenia</string>
+  <string name="no_permissions">Musíte povoliť oprávnenia na prístup k pripomienkam</string>
+  <string name="send_ping">Poslať ping</string>
+  <string name="open_mpris_controls">Otvoriť diaľkové ovládanie</string>
+  <string name="category_connected_devices">Pripojené zariadenia</string>
+  <string name="category_not_paired_devices">Nespárované zariadenia</string>
+  <string name="category_remembered_devices">Zapamätané zariadenia</string>
+  <string name="plugins_failed_to_load">Zlyhalo načítanie pluginov (tapnite pre viac info):</string>
+  <string name="device_menu_plugins">Vybrať pluginy</string>
+  <string name="device_menu_unpair">Odpárovať</string>
+  <string name="unknown_device">Neznáme zariadenie</string>
+  <string name="error_not_reachable">Zariadenie nedostupné</string>
+  <string name="error_already_requested">Spárovanie už vyžiadané</string>
+  <string name="error_already_paired">Zariadenie už spárované</string>
+  <string name="error_could_not_send_package">Nemôžem poslať balík</string>
+  <string name="error_timed_out">Čas vypršal</string>
+  <string name="error_canceled_by_user">Zrušené používateľom</string>
+  <string name="error_canceled_by_other_peer">Zrušené iným klientom</string>
+  <string name="error_invalid_key">Získaný nesprávny kľúč</string>
+  <string name="pair_requested">Spárovanie vyžiadané</string>
+  <string name="pairing_request_from">Požiadavka na spárovanie od %1s</string>
+  <string name="tap_to_answer">Tapnite na odpoveď</string>
+  <string name="reconnect">Znovu pripojiť</string>
+  <string name="device_not_paired">Zariadenie nespárované</string>
+  <string name="request_pairing">Požiadavka na spárovanie</string>
+  <string name="pairing_accept">Prijať</string>
+  <string name="pairing_reject">Odmietnuť</string>
+  <string name="device">Zariadenie</string>
+  <string name="pair_device">Spárovať zariadenie</string>
+  <string name="remote_control">Diaľkové ovládanie</string>
+  <string name="settings">Nastavenia KDE Connect</string>
+  <string name="mpris_play">Prehrať</string>
+  <string name="mpris_previous">Predošlé</string>
+  <string name="mpris_next">Nasledovné</string>
+  <string name="mpris_volume">Hlasitosť</string>
+  <string name="share_to">Zdieľať pre...</string>
+  <string name="protocol_version_older">Toto zariadenie používa starú verziu protokolu</string>
+  <string name="protocol_version_newer">Toto zariadenie používa novšiu verziu protokolu</string>
+  <string name="general_settings">Otvoriť nastavenia</string>
+  <string name="device_name">Zariadenie nespárované</string>
+  <string name="invalid_device_name">Získaný nesprávny kľúč</string>
+</resources>
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Telefonunderrättelser</string>
+  <string name="pref_plugin_telephony_desc">Skicka underrättelser för SMS och samtal</string>
+  <string name="pref_plugin_battery">Batterirapport</string>
+  <string name="pref_plugin_battery_desc">Rapportera periodiskt batteriets status</string>
+  <string name="pref_plugin_clipboard">Synkronisera klippbord</string>
+  <string name="pref_plugin_clipboard_desc">Dela klippbordets innehåll</string>
+  <string name="pref_plugin_mpris">Fjärrkontroll av multimedia</string>
+  <string name="pref_plugin_mpris_desc">Styr ljud och video från telefonen</string>
+  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_ping_desc">Skicka och ta emot ping</string>
+  <string name="pref_plugin_notifications">Synkronisering av underrättelser</string>
+  <string name="pref_plugin_notifications_desc">Kom åt underrättelser från andra apparater</string>
+  <string name="plugin_not_available">Funktionen är inte tillgänglig i Android-versionen</string>
+  <string name="device_list_empty">Inga apparater</string>
+  <string name="ok">Ok</string>
+  <string name="cancel">Avbryt</string>
+  <string name="open_settings">Öppna inställningarna</string>
+  <string name="no_permissions">Du måste ge rättighet att komma åt underrättelser</string>
+  <string name="send_ping">Skicka ping</string>
+  <string name="open_mpris_controls">Öppna fjärrkontroll</string>
+  <string name="category_connected_devices">Anslutna apparater</string>
+  <string name="category_not_paired_devices">Inga parade apparater</string>
+  <string name="category_remembered_devices">Ihågkomna apparater</string>
+  <string name="plugins_failed_to_load">Misslyckades ladda insticksprogram (rör för mer information):</string>
+  <string name="device_menu_plugins">Välj insticksprogram</string>
+  <string name="device_menu_unpair">Ta bort ihopparning</string>
+  <string name="unknown_device">Okänd apparat</string>
+  <string name="error_not_reachable">Apparaten kan inte nås</string>
+  <string name="error_already_requested">Ihopparning redan begärd</string>
+  <string name="error_already_paired">Apparat redan ihopparad</string>
+  <string name="error_could_not_send_package">Kunde inte skicka paket</string>
+  <string name="error_timed_out">Tidsgräns överskriden</string>
+  <string name="error_canceled_by_user">Avbruten av användaren</string>
+  <string name="error_canceled_by_other_peer">Avbruten av motparten</string>
+  <string name="error_invalid_key">Ogiltig nyckel mottagen</string>
+  <string name="pair_requested">Ihopparning begärd</string>
+  <string name="pairing_request_from">Begäran om ihopparning från %1s</string>
+  <string name="tap_to_answer">Rör för att svara</string>
+  <string name="reconnect">Anslut igen</string>
+  <string name="device_not_paired">Apparat inte ihopparad</string>
+  <string name="request_pairing">Begära ihopparning</string>
+  <string name="pairing_accept">Acceptera</string>
+  <string name="pairing_reject">Avslå</string>
+  <string name="device">Apparat</string>
+  <string name="pair_device">Para ihop apparat</string>
+  <string name="remote_control">Fjärrkontroll</string>
+  <string name="settings">KDE anslutningsinställningar</string>
+  <string name="mpris_play">Spela</string>
+  <string name="mpris_previous">Föregående</string>
+  <string name="mpris_rew">Snabbspola bakåt</string>
+  <string name="mpris_ff">Snabbspola framåt</string>
+  <string name="mpris_next">Nästa</string>
+  <string name="mpris_volume">Volym</string>
+  <string name="share_to">Dela med...</string>
+  <string name="protocol_version_older">Apparaten använder en gammal protokollversion</string>
+  <string name="protocol_version_newer">Apparaten använder en nyare protokollversion</string>
+  <string name="general_settings">Allmänna inställningar</string>
+  <string name="device_name">Apparatnamn</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Ogiltigt apparatnamn</string>
+</resources>
--- a/KdeConnect/src/main/res/values-sw600dp/dimens.xml
+++ b/KdeConnect/src/main/res/values-sw600dp/dimens.xml
--- a/KdeConnect/src/main/res/values-sw720dp-land/dimens.xml
+++ b/KdeConnect/src/main/res/values-sw720dp-land/dimens.xml
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Телефонний сповіщувач</string>
+  <string name="pref_plugin_telephony_desc">Надсилання сповіщень щодо SMS та дзвінків</string>
+  <string name="pref_plugin_battery">Звіт щодо заряду</string>
+  <string name="pref_plugin_battery_desc">Періодична інформація щодо стану акумулятора</string>
+  <string name="pref_plugin_clipboard">Синхронізація буфера</string>
+  <string name="pref_plugin_clipboard_desc">Спільне використання буфера обміну даними</string>
+  <string name="pref_plugin_mpris">Дистанційне керування відтворенням</string>
+  <string name="pref_plugin_mpris_desc">Керування відтворенням звуку та відео з вашого телефону</string>
+  <string name="pref_plugin_ping">Підтримання зв’язку</string>
+  <string name="pref_plugin_ping_desc">Надсилання і отримання сигналів підтримання зв’язку</string>
+  <string name="pref_plugin_notifications">Синхронізація сповіщень</string>
+  <string name="pref_plugin_notifications_desc">Доступ до ваших сповіщень з інших пристроїв</string>
+  <string name="plugin_not_available">Ця можливість є недоступною для вашої версії для Android</string>
+  <string name="device_list_empty">Немає пристроїв</string>
+  <string name="ok">Гаразд</string>
+  <string name="cancel">Скасувати</string>
+  <string name="open_settings">Відкрити вікно параметрів</string>
+  <string name="no_permissions">Вам слід надати доступ до сповіщень</string>
+  <string name="send_ping">Надіслати сигнал підтримання зв’язку</string>
+  <string name="open_mpris_controls">Відкрити дистанційне керування</string>
+  <string name="category_connected_devices">З’єднані пристрої</string>
+  <string name="category_not_paired_devices">Непов’язані пристрої</string>
+  <string name="category_remembered_devices">Відомі пристрої</string>
+  <string name="plugins_failed_to_load">Додатки, які не вдалося завантажити (натисніть, щоб дізнатися більше):</string>
+  <string name="device_menu_plugins">Виберіть додатки</string>
+  <string name="device_menu_unpair">Скасувати пов’язування</string>
+  <string name="unknown_device">Невідомий пристрій</string>
+  <string name="error_not_reachable">Немає доступу до пристрою</string>
+  <string name="error_already_requested">Запит щодо пов’язування вже надіслано</string>
+  <string name="error_already_paired">Пристрій вже пов’язано</string>
+  <string name="error_could_not_send_package">Не вдалося надіслати пакунок</string>
+  <string name="error_timed_out">Час очікування вичерпано</string>
+  <string name="error_canceled_by_user">Скасовано користувачем</string>
+  <string name="error_canceled_by_other_peer">Скасовано з іншого вузла пов’язування</string>
+  <string name="error_invalid_key">Отримано некоректний ключ</string>
+  <string name="pair_requested">Запит щодо пов’язування</string>
+  <string name="pairing_request_from">Запит щодо пов’язування від %1s</string>
+  <string name="tap_to_answer">Натисніть, щоб відповісти</string>
+  <string name="reconnect">З\'єднати знову</string>
+  <string name="device_not_paired">Пристрій не пов’язано</string>
+  <string name="request_pairing">Надіслати запит щодо пов’язування</string>
+  <string name="pairing_accept">Прийняти</string>
+  <string name="pairing_reject">Відмовити</string>
+  <string name="device">Пристрій</string>
+  <string name="pair_device">Пов’язати пристрій</string>
+  <string name="remote_control">Дистанційне керування</string>
+  <string name="settings">Параметри з’єднання з KDE</string>
+  <string name="mpris_play">Пуск</string>
+  <string name="mpris_previous">Назад</string>
+  <string name="mpris_rew">Повний назад</string>
+  <string name="mpris_ff">Повний вперед</string>
+  <string name="mpris_next">Далі</string>
+  <string name="mpris_volume">Гучність</string>
+  <string name="share_to">Спільно використовувати з…</string>
+  <string name="protocol_version_older">На цьому пристрої використовується стара версія протоколу</string>
+  <string name="protocol_version_newer">На цьому пристрої використовується новіша версія протоколу</string>
+  <string name="general_settings">Загальні параметри</string>
+  <string name="device_name">Назва пристрою</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Некоректна назва пристрою</string>
+</resources>
--- a/KdeConnect/src/main/res/values-v11/styles.xml
+++ b/KdeConnect/src/main/res/values-v11/styles.xml
--- a/KdeConnect/src/main/res/values/dimens.xml
+++ b/KdeConnect/src/main/res/values/dimens.xml
--- a/KdeConnect/src/main/res/values/strings.xml
+++ b/KdeConnect/src/main/res/values/strings.xml
@@ -50,11 +50,16 @@
    <string name="settings">KDE Connect Settings</string>
    <string name="mpris_play">Play</string>
    <string name="mpris_previous">Previous</string>
+    <string name="mpris_rew">Rewind</string>
+    <string name="mpris_ff">Fast-forward</string>
    <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>
-
+    <string name="general_settings">General Settings</string>
+    <string name="device_name">Device name</string>
+    <string name="device_name_preference_summary">%s</string>
+    <string name="invalid_device_name">Invalid device name</string>

 </resources>
--- a/KdeConnect/src/main/res/values/styles.xml
+++ b/KdeConnect/src/main/res/values/styles.xml
--- a/src/main/res/xml/general_preferences.xml
+++ b/src/main/res/xml/general_preferences.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        android:title="@string/general_settings">
+
+        <EditTextPreference
+            android:key="device_name_preference"
+            android:title="@string/device_name"
+            android:summary="@string/device_name_preference_summary"
+            android:dialogTitle="@string/device_name"
+            android:singleLine="true" />
+
+    </PreferenceCategory>
+</PreferenceScreen>
Author	SHA1	Message	Date
Albert Vaca	30d2665b12	Upgraded project to new Android SDK Now using gradle magic imports instead of jar files for libraries	2013-11-02 17:46:20 +01:00
l10n daemon script	c14946e9e4	SVN_SILENT made messages (after extraction)	2013-11-02 01:35:34 +00:00
l10n daemon script	1aab14fd50	SVN_SILENT made messages (after extraction)	2013-10-31 01:37:52 +00:00
l10n daemon script	549fc01c1d	SVN_SILENT made messages (after extraction)	2013-10-30 01:42:44 +00:00
Albert Vaca	d59de8a0b6	Increased version to release	2013-10-30 01:46:00 +01:00
Mauro Panzeri	8823277e74	Follow the android guidelines for icons/drawables and their names. Guidelines: http://goo.gl/E70Ez REVIEW: 113200	2013-10-30 01:45:27 +01:00
Albert Vaca	30cf27e835	NetworkPackage.encrypt now returns a new package instead of changing itself This was causing problems with plugins that keep a reference to the packages they have already sent, like the telephony plugin, because the package became encrypted (and thus inaccessible) after sending it. BUG: 326275	2013-10-30 01:37:55 +01:00
Mauro Panzeri	9dbe1ec9cf	Added a settings activity to change the publicly visible device name When changed the new name will be used instead of the one from HumanDeviceNames REVIEW: 113204 BUG: 325061	2013-10-30 01:37:47 +01:00
Albert Vaca	0595662efc	Spotify doesn't support seeking, disable mpris seek buttons for it	2013-10-30 01:31:21 +01:00
Albert Vaca	6609ae665c	Fixed a crash trying to disconnect not-yet-active sessions.	2013-10-30 01:31:20 +01:00
Maksim Krylosov	2f26fa5188	Added rewind and fast-forward buttons to MPRIS controls	2013-10-30 01:31:20 +01:00
Albert Vaca	6471bafdd9	Fixed important bug trying to load device settings before deviceId was set (Also improved code style and fixed minor TODOs)	2013-10-30 01:31:20 +01:00
Albert Vaca	0620810e4b	Upgraded to build tools 18.1.1 and gradle 1.8	2013-10-30 01:31:20 +01:00
Albert Vaca	db9209765d	Android Studio is getting confused if project name != directory name	2013-10-29 17:47:07 +01:00
Mauro Panzeri	e459d792d0	"Share to" now retrieves filename for file:// uris too Querying the ContentProvider only works for content://... uris but when you share a file from a file-manager, the uri you get has the form file://... and ContentProvider returns a null cursor. BUG: 325684 REVIEW: 113202	2013-10-29 17:47:07 +01:00
Albert Vaca	31fcc3e184	Project refactor because Android Studio was not able to open it For some reason it was not detecting the directory as an Android project Android Build Tools version increased from 18.0.1 to 18.1	2013-10-29 17:47:07 +01:00
l10n daemon script	544b5e8c87	SVN_SILENT made messages (after extraction)	2013-10-25 01:35:28 +00:00
l10n daemon script	7819ae1ca2	SVN_SILENT made messages (after extraction)	2013-10-18 01:44:45 +00:00
l10n daemon script	98885d6c35	SVN_SILENT made messages (after extraction)	2013-10-17 01:34:48 +00:00
l10n daemon script	485e646f6f	SVN_SILENT made messages (after extraction)	2013-10-14 01:51:48 +00:00
l10n daemon script	dfece0a414	SVN_SILENT made messages (after extraction)	2013-10-11 01:53:05 +00:00
l10n daemon script	bbaf40165c	SVN_SILENT made messages (after extraction)	2013-10-07 01:47:28 +00:00
Albert Vaca	b221fa04bf	Increased version number for release	2013-10-05 17:26:51 +02:00
Albert Vaca	07bf1e9ebc	Made sendPackage sync, so mutex hack in Device is no longer needed	2013-10-05 17:26:51 +02:00
Albert Vaca	a07c9a9fb7	Fixed warnings about cursors not closed	2013-10-05 17:26:51 +02:00
l10n daemon script	40a9171985	SVN_SILENT made messages (after extraction)	2013-10-04 01:52:34 +00:00
Albert Vaca	69197fd657	Increased version for release.	2013-10-03 15:52:10 +02:00
Albert Vaca	55e3861c5c	Fixed a crash when pressing back from remote controls in action bar Device activity isn't receiving the device id in that case.	2013-10-03 15:52:10 +02:00
Albert Vaca	5d00e6e168	Added a mutex to avoid files being sent all at the same time It's a bit hackish but works.	2013-10-03 15:52:09 +02:00
l10n daemon script	967635a2f4	SVN_SILENT made messages (after extraction)	2013-10-03 01:46:02 +00:00
Albert Astals Cid	58b31fa032	Transition to the StaticMessages.sh thing Let's see what next scripty run says CCMAIL: albertvaka@gmail.com	2013-10-01 21:52:09 +02:00