Bump version to release

This reverts commit cf808c03ba.
and commit 3d4bf643d4.

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="1720"
-    android:versionName="1.7.2">
+    android:versionCode="1820"
+    android:versionName="1.8.2">
 
     <supports-screens
         android:anyDensity="true"
@@ -11,7 +11,9 @@
         android:smallScreens="true"
         android:xlargeScreens="true" />
 
-    <uses-feature android:name="android.hardware.telephony" android:required="false" />
+    <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" />
@@ -20,10 +22,18 @@
     <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.BATTERY_STATS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" android:required="false" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" android:required="false" />
-    <uses-permission android:name="android.permission.SEND_SMS" android:required="false" />
-    <uses-permission android:name="android.permission.READ_SMS" android:required="false" />
+    <uses-permission
+        android:name="android.permission.READ_PHONE_STATE"
+        android:required="false" />
+    <uses-permission
+        android:name="android.permission.RECEIVE_SMS"
+        android:required="false" />
+    <uses-permission
+        android:name="android.permission.SEND_SMS"
+        android:required="false" />
+    <uses-permission
+        android:name="android.permission.READ_SMS"
+        android:required="false" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -34,25 +44,26 @@
         android:icon="@drawable/icon"
         android:label="KDE Connect"
         android:supportsRtl="true"
-        android:theme="@style/KdeConnectTheme"
-        >
+        android:theme="@style/KdeConnectTheme">
 
         <service
             android:name="org.kde.kdeconnect.BackgroundService"
-            android:enabled="true" >
-        </service>
+            android:enabled="true" />
 
-        <service android:name="org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardService"
+        <service
+            android:name="org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardService"
             android:label="KDE Connect Remote Keyboard"
             android:permission="android.permission.BIND_INPUT_METHOD">
             <intent-filter>
                 <action android:name="android.view.InputMethod" />
             </intent-filter>
-            <meta-data android:name="android.view.im" android:resource="@xml/remotekeyboardplugin_method" />
+            <meta-data
+                android:name="android.view.im"
+                android:resource="@xml/remotekeyboardplugin_method" />
         </service>
 
         <activity
-            android:name="org.kde.kdeconnect.UserInterface.MaterialActivity"
+            android:name="org.kde.kdeconnect.UserInterface.MainActivity"
             android:label="KDE Connect"
             android:theme="@style/KdeConnectTheme.NoActionBar">
             <intent-filter>
@@ -64,31 +75,31 @@
         <activity
             android:name="org.kde.kdeconnect.UserInterface.SettingsActivity"
             android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
         </activity>
         <activity
             android:name="org.kde.kdeconnect.UserInterface.CustomDevicesActivity"
             android:label="@string/custom_devices_settings"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
         </activity>
         <activity
             android:name="org.kde.kdeconnect.Plugins.SharePlugin.SendFileActivity"
             android:label="KDE Connect"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
         </activity>
         <activity
             android:name="org.kde.kdeconnect.UserInterface.PluginSettingsActivity"
             android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.kde.kdeconnect.UserInterface.SettingsActivity" />
@@ -96,15 +107,14 @@
         <activity
             android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareSettingsActivity"
             android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.kde.kdeconnect.Plugins.SharePlugin.ShareSettingsActivity" />
         </activity>
 
 
-
-        <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver" >
+        <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
 
@@ -122,17 +132,6 @@
             <intent-filter>
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
             </intent-filter>
-            <!--
-            <intent-filter>
-                <action android:name="android.provider.Telephony.SMS_RECEIVED" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PHONE_STATE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.BATTERY_CHANGED" />
-            </intent-filter>
-            -->
         </receiver>
 
         <activity
@@ -140,43 +139,46 @@
             android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
             android:label="@string/findmyphone_title"
-            android:launchMode="singleInstance">
-        </activity>
+            android:launchMode="singleInstance" />
 
         <!-- Plugin-related activities and services -->
 
         <activity
             android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
             android:label="@string/remote_control"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
-            >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
+            android:launchMode="singleTop">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
         </activity>
+        <receiver android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisMediaNotificationReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
+
         <activity
             android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandActivity"
             android:label="@string/remote_control"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
-            >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
         </activity>
         <activity
             android:name="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/remote_control"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
+            android:windowSoftInputMode="stateHidden|adjustResize">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
         </activity>
         <activity
             android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareActivity"
-            android:label="KDE Connect"
-            >
+            android:label="KDE Connect">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
@@ -191,10 +193,12 @@
 
                 <data android:mimeType="*/*" />
             </intent-filter>
+
             <meta-data
                 android:name="android.service.chooser.chooser_target_service"
                 android:value="org.kde.kdeconnect.Plugins.SharePlugin.ShareChooserTargetService" />
         </activity>
+
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="org.kde.kdeconnect_tp.fileprovider"
@@ -204,9 +208,10 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/fileprovider_paths" />
         </provider>
+
         <service
             android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
-            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService" />
             </intent-filter>
@@ -217,12 +222,12 @@
             <intent-filter>
                 <action android:name="android.service.chooser.ChooserTargetService" />
             </intent-filter>
-            </service>
+        </service>
 
         <activity
             android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity"
             android:label="@string/title_activity_notification_filter"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.PluginSettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" />

build.gradle

@@ -1,10 +1,7 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
@@ -73,15 +70,13 @@ dependencies {
 
     repositories {
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        google()
     }
 
     implementation 'com.android.support:support-v4:25.4.0'
     implementation 'com.android.support:appcompat-v7:25.4.0'
     implementation 'com.android.support:design:25.4.0'
+    implementation 'com.jakewharton:disklrucache:2.0.2' //For caching album art bitmaps
 
     implementation 'org.apache.sshd:sshd-core:0.8.0' //0.9 seems to fail on Android 6 and 1.+ requires java.nio.file, which doesn't exist in Android
 

res/drawable/disableable_button.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:color="@color/primary" />
+    <item android:state_enabled="false" android:color="@color/disabled_grey" />
+</selector>

res/drawable/ic_add.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>

res/drawable/ic_album_art_placeholder.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="192dp"
+        android:height="192dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
+</vector>

res/drawable/ic_next_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>

res/drawable/ic_pause_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>

res/drawable/ic_play_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M8,5v14l11,-7z"/>
+</vector>

res/drawable/ic_previous_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+</vector>

res/layout-land/activity_mpris.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:paddingBottom="25dp"
+    android:paddingLeft="25dp"
+    android:paddingRight="25dp"
+    android:paddingTop="25dp">
+
+    <ImageView
+        android:id="@+id/album_art"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_marginRight="25dp"
+        android:layout_weight="1"
+        android:contentDescription="@string/mpris_coverart_description"
+        android:scaleType="fitCenter" />
+
+    <include
+        layout="@layout/mpris_control"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
+
+</LinearLayout>

res/layout/activity_device.xml

@@ -2,105 +2,100 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     android:padding="@dimen/activity_vertical_margin"
-    tools:context="org.kde.kdeconnect.UserInterface.DeviceFragment"
-    android:orientation="vertical">
+    tools:context="org.kde.kdeconnect.UserInterface.DeviceFragment">
 
     <LinearLayout
+        android:id="@+id/pairing_buttons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:id="@+id/pairing_buttons"
-        android:layout_gravity="center">
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:orientation="vertical">
 
         <ProgressBar
-            android:visibility="gone"
+            android:id="@+id/pair_progress"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/pair_progress" />
+            android:visibility="gone" />
 
         <TextView
+            android:id="@+id/pair_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/device_not_paired"
-            android:id="@+id/pair_message"
-        />
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <Button
             android:id="@+id/pair_button"
-            android:background="@drawable/button_round"
-            android:textColor="@android:color/white"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@drawable/button_round"
             android:text="@string/request_pairing"
-        />
+            android:textColor="@android:color/white" />
 
 
         <LinearLayout
+            android:id="@+id/pair_request"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:id="@+id/pair_request"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+            android:visibility="gone">
 
             <Button
-                android:background="@drawable/button_round"
-                android:textColor="@android:color/white"
-                android:layout_margin="4dip"
                 android:id="@+id/accept_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/pairing_accept"
+                android:layout_margin="4dip"
                 android:layout_weight="1"
-            />
+                android:background="@drawable/button_round"
+                android:text="@string/pairing_accept"
+                android:textColor="@android:color/white" />
 
             <Button
-                android:background="@drawable/button_round"
-                android:textColor="@android:color/white"
-                android:layout_margin="4dip"
                 android:id="@+id/reject_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="4dip"
+                android:layout_weight="1"
+                android:background="@drawable/button_round"
                 android:text="@string/pairing_reject"
-                android:layout_weight="1" />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
     </LinearLayout>
 
     <TextView
         android:id="@+id/not_reachable_message"
-        android:visibility="gone"
         android:layout_width="match_parent"
-        android:drawableStart="@drawable/ic_error_outline_black_48dp"
+        android:layout_height="match_parent"
         android:drawableLeft="@drawable/ic_error_outline_black_48dp"
         android:drawablePadding="8dip"
-        android:layout_height="match_parent"
+        android:drawableStart="@drawable/ic_error_outline_black_48dp"
         android:gravity="center_vertical"
         android:text="@string/unreachable_description"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        />
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/on_data_message"
-        android:visibility="gone"
         android:layout_width="match_parent"
-        android:drawableStart="@drawable/ic_error_outline_black_48dp"
+        android:layout_height="match_parent"
         android:drawableLeft="@drawable/ic_error_outline_black_48dp"
         android:drawablePadding="8dip"
-        android:layout_height="match_parent"
+        android:drawableStart="@drawable/ic_error_outline_black_48dp"
         android:gravity="center_vertical"
         android:text="@string/on_data_message"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        />
+        android:visibility="gone" />
 
     <ListView
         android:id="@+id/buttons_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true"
-        tools:context=".DeviceActivity"
-        />
+        tools:context=".DeviceActivity" />
 
 </LinearLayout>

res/layout/activity_find_my_phone.xml

@@ -2,25 +2,22 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhoneActivity">
 
 
-
     <Button
+        android:id="@+id/bFindMyPhone"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:text="@string/findmyphone_found"
-        android:textSize="50dp"
-        android:id="@+id/bFindMyPhone"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
-
-
+        android:layout_alignParentStart="true"
+        android:text="@string/findmyphone_found"
+        android:textSize="50sp" />
 
 
 </RelativeLayout>

res/layout/activity_list.xml

@@ -1,11 +1,10 @@
 <ListView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/listView1"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:addStatesFromChildren="true"
+    android:orientation="vertical"
     android:paddingLeft="16dip"
     android:paddingRight="16dip"
-    tools:context="org.kde.kdeconnect.UserInterface.MaterialActivity"
-    android:id="@+id/listView1"
-    android:addStatesFromChildren="true"
-    android:orientation="vertical">
-</ListView>
+    tools:context="org.kde.kdeconnect.UserInterface.MainActivity" />

res/layout/activity_main.xml

@@ -1,45 +1,42 @@
-<android.support.v4.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="org.kde.kdeconnect.UserInterface.MaterialActivity">  <!-- fitSystemWindows to make the drawer slide below the Lollipop transparent status bar -->
+    tools:context="org.kde.kdeconnect.UserInterface.MainActivity">  <!-- fitSystemWindows to make the drawer slide below the Lollipop transparent status bar -->
 
     <LinearLayout
-        android:layout_height="match_parent"
         android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            android:background="?attr/colorPrimary"
             android:elevation="8dp"
-            android:background="?attr/colorPrimary" />
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
         <FrameLayout
             android:id="@+id/container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-        </FrameLayout>
+            android:layout_height="match_parent" />
 
     </LinearLayout>
 
     <android.support.design.widget.NavigationView
         android:id="@+id/navigation_drawer"
-        android:background="@drawable/state_list_drawer_background"
-        app:itemBackground="@drawable/state_list_drawer_background"
-        app:itemTextColor="@color/state_list_drawer_text"
-        app:itemIconTint="@color/state_list_drawer_text"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
+        android:background="@drawable/state_list_drawer_background"
         app:headerLayout="@layout/nav_header"
-        />
+        app:itemBackground="@drawable/state_list_drawer_background"
+        app:itemIconTint="@color/state_list_drawer_text"
+        app:itemTextColor="@color/state_list_drawer_text" />
 
 </android.support.v4.widget.DrawerLayout>

res/layout/activity_mousepad.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:keepScreenOn="true"
-    android:orientation="vertical"
+    android:id="@+id/mousepad_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/mousepad_view">
+    android:keepScreenOn="true"
+    android:orientation="vertical">
 
     <TextView
+        style="@android:style/TextAppearance.Medium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/mousepad_info"
-        android:gravity="center"
-        style="@android:style/TextAppearance.Medium"
         android:layout_centerInParent="true"
-        android:padding="12dip" />
+        android:gravity="center"
+        android:padding="12dip"
+        android:text="@string/mousepad_info" />
 
     <view
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:id="@+id/keyListener"
         class="org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView"
-        android:id="@+id/keyListener" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
 </RelativeLayout>

res/layout/activity_mpris.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="25dp"
+    android:paddingLeft="25dp"
+    android:paddingRight="25dp"
+    android:paddingTop="25dp">
+
+    <ImageView
+        android:id="@+id/album_art"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginBottom="25dp"
+        android:layout_weight="4"
+        android:contentDescription="@string/mpris_coverart_description"
+        android:scaleType="fitCenter" />
+
+    <include
+        layout="@layout/mpris_control"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>

res/layout/activity_notification_filter.xml

@@ -6,27 +6,26 @@
     tools:context="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity">
 
     <TextView
-        android:text="@string/filter_apps_info"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
+        android:id="@+id/tFilter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingBottom="5dp"
-        android:id="@+id/tFilter"/>
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:text="@string/filter_apps_info" />
 
     <ProgressBar
-        android:layout_marginTop="64dip"
+        android:id="@+id/spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:id="@+id/spinner" />
+        android:layout_marginTop="64dip" />
 
     <ListView
+        android:id="@+id/lvFilterApps"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:id="@+id/lvFilterApps"
-        android:visibility="gone"
-        />
+        android:visibility="gone" />
 
 </LinearLayout>

res/layout/activity_refresh_list.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                              xmlns:tools="http://schemas.android.com/tools"
-                                              android:id="@+id/refresh_list_layout"
-                                              android:layout_width="match_parent"
-                                              android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/refresh_list_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <ListView android:layout_width="match_parent"
+    <ListView
+        android:id="@+id/listView1"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:addStatesFromChildren="true"
+        android:orientation="vertical"
         android:paddingLeft="16dip"
         android:paddingRight="16dip"
-        tools:context=".MainActivity"
-        android:id="@+id/listView1"
-        android:addStatesFromChildren="true"
-        android:orientation="vertical"/>
+        tools:context=".MainActivity" />
 
 </android.support.v4.widget.SwipeRefreshLayout>

res/layout/activity_runcommand.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/runcommandslist"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="4dp"
+        android:addStatesFromChildren="true"
+        android:orientation="vertical" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/add_command_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_add"
+        app:backgroundTint="@color/primary"
+        app:layout_anchor="@id/runcommandslist"
+        app:layout_anchorGravity="bottom|end" />
+
+    <TextView
+        android:id="@+id/addcomand_explanation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="30dp"
+        android:text="@string/addcommand_explanation"
+        android:textAlignment="center"
+        android:textSize="16sp" />
+
+</android.support.design.widget.CoordinatorLayout>

res/layout/addcommanddialog.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="20dp">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/command_confirm_needed"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+    <EditText
+        android:id="@+id/addcommand_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:ems="10"
+        android:hint="@string/addcommand_name"
+        android:inputType="text" />
+
+    <EditText
+        android:id="@+id/addcommand_command"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:ems="10"
+        android:hint="@string/addcommand_command"
+        android:inputType="text" />
+
+</LinearLayout>

res/layout/custom_ip_list.xml

@@ -1,36 +1,35 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:orientation="vertical">
+    android:paddingTop="@dimen/activity_vertical_margin">
 
     <ListView
+        android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
-        android:id="@android:id/list"
-        android:layout_weight="1"
-    />
+        android:layout_weight="1" />
 
     <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="100dp"
-            android:text="@string/custom_dev_list_help"/>
+        android:layout_width="fill_parent"
+        android:layout_height="100dp"
+        android:text="@string/custom_dev_list_help" />
 
     <EditText
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionSend"
-            android:hint="@string/add_host_hint"
-            android:id="@+id/ip_edittext"/>
+        android:id="@+id/ip_edittext"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/add_host_hint"
+        android:imeOptions="actionSend" />
 
     <Button
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/add_host"
-            android:id="@android:id/button1"/>
+        android:id="@android:id/button1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/add_host" />
 
 
 </LinearLayout>

res/layout/list_item_category.xml

@@ -1,34 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawableBottom="@drawable/text_section_header"
-        android:textStyle="bold"
+        android:id="@+id/list_item_category_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textColor="?android:textColorSecondary"
+        android:drawableBottom="@drawable/text_section_header"
         android:drawablePadding="4dp"
-        android:textSize="14sp"
-        android:textAllCaps="true"
         android:paddingLeft="8dip"
         android:paddingRight="8dip"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:id="@+id/list_item_category_text"
-        />
+        android:textAllCaps="true"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="14sp"
+        android:textStyle="bold" />
 
     <TextView
+        android:id="@+id/list_item_category_empty_placeholder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:layout_margin="10dip"
-        android:visibility="gone"
-        android:textAppearance="?android:attr/textAppearanceSmall"
         android:text="@string/device_list_empty"
-        android:id="@+id/list_item_category_empty_placeholder"
-        android:layout_gravity="center" />
-
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:visibility="gone" />
 
 </LinearLayout>

res/layout/list_item_entry.xml

@@ -1,37 +1,38 @@
 <?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"
-    android:paddingLeft="12dip"
-    android:paddingStart="12dip"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="@drawable/abc_list_selector_holo_dark"
-    android:orientation="vertical">
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingLeft="12dip"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="12dip">
     <!-- We should use android:background="@android:/listChoiceBackgroundIndicator"
          instead of abc_list_selector_holo_dark but that's only supported from API11 -->
 
-    <TextView android:id="@+id/list_item_entry_title"
+    <TextView
+        android:id="@+id/list_item_entry_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceLarge"
         android:ellipsize="marquee"
         android:fadingEdge="horizontal"
-        android:text="" />
+        android:singleLine="true"
+        android:text=""
+        android:textAppearance="?android:attr/textAppearanceLarge" />
 
-    <TextView android:id="@+id/list_item_entry_summary"
+    <TextView
+        android:id="@+id/list_item_entry_summary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
-        android:visibility="gone"
+        android:text=""
+        android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="@android:color/darker_gray"
-        android:text="" />
-
+        android:visibility="gone" />
 
 </LinearLayout>

res/layout/list_item_with_button_entry.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:baselineAligned="false"
-    android:layout_height="wrap_content"
-    android:paddingLeft="12dip"
-    android:paddingStart="12dip"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:orientation="horizontal">
-
-        <ImageView android:id="@+id/list_item_entry_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:src="@drawable/ic_device_laptop"
-            android:layout_weight="0" />
-
-    <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_weight="1"
-            android:layout_height="wrap_content">
-
-        <TextView android:id="@+id/list_item_entry_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="8dip"
-                android:layout_marginStart="8dip"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:text=""/>
-
-
-        <TextView android:id="@+id/list_item_entry_summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:singleLine="true"
-                android:textColor="#CC2222"
-                android:visibility="gone"
-                android:text="" />
-
-        </LinearLayout>
-
-
-    <ProgressBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/progressBar"
-        android:layout_weight="0"
-        android:indeterminate="true" />
-
-    <Button
-        android:layout_width="wrap_content"
-        android:minWidth="128dip"
-        android:layout_height="wrap_content"
-        android:text="@string/request_pairing"
-        android:padding="8dip"
-        android:background="@drawable/button_round"
-        android:textColor="#FFFFFF"
-        android:id="@+id/entry_pair_button"
-        android:layout_weight="0"
-        android:nestedScrollingEnabled="false" />
-
-</LinearLayout>
-
-

res/layout/list_item_with_icon_entry.xml

@@ -1,52 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:baselineAligned="false"
     android:layout_height="wrap_content"
-    android:paddingLeft="12dip"
-    android:paddingStart="12dip"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:clickable="true"
     android:background="@drawable/abc_list_selector_holo_dark"
-    android:orientation="horizontal">
+    android:baselineAligned="false"
+    android:clickable="true"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingLeft="12dip"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="12dip">
 
-    <ImageView android:id="@+id/list_item_entry_icon"
+    <ImageView
+        android:id="@+id/list_item_entry_icon"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_device_laptop"
-        />
+        android:contentDescription="@string/device_icon_description"
+        android:src="@drawable/ic_device_laptop" />
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:orientation="vertical"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-        <TextView android:id="@+id/list_item_entry_title"
+        <TextView
+            android:id="@+id/list_item_entry_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="8dip"
             android:layout_marginStart="8dip"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
             android:ellipsize="marquee"
             android:fadingEdge="horizontal"
-            android:text="" />
+            android:singleLine="true"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView android:id="@+id/list_item_entry_summary"
+        <TextView
+            android:id="@+id/list_item_entry_summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dip"
             android:layout_marginStart="8dip"
-            android:textAppearance="?android:attr/textAppearanceSmall"
             android:singleLine="true"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="#CC2222"
-            android:visibility="gone"
-            android:text="" />
+            android:visibility="gone" />
 
     </LinearLayout>
 

res/layout/mpris_control.xml

@@ -2,183 +2,161 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+    android:id="@+id/mpris_control_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/mpris_control_view"
+    android:layout_gravity="center"
     android:gravity="center"
-    android:paddingLeft="30dip"
-    android:paddingTop="5dip"
-    android:paddingRight="30dip"
-    android:paddingBottom="5dip">
+    android:orientation="vertical">
 
     <TextView
+        android:id="@+id/no_players"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_gravity="center_horizontal"
         android:text="@string/no_players_connected"
-        android:id="@+id/no_players"
-        android:layout_gravity="center_horizontal" />
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <Spinner
+        android:id="@+id/player_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/player_spinner"
-        android:layout_gravity="center"
-    />
+        android:layout_gravity="center" />
 
     <TextView
+        android:id="@+id/now_playing_textview"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:id="@+id/now_playing_textview"
+        android:layout_gravity="center"
         android:ellipsize="marquee"
+        android:gravity="center"
         android:marqueeRepeatLimit="marquee_forever"
+        android:padding="8dip"
         android:scrollHorizontally="true"
         android:singleLine="true"
-        android:gravity="center"
-        android:padding="8dip"
-        android:layout_gravity="center"
-    />
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <ImageButton
+        android:id="@+id/play_button"
         android:layout_width="fill_parent"
         android:layout_height="75dp"
-        android:id="@+id/play_button"
-        android:src="@drawable/ic_play_black"
-        android:contentDescription="@string/mpris_play"
         android:layout_gravity="center"
         android:layout_weight="0"
-        android:clickable="false"
         android:adjustViewBounds="false"
-        android:baselineAlignBottom="true" />
+        android:baselineAlignBottom="true"
+        android:clickable="false"
+        android:contentDescription="@string/mpris_play"
+        android:theme="@style/DisableableButton"
+        android:src="@drawable/ic_play_black" />
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="60dip"
         android:layout_gravity="center"
-    >
+        android:orientation="horizontal">
 
         <ImageButton
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
             android:id="@+id/prev_button"
-            android:src="@drawable/ic_previous_black"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
             android:contentDescription="@string/mpris_previous"
-            android:layout_weight="0.25"
-        />
+            android:theme="@style/DisableableButton"
+            android:src="@drawable/ic_previous_black" />
 
         <ImageButton
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
             android:id="@+id/rew_button"
-            android:src="@drawable/ic_rewind_black"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
             android:contentDescription="@string/mpris_rew"
-            android:layout_weight="0.25"
-        />
+            android:theme="@style/DisableableButton"
+            android:src="@drawable/ic_rewind_black" />
 
         <ImageButton
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
             android:id="@+id/ff_button"
-            android:src="@drawable/ic_fast_forward_black"
-            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="@drawable/ic_next_black"
-            android:contentDescription="@string/mpris_next"
             android:layout_weight="0.25"
-        />
+            android:contentDescription="@string/mpris_ff"
+            android:theme="@style/DisableableButton"
+            android:src="@drawable/ic_fast_forward_black" />
+
+        <ImageButton
+            android:id="@+id/next_button"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
+            android:contentDescription="@string/mpris_next"
+            android:theme="@style/DisableableButton"
+            android:src="@drawable/ic_next_black" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:orientation="horizontal"
+        android:id="@+id/progress_slider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/progress_slider">
+        android:orientation="horizontal">
 
         <TextView
+            android:id="@+id/progress_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:id="@+id/progress_textview"
-            android:singleLine="true"
+            android:layout_gravity="center"
             android:gravity="center"
             android:padding="8dip"
-            android:layout_gravity="center"
-            android:text="00:00" />
+            android:singleLine="true"
+            android:text="00:00"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <SeekBar
+            android:id="@+id/positionSeek"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/positionSeek"
-            android:layout_weight="1"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"
+            android:layout_weight="1" />
 
         <TextView
+            android:id="@+id/time_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:id="@+id/time_textview"
-            android:singleLine="true"
+            android:layout_gravity="center"
             android:gravity="center"
             android:padding="8dip"
-            android:layout_gravity="center"
-            android:text="00:00" />
+            android:singleLine="true"
+            android:text="00:00"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
 
     <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/volume_layout"
-            android:layout_gravity="center"
-        android:layout_marginTop="8dip">
+        android:id="@+id/volume_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="8dip"
+        android:orientation="horizontal">
 
         <ImageView
+            android:id="@+id/imageView"
             android:layout_width="30dip"
             android:layout_height="30dip"
-            android:maxWidth="30dip"
-            android:layout_marginRight="10dip"
             android:layout_marginEnd="10dip"
-            android:id="@+id/imageView"
+            android:layout_marginRight="10dip"
             android:layout_weight="0"
             android:contentDescription="@string/mpris_volume"
-            android:src="@drawable/ic_volume_black"
-        />
+            android:maxWidth="30dip"
+            android:src="@drawable/ic_volume_black" />
 
 
         <SeekBar
+            android:id="@+id/volume_seek"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/volume_seek"
-            android:layout_weight="1"
-            android:max="100"
             android:layout_gravity="center"
-        />
+            android:layout_weight="1"
+            android:max="100" />
 
     </LinearLayout>
 
-    <!--
-        <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/pause_button"
-                android:src="@android:drawable/ic_media_pause"
-                android:layout_gravity="center"/>
-
-        <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/pause_button"
-                android:src="@android:drawable/ic_media_stop"
-                android:layout_gravity="center"/>
-    -->
 </LinearLayout>

res/layout/nav_header.xml

@@ -3,51 +3,34 @@
     android:layout_width="match_parent"
     android:layout_height="160dp"
     android:background="@drawable/drawer_header"
-    android:orientation="vertical"
-    android:gravity="bottom">
+    android:gravity="bottom"
+    android:orientation="vertical">
 
     <TextView
+        android:id="@+id/kdeconnect_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="KDE Connect"
-        android:textColor="#FFF"
-        android:textStyle="bold"
-        android:id="@+id/kdeconnect_label"
+        android:paddingEnd="48dp"
         android:paddingLeft="16dp"
+        android:paddingRight="48dp"
         android:paddingStart="16dp"
         android:paddingTop="8dp"
-        android:paddingRight="48dp"
-        android:paddingEnd="48dp"
-        />
+        android:text="KDE Connect"
+        android:textColor="#FFF"
+        android:textStyle="bold" />
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="My device"
         android:id="@+id/device_name"
-        android:layout_marginBottom="0dp"
-        android:textColor="#fff"
-        android:paddingBottom="16dp"
-        android:paddingTop="4dp"
-        android:paddingRight="48dp"
-        android:paddingEnd="48dp"
-        android:paddingStart="16dp"
-        android:paddingLeft="16dp" />
-
-    <!--
-    <ImageView
-        android:src="@drawable/ic_action_image_edit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:clickable="true"
-        android:background="@drawable/abc_list_selector_holo_dark"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="@string/rename_device"
-        android:id="@+id/rename"
-    />
-    -->
+        android:layout_marginBottom="0dp"
+        android:paddingBottom="16dp"
+        android:paddingEnd="48dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="48dp"
+        android:paddingStart="16dp"
+        android:paddingTop="4dp"
+        android:text="My device"
+        android:textColor="#fff" />
 
 </LinearLayout>

res/layout/preference_with_button.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -20,16 +19,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:background="?attr/selectableItemBackground"
     android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingEnd="?android:attr/scrollbarSize"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingStart="12dip"
     android:paddingLeft="12dip"
-    android:background="?attr/selectableItemBackground">
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="12dip">
 
     <!-- Preference will place its actual preference widget here. -->
-    <LinearLayout android:id="@android:id/widget_frame"
+    <LinearLayout
+        android:id="@android:id/widget_frame"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
@@ -38,40 +38,43 @@
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="12dip"
-        android:layout_marginLeft="12dip"
-        android:layout_marginEnd="4dip"
-        android:layout_marginRight="4dip"
-        android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
+        android:layout_marginEnd="4dip"
+        android:layout_marginLeft="12dip"
+        android:layout_marginRight="4dip"
+        android:layout_marginStart="12dip"
+        android:layout_marginTop="6dip"
         android:layout_weight="1">
 
-        <TextView android:id="@+android:id/title"
+        <TextView
+            android:id="@+android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
             android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView android:id="@android:id/summary"
+        <TextView
+            android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignStart="@android:id/title"
             android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:layout_below="@android:id/title"
+            android:maxLines="3"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="3" />
+            android:textColor="?android:attr/textColorSecondary" />
 
     </RelativeLayout>
 
     <ImageButton
+        android:id="@+id/settingsButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/settingsButton"
-        android:padding="8dip"
         android:background="@drawable/abc_btn_borderless_material"
-        android:src="@drawable/ic_action_settings_inverted"/>
+        android:contentDescription="@string/settings_icon_description"
+        android:padding="8dip"
+        android:src="@drawable/ic_action_settings_inverted" />
 
 </LinearLayout>

res/menu/menu_mousepad.xml

@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">
+    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto">
 
-    <item android:id="@+id/menu_show_keyboard"
-        android:title="@string/show_keyboard"
+    <item
+        android:id="@+id/menu_show_keyboard"
         android:icon="@drawable/ic_action_keyboard"
+        android:title="@string/show_keyboard"
         kdeconnect:showAsAction="ifRoom" />
 
-    <item android:id="@+id/menu_right_click"
+    <item
+        android:id="@+id/menu_right_click"
         android:title="@string/right_click"
         kdeconnect:showAsAction="never" />
 
-    <item android:id="@+id/menu_middle_click"
+    <item
+        android:id="@+id/menu_middle_click"
         android:title="@string/middle_click"
         kdeconnect:showAsAction="never" />
 

res/menu/pairing.xml

@@ -5,22 +5,19 @@
         android:id="@+id/menu_refresh"
         android:icon="@drawable/ic_action_refresh"
         android:orderInCategory="200"
-        kdeconnect:showAsAction="never"
         android:title="@string/refresh"
-        />
+        kdeconnect:showAsAction="never" />
 
     <item
         android:id="@+id/menu_rename"
         android:orderInCategory="300"
         android:title="@string/device_rename_title"
-        kdeconnect:showAsAction="never"
-        />
+        kdeconnect:showAsAction="never" />
 
-       <item
+    <item
         android:id="@+id/menu_custom_device_list"
         android:orderInCategory="900"
         android:title="@string/custom_device_list"
-        kdeconnect:showAsAction="never"
-        />
+        kdeconnect:showAsAction="never" />
 
 </menu>

res/menu/refresh.xml

@@ -2,11 +2,10 @@
     xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">
 
     <item
-            android:id="@+id/menu_refresh"
-            android:icon="@drawable/ic_action_refresh"
-            android:orderInCategory="200"
-            kdeconnect:showAsAction="never"
-            android:title="@string/refresh"
-        />
+        android:id="@+id/menu_refresh"
+        android:icon="@drawable/ic_action_refresh"
+        android:orderInCategory="200"
+        android:title="@string/refresh"
+        kdeconnect:showAsAction="never" />
 
 </menu>

res/values-ar/strings.xml

@@ -75,7 +75,6 @@
   <string name="incoming_file_title">ملفّ وارد من %1s</string>
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">يرسل ملفًّا إلى %1s</string>
-  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">استُقبل ملفّ من %1s</string>
   <string name="received_file_fail_title">فشل استقبال الملفّ من %1s</string>
   <string name="received_file_text">المس لفتح \'%1s\'</string>

res/values-bs/strings.xml

@@ -56,7 +56,6 @@
   <string name="incoming_file_title">Dolazna datoteka od %1s</string>
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Slanje datoteke na %1s</string>
-  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Primljena datoteka od %1s</string>
   <string name="received_file_text">Kucni za otvaranje \'%1s\'</string>
   <string name="sent_file_title">Poslana datoteka na %1s</string>

res/values-ca/strings.xml

@@ -83,8 +83,10 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">S\'està enviant el fitxer a %1s</string>
   <string name="outgoing_files_title">S\'estan enviant fitxers a %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">S\'ha enviat %1$d de %2$d fitxers</string>
+  <plurals name="outgoing_files_text">
+    <item quantity="one">S\'ha enviat %1$d fitxer</item>
+    <item quantity="other">S\'ha enviat %1$d de %2$d fitxers</item>
+  </plurals>
   <string name="received_file_title">Fitxer rebut des de %1s</string>
   <string name="received_file_fail_title">Ha fallat en rebre el fitxer des de %1s</string>
   <string name="received_file_text">Puntegeu per obrir «%1s»</string>
@@ -106,6 +108,7 @@
   <string name="remote_control">Comandament a distància</string>
   <string name="settings">Arranjament del KDE Connect</string>
   <string name="mpris_play">Reprodueix</string>
+  <string name="mpris_pause">Pausa</string>
   <string name="mpris_previous">Anterior</string>
   <string name="mpris_rew">Rebobina</string>
   <string name="mpris_ff">Avanç ràpid</string>
@@ -121,6 +124,8 @@
     <item>1 minut</item>
     <item>2 minuts</item>
   </string-array>
+  <string name="mpris_notification_settings_title">Mostra les notificacions dels reproductors</string>
+  <string name="mpris_notification_settings_summary">Permet controlar els reproductors multimèdia sense obrir el KDE Connect.</string>
   <string name="share_to">Comparteix amb...</string>
   <string name="protocol_version_older">Aquest dispositiu usa una versió antiga del protocol</string>
   <string name="protocol_version_newer">Aquest dispositiu usa una versió nova del protocol</string>
@@ -183,4 +188,16 @@
   <string name="telepathy_permission_explanation">Per a llegir i escriure SMS des de l\'escriptori, haureu de donar permís als SMS</string>
   <string name="telephony_permission_explanation">Per a veure les trucades telefòniques i SMS des de l\'escriptori, haureu de donar permís a les trucades telefòniques i SMS</string>
   <string name="telephony_optional_permission_explanation">Per a veure un nom de contacte en comptes d\'un número de telèfon, haureu de donar permís als contactes del telèfon</string>
+  <string name="select_ringtone">Seleccioneu un to de la trucada</string>
+  <string name="telephony_pref_blocked_title">Nombres blocats</string>
+  <string name="telephony_pref_blocked_dialog_desc">No es mostren ni les trucades ni els SMS d\'aquests números. Especifiqueu un número per línia</string>
+  <string name="mpris_coverart_description">Caràtula del suport actual</string>
+  <string name="device_icon_description">Icona del dispositiu</string>
+  <string name="settings_icon_description">Icona d\'arranjament</string>
+  <string name="add_command">Afegeix una ordre</string>
+  <string name="addcommand_name">Nom</string>
+  <string name="addcommand_command">Ordre</string>
+  <string name="command_confirm_needed">Cal confirmar l\'ordre a l\'escriptori</string>
+  <string name="addcommand_explanation">No hi ha cap ordre registrada</string>
+  <string name="addcommand_explanation2">Podeu afegir ordres noves a l\'Arranjament del sistema del KDE Connect</string>
 </resources>

res/values-cs/strings.xml

@@ -82,8 +82,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Odesílám soubor do %1s</string>
   <string name="outgoing_files_title">Odesílám soubory do %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Odesláno %1$d ze %2$d souborů</string>
   <string name="received_file_title">Přijat soubor od %1s</string>
   <string name="received_file_fail_title">Selhalo přijímání souboru od %1s</string>
   <string name="received_file_text">Ťukněte pro otevření \'%1s\'</string>

res/values-da/strings.xml

@@ -82,8 +82,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Sender fil til %1s</string>
   <string name="outgoing_files_title">Sender filer til %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Sendte %1$d ud af %2$d filer</string>
   <string name="received_file_title">Modtog fil fra %1s</string>
   <string name="received_file_fail_title">Kunne ikke modtage fil fra %1s</string>
   <string name="received_file_text">Tap for at åbne \"%1s\"</string>

res/values-de/strings.xml

@@ -76,8 +76,10 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Datei wird an %1s gesendet</string>
   <string name="outgoing_files_title">Datei wird an %1s gesendet</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">%1$d von %2$d Dateien gesendet</string>
+  <plurals name="outgoing_files_text">
+    <item quantity="one">%1$d Datei gesendet</item>
+    <item quantity="other">%1$d von %2$d Dateien gesendet</item>
+  </plurals>
   <string name="received_file_title">Datei von %1s erhalten</string>
   <string name="received_file_fail_title">Der Empfang der Datei %1s ist fehlgeschlagen</string>
   <string name="received_file_text">Tippen um „%1s“ zu öffnen</string>
@@ -99,6 +101,7 @@
   <string name="remote_control">Fernbedienung</string>
   <string name="settings">KDE-Connect-Einstellungen</string>
   <string name="mpris_play">Wiedergabe</string>
+  <string name="mpris_pause">Anhalten</string>
   <string name="mpris_previous">Zurück</string>
   <string name="mpris_rew">Schneller Rücklauf</string>
   <string name="mpris_ff">Vorlauf</string>
@@ -166,4 +169,12 @@
   <string name="findmyphone_found">Gefunden</string>
   <string name="open">Öffnen</string>
   <string name="close">Schließen</string>
+  <string name="select_ringtone">Einen Klingelton auswählen</string>
+  <string name="device_icon_description">Gerätesymbol</string>
+  <string name="settings_icon_description">Einstellungssymbol</string>
+  <string name="add_command">Einen Befehl hinzufügen</string>
+  <string name="addcommand_name">Name</string>
+  <string name="addcommand_command">Befehl</string>
+  <string name="addcommand_explanation">Es sind keine Befehle registriert.</string>
+  <string name="addcommand_explanation2">Sie können neue Befehle in den Systemeinstellungen für KDE-Connect hinzufügen.</string>
 </resources>

res/values-el/strings.xml

@@ -82,8 +82,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Αποστολή αρχείου σε %1s</string>
   <string name="outgoing_files_title">Αποστολή αρχείων σε %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Εστάλησαν %1$d από %2$d αρχεία</string>
   <string name="received_file_title">Ελήφθη αρχείο από %1s</string>
   <string name="received_file_fail_title">Αποτυχία λήψης αρχείου από %1s</string>
   <string name="received_file_text">Χτυπήστε για άνοιγμα \'%1s\'</string>

res/values-en-rGB/strings.xml

@@ -37,6 +37,7 @@
   <string name="remotekeyboard_connected">Remote keyboard connection is active</string>
   <string name="remotekeyboard_multiple_connections">There is more than one remote keyboard connection, select the device to configure</string>
   <string name="open_mousepad">Remote input</string>
+  <string name="mousepad_info">Move a finger on the screen to move the mouse cursor. Tap for a click, and use two/three fingers for right and middle buttons. Use 2 fingers to scroll. Use a long press to drag\'n drop.</string>
   <string name="mousepad_double_tap_settings_title">Set two finger tap action</string>
   <string name="mousepad_triple_tap_settings_title">Set three finger tap action</string>
   <string name="mousepad_sensitivity_settings_title">Set touchpad sensitivity</string>
@@ -82,8 +83,10 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Sending file to %1s</string>
   <string name="outgoing_files_title">Sending files to %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Sent %1$d out of %2$d files</string>
+  <plurals name="outgoing_files_text">
+    <item quantity="one">Send files</item>
+    <item quantity="other">Sent %1$d out of %2$d files</item>
+  </plurals>
   <string name="received_file_title">Received file from %1s</string>
   <string name="received_file_fail_title">Failed receiving file from %1s</string>
   <string name="received_file_text">Tap to open \'%1s\'</string>
@@ -105,6 +108,7 @@
   <string name="remote_control">Remote control</string>
   <string name="settings">KDE Connect Settings</string>
   <string name="mpris_play">Play</string>
+  <string name="mpris_pause">Pause</string>
   <string name="mpris_previous">Previous</string>
   <string name="mpris_rew">Rewind</string>
   <string name="mpris_ff">Fast-forward</string>
@@ -120,6 +124,8 @@
     <item>1 minute</item>
     <item>2 minutes</item>
   </string-array>
+  <string name="mpris_notification_settings_title">Show media control notification</string>
+  <string name="mpris_notification_settings_summary">Allows controlling your media players without opening KDE Connect.</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>
@@ -182,4 +188,16 @@
   <string name="telepathy_permission_explanation">To read and write SMS from your desktop you need to give permission to SMS</string>
   <string name="telephony_permission_explanation">To see phone calls and SMS from the desktop you need to give permission to phone calls and SMS</string>
   <string name="telephony_optional_permission_explanation">To see a contact name instead of a phone number you need to give access to the phone\'s contacts</string>
+  <string name="select_ringtone">Select a ringtone</string>
+  <string name="telephony_pref_blocked_title">Blocked numbers</string>
+  <string name="telephony_pref_blocked_dialog_desc">Don\'t show calls and SMS from these numbers. Please specify one number per line</string>
+  <string name="mpris_coverart_description">Cover art of current media</string>
+  <string name="device_icon_description">Device icon</string>
+  <string name="settings_icon_description">Settings icon</string>
+  <string name="add_command">Add a command</string>
+  <string name="addcommand_name">Name</string>
+  <string name="addcommand_command">Command</string>
+  <string name="command_confirm_needed">You will need to confirm the command on the desktop</string>
+  <string name="addcommand_explanation">There are no commands registered</string>
+  <string name="addcommand_explanation2">You can add new commands in the KDE Connect System Settings</string>
 </resources>

res/values-es/strings.xml

@@ -83,8 +83,10 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Enviando archivo a %1s</string>
   <string name="outgoing_files_title">Enviando archivos a %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Enviados %1$d de %2$d archivos</string>
+  <plurals name="outgoing_files_text">
+    <item quantity="one">Enviado %1$d archivo</item>
+    <item quantity="other">Enviados %1$d de %2$d archivos</item>
+  </plurals>
   <string name="received_file_title">Archivo recibido desde %1s</string>
   <string name="received_file_fail_title">Fallo recibiendo archivo desde %1s</string>
   <string name="received_file_text">Pulse para abrir «%1s»</string>
@@ -106,6 +108,7 @@
   <string name="remote_control">Control remoto</string>
   <string name="settings">Preferencias de KDE Connect</string>
   <string name="mpris_play">Reproducir</string>
+  <string name="mpris_pause">Pausar</string>
   <string name="mpris_previous">Anterior</string>
   <string name="mpris_rew">Rebobinar</string>
   <string name="mpris_ff">Avance rápido</string>
@@ -121,6 +124,8 @@
     <item>1 minuto</item>
     <item>2 minutos</item>
   </string-array>
+  <string name="mpris_notification_settings_title">Mostrar notificación del control de medios</string>
+  <string name="mpris_notification_settings_summary">Permite controlar sus reproductores de medios sin abrir KDE Connect.</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>
@@ -183,4 +188,16 @@
   <string name="telepathy_permission_explanation">Para leer y escribir SMS desde su escritorio, necesita dar permisos para SMS</string>
   <string name="telephony_permission_explanation">Para ver las llamadas telefónicas y SMS desde su escritorio, necesita dar permisos para llamadas telefónicas y SMS</string>
   <string name="telephony_optional_permission_explanation">Para ver el nombre de un contacto en lugar de un número telefónico, necesita dar acceso a los contactos de su teléfono</string>
+  <string name="select_ringtone">Seleccionar tono</string>
+  <string name="telephony_pref_blocked_title">Números bloqueados</string>
+  <string name="telephony_pref_blocked_dialog_desc">No mostrar llamadas y SMS de estos números. Por favor, especifique solo un número por línea</string>
+  <string name="mpris_coverart_description">Carátula del medio actual</string>
+  <string name="device_icon_description">Icono del dispositivo</string>
+  <string name="settings_icon_description">Icono de preferencias</string>
+  <string name="add_command">Añadir una orden</string>
+  <string name="addcommand_name">Nombre</string>
+  <string name="addcommand_command">Orden</string>
+  <string name="command_confirm_needed">Necesitará confirmar la orden desde su escritorio</string>
+  <string name="addcommand_explanation">No hay ninguna orden registrada</string>
+  <string name="addcommand_explanation2">Puede añadir nuevas órdenes en las preferencias del sistema de KDE Connect</string>
 </resources>

res/values-et/strings.xml

@@ -76,8 +76,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Faili saatmine seadmesse %1s</string>
   <string name="outgoing_files_title">Failide saatmine seadmesse %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Saadetud %1$d / %2$d faili</string>
   <string name="received_file_title">Faili saamine seadmest %1s</string>
   <string name="received_file_fail_title">Faili saamine seadmest %1s nurjus</string>
   <string name="received_file_text">Koputa \"%1s\" avamiseks</string>

res/values-eu/strings.xml

@@ -82,8 +82,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Fitxategia bidaltzen %1s-ra</string>
   <string name="outgoing_files_title">Fitxategiak bidaltzen %1s-ra</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">%1$d / %2$d fitxategi bidalita</string>
   <string name="received_file_title">Fitxategia jaso da %1s-tik</string>
   <string name="received_file_fail_title">Huts egin du fitxategia jasotzea %1s-tik</string>
   <string name="received_file_text">Sakatu \'%1s\' irekitzeko</string>

res/values-fi/strings.xml

@@ -75,7 +75,6 @@
   <string name="incoming_file_title">Saapuva tiedosto lähettäjältä %1s</string>
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Lähetetään tiedostoa laitteeseen %1s</string>
-  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Vastaanotettiin tiedosto lähettäjältä %1s</string>
   <string name="received_file_fail_title">Ei voitu vastaanottaa tiedostoa lähettäjältä %1s</string>
   <string name="received_file_text">Avaa ”%1s” napauttamalla</string>

res/values-fr/strings.xml

@@ -82,8 +82,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Envoi d\'un fichier à %1s</string>
   <string name="outgoing_files_title">Envoi de fichiers à %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Envoi de %1$d sur %2$d fichiers</string>
   <string name="received_file_title">Fichier reçu de %1s</string>
   <string name="received_file_fail_title">Impossible de recevoir le fichier depuis : %1s</string>
   <string name="received_file_text">Appuyez pour ouvrir %1s</string>

res/values-gl/strings.xml

@@ -83,8 +83,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Enviando un ficheiro a %1s</string>
   <string name="outgoing_files_title">Enviando os ficheiros a %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Enviáronse %1$d de %2$d ficheiros.</string>
   <string name="received_file_title">Recibiuse un ficheiro de %1s</string>
   <string name="received_file_fail_title">A recepción do ficheiro de %1s fallou</string>
   <string name="received_file_text">Toque para abrir «%1s».</string>

res/values-he/strings.xml

@@ -82,8 +82,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">שולח קובץ אל %1s</string>
   <string name="outgoing_files_title">שולח קובצים אל %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">"שולח %1$d מתוך %2$d קבצים "</string>
   <string name="received_file_title">התקבל קובץ מאת %1s</string>
   <string name="received_file_fail_title">נכשל בקבלת קובץ מאת %1s</string>
   <string name="received_file_text">לחץ כדי לפתוח את \"%1s\"</string>

res/values-it/strings.xml

@@ -83,8 +83,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Invio file a %1s</string>
   <string name="outgoing_files_title">Invio file a %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Inviati %1$d di %2$d file</string>
   <string name="received_file_title">File ricevuto da %1s</string>
   <string name="received_file_fail_title">Ricezione file da %1s non riuscita</string>
   <string name="received_file_text">Tocca per aprire «%1s»</string>
@@ -106,6 +104,7 @@
   <string name="remote_control">Telecomando</string>
   <string name="settings">Impostazioni</string>
   <string name="mpris_play">Riproduci</string>
+  <string name="mpris_pause">Pausa</string>
   <string name="mpris_previous">Precedente</string>
   <string name="mpris_rew">Riavvolgi</string>
   <string name="mpris_ff">Avanti veloce</string>
@@ -121,6 +120,8 @@
     <item>1 minuto</item>
     <item>2 minuti</item>
   </string-array>
+  <string name="mpris_notification_settings_title">Mostra la notifica del controllo multimediale</string>
+  <string name="mpris_notification_settings_summary">Consente di controllare i lettori multimediali senza aprire KDE Connect.</string>
   <string name="share_to">Condividi…</string>
   <string name="protocol_version_older">Questo dispositivo usa una vecchia versione del protocollo di rete</string>
   <string name="protocol_version_newer">Questo dispositivo usa una nuova versione del protocollo di rete</string>
@@ -183,4 +184,7 @@
   <string name="telepathy_permission_explanation">Per leggere e scrivere SMS dal tuo desktop, devi concedere l\'autorizzazione per SMS</string>
   <string name="telephony_permission_explanation">Per vedere le chiamate telefoniche e gli SMS dal desktop devi dare l\'autorizzazione per telefonate e SMS</string>
   <string name="telephony_optional_permission_explanation">Per vedere il nome di un contatto invece del numero di telefono devi dare accesso alla rubrica del telefono</string>
+  <string name="select_ringtone">Seleziona una suoneria</string>
+  <string name="telephony_pref_blocked_title">Numeri bloccati</string>
+  <string name="telephony_pref_blocked_dialog_desc">Non mostrare le chiamate e gli SMS da questi numeri. Specifica un numero per riga</string>
 </resources>

res/values-ko/strings.xml

@@ -76,8 +76,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">%1s(으)로 파일 보내는 중</string>
   <string name="outgoing_files_title">%1s(으)로 파일 보내는 중</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">파일 %2$d개 중 %1$d개 보냄</string>
   <string name="received_file_title">%1s에서 파일 받음</string>
   <string name="received_file_fail_title">%1s에서 파일 받기 실패</string>
   <string name="received_file_text">\'%1s\'을(를) 열려면 누르십시오</string>

res/values-nl/strings.xml

@@ -83,8 +83,10 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Bezig bestand te verzenden naar %1s</string>
   <string name="outgoing_files_title">Bezig bestanden te verzenden naar %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Verzonden %1$d uit %2$d bestanden</string>
+  <plurals name="outgoing_files_text">
+    <item quantity="one">Bestand %1$d verzenden</item>
+    <item quantity="other">%1$d bestanden uit %2$d verzenden</item>
+  </plurals>
   <string name="received_file_title">Bestand ontvangen van %1s</string>
   <string name="received_file_fail_title">Bestand ontvangen van %1s is mislukt</string>
   <string name="received_file_text">Tap om \'%1s\' te openen</string>
@@ -106,6 +108,7 @@
   <string name="remote_control">Afstandsbediening</string>
   <string name="settings">Instellingen van KDE Connect</string>
   <string name="mpris_play">Afspelen</string>
+  <string name="mpris_pause">Pauzeren</string>
   <string name="mpris_previous">Vorige</string>
   <string name="mpris_rew">Terugspoelen</string>
   <string name="mpris_ff">Snel vooruit</string>
@@ -121,6 +124,8 @@
     <item>1 minuut</item>
     <item>2 minuten</item>
   </string-array>
+  <string name="mpris_notification_settings_title">Mediabesturingsmelding tonen</string>
+  <string name="mpris_notification_settings_summary">Staat besturing van uw mediaspelers toe zonder KDE Connect te openen.</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>
@@ -183,4 +188,16 @@
   <string name="telepathy_permission_explanation">Om een SMS te lezen of te schrijven vanaf uw bureaublad moet u toestemming geven tot SMS</string>
   <string name="telephony_permission_explanation">Om telefoonoproepen en SMS te zien vanaf het bureaublad moet u toestemming geven tot telefoonoproepen en SMS</string>
   <string name="telephony_optional_permission_explanation">Om een naam van een contactpersoon te zien in plaats van een telefoonnummer moet u toegang geven tot de contacten in uw telefoon</string>
+  <string name="select_ringtone">Selecteer een ringtone</string>
+  <string name="telephony_pref_blocked_title">Geblokkeerde nummers</string>
+  <string name="telephony_pref_blocked_dialog_desc">Geen oproepen en SMSen vanaf deze nummers tonen. Specificeer één nummer per regel</string>
+  <string name="mpris_coverart_description">Cover-illustratie van huidige media</string>
+  <string name="device_icon_description">Apparaatpictogram</string>
+  <string name="settings_icon_description">Pictogram voor instellingen</string>
+  <string name="add_command">Een commando toevoegen</string>
+  <string name="addcommand_name">Naam</string>
+  <string name="addcommand_command">Commando</string>
+  <string name="command_confirm_needed">U zult het commando moeten bevestigen op het bureaublad</string>
+  <string name="addcommand_explanation">Er zijn geen commando\'s geregistreerd</string>
+  <string name="addcommand_explanation2">U kunt nieuwe commando\'s in de instellingen voor het KDE connect-systeem toevoegen</string>
 </resources>

res/values-nn/strings.xml

@@ -83,8 +83,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Sender fil til %1s</string>
   <string name="outgoing_files_title">Sender filer til %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Sende %1$d av %2$d filer</string>
   <string name="received_file_title">Fekk fil frå %1s</string>
   <string name="received_file_fail_title">Klarte ikkje ta imot fil frå %1s</string>
   <string name="received_file_text">Trykk for å opna «%1s»</string>

res/values-pl/strings.xml

@@ -83,8 +83,12 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Wysyłanie pliku do %1s</string>
   <string name="outgoing_files_title">Wysyłanie pliku do %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Wysłano %1$d z %2$d plików</string>
+  <plurals name="outgoing_files_text">
+    <item quantity="one">Wysłano %1$d plik</item>
+    <item quantity="few">Wysłano %1$d z %2$d plików</item>
+    <item quantity="many">Wysłano %1$d z %2$d plików</item>
+    <item quantity="other"/>
+  </plurals>
   <string name="received_file_title">Odebrano plik od %1s</string>
   <string name="received_file_fail_title">Nieudane odbieranie pliku z %1s</string>
   <string name="received_file_text">Znacznik do otwarcia \'%1s\'</string>
@@ -106,6 +110,7 @@
   <string name="remote_control">Zdalne sterowanie</string>
   <string name="settings">Ustawienia KDE Connect</string>
   <string name="mpris_play">Odtwórz</string>
+  <string name="mpris_pause">Wstrzymaj</string>
   <string name="mpris_previous">Poprzedni</string>
   <string name="mpris_rew">Przewiń</string>
   <string name="mpris_ff">Przewiń do przodu</string>
@@ -121,6 +126,8 @@
     <item>1 minuta</item>
     <item>2 minuty</item>
   </string-array>
+  <string name="mpris_notification_settings_title">Pokaż powiadomienia sterowania mediami</string>
+  <string name="mpris_notification_settings_summary">Umożliwia sterowanie odtwarzaczami bez otwierania KDE Connect.</string>
   <string name="share_to">Współdziel z...</string>
   <string name="protocol_version_older">Urządzenie to używa starej wersji protokołu</string>
   <string name="protocol_version_newer">Urządzenie to używa nowszej wersji protokołu</string>
@@ -163,7 +170,7 @@
   <string name="refresh">Odśwież</string>
   <string name="unreachable_description">To sparowane urządzenie jest nieosiągalne. Upewnij się, że jest podłączone do tej samej sieci.</string>
   <string name="on_data_message">Wygląda na to, że korzystasz z internetu mobilnego. KDE Connect działa tylko na lokalnych sieciach.</string>
-  <string name="no_file_browser">Nie wgrano żadanych przeglądarek plików.</string>
+  <string name="no_file_browser">Nie wgrano żadnych przeglądarek plików.</string>
   <string name="pref_plugin_telepathy">Wyślij SMS-a</string>
   <string name="pref_plugin_telepathy_desc">Wyślij wiadomość tekstową z komputera</string>
   <string name="plugin_not_supported">Ta wtyczka nie jest obsługiwana przez to urządzenie</string>
@@ -183,4 +190,16 @@
   <string name="telepathy_permission_explanation">Aby odczytywać i pisać SMSy z twojego komputera musisz nadać uprawnienia do SMSów</string>
   <string name="telephony_permission_explanation">Aby widzieć rozmowy telefoniczne i SMSy z twojego komputera musisz nadać uprawnienia na rozmowy telefoniczne i SMSy</string>
   <string name="telephony_optional_permission_explanation">Aby widzieć nazwę kontaktu zamiast numeru telefonu musisz pozwolić na dostęp do kontaktów telefonu</string>
+  <string name="select_ringtone">Wybierz dzwonek</string>
+  <string name="telephony_pref_blocked_title">Zablokowane numery</string>
+  <string name="telephony_pref_blocked_dialog_desc">Nie pokazuj rozmów, ani SMSów z tych numerów. Podawaj jeden numer na wiersz</string>
+  <string name="mpris_coverart_description">Okładka dla bieżących multimediów</string>
+  <string name="device_icon_description">Ikona urządzenia</string>
+  <string name="settings_icon_description">Ikona ustawień</string>
+  <string name="add_command">Dodaj polecenie</string>
+  <string name="addcommand_name">Nazwa</string>
+  <string name="addcommand_command">Polecenie</string>
+  <string name="command_confirm_needed">Będziesz musiał potwierdzić polecenie na pulpicie</string>
+  <string name="addcommand_explanation">Nie zarejestrowano żadnych poleceń</string>
+  <string name="addcommand_explanation2">Nowe polecenia można dodawać w ustawieniach systemowych KDE Connect</string>
 </resources>

res/values-pt-rBR/strings.xml

@@ -70,7 +70,6 @@
   <string name="incoming_file_title">Arquivo recebido de %1s</string>
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Enviando arquivo para %1s</string>
-  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Arquivo recebido de %1s</string>
   <string name="received_file_fail_title">Falha ao receber o arquivo de %1s</string>
   <string name="received_file_text">Toque para abrir o \'%1s\'</string>

res/values-pt/strings.xml

@@ -83,8 +83,10 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">A enviar o ficheiro para o %1s</string>
   <string name="outgoing_files_title">A enviar os ficheiros para o %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Foram enviados %1$d de %2$d ficheiros</string>
+  <plurals name="outgoing_files_text">
+    <item quantity="one">Foi enviado %1$d ficheiro</item>
+    <item quantity="other">Foram enviados %1$d de %2$d ficheiros</item>
+  </plurals>
   <string name="received_file_title">Ficheiro recebido de %1s</string>
   <string name="received_file_fail_title">Falhou a recepção do ficheiro de %1s</string>
   <string name="received_file_text">Toque para abrir o \'%1s\'</string>
@@ -106,6 +108,7 @@
   <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_pause">Pausa</string>
   <string name="mpris_previous">Anterior</string>
   <string name="mpris_rew">Recuar</string>
   <string name="mpris_ff">Avançar</string>
@@ -121,6 +124,8 @@
     <item>1 minuto</item>
     <item>2 minutos</item>
   </string-array>
+  <string name="mpris_notification_settings_title">Mostrar a notificação do controlo multimédia</string>
+  <string name="mpris_notification_settings_summary">Permite controlar os seus leitores multimédia sem abrir o KDE Connect.</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>
@@ -183,4 +188,16 @@
   <string name="telepathy_permission_explanation">Para ler e escrever SMS\'s a partir do seu ambiente de trabalho, precisa de dar permissões para os SMS\'s</string>
   <string name="telephony_permission_explanation">Para ver as chamadas e os SMS\'s a partir do seu ambiente de trabalho, precisa de dar permissões para as chamadas telefónicas e SMS\'s</string>
   <string name="telephony_optional_permission_explanation">Para ver o nome de um contacto em vez do seu número de telefone, precisa de dar acesso aos contactos do telemóvel</string>
+  <string name="select_ringtone">Seleccione um toque de chamada</string>
+  <string name="telephony_pref_blocked_title">Números bloqueados</string>
+  <string name="telephony_pref_blocked_dialog_desc">Não mostrar as chamadas e SMS\'s desses números. Por favor, indique um número por linha</string>
+  <string name="mpris_coverart_description">Capa do conteúdo actual</string>
+  <string name="device_icon_description">Ícone do dispositivo</string>
+  <string name="settings_icon_description">Ícone de configuração</string>
+  <string name="add_command">Adicionar um comando</string>
+  <string name="addcommand_name">Nome</string>
+  <string name="addcommand_command">Comando</string>
+  <string name="command_confirm_needed">Terá de confirmar o comando no ambiente de trabalho</string>
+  <string name="addcommand_explanation">Não existem comandos registados</string>
+  <string name="addcommand_explanation2">Poderá adicionar comandos novos na Configuração do Sistema KDE Connect</string>
 </resources>

res/values-ru/strings.xml

@@ -82,8 +82,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Отправка файла на %1s</string>
   <string name="outgoing_files_title">Отправка файлов на %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Отправлено %1$d из %2$d файлов</string>
   <string name="received_file_title">Получен файл с %1s</string>
   <string name="received_file_fail_title">Не удалось получить файл с %1s</string>
   <string name="received_file_text">Нажмите, чтобы открыть «%1s»</string>

res/values-sk/strings.xml

@@ -75,7 +75,6 @@
   <string name="incoming_file_title">Prichádzajúci súbor od %s</string>
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Posielam súbor pre %1s</string>
-  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Prijatý súbor od %1s</string>
   <string name="received_file_fail_title">Zlyhalo prijatie súboru od %1s</string>
   <string name="received_file_text">Ťuknite na otvorenie \'%1s\'</string>

res/values-sr/strings.xml

@@ -82,8 +82,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Шаљем фајл на %1s</string>
   <string name="outgoing_files_title">Шаљем фајлове на %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Послато %1$d од %2$d фајлова</string>
   <string name="received_file_title">Примљен фајл са %1s</string>
   <string name="received_file_fail_title">Неуспео пријем фајла са %1s</string>
   <string name="received_file_text">Тапните да отворите „%1s“</string>

res/values-sv/strings.xml

@@ -83,8 +83,10 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Skickar fil till %1s</string>
   <string name="outgoing_files_title">Skickar filer till %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Skickade %1$d av %2$d filer</string>
+  <plurals name="outgoing_files_text">
+    <item quantity="one">Skickade %1$d fil</item>
+    <item quantity="other">Skickade %1$d av %2$d filer</item>
+  </plurals>
   <string name="received_file_title">Tog emot fil från %1s</string>
   <string name="received_file_fail_title">Misslyckades ta emot fil från %1s</string>
   <string name="received_file_text">Rör för att öppna \'%1s\'</string>
@@ -106,6 +108,7 @@
   <string name="remote_control">Fjärrkontroll</string>
   <string name="settings">KDE anslutningsinställningar</string>
   <string name="mpris_play">Spela</string>
+  <string name="mpris_pause">Paus</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>
@@ -121,6 +124,8 @@
     <item>1 minut</item>
     <item>2 minuter</item>
   </string-array>
+  <string name="mpris_notification_settings_title">Visa underrättelser om mediastyrning</string>
+  <string name="mpris_notification_settings_summary">Tillåter att styra mediaspelare utan att KDE-anslut öppnas.</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>
@@ -183,4 +188,16 @@
   <string name="telepathy_permission_explanation">För att läsa och skriva SMS från skrivbordet måste du ge rättigheter för SMS</string>
   <string name="telephony_permission_explanation">För att se telefonsamtal och SMS från skrivbordet måste du ge rättigheter för telefonsamtal och SMS</string>
   <string name="telephony_optional_permission_explanation">För att se ett kontaktnamn istället för ett telefonnummer måste du ge tillgång till telefonens kontakter</string>
+  <string name="select_ringtone">Välj en ringsignal</string>
+  <string name="telephony_pref_blocked_title">Blockerade nummer</string>
+  <string name="telephony_pref_blocked_dialog_desc">Visa inte samtal och SMS från dessa nummer. Ange ett nummer per rad.</string>
+  <string name="mpris_coverart_description">Omslag för aktuell media</string>
+  <string name="device_icon_description">Enhetsikon</string>
+  <string name="settings_icon_description">Inställningsikon</string>
+  <string name="add_command">Lägg till ett kommando</string>
+  <string name="addcommand_name">Namn</string>
+  <string name="addcommand_command">Kommando</string>
+  <string name="command_confirm_needed">Du måste bekräfta kommandot på skrivbordet</string>
+  <string name="addcommand_explanation">Det finns inga kommandon registrerade</string>
+  <string name="addcommand_explanation2">Du kan lägga till nya kommandon i KDE-ansluts systeminställningar</string>
 </resources>

res/values-tr/strings.xml

@@ -82,8 +82,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Dosya şuraya gönderiliyor, %1s</string>
   <string name="outgoing_files_title">Dosyalar şuraya gönderiliyor, %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">%2$d dosyadan %1$d dosya gönderildi</string>
   <string name="received_file_title">Şuradan dosya alındı, %1s</string>
   <string name="received_file_fail_title">Şuradan dosya alma başarısız, %1s</string>
   <string name="received_file_text">\'%1s\' açmak için dokunun</string>

res/values-uk/strings.xml

@@ -83,8 +83,12 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Надсилаємо файл до %1s</string>
   <string name="outgoing_files_title">Надсилаємо файли на %1s</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Надіслано %1$d з %2$d файлів</string>
+  <plurals name="outgoing_files_text">
+    <item quantity="one">Надіслано %1$d з %2$d файла</item>
+    <item quantity="few">Надіслано %1$d з %2$d файлів</item>
+    <item quantity="many">Надіслано %1$d з %2$d файлів</item>
+    <item quantity="other">Надіслано %1$d файл</item>
+  </plurals>
   <string name="received_file_title">Отримано файл з %1s</string>
   <string name="received_file_fail_title">Не вдалося отримати файл з %1s</string>
   <string name="received_file_text">Натисніть, щоб відкрити «%1s»</string>
@@ -106,6 +110,7 @@
   <string name="remote_control">Дистанційне керування</string>
   <string name="settings">Параметри з’єднання з KDE</string>
   <string name="mpris_play">Пуск</string>
+  <string name="mpris_pause">Пауза</string>
   <string name="mpris_previous">Назад</string>
   <string name="mpris_rew">Повний назад</string>
   <string name="mpris_ff">Повний вперед</string>
@@ -121,6 +126,8 @@
     <item>1 хвилина</item>
     <item>2 хвилини</item>
   </string-array>
+  <string name="mpris_notification_settings_title">Показувати сповіщення щодо керування відтворенням</string>
+  <string name="mpris_notification_settings_summary">Уможливлює керування відтворенням мультимедійних даних без відкриття KDE Connect.</string>
   <string name="share_to">Спільно використовувати з…</string>
   <string name="protocol_version_older">На цьому пристрої використовується стара версія протоколу</string>
   <string name="protocol_version_newer">На цьому пристрої використовується новіша версія протоколу</string>
@@ -183,4 +190,16 @@
   <string name="telepathy_permission_explanation">Щоб читати і писати SMS з вашого робочого комп’ютера, вам слід надати програмі доступ до SMS</string>
   <string name="telephony_permission_explanation">"Щоб переглядати дзвінки і SMS з робочого комп’ютера, вам слід надати програмі доступ до дзвінків і  SMS"</string>
   <string name="telephony_optional_permission_explanation">Щоб бачити ім’я контакту замість номеру телефону, вам слід надати програмі доступ до записів контактів на телефоні</string>
+  <string name="select_ringtone">Виберіть мелодію дзвінка</string>
+  <string name="telephony_pref_blocked_title">Заблоковані номери</string>
+  <string name="telephony_pref_blocked_dialog_desc">Не показувати виклики та SMS з цих номерів. Будь ласка, вказуйте кожен із номерів у окремому рядку.</string>
+  <string name="mpris_coverart_description">Зображення обкладинки відтворюваних даних</string>
+  <string name="device_icon_description">Піктограма пристрою</string>
+  <string name="settings_icon_description">Піктограма параметрів</string>
+  <string name="add_command">Додати команду</string>
+  <string name="addcommand_name">Назва</string>
+  <string name="addcommand_command">Команда</string>
+  <string name="command_confirm_needed">Вам доведеться підтвердити команду на комп\'ютері</string>
+  <string name="addcommand_explanation">Жодних команд не зареєстровано</string>
+  <string name="addcommand_explanation2">Ви можете додавати нові команди за допомогою Системних параметрів KDE Connect</string>
 </resources>

res/values-zh-rCN/strings.xml

@@ -83,8 +83,6 @@
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">正在向%1s发送文件</string>
   <string name="outgoing_files_title">正在向 %1s 发送文件</string>
-  <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">已发送 %2$d 个文件中的 %1$d 个</string>
   <string name="received_file_title">已从%1s接收文件</string>
   <string name="received_file_fail_title">未能从%1s接收文件</string>
   <string name="received_file_text">点击以打开“%1s”</string>
@@ -106,6 +104,7 @@
   <string name="remote_control">远程控制</string>
   <string name="settings">KDE Connect设置</string>
   <string name="mpris_play">播放</string>
+  <string name="mpris_pause">暂停</string>
   <string name="mpris_previous">前一个</string>
   <string name="mpris_rew">后退</string>
   <string name="mpris_ff">快进</string>
@@ -182,4 +181,6 @@
   <string name="telepathy_permission_explanation">从计算机桌面读取、写入短消息需要向应用程序授予 SMS 权限</string>
   <string name="telephony_permission_explanation">您必须给予访问手机通话和短信的权限才能从桌面计算机查看通话记录和短信</string>
   <string name="telephony_optional_permission_explanation">要查看联系人姓名而非电话号码，您需要授予访问手机通讯录的权限</string>
+  <string name="addcommand_name">名称</string>
+  <string name="addcommand_command">命令</string>
 </resources>

res/values-zh-rTW/strings.xml

@@ -75,7 +75,6 @@
   <string name="incoming_file_title">從 %1s 傳來的檔案</string>
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">正在將檔案發送到 %1s</string>
-  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">已從 %1s 接收檔案</string>
   <string name="received_file_fail_title">從 %1s 接收檔案失敗</string>
   <string name="received_file_text">點擊開啟 \'%1s\'</string>

res/values/strings.xml

@@ -104,8 +104,10 @@
     <string name="incoming_file_text">%1s</string>
     <string name="outgoing_file_title">Sending file to %1s</string>
     <string name="outgoing_files_title">Sending files to %1s</string>
-    <string name="outgoing_file_text">%1s</string>
-    <string name="outgoing_files_text">Sent %1$d out of %2$d files</string>
+    <plurals name="outgoing_files_text">
+        <item quantity="one">Sent %1$d file</item>
+        <item quantity="other">Sent %1$d out of %2$d files</item>
+    </plurals>
     <string name="received_file_title">Received file from %1s</string>
     <string name="received_file_fail_title">Failed receiving file from %1s</string>
     <string name="received_file_text">Tap to open \'%1s\'</string>
@@ -127,6 +129,7 @@
     <string name="remote_control">Remote control</string>
     <string name="settings">KDE Connect Settings</string>
     <string name="mpris_play">Play</string>
+    <string name="mpris_pause">Pause</string>
     <string name="mpris_previous">Previous</string>
     <string name="mpris_rew">Rewind</string>
     <string name="mpris_ff">Fast-forward</string>
@@ -151,6 +154,9 @@
         <item>60000000</item>
         <item>120000000</item>
     </string-array>
+    <string name="mpris_notification_settings_title">Show media control notification</string>
+    <string name="mpris_notification_settings_summary">Allows controlling your media players without opening KDE Connect.</string>
+    <string name="mpris_notification_key" translatable="false">mpris_notification_enabled</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>
@@ -216,5 +222,18 @@
     <string name="telepathy_permission_explanation">To read and write SMS from your desktop you need to give permission to SMS</string>
     <string name="telephony_permission_explanation">To see phone calls and SMS from the desktop you need to give permission to phone calls and SMS</string>
     <string name="telephony_optional_permission_explanation">To see a contact name instead of a phone number you need to give access to the phone\'s contacts</string>
+    <string name="select_ringtone">Select a ringtone</string>
+    <string name="telephony_pref_blocked_title">Blocked numbers</string>
+    <string name="telephony_pref_blocked_dialog_desc">Don\'t show calls and SMS from these numbers. Please specify one number per line</string>
+    <string name="mpris_coverart_description">Cover art of current media</string>
+    <string name="device_icon_description">Device icon</string>
+    <string name="settings_icon_description">Settings icon</string>
+
+    <string name="add_command">Add a command</string>
+    <string name="addcommand_name">Name</string>
+    <string name="addcommand_command">Command</string>
+    <string name="command_confirm_needed">You will need to confirm the command on the desktop</string>
+    <string name="addcommand_explanation">There are no commands registered</string>
+    <string name="addcommand_explanation2">You can add new commands in the KDE Connect System Settings</string>
 
 </resources>

res/values/styles.xml

@@ -2,6 +2,7 @@
     <color name="primary">#F67400</color>
     <color name="primaryDark">#BD5900</color>
     <color name="accent">#4ebffa</color>
+    <color name="disabled_grey">#eee</color>
 
     <!-- NoActionBar because we use a Toolbar widget as ActionBar -->
     <style name="KdeConnectThemeBase" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -18,10 +19,12 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="KdeConnectTheme" parent="KdeConnectThemeBase">
-    </style>
+    <style name="KdeConnectTheme" parent="KdeConnectThemeBase" />
 
-    <style name="KdeConnectTheme.NoActionBar" parent="KdeConnectThemeBase.NoActionBar">
+    <style name="KdeConnectTheme.NoActionBar" parent="KdeConnectThemeBase.NoActionBar" />
+
+    <style name="DisableableButton" parent="ThemeOverlay.AppCompat">
+        <item name="colorButtonNormal">@drawable/disableable_button</item>
     </style>
 
 </resources>

res/xml/fileprovider_paths.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
-   <external-path name="external_files" path="." />
+    <external-path
+        name="external_files"
+        path="." />
 </paths>

res/xml/findmyphoneplugin_preferences.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RingtonePreference
+        android:key="select_ringtone"
+        android:showSilent="false"
+        android:title="@string/select_ringtone" />
+</PreferenceScreen>

res/xml/mousepadplugin_preferences.xml

@@ -10,7 +10,7 @@
         android:entryValues="@array/mousepad_tap_values"
         android:key="@string/mousepad_double_tap_key"
         android:summary="%s"
-        android:title="@string/mousepad_double_tap_settings_title"/>
+        android:title="@string/mousepad_double_tap_settings_title" />
 
     <ListPreference
         android:id="@+id/mousepad_triple_tap_preference"
@@ -19,7 +19,7 @@
         android:entryValues="@array/mousepad_tap_values"
         android:key="@string/mousepad_triple_tap_key"
         android:summary="%s"
-        android:title="@string/mousepad_triple_tap_settings_title"/>
+        android:title="@string/mousepad_triple_tap_settings_title" />
 
     <ListPreference
         android:id="@+id/mousepad_sensitivity_preference"
@@ -28,11 +28,11 @@
         android:entryValues="@array/mousepad_sensitivity_values"
         android:key="@string/mousepad_sensitivity_key"
         android:summary="%s"
-        android:title="@string/mousepad_sensitivity_settings_title"/>
+        android:title="@string/mousepad_sensitivity_settings_title" />
 
     <CheckBoxPreference
         android:id="@+id/mousepad_scroll_preference"
+        android:defaultValue="false"
         android:key="@string/mousepad_scroll_direction"
-        android:title="@string/mousepad_scroll_direction_title"
-        android:defaultValue="false" />
+        android:title="@string/mousepad_scroll_direction_title" />
 </PreferenceScreen>

res/xml/mprisplugin_preferences.xml

@@ -5,11 +5,18 @@
 
     <ListPreference
         android:id="@+id/mpris_time_preference"
-        android:key="@string/mpris_time_key"
-        android:title="@string/mpris_time_settings_title"
-        android:summary="@string/mpris_time_settings_summary"
+        android:defaultValue="@string/mpris_time_default"
         android:entries="@array/mpris_time_entries"
         android:entryValues="@array/mpris_time_entries_values"
-        android:defaultValue="@string/mpris_time_default" />
+        android:key="@string/mpris_time_key"
+        android:summary="@string/mpris_time_settings_summary"
+        android:title="@string/mpris_time_settings_title" />
 
-</PreferenceScreen>
+    <CheckBoxPreference
+        android:id="@+id/mpris_notification_preference"
+        android:defaultValue="true"
+        android:key="@string/mpris_notification_key"
+        android:summary="@string/mpris_notification_settings_summary"
+        android:title="@string/mpris_notification_settings_title" />
+
+</PreferenceScreen>

res/xml/remotekeyboardplugin_keyboard.xml

@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Keyboard
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:keyHeight="@dimen/key_height"
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
     android:horizontalGap="0px"
-    android:verticalGap="0px" >
+    android:keyHeight="@dimen/key_height"
+    android:verticalGap="0px">
 
     <Row android:rowEdgeFlags="bottom">
-		<Key android:keyIcon="@drawable/ic_keyboard_hide_white_36dp" android:codes="0" android:keyWidth="20%" />
-		<Key android:keyIcon="@drawable/ic_action_settings" android:codes="1" android:keyWidth="40%"/>
-		<Key android:keyIcon="@drawable/ic_action_keyboard" android:codes="2" android:keyWidth="40%"/>
-		<Key android:keyIcon="@drawable/ic_phonelink_white_36dp" android:codes="3" android:keyWidth="20%" />-->
-	</Row>
+        <Key
+            android:codes="0"
+            android:keyIcon="@drawable/ic_keyboard_hide_white_36dp"
+            android:keyWidth="20%" />
+        <Key
+            android:codes="1"
+            android:keyIcon="@drawable/ic_action_settings"
+            android:keyWidth="40%" />
+        <Key
+            android:codes="2"
+            android:keyIcon="@drawable/ic_action_keyboard"
+            android:keyWidth="40%" />
+        <Key
+            android:codes="3"
+            android:keyIcon="@drawable/ic_phonelink_white_36dp"
+            android:keyWidth="20%" />-->
+    </Row>
 </Keyboard>

res/xml/remotekeyboardplugin_method.xml

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <input-method xmlns:android="http://schemas.android.com/apk/res/android"
-        android:supportsSwitchingToNextInputMethod="true">
-</input-method>
+    android:supportsSwitchingToNextInputMethod="true" />

res/xml/remotekeyboardplugin_preferences.xml

@@ -5,7 +5,7 @@
 
     <CheckBoxPreference
         android:id="@+id/remotekeyboard_editing_only"
+        android:defaultValue="true"
         android:key="@string/remotekeyboard_editing_only"
-        android:title="@string/remotekeyboard_editing_only_title"
-        android:defaultValue="true" />
+        android:title="@string/remotekeyboard_editing_only_title" />
 </PreferenceScreen>

res/xml/shareplugin_preferences.xml

@@ -5,11 +5,11 @@
 
     <CheckBoxPreference
         android:id="@+id/share_destination_customize"
+        android:defaultValue="false"
         android:key="share_destination_custom"
-        android:title="@string/share_destination_customize"
         android:summaryOff="@string/share_destination_customize_summary_disabled"
         android:summaryOn="@string/share_destination_customize_summary_enabled"
-        android:defaultValue="false" />
+        android:title="@string/share_destination_customize" />
 
     <Preference
         android:id="@+id/share_destination_folder_preference"
@@ -18,9 +18,9 @@
 
     <CheckBoxPreference
         android:id="@+id/share_notification_preference"
+        android:defaultValue="true"
         android:key="share_notification_preference"
-        android:title="@string/share_notification_preference"
         android:summary="@string/share_notification_preference_summary"
-        android:defaultValue="true" />
+        android:title="@string/share_notification_preference" />
 
 </PreferenceScreen>

res/xml/telephonyplugin_preferences.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <EditTextPreference
+        android:dialogMessage="@string/telephony_pref_blocked_dialog_desc"
+        android:key="telephony_blocked_numbers"
+        android:title="@string/telephony_pref_blocked_title" />
+
+</PreferenceScreen>

src/org/kde/kdeconnect/Backends/BaseLink.java

@@ -23,7 +23,7 @@ package org.kde.kdeconnect.Backends;
 import android.content.Context;
 
 import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -34,13 +34,13 @@ public abstract class BaseLink {
 
     protected final Context context;
 
-    public interface PackageReceiver {
-        void onPackageReceived(NetworkPackage np);
+    public interface PacketReceiver {
+        void onPacketReceived(NetworkPacket np);
     }
 
     private final BaseLinkProvider linkProvider;
     private final String deviceId;
-    private final ArrayList<PackageReceiver> receivers = new ArrayList<>();
+    private final ArrayList<PacketReceiver> receivers = new ArrayList<>();
     protected PrivateKey privateKey;
 
     protected BaseLink(Context context, String deviceId, BaseLinkProvider linkProvider) {
@@ -70,17 +70,17 @@ public abstract class BaseLink {
         return false;
     }
 
-    public void addPackageReceiver(PackageReceiver pr) {
+    public void addPacketReceiver(PacketReceiver pr) {
         receivers.add(pr);
     }
-    public void removePackageReceiver(PackageReceiver pr) {
+    public void removePacketReceiver(PacketReceiver pr) {
         receivers.remove(pr);
     }
 
     //Should be called from a background thread listening to packages
-    protected void packageReceived(NetworkPackage np) {
-        for(PackageReceiver pr : receivers) {
-            pr.onPackageReceived(np);
+    protected void packageReceived(NetworkPacket np) {
+        for(PacketReceiver pr : receivers) {
+            pr.onPacketReceived(np);
         }
     }
 
@@ -89,7 +89,7 @@ public abstract class BaseLink {
     }
 
     //TO OVERRIDE, should be sync
-    public abstract boolean sendPackage(NetworkPackage np,Device.SendPackageStatusCallback callback);
+    public abstract boolean sendPacket(NetworkPacket np, Device.SendPacketStatusCallback callback);
     @Deprecated
-    public abstract boolean sendPackageEncrypted(NetworkPackage np,Device.SendPackageStatusCallback callback, PublicKey key);
+    public abstract boolean sendPacketEncrypted(NetworkPacket np, Device.SendPacketStatusCallback callback, PublicKey key);
 }

src/org/kde/kdeconnect/Backends/BaseLinkProvider.java

@@ -20,7 +20,7 @@
 
 package org.kde.kdeconnect.Backends;
 
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -29,7 +29,7 @@ public abstract class BaseLinkProvider {
     private final CopyOnWriteArrayList<ConnectionReceiver> connectionReceivers = new CopyOnWriteArrayList<>();
 
     public interface ConnectionReceiver {
-        void onConnectionReceived(NetworkPackage identityPackage, BaseLink link);
+        void onConnectionReceived(NetworkPacket identityPacket, BaseLink link);
         void onConnectionLost(BaseLink link);
     }
 
@@ -42,10 +42,10 @@ public abstract class BaseLinkProvider {
     }
 
     //These two should be called when the provider links to a new computer
-    protected void connectionAccepted(NetworkPackage identityPackage, BaseLink link) {
+    protected void connectionAccepted(NetworkPacket identityPacket, BaseLink link) {
         //Log.i("KDE/LinkProvider", "connectionAccepted");
         for(ConnectionReceiver cr : connectionReceivers) {
-            cr.onConnectionReceived(identityPackage, link);
+            cr.onConnectionReceived(identityPacket, link);
         }
     }
     protected void connectionLost(BaseLink link) {

src/org/kde/kdeconnect/Backends/BasePairingHandler.java

@@ -21,7 +21,7 @@
 package org.kde.kdeconnect.Backends;
 
 import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 
 /**
  * This class separates the pairing interface for each type of link.
@@ -73,7 +73,7 @@ public abstract class BasePairingHandler {
     }
 
     /* To be implemented by respective pairing handler */
-    public abstract void packageReceived(NetworkPackage np) throws Exception;
+    public abstract void packageReceived(NetworkPacket np) throws Exception;
     public abstract void requestPairing();
     public abstract void acceptPairing();
     public abstract void rejectPairing();

src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLink.java

@@ -34,9 +34,13 @@ import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.Backends.BasePairingHandler;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.RsaHelper;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
 import java.nio.charset.Charset;
 import java.security.PublicKey;
 import java.util.UUID;
@@ -77,18 +81,18 @@ public class BluetoothLink extends BaseLink {
         }
 
         private void processMessage(String message) {
-            NetworkPackage np;
+            NetworkPacket np;
             try {
-                np = NetworkPackage.unserialize(message);
+                np = NetworkPacket.unserialize(message);
             } catch (JSONException e) {
                 Log.e("BluetoothLink/receiving", "Unable to parse message.", e);
                 return;
             }
 
-            if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_ENCRYPTED)) {
+            if (np.getType().equals(NetworkPacket.PACKET_TYPE_ENCRYPTED)) {
                 try {
                     np = RsaHelper.decrypt(np, privateKey);
-                } catch(Exception e) {
+                } catch (Exception e) {
                     Log.e("BluetoothLink/receiving", "Exception decrypting the package", e);
                 }
             }
@@ -102,7 +106,10 @@ public class BluetoothLink extends BaseLink {
                     np.setPayload(transferSocket.getInputStream(), np.getPayloadSize());
                 } catch (Exception e) {
                     if (transferSocket != null) {
-                        try { transferSocket.close(); } catch(IOException ignored) { }
+                        try {
+                            transferSocket.close();
+                        } catch (IOException ignored) {
+                        }
                     }
                     Log.e("BluetoothLink/receiving", "Unable to get payload", e);
                 }
@@ -144,28 +151,28 @@ public class BluetoothLink extends BaseLink {
         linkProvider.disconnectedLink(this, getDeviceId(), socket);
     }
 
-    private void sendMessage(NetworkPackage np) throws JSONException, IOException {
+    private void sendMessage(NetworkPacket np) throws JSONException, IOException {
         byte[] message = np.serialize().getBytes(Charset.forName("UTF-8"));
         OutputStream socket = this.socket.getOutputStream();
-        Log.i("BluetoothLink","Beginning to send message");
+        Log.i("BluetoothLink", "Beginning to send message");
         socket.write(message);
-        Log.i("BluetoothLink","Finished sending message");
+        Log.i("BluetoothLink", "Finished sending message");
     }
 
     @Override
-    public boolean sendPackage(NetworkPackage np, Device.SendPackageStatusCallback callback) {
-        return sendPackageInternal(np, callback, null);
+    public boolean sendPacket(NetworkPacket np, Device.SendPacketStatusCallback callback) {
+        return sendPacketInternal(np, callback, null);
     }
 
     @Override
-    public boolean sendPackageEncrypted(NetworkPackage np, Device.SendPackageStatusCallback callback, PublicKey key) {
-        return sendPackageInternal(np, callback, key);
+    public boolean sendPacketEncrypted(NetworkPacket np, Device.SendPacketStatusCallback callback, PublicKey key) {
+        return sendPacketInternal(np, callback, key);
     }
 
-    private boolean sendPackageInternal(NetworkPackage np, final Device.SendPackageStatusCallback callback, PublicKey key) {
+    private boolean sendPacketInternal(NetworkPacket np, final Device.SendPacketStatusCallback callback, PublicKey key) {
 
         /*if (!isConnected()) {
-            Log.e("BluetoothLink", "sendPackageEncrypted failed: not connected");
+            Log.e("BluetoothLink", "sendPacketEncrypted failed: not connected");
             callback.sendFailure(new Exception("Not connected"));
             return;
         }*/
@@ -219,7 +226,10 @@ public class BluetoothLink extends BaseLink {
                     callback.onFailure(e);
                     return false;
                 } finally {
-                    try { transferSocket.close(); } catch (IOException ignored) { }
+                    try {
+                        transferSocket.close();
+                    } catch (IOException ignored) {
+                    }
                 }
             }
 

src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java

@@ -23,8 +23,8 @@ package org.kde.kdeconnect.Backends.BluetoothBackend;
 import android.annotation.TargetApi;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothSocket;
 import android.bluetooth.BluetoothServerSocket;
+import android.bluetooth.BluetoothSocket;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -35,13 +35,16 @@ import android.util.Log;
 
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 import java.util.Set;
+import java.util.UUID;
 
 @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
 public class BluetoothLinkProvider extends BaseLinkProvider {
@@ -58,19 +61,19 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
     private ServerRunnable serverRunnable;
     private ClientRunnable clientRunnable;
 
-    private void addLink(NetworkPackage identityPackage, BluetoothLink link) {
-        String deviceId = identityPackage.getString("deviceId");
-        Log.i("BluetoothLinkProvider","addLink to "+deviceId);
+    private void addLink(NetworkPacket identityPacket, BluetoothLink link) {
+        String deviceId = identityPacket.getString("deviceId");
+        Log.i("BluetoothLinkProvider", "addLink to " + deviceId);
         BluetoothLink oldLink = visibleComputers.get(deviceId);
         if (oldLink == link) {
             Log.e("BluetoothLinkProvider", "oldLink == link. This should not happen!");
             return;
         }
         visibleComputers.put(deviceId, link);
-        connectionAccepted(identityPackage, link);
+        connectionAccepted(identityPacket, link);
         link.startListening();
         if (oldLink != null) {
-            Log.i("BluetoothLinkProvider","Removing old connection to same device");
+            Log.i("BluetoothLinkProvider", "Removing old connection to same device");
             oldLink.disconnect();
         }
     }
@@ -80,7 +83,7 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
 
         bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
         if (bluetoothAdapter == null) {
-            Log.e("BluetoothLinkProvider","No bluetooth adapter found.");
+            Log.e("BluetoothLinkProvider", "No bluetooth adapter found.");
         }
     }
 
@@ -92,7 +95,7 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
 
         if (!bluetoothAdapter.isEnabled()) {
             Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-            Log.e("BluetoothLinkProvider","Bluetooth adapter not enabled.");
+            Log.e("BluetoothLinkProvider", "Bluetooth adapter not enabled.");
             // TODO: next line needs to be called from an existing activity, so move it?
             // startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT);
             // TODO: Check result of the previous command, whether the user allowed bluetooth or not.
@@ -183,7 +186,7 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
 
             Log.i("BTLinkProvider/Server", "Received connection from " + socket.getRemoteDevice().getAddress());
 
-            NetworkPackage np = NetworkPackage.createIdentityPackage(context);
+            NetworkPacket np = NetworkPacket.createIdentityPacket(context);
             byte[] message = np.serialize().getBytes("UTF-8");
             outputStream.write(message);
 
@@ -194,14 +197,14 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
             Reader reader = new InputStreamReader(socket.getInputStream(), "UTF-8");
             int charsRead;
             char[] buf = new char[512];
-            while(sb.lastIndexOf("\n") == -1 && (charsRead = reader.read(buf)) != -1) {
+            while (sb.lastIndexOf("\n") == -1 && (charsRead = reader.read(buf)) != -1) {
                 sb.append(buf, 0, charsRead);
             }
 
             String response = sb.toString();
-            final NetworkPackage identityPackage = NetworkPackage.unserialize(response);
+            final NetworkPacket identityPacket = NetworkPacket.unserialize(response);
 
-            if (!identityPackage.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
+            if (!identityPacket.getType().equals(NetworkPacket.PACKET_TYPE_IDENTITY)) {
                 Log.e("BTLinkProvider/Server", "2 Expecting an identity package");
                 return;
             }
@@ -209,9 +212,9 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
             Log.i("BTLinkProvider/Server", "Received identity package");
 
             BluetoothLink link = new BluetoothLink(context, socket,
-                    identityPackage.getString("deviceId"), BluetoothLinkProvider.this);
+                    identityPacket.getString("deviceId"), BluetoothLinkProvider.this);
 
-            addLink(identityPackage, link);
+            addLink(identityPacket, link);
         }
     }
 
@@ -263,7 +266,7 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
         }
 
         @Override
-        @TargetApi(value=Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
+        @TargetApi(value = Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals(BluetoothDevice.ACTION_UUID)) {
@@ -278,7 +281,7 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
                     return;
                 }
 
-                for (Parcelable uuid: activeUuids) {
+                for (Parcelable uuid : activeUuids) {
                     if (uuid.toString().equals(SERVICE_UUID.toString())) {
                         connectToDevice(device);
                         return;
@@ -327,14 +330,14 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
             try {
                 int character;
                 StringBuilder sb = new StringBuilder();
-                while(sb.lastIndexOf("\n") == -1 && (character = socket.getInputStream().read()) != -1) {
-                    sb.append((char)character);
+                while (sb.lastIndexOf("\n") == -1 && (character = socket.getInputStream().read()) != -1) {
+                    sb.append((char) character);
                 }
 
                 String message = sb.toString();
-                final NetworkPackage identityPackage = NetworkPackage.unserialize(message);
+                final NetworkPacket identityPacket = NetworkPacket.unserialize(message);
 
-                if (!identityPackage.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
+                if (!identityPacket.getType().equals(NetworkPacket.PACKET_TYPE_IDENTITY)) {
                     Log.e("BTLinkProvider/Client", "1 Expecting an identity package");
                     socket.close();
                     return;
@@ -342,27 +345,27 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
 
                 Log.i("BTLinkProvider/Client", "Received identity package");
 
-                String myId = NetworkPackage.createIdentityPackage(context).getString("deviceId");
-                if (identityPackage.getString("deviceId").equals(myId)) {
+                String myId = NetworkPacket.createIdentityPacket(context).getString("deviceId");
+                if (identityPacket.getString("deviceId").equals(myId)) {
                     // Probably won't happen, but just to be safe
                     socket.close();
                     return;
                 }
 
-                if (visibleComputers.containsKey(identityPackage.getString("deviceId"))) {
+                if (visibleComputers.containsKey(identityPacket.getString("deviceId"))) {
                     return;
                 }
 
                 Log.i("BTLinkProvider/Client", "Identity package received, creating link");
 
                 final BluetoothLink link = new BluetoothLink(context, socket,
-                        identityPackage.getString("deviceId"), BluetoothLinkProvider.this);
+                        identityPacket.getString("deviceId"), BluetoothLinkProvider.this);
 
-                NetworkPackage np2 = NetworkPackage.createIdentityPackage(context);
-                link.sendPackage(np2,new Device.SendPackageStatusCallback() {
+                NetworkPacket np2 = NetworkPacket.createIdentityPacket(context);
+                link.sendPacket(np2, new Device.SendPacketStatusCallback() {
                     @Override
                     public void onSuccess() {
-                        addLink(identityPackage, link);
+                        addLink(identityPacket, link);
                     }
 
                     @Override

src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothPairingHandler.java

@@ -21,9 +21,10 @@
 package org.kde.kdeconnect.Backends.BluetoothBackend;
 
 import android.util.Log;
+
 import org.kde.kdeconnect.Backends.BasePairingHandler;
 import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 import org.kde.kdeconnect_tp.R;
 
 import java.util.Timer;
@@ -32,6 +33,7 @@ import java.util.TimerTask;
 public class BluetoothPairingHandler extends BasePairingHandler {
 
     Timer mPairingTimer;
+
     public BluetoothPairingHandler(Device device, final PairingHandlerCallback callback) {
         super(device, callback);
 
@@ -42,15 +44,15 @@ public class BluetoothPairingHandler extends BasePairingHandler {
         }
     }
 
-//    @Override
-    public NetworkPackage createPairPackage() {
-        NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_PAIR);
+    //    @Override
+    public NetworkPacket createPairPacket() {
+        NetworkPacket np = new NetworkPacket(NetworkPacket.PACKET_TYPE_PAIR);
         np.set("pair", true);
         return np;
     }
 
     @Override
-    public void packageReceived(NetworkPackage np) throws Exception{
+    public void packageReceived(NetworkPacket np) throws Exception {
 
         boolean wantsPair = np.getBoolean("pair");
 
@@ -66,7 +68,7 @@ public class BluetoothPairingHandler extends BasePairingHandler {
 
         if (wantsPair) {
 
-            if (mPairStatus == PairStatus.Requested)  { //We started pairing
+            if (mPairStatus == PairStatus.Requested) { //We started pairing
                 hidePairingNotification();
                 pairingDone();
             } else {
@@ -89,11 +91,11 @@ public class BluetoothPairingHandler extends BasePairingHandler {
                 mPairingTimer.schedule(new TimerTask() {
                     @Override
                     public void run() {
-                        Log.w("KDE/Device","Unpairing (timeout B)");
+                        Log.w("KDE/Device", "Unpairing (timeout B)");
                         mPairStatus = PairStatus.NotPaired;
                         hidePairingNotification();
                     }
-                }, 25*1000); //Time to show notification, waiting for user to accept (peer will timeout in 30 seconds)
+                }, 25 * 1000); //Time to show notification, waiting for user to accept (peer will timeout in 30 seconds)
                 mPairStatus = PairStatus.RequestedByPeer;
                 mCallback.incomingRequest();
 
@@ -117,7 +119,7 @@ public class BluetoothPairingHandler extends BasePairingHandler {
     @Override
     public void requestPairing() {
 
-        Device.SendPackageStatusCallback statusCallback = new Device.SendPackageStatusCallback() {
+        Device.SendPacketStatusCallback statusCallback = new Device.SendPacketStatusCallback() {
             @Override
             public void onSuccess() {
                 hidePairingNotification(); //Will stop the pairingTimer if it was running
@@ -126,10 +128,10 @@ public class BluetoothPairingHandler extends BasePairingHandler {
                     @Override
                     public void run() {
                         mCallback.pairingFailed(mDevice.getContext().getString(R.string.error_timed_out));
-                        Log.w("KDE/Device","Unpairing (timeout A)");
+                        Log.w("KDE/Device", "Unpairing (timeout A)");
                         mPairStatus = PairStatus.NotPaired;
                     }
-                }, 30*1000); //Time to wait for the other to accept
+                }, 30 * 1000); //Time to wait for the other to accept
                 mPairStatus = PairStatus.Requested;
             }
 
@@ -138,20 +140,20 @@ public class BluetoothPairingHandler extends BasePairingHandler {
                 mCallback.pairingFailed(mDevice.getContext().getString(R.string.error_could_not_send_package));
             }
         };
-        mDevice.sendPackage(createPairPackage(), statusCallback);
+        mDevice.sendPacket(createPairPacket(), statusCallback);
     }
 
     public void hidePairingNotification() {
         mDevice.hidePairingNotification();
         if (mPairingTimer != null) {
-            mPairingTimer .cancel();
+            mPairingTimer.cancel();
         }
     }
 
     @Override
     public void acceptPairing() {
         hidePairingNotification();
-        Device.SendPackageStatusCallback statusCallback = new Device.SendPackageStatusCallback() {
+        Device.SendPacketStatusCallback statusCallback = new Device.SendPacketStatusCallback() {
             @Override
             public void onSuccess() {
                 pairingDone();
@@ -162,16 +164,16 @@ public class BluetoothPairingHandler extends BasePairingHandler {
                 mCallback.pairingFailed(mDevice.getContext().getString(R.string.error_not_reachable));
             }
         };
-        mDevice.sendPackage(createPairPackage(), statusCallback);
+        mDevice.sendPacket(createPairPacket(), statusCallback);
     }
 
     @Override
     public void rejectPairing() {
         hidePairingNotification();
         mPairStatus = PairStatus.NotPaired;
-        NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_PAIR);
+        NetworkPacket np = new NetworkPacket(NetworkPacket.PACKET_TYPE_PAIR);
         np.set("pair", false);
-        mDevice.sendPackage(np);
+        mDevice.sendPacket(np);
     }
 
     //@Override
@@ -186,8 +188,8 @@ public class BluetoothPairingHandler extends BasePairingHandler {
     @Override
     public void unpair() {
         mPairStatus = PairStatus.NotPaired;
-        NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_PAIR);
+        NetworkPacket np = new NetworkPacket(NetworkPacket.PACKET_TYPE_PAIR);
         np.set("pair", false);
-        mDevice.sendPackage(np);
+        mDevice.sendPacket(np);
     }
 }

src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java

@@ -30,7 +30,7 @@ import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.RsaHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Helpers.StringsHelper;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -53,8 +53,8 @@ public class LanLink extends BaseLink {
     }
 
     public enum ConnectionStarted {
-        Locally, Remotely;
-    };
+        Locally, Remotely
+    }
 
     private ConnectionStarted connectionSource; // If the other device sent me a broadcast,
                                                 // I should not close the connection with it
@@ -107,8 +107,8 @@ public class LanLink extends BaseLink {
                         if (packet.isEmpty()) {
                             continue;
                         }
-                        NetworkPackage np = NetworkPackage.unserialize(packet);
-                        receivedNetworkPackage(np);
+                        NetworkPacket np = NetworkPacket.unserialize(packet);
+                        receivedNetworkPacket(np);
                     }
                 } catch (Exception e) {
                     Log.i("LanLink", "Socket closed: " + newSocket.hashCode() + ". Reason: " + e.getMessage());
@@ -142,9 +142,9 @@ public class LanLink extends BaseLink {
     }
 
     //Blocking, do not call from main thread
-    private boolean sendPackageInternal(NetworkPackage np, final Device.SendPackageStatusCallback callback, PublicKey key) {
+    private boolean sendPacketInternal(NetworkPacket np, final Device.SendPacketStatusCallback callback, PublicKey key) {
         if (socket == null) {
-            Log.e("KDE/sendPackage", "Not yet connected");
+            Log.e("KDE/sendPacket", "Not yet connected");
             callback.onFailure(new NotYetConnectedException());
             return false;
         }
@@ -167,7 +167,7 @@ public class LanLink extends BaseLink {
                 np = RsaHelper.encrypt(np, key);
             }
 
-            //Log.e("LanLink/sendPackage", np.getType());
+            //Log.e("LanLink/sendPacket", np.getType());
 
             //Send body of the network package
             try {
@@ -244,24 +244,24 @@ public class LanLink extends BaseLink {
 
     //Blocking, do not call from main thread
     @Override
-    public boolean sendPackage(NetworkPackage np,Device.SendPackageStatusCallback callback) {
-        return sendPackageInternal(np, callback, null);
+    public boolean sendPacket(NetworkPacket np, Device.SendPacketStatusCallback callback) {
+        return sendPacketInternal(np, callback, null);
     }
 
     //Blocking, do not call from main thread
     @Override
-    public boolean sendPackageEncrypted(NetworkPackage np, Device.SendPackageStatusCallback callback, PublicKey key) {
-        return sendPackageInternal(np, callback, key);
+    public boolean sendPacketEncrypted(NetworkPacket np, Device.SendPacketStatusCallback callback, PublicKey key) {
+        return sendPacketInternal(np, callback, key);
     }
 
-    private void receivedNetworkPackage(NetworkPackage np) {
+    private void receivedNetworkPacket(NetworkPacket np) {
 
-        if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_ENCRYPTED)) {
+        if (np.getType().equals(NetworkPacket.PACKET_TYPE_ENCRYPTED)) {
             try {
                 np = RsaHelper.decrypt(np, privateKey);
             } catch(Exception e) {
                 e.printStackTrace();
-                Log.e("KDE/onPackageReceived","Exception decrypting the package");
+                Log.e("KDE/onPacketReceived","Exception decrypting the package");
             }
         }
 

src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java

@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 package org.kde.kdeconnect.Backends.LanBackend;
@@ -27,6 +27,7 @@ import android.preference.PreferenceManager;
 import android.util.Base64;
 import android.util.Log;
 
+import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
@@ -34,7 +35,7 @@ import org.kde.kdeconnect.Helpers.DeviceHelper;
 import org.kde.kdeconnect.Helpers.NetworkHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Helpers.StringsHelper;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 import org.kde.kdeconnect.UserInterface.CustomDevicesActivity;
 
 import java.io.BufferedReader;
@@ -59,6 +60,13 @@ import javax.net.ssl.HandshakeCompletedEvent;
 import javax.net.ssl.HandshakeCompletedListener;
 import javax.net.ssl.SSLSocket;
 
+/**
+ * This BaseLinkProvider creates {@link LanLink}s to other devices on the same
+ * WiFi network. The first packet sent over a socket must be an
+ * {@link NetworkPacket#createIdentityPacket(Context)}.
+ *
+ * @see #identityPacketReceived(NetworkPacket, Socket, LanLink.ConnectionStarted)
+ */
 public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDisconnectedCallback {
 
     public static final int MIN_VERSION_WITH_SSL_SUPPORT = 6;
@@ -90,26 +98,26 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
     }
 
     //They received my UDP broadcast and are connecting to me. The first thing they sned should be their identity.
-    void tcpPackageReceived(Socket socket) throws Exception {
+    void tcpPacketReceived(Socket socket) throws Exception {
 
-        NetworkPackage networkPackage;
+        NetworkPacket networkPacket;
         try {
             BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
             String message = reader.readLine();
-            networkPackage = NetworkPackage.unserialize(message);
-            //Log.e("TcpListener","Received TCP package: "+networkPackage.serialize());
+            networkPacket = NetworkPacket.unserialize(message);
+            //Log.e("TcpListener","Received TCP package: "+networkPacket.serialize());
         } catch (Exception e) {
             e.printStackTrace();
             return;
         }
 
-        if (!networkPackage.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
-            Log.e("KDE/LanLinkProvider", "Expecting an identity package instead of " + networkPackage.getType());
+        if (!networkPacket.getType().equals(NetworkPacket.PACKET_TYPE_IDENTITY)) {
+            Log.e("KDE/LanLinkProvider", "Expecting an identity package instead of " + networkPacket.getType());
             return;
         }
 
-        Log.i("KDE/LanLinkProvider", "Identity package received from a TCP connection from " + networkPackage.getString("deviceName"));
-        identityPackageReceived(networkPackage, socket, LanLink.ConnectionStarted.Locally);
+        Log.i("KDE/LanLinkProvider", "Identity package received from a TCP connection from " + networkPacket.getString("deviceName"));
+        identityPacketReceived(networkPacket, socket, LanLink.ConnectionStarted.Locally);
     }
 
     //I've received their broadcast and should connect to their TCP socket and send my identity.
@@ -120,9 +128,9 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         try {
 
             String message = new String(packet.getData(), StringsHelper.UTF8);
-            final NetworkPackage identityPackage = NetworkPackage.unserialize(message);
-            final String deviceId = identityPackage.getString("deviceId");
-            if (!identityPackage.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
+            final NetworkPacket identityPacket = NetworkPacket.unserialize(message);
+            final String deviceId = identityPacket.getString("deviceId");
+            if (!identityPacket.getType().equals(NetworkPacket.PACKET_TYPE_IDENTITY)) {
                 Log.e("KDE/LanLinkProvider", "Expecting an UDP identity package");
                 return;
             } else {
@@ -133,38 +141,38 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                 }
             }
 
-            if (identityPackage.getInt("protocolVersion") >= MIN_VERSION_WITH_NEW_PORT_SUPPORT && identityPackage.getInt("tcpPort") < MIN_PORT) {
+            if (identityPacket.getInt("protocolVersion") >= MIN_VERSION_WITH_NEW_PORT_SUPPORT && identityPacket.getInt("tcpPort") < MIN_PORT) {
                 Log.w("KDE/LanLinkProvider", "Ignoring a udp broadcast from legacy port because it comes from a device which knows about the new port.");
                 return;
             }
 
-            Log.i("KDE/LanLinkProvider", "Broadcast identity package received from " + identityPackage.getString("deviceName"));
+            Log.i("KDE/LanLinkProvider", "Broadcast identity package received from " + identityPacket.getString("deviceName"));
 
-            int tcpPort = identityPackage.getInt("tcpPort", MIN_PORT);
+            int tcpPort = identityPacket.getInt("tcpPort", MIN_PORT);
 
             SocketFactory socketFactory = SocketFactory.getDefault();
             Socket socket = socketFactory.createSocket(address, tcpPort);
             configureSocket(socket);
 
             OutputStream out = socket.getOutputStream();
-            NetworkPackage myIdentity = NetworkPackage.createIdentityPackage(context);
+            NetworkPacket myIdentity = NetworkPacket.createIdentityPacket(context);
             out.write(myIdentity.serialize().getBytes());
             out.flush();
 
-            identityPackageReceived(identityPackage, socket, LanLink.ConnectionStarted.Remotely);
+            identityPacketReceived(identityPacket, socket, LanLink.ConnectionStarted.Remotely);
 
         } catch (Exception e) {
             Log.e("KDE/LanLinkProvider", "Cannot connect to " + address);
             e.printStackTrace();
             if (!reverseConnectionBlackList.contains(address)) {
-                Log.w("KDE/LanLinkProvider","Blacklisting "+address);
+                Log.w("KDE/LanLinkProvider", "Blacklisting " + address);
                 reverseConnectionBlackList.add(address);
                 new Timer().schedule(new TimerTask() {
                     @Override
                     public void run() {
                         reverseConnectionBlackList.remove(address);
                     }
-                }, 5*1000);
+                }, 5 * 1000);
 
                 // Try to cause a reverse connection
                 onNetworkChange();
@@ -180,10 +188,22 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         }
     }
 
-    private void identityPackageReceived(final NetworkPackage identityPackage, final Socket socket, final LanLink.ConnectionStarted connectionStarted) {
+    /**
+     * Called when a new 'identity' packet is received. Those are passed here by
+     * {@link #tcpPacketReceived(Socket)} and {@link #udpPacketReceived(DatagramPacket)}.
+     * <p>
+     * If the remote device should be connected, this calls {@link #addLink}.
+     * Otherwise, if there was an Exception, we unpair from that device.
+     * </p>
+     *
+     * @param identityPacket    identity of a remote device
+     * @param socket            a new Socket, which should be used to receive packets from the remote device
+     * @param connectionStarted which side started this connection
+     */
+    private void identityPacketReceived(final NetworkPacket identityPacket, final Socket socket, final LanLink.ConnectionStarted connectionStarted) {
 
         String myId = DeviceHelper.getDeviceId(context);
-        final String deviceId = identityPackage.getString("deviceId");
+        final String deviceId = identityPacket.getString("deviceId");
         if (deviceId.equals(myId)) {
             Log.e("KDE/LanLinkProvider", "Somehow I'm connected to myself, ignoring. This should not happen.");
             return;
@@ -194,7 +214,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
 
         // Add ssl handler if device uses new protocol
         try {
-            if (identityPackage.getInt("protocolVersion") >= MIN_VERSION_WITH_SSL_SUPPORT) {
+            if (identityPacket.getInt("protocolVersion") >= MIN_VERSION_WITH_SSL_SUPPORT) {
 
                 SharedPreferences preferences = context.getSharedPreferences("trusted_devices", Context.MODE_PRIVATE);
                 boolean isDeviceTrusted = preferences.getBoolean(deviceId, false);
@@ -208,25 +228,25 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                             if (device == null) return;
                             device.unpair();
                             //Retry as unpaired
-                            identityPackageReceived(identityPackage, socket, connectionStarted);
+                            identityPacketReceived(identityPacket, socket, connectionStarted);
                         }
                     });
                 }
 
-                Log.i("KDE/LanLinkProvider","Starting SSL handshake with " + identityPackage.getString("deviceName") + " trusted:"+isDeviceTrusted);
+                Log.i("KDE/LanLinkProvider", "Starting SSL handshake with " + identityPacket.getString("deviceName") + " trusted:" + isDeviceTrusted);
 
                 final SSLSocket sslsocket = SslHelper.convertToSslSocket(context, socket, deviceId, isDeviceTrusted, clientMode);
                 sslsocket.addHandshakeCompletedListener(new HandshakeCompletedListener() {
                     @Override
                     public void handshakeCompleted(HandshakeCompletedEvent event) {
-                        String mode = clientMode? "client" : "server";
+                        String mode = clientMode ? "client" : "server";
                         try {
                             Certificate certificate = event.getPeerCertificates()[0];
-                            identityPackage.set("certificate", Base64.encodeToString(certificate.getEncoded(), 0));
-                            Log.i("KDE/LanLinkProvider","Handshake as " + mode + " successful with " + identityPackage.getString("deviceName") + " secured with " + event.getCipherSuite());
-                            addLink(identityPackage, sslsocket, connectionStarted);
+                            identityPacket.set("certificate", Base64.encodeToString(certificate.getEncoded(), 0));
+                            Log.i("KDE/LanLinkProvider", "Handshake as " + mode + " successful with " + identityPacket.getString("deviceName") + " secured with " + event.getCipherSuite());
+                            addLink(identityPacket, sslsocket, connectionStarted);
                         } catch (Exception e) {
-                            Log.e("KDE/LanLinkProvider","Handshake as " + mode + " failed with " + identityPackage.getString("deviceName"));
+                            Log.e("KDE/LanLinkProvider", "Handshake as " + mode + " failed with " + identityPacket.getString("deviceName"));
                             e.printStackTrace();
                             BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
                                 @Override
@@ -246,7 +266,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                         try {
                             sslsocket.startHandshake();
                         } catch (Exception e) {
-                            Log.e("KDE/LanLinkProvider","Handshake failed with " + identityPackage.getString("deviceName"));
+                            Log.e("KDE/LanLinkProvider", "Handshake failed with " + identityPacket.getString("deviceName"));
                             e.printStackTrace();
 
                             //String[] ciphers = sslsocket.getSupportedCipherSuites();
@@ -257,7 +277,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                     }
                 }).start();
             } else {
-                addLink(identityPackage, socket, connectionStarted);
+                addLink(identityPacket, socket, connectionStarted);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -265,9 +285,22 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
 
     }
 
-    private synchronized void addLink(final NetworkPackage identityPackage, Socket socket, LanLink.ConnectionStarted connectionOrigin) throws IOException {
+    /**
+     * Add or update a link in the {@link #visibleComputers} map. This method is synchronized, which ensures that only one
+     * link is operated on at a time.
+     * <p>
+     * Without synchronization, the call to {@link SslHelper#parseCertificate(byte[])} in
+     * {@link Device#addLink(NetworkPacket, BaseLink)} crashes on some devices running Oreo 8.1 (SDK level 27).
+     * </p>
+     *
+     * @param identityPacket   representation of remote device
+     * @param socket           a new Socket, which should be used to receive packets from the remote device
+     * @param connectionOrigin which side started this connection
+     * @throws IOException if an exception is thrown by {@link LanLink#reset(Socket, LanLink.ConnectionStarted)}
+     */
+    private synchronized void addLink(final NetworkPacket identityPacket, Socket socket, LanLink.ConnectionStarted connectionOrigin) throws IOException {
 
-        String deviceId = identityPackage.getString("deviceId");
+        String deviceId = identityPacket.getString("deviceId");
         LanLink currentLink = visibleComputers.get(deviceId);
         if (currentLink != null) {
             //Update old link
@@ -279,7 +312,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
             //Let's create the link
             LanLink link = new LanLink(context, deviceId, this, socket, connectionOrigin);
             visibleComputers.put(deviceId, link);
-            connectionAccepted(identityPackage, link);
+            connectionAccepted(identityPacket, link);
         }
     }
 
@@ -313,7 +346,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                         Log.e("LanLinkProvider", "UdpReceive exception");
                     }
                 }
-                Log.w("UdpListener","Stopping UDP listener");
+                Log.w("UdpListener", "Stopping UDP listener");
             }
         }).start();
         return server;
@@ -330,7 +363,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                         try {
                             Socket socket = tcpServer.accept();
                             configureSocket(socket);
-                            tcpPackageReceived(socket);
+                            tcpPacketReceived(socket);
                         } catch (Exception e) {
                             e.printStackTrace();
                             Log.e("LanLinkProvider", "TcpReceive exception");
@@ -347,13 +380,13 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
 
     static ServerSocket openServerSocketOnFreePort(int minPort) throws IOException {
         int tcpPort = minPort;
-        while(tcpPort < MAX_PORT) {
+        while (tcpPort < MAX_PORT) {
             try {
                 ServerSocket candidateServer = new ServerSocket();
                 candidateServer.bind(new InetSocketAddress(tcpPort));
-                Log.i("KDE/LanLink", "Using port "+tcpPort);
+                Log.i("KDE/LanLink", "Using port " + tcpPort);
                 return candidateServer;
-            } catch(IOException e) {
+            } catch (IOException e) {
                 tcpPort++;
             }
         }
@@ -361,7 +394,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         throw new IOException("No ports available");
     }
 
-    private void broadcastUdpPackage() {
+    private void broadcastUdpPacket() {
 
         if (NetworkHelper.isOnMobileNetwork(context)) {
             Log.w("LanLinkProvider", "On 3G network, not sending broadcast.");
@@ -379,7 +412,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                 }
                 iplist.add("255.255.255.255"); //Default: broadcast.
 
-                NetworkPackage identity = NetworkPackage.createIdentityPackage(context);
+                NetworkPacket identity = NetworkPacket.createIdentityPacket(context);
                 identity.set("tcpPort", MIN_PORT);
                 DatagramSocket socket = null;
                 byte[] bytes = null;
@@ -390,7 +423,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                     bytes = identity.serialize().getBytes(StringsHelper.UTF8);
                 } catch (Exception e) {
                     e.printStackTrace();
-                    Log.e("KDE/LanLinkProvider","Failed to create DatagramSocket");
+                    Log.e("KDE/LanLinkProvider", "Failed to create DatagramSocket");
                 }
 
                 if (bytes != null) {
@@ -415,6 +448,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
             }
         }).start();
     }
+
     @Override
     public void onStart() {
         //Log.i("KDE/LanLinkProvider", "onStart");
@@ -431,18 +465,18 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
             // and newer android versions. Although devices with android version less than ICS cannot connect to other devices who also have android version less
             // than ICS because server is disabled on both
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-                Log.w("KDE/LanLinkProvider","Not starting a TCP server because it's not supported on Android < 14. Operating only as client.");
+                Log.w("KDE/LanLinkProvider", "Not starting a TCP server because it's not supported on Android < 14. Operating only as client.");
             } else {
                 setupTcpListener();
             }
 
-            broadcastUdpPackage();
+            broadcastUdpPacket();
         }
     }
 
     @Override
     public void onNetworkChange() {
-        broadcastUdpPackage();
+        broadcastUdpPacket();
     }
 
     @Override
@@ -451,17 +485,17 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         listening = false;
         try {
             tcpServer.close();
-        } catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         try {
             udpServer.close();
-        } catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         try {
             udpServerOldPort.close();
-        } catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }

src/org/kde/kdeconnect/Backends/LanBackend/LanPairingHandler.java

@@ -28,7 +28,7 @@ import android.util.Log;
 
 import org.kde.kdeconnect.Backends.BasePairingHandler;
 import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 import org.kde.kdeconnect_tp.R;
 
 import java.security.KeyFactory;
@@ -51,8 +51,8 @@ public class LanPairingHandler extends BasePairingHandler {
         }
     }
 
-    private NetworkPackage createPairPackage() {
-        NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_PAIR);
+    private NetworkPacket createPairPacket() {
+        NetworkPacket np = new NetworkPacket(NetworkPacket.PACKET_TYPE_PAIR);
         np.set("pair", true);
         SharedPreferences globalSettings = PreferenceManager.getDefaultSharedPreferences(mDevice.getContext());
         String publicKey = "-----BEGIN PUBLIC KEY-----\n" + globalSettings.getString("publicKey", "").trim()+ "\n-----END PUBLIC KEY-----\n";
@@ -61,7 +61,7 @@ public class LanPairingHandler extends BasePairingHandler {
     }
 
     @Override
-    public void packageReceived(NetworkPackage np) throws Exception{
+    public void packageReceived(NetworkPacket np) throws Exception{
 
         boolean wantsPair = np.getBoolean("pair");
 
@@ -140,7 +140,7 @@ public class LanPairingHandler extends BasePairingHandler {
     @Override
     public void requestPairing() {
 
-        Device.SendPackageStatusCallback statusCallback = new Device.SendPackageStatusCallback() {
+        Device.SendPacketStatusCallback statusCallback = new Device.SendPacketStatusCallback() {
             @Override
             public void onSuccess() {
                 hidePairingNotification(); //Will stop the pairingTimer if it was running
@@ -166,7 +166,7 @@ public class LanPairingHandler extends BasePairingHandler {
                 mCallback.pairingFailed(mDevice.getContext().getString(R.string.error_could_not_send_package));
             }
         };
-        mDevice.sendPackage(createPairPackage(), statusCallback);
+        mDevice.sendPacket(createPairPacket(), statusCallback);
     }
 
     void hidePairingNotification() {
@@ -179,7 +179,7 @@ public class LanPairingHandler extends BasePairingHandler {
     @Override
     public void acceptPairing() {
         hidePairingNotification();
-        Device.SendPackageStatusCallback statusCallback = new Device.SendPackageStatusCallback() {
+        Device.SendPacketStatusCallback statusCallback = new Device.SendPacketStatusCallback() {
             @Override
             public void onSuccess() {
                 pairingDone();
@@ -195,16 +195,16 @@ public class LanPairingHandler extends BasePairingHandler {
                 mCallback.pairingFailed(mDevice.getContext().getString(R.string.error_not_reachable));
             }
         };
-        mDevice.sendPackage(createPairPackage(), statusCallback);
+        mDevice.sendPacket(createPairPacket(), statusCallback);
     }
 
     @Override
     public void rejectPairing() {
         hidePairingNotification();
         mPairStatus = PairStatus.NotPaired;
-        NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_PAIR);
+        NetworkPacket np = new NetworkPacket(NetworkPacket.PACKET_TYPE_PAIR);
         np.set("pair", false);
-        mDevice.sendPackage(np);
+        mDevice.sendPacket(np);
     }
 
     void pairingDone() {
@@ -242,8 +242,8 @@ public class LanPairingHandler extends BasePairingHandler {
     @Override
     public void unpair() {
         mPairStatus = PairStatus.NotPaired;
-        NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_PAIR);
+        NetworkPacket np = new NetworkPacket(NetworkPacket.PACKET_TYPE_PAIR);
         np.set("pair", false);
-        mDevice.sendPackage(np);
+        mDevice.sendPacket(np);
     }
 }

src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java

@@ -26,7 +26,7 @@ import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.Backends.BasePairingHandler;
 import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 
 import java.security.PublicKey;
 
@@ -47,7 +47,7 @@ public class LoopbackLink extends BaseLink {
     }
 
     @Override
-    public boolean sendPackage(NetworkPackage in, Device.SendPackageStatusCallback callback) {
+    public boolean sendPacket(NetworkPacket in, Device.SendPacketStatusCallback callback) {
         packageReceived(in);
         if (in.hasPayload()) {
             callback.onProgressChanged(0);
@@ -59,7 +59,7 @@ public class LoopbackLink extends BaseLink {
     }
 
     @Override
-    public boolean sendPackageEncrypted(NetworkPackage np, Device.SendPackageStatusCallback callback, PublicKey key) {
-        return sendPackage(np, callback);
+    public boolean sendPacketEncrypted(NetworkPacket np, Device.SendPacketStatusCallback callback, PublicKey key) {
+        return sendPacket(np, callback);
     }
 }

src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java

@@ -23,7 +23,7 @@ package org.kde.kdeconnect.Backends.LoopbackBackend;
 import android.content.Context;
 
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 
 public class LoopbackLinkProvider extends BaseLinkProvider {
 
@@ -44,7 +44,7 @@ public class LoopbackLinkProvider extends BaseLinkProvider {
 
     @Override
     public void onNetworkChange() {
-        NetworkPackage np = NetworkPackage.createIdentityPackage(context);
+        NetworkPacket np = NetworkPacket.createIdentityPacket(context);
         connectionAccepted(np, new LoopbackLink(context, this));
     }
 /*

src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackPairingHandler.java

@@ -24,7 +24,7 @@ import android.util.Log;
 
 import org.kde.kdeconnect.Backends.BasePairingHandler;
 import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 
 public class LoopbackPairingHandler extends BasePairingHandler {
 
@@ -33,7 +33,7 @@ public class LoopbackPairingHandler extends BasePairingHandler {
     }
 
     @Override
-    public void packageReceived(NetworkPackage np) throws Exception {
+    public void packageReceived(NetworkPacket np) throws Exception {
 
     }
 

src/org/kde/kdeconnect/BackgroundService.java

@@ -60,7 +60,7 @@ public class BackgroundService extends Service {
 
     private final HashSet<Object> discoveryModeAcquisitions = new HashSet<>();
 
-    public static BackgroundService getInstance(){
+    public static BackgroundService getInstance() {
         return instance;
     }
 
@@ -113,14 +113,17 @@ public class BackgroundService extends Service {
         public void incomingRequest() {
             onDeviceListChanged();
         }
+
         @Override
         public void pairingSuccessful() {
             onDeviceListChanged();
         }
+
         @Override
         public void pairingFailed(String error) {
             onDeviceListChanged();
         }
+
         @Override
         public void unpaired() {
             onDeviceListChanged();
@@ -128,7 +131,7 @@ public class BackgroundService extends Service {
     };
 
     public void onDeviceListChanged() {
-        for(DeviceListChangedCallback callback : deviceListChangedCallbacks.values()) {
+        for (DeviceListChangedCallback callback : deviceListChangedCallbacks.values()) {
             callback.onDeviceListChanged();
         }
     }
@@ -137,11 +140,11 @@ public class BackgroundService extends Service {
         //Log.e("BackgroundService", "Loading remembered trusted devices");
         SharedPreferences preferences = getSharedPreferences("trusted_devices", Context.MODE_PRIVATE);
         Set<String> trustedDevices = preferences.getAll().keySet();
-        for(String deviceId : trustedDevices) {
+        for (String deviceId : trustedDevices) {
             //Log.e("BackgroundService", "Loading device "+deviceId);
             if (preferences.getBoolean(deviceId, false)) {
                 Device device = new Device(this, deviceId);
-                devices.put(deviceId,device);
+                devices.put(deviceId, device);
                 device.addPairingCallback(devicePairingCallback);
             }
         }
@@ -167,7 +170,7 @@ public class BackgroundService extends Service {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                for(Device d : devices.values()) {
+                for (Device d : devices.values()) {
                     if (!d.isPaired() && !d.isPairRequested() && !d.isPairRequestedByPeer() && !d.deviceShouldBeKeptAlive()) {
                         d.disconnect();
                     }
@@ -178,22 +181,21 @@ public class BackgroundService extends Service {
 
     private final BaseLinkProvider.ConnectionReceiver deviceListener = new BaseLinkProvider.ConnectionReceiver() {
         @Override
-        public void onConnectionReceived(final NetworkPackage identityPackage, final BaseLink link) {
+        public void onConnectionReceived(final NetworkPacket identityPacket, final BaseLink link) {
 
-            String deviceId = identityPackage.getString("deviceId");
+            String deviceId = identityPacket.getString("deviceId");
 
             Device device = devices.get(deviceId);
 
             if (device != null) {
                 Log.i("KDE/BackgroundService", "addLink, known device: " + deviceId);
-                device.addLink(identityPackage, link);
+                device.addLink(identityPacket, link);
             } else {
                 Log.i("KDE/BackgroundService", "addLink,unknown device: " + deviceId);
-                device = new Device(BackgroundService.this, identityPackage, link);
+                device = new Device(BackgroundService.this, identityPacket, link);
                 if (device.isPaired() || device.isPairRequested() || device.isPairRequestedByPeer()
                         || link.linkShouldBeKeptAlive()
-                        ||!discoveryModeAcquisitions.isEmpty() )
-                {
+                        || !discoveryModeAcquisitions.isEmpty()) {
                     devices.put(deviceId, device);
                     device.addPairingCallback(devicePairingCallback);
                 } else {
@@ -247,6 +249,7 @@ public class BackgroundService extends Service {
     public void addDeviceListChangedCallback(String key, DeviceListChangedCallback callback) {
         deviceListChangedCallbacks.put(key, callback);
     }
+
     public void removeDeviceListChangedCallback(String key) {
         deviceListChangedCallbacks.remove(key);
     }
@@ -290,7 +293,7 @@ public class BackgroundService extends Service {
     }
 
     @Override
-    public IBinder onBind (Intent intent) {
+    public IBinder onBind(Intent intent) {
         return new Binder();
     }
 

src/org/kde/kdeconnect/Device.java

@@ -42,7 +42,7 @@ import org.kde.kdeconnect.Helpers.NotificationHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect.Plugins.PluginFactory;
-import org.kde.kdeconnect.UserInterface.MaterialActivity;
+import org.kde.kdeconnect.UserInterface.MainActivity;
 import org.kde.kdeconnect_tp.R;
 
 import java.security.KeyFactory;
@@ -61,7 +61,7 @@ import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-public class Device implements BaseLink.PackageReceiver {
+public class Device implements BaseLink.PacketReceiver {
 
     private final Context context;
 
@@ -110,19 +110,26 @@ public class Device implements BaseLink.PackageReceiver {
             if ("phone".equals(s)) return Phone;
             return Computer; //Default
         }
+
         public String toString() {
             switch (this) {
-                case Tablet: return "tablet";
-                case Phone: return "phone";
-                default: return "desktop";
+                case Tablet:
+                    return "tablet";
+                case Phone:
+                    return "phone";
+                default:
+                    return "desktop";
             }
         }
     }
 
     public interface PairingCallback {
         void incomingRequest();
+
         void pairingSuccessful();
+
         void pairingFailed(String error);
+
         void unpaired();
     }
 
@@ -136,7 +143,7 @@ public class Device implements BaseLink.PackageReceiver {
         this.deviceId = deviceId;
         this.name = settings.getString("deviceName", context.getString(R.string.unknown_device));
         this.pairStatus = PairStatus.Paired;
-        this.protocolVersion = NetworkPackage.ProtocolVersion; //We don't know it yet
+        this.protocolVersion = NetworkPacket.ProtocolVersion; //We don't know it yet
         this.deviceType = DeviceType.FromString(settings.getString("deviceType", "desktop"));
 
         try {
@@ -147,7 +154,7 @@ public class Device implements BaseLink.PackageReceiver {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            Log.e("KDE/Device","Exception deserializing stored public key for device");
+            Log.e("KDE/Device", "Exception deserializing stored public key for device");
         }
 
         //Assume every plugin is supported until addLink is called and we can get the actual list
@@ -158,7 +165,7 @@ 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) {
+    Device(Context context, NetworkPacket np, BaseLink dl) {
 
         //Log.e("Device","Constructor B");
 
@@ -176,16 +183,20 @@ public class Device implements BaseLink.PackageReceiver {
     }
 
     public String getName() {
-        return name != null? name : context.getString(R.string.unknown_device);
+        return name != null ? name : context.getString(R.string.unknown_device);
     }
 
-    public Drawable getIcon()
-    {
+    public Drawable getIcon() {
         int drawableId;
         switch (deviceType) {
-            case Phone: drawableId = R.drawable.ic_device_phone; break;
-            case Tablet: drawableId = R.drawable.ic_device_tablet; break;
-            default: drawableId = R.drawable.ic_device_laptop;
+            case Phone:
+                drawableId = R.drawable.ic_device_phone;
+                break;
+            case Tablet:
+                drawableId = R.drawable.ic_device_tablet;
+                break;
+            default:
+                drawableId = R.drawable.ic_device_laptop;
         }
         return ContextCompat.getDrawable(context, drawableId);
     }
@@ -204,12 +215,10 @@ public class Device implements BaseLink.PackageReceiver {
 
     //Returns 0 if the version matches, < 0 if it is older or > 0 if it is newer
     public int compareProtocolVersion() {
-        return protocolVersion - NetworkPackage.ProtocolVersion;
+        return protocolVersion - NetworkPacket.ProtocolVersion;
     }
 
 
-
-
     //
     // Pairing-related functions
     //
@@ -221,7 +230,7 @@ public class Device implements BaseLink.PackageReceiver {
     /* Asks all pairing handlers that, is pair requested? */
     public boolean isPairRequested() {
         boolean pairRequested = false;
-        for (BasePairingHandler ph: pairingHandlers.values()) {
+        for (BasePairingHandler ph : pairingHandlers.values()) {
             pairRequested = pairRequested || ph.isPairRequested();
         }
         return pairRequested;
@@ -248,14 +257,11 @@ public class Device implements BaseLink.PackageReceiver {
 
         Resources res = context.getResources();
 
-        switch(pairStatus) {
-            case Paired:
-                for (PairingCallback cb : pairingCallback) {
-                    cb.pairingFailed(res.getString(R.string.error_already_paired));
-                }
-                return;
-            case NotPaired:
-                ;
+        if (isPaired()) {
+            for (PairingCallback cb : pairingCallback) {
+                cb.pairingFailed(res.getString(R.string.error_already_paired));
+            }
+            return;
         }
 
         if (!isReachable()) {
@@ -311,7 +317,7 @@ public class Device implements BaseLink.PackageReceiver {
 
         //Store as trusted device
         SharedPreferences preferences = context.getSharedPreferences("trusted_devices", Context.MODE_PRIVATE);
-        preferences.edit().putBoolean(deviceId,true).apply();
+        preferences.edit().putBoolean(deviceId, true).apply();
 
         SharedPreferences.Editor editor = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE).edit();
         editor.putString("deviceName", name);
@@ -366,25 +372,25 @@ public class Device implements BaseLink.PackageReceiver {
 
         hidePairingNotification();
 
-        notificationId = (int)System.currentTimeMillis();
+        notificationId = (int) System.currentTimeMillis();
 
-        Intent intent = new Intent(getContext(), MaterialActivity.class);
+        Intent intent = new Intent(getContext(), MainActivity.class);
         intent.putExtra("deviceId", getDeviceId());
         intent.putExtra("notificationId", notificationId);
         PendingIntent pendingIntent = PendingIntent.getActivity(getContext(), 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);
 
-        Intent acceptIntent = new Intent(getContext(), MaterialActivity.class);
-        Intent rejectIntent = new Intent(getContext(), MaterialActivity.class);
+        Intent acceptIntent = new Intent(getContext(), MainActivity.class);
+        Intent rejectIntent = new Intent(getContext(), MainActivity.class);
 
         acceptIntent.putExtra("deviceId", getDeviceId());
         acceptIntent.putExtra("notificationId", notificationId);
-        acceptIntent.setAction("action "+System.currentTimeMillis());
-        acceptIntent.putExtra(MaterialActivity.PAIR_REQUEST_STATUS, MaterialActivity.PAIRING_ACCEPTED);
+        acceptIntent.setAction("action " + System.currentTimeMillis());
+        acceptIntent.putExtra(MainActivity.PAIR_REQUEST_STATUS, MainActivity.PAIRING_ACCEPTED);
 
         rejectIntent.putExtra("deviceId", getDeviceId());
         rejectIntent.putExtra("notificationId", notificationId);
-        rejectIntent.setAction("action "+System.currentTimeMillis());
-        rejectIntent.putExtra(MaterialActivity.PAIR_REQUEST_STATUS, MaterialActivity.PAIRING_REJECTED);
+        rejectIntent.setAction("action " + System.currentTimeMillis());
+        rejectIntent.putExtra(MainActivity.PAIR_REQUEST_STATUS, MainActivity.PAIRING_REJECTED);
 
         PendingIntent acceptedPendingIntent = PendingIntent.getActivity(getContext(), 2, acceptIntent, PendingIntent.FLAG_ONE_SHOT);
         PendingIntent rejectedPendingIntent = PendingIntent.getActivity(getContext(), 4, rejectIntent, PendingIntent.FLAG_ONE_SHOT);
@@ -423,24 +429,24 @@ public class Device implements BaseLink.PackageReceiver {
         return !links.isEmpty();
     }
 
-    public void addLink(NetworkPackage identityPackage, BaseLink link) {
+    public void addLink(NetworkPacket identityPacket, BaseLink link) {
         //FilesHelper.LogOpenFileCount();
 
-        this.protocolVersion = identityPackage.getInt("protocolVersion");
+        this.protocolVersion = identityPacket.getInt("protocolVersion");
 
-        if (identityPackage.has("deviceName")) {
-            this.name = identityPackage.getString("deviceName", this.name);
+        if (identityPacket.has("deviceName")) {
+            this.name = identityPacket.getString("deviceName", this.name);
             SharedPreferences.Editor editor = settings.edit();
             editor.putString("deviceName", this.name);
             editor.apply();
         }
 
-        if (identityPackage.has("deviceType")) {
-            this.deviceType = DeviceType.FromString(identityPackage.getString("deviceType", "desktop"));
+        if (identityPacket.has("deviceType")) {
+            this.deviceType = DeviceType.FromString(identityPacket.getString("deviceType", "desktop"));
         }
 
-        if (identityPackage.has("certificate")) {
-            String certificateString = identityPackage.getString("certificate");
+        if (identityPacket.has("certificate")) {
+            String certificateString = identityPacket.getString("certificate");
 
             try {
                 byte[] certificateBytes = Base64.decode(certificateString, 0);
@@ -466,7 +472,7 @@ public class Device implements BaseLink.PackageReceiver {
             Log.e("KDE/Device", "Exception reading our own private key"); //Should not happen
         }
 
-        Log.i("KDE/Device","addLink "+link.getLinkProvider().getName()+" -> "+getName() + " active links: "+ links.size());
+        Log.i("KDE/Device", "addLink " + link.getLinkProvider().getName() + " -> " + getName() + " active links: " + links.size());
 
         if (!pairingHandlers.containsKey(link.getName())) {
             BasePairingHandler.PairingHandlerCallback callback = new BasePairingHandler.PairingHandlerCallback() {
@@ -497,15 +503,15 @@ public class Device implements BaseLink.PackageReceiver {
             pairingHandlers.put(link.getName(), link.getPairingHandler(this, callback));
         }
 
-        Set<String> outgoingCapabilities = identityPackage.getStringSet("outgoingCapabilities", null);
-        Set<String> incomingCapabilities = identityPackage.getStringSet("incomingCapabilities", null);
+        Set<String> outgoingCapabilities = identityPacket.getStringSet("outgoingCapabilities", null);
+        Set<String> incomingCapabilities = identityPacket.getStringSet("incomingCapabilities", null);
         if (incomingCapabilities != null && outgoingCapabilities != null) {
             m_supportedPlugins = new Vector<>(PluginFactory.pluginsForCapabilities(context, incomingCapabilities, outgoingCapabilities));
         } else {
             m_supportedPlugins = new Vector<>(PluginFactory.getAvailablePlugins());
         }
 
-        link.addPackageReceiver(this);
+        link.addPacketReceiver(this);
 
         reloadPluginsFromSettings();
 
@@ -526,7 +532,7 @@ public class Device implements BaseLink.PackageReceiver {
             pairingHandlers.remove(link.getName());
         }
 
-        link.removePackageReceiver(this);
+        link.removePacketReceiver(this);
         links.remove(link);
         Log.i("KDE/Device", "removeLink: " + link.getLinkProvider().getName() + " -> " + getName() + " active links: " + links.size());
         if (links.isEmpty()) {
@@ -535,20 +541,20 @@ public class Device implements BaseLink.PackageReceiver {
     }
 
     @Override
-    public void onPackageReceived(NetworkPackage np) {
+    public void onPacketReceived(NetworkPacket np) {
 
         hackToMakeRetrocompatiblePacketTypes(np);
 
-        if (NetworkPackage.PACKAGE_TYPE_PAIR.equals(np.getType())) {
+        if (NetworkPacket.PACKET_TYPE_PAIR.equals(np.getType())) {
 
             Log.i("KDE/Device", "Pair package");
 
-            for (BasePairingHandler ph: pairingHandlers.values()) {
+            for (BasePairingHandler ph : pairingHandlers.values()) {
                 try {
                     ph.packageReceived(np);
                 } catch (Exception e) {
                     e.printStackTrace();
-                    Log.e("PairingPackageReceived","Exception");
+                    Log.e("PairingPacketReceived", "Exception");
                 }
             }
         } else if (isPaired()) {
@@ -559,11 +565,11 @@ public class Device implements BaseLink.PackageReceiver {
                 for (String pluginKey : targetPlugins) {
                     Plugin plugin = plugins.get(pluginKey);
                     try {
-                        plugin.onPackageReceived(np);
+                        plugin.onPacketReceived(np);
                     } catch (Exception e) {
                         e.printStackTrace();
-                        Log.e("KDE/Device", "Exception in " + plugin.getPluginKey() + "'s onPackageReceived()");
-                        //try { Log.e("KDE/Device", "NetworkPackage:" + np.serialize()); } catch (Exception _) { }
+                        Log.e("KDE/Device", "Exception in " + plugin.getPluginKey() + "'s onPacketReceived()");
+                        //try { Log.e("KDE/Device", "NetworkPacket:" + np.serialize()); } catch (Exception _) { }
                     }
                 }
             } else {
@@ -571,7 +577,7 @@ public class Device implements BaseLink.PackageReceiver {
             }
         } else {
 
-            //Log.e("KDE/onPackageReceived","Device not paired, will pass package to unpairedPackageListeners");
+            //Log.e("KDE/onPacketReceived","Device not paired, will pass package to unpairedPacketListeners");
 
             // If it is pair package, it should be captured by "if" at start
             // If not and device is paired, it should be captured by isPaired
@@ -585,10 +591,10 @@ public class Device implements BaseLink.PackageReceiver {
                 for (String pluginKey : targetPlugins) {
                     Plugin plugin = plugins.get(pluginKey);
                     try {
-                        plugin.onUnpairedDevicePackageReceived(np);
+                        plugin.onUnpairedDevicePacketReceived(np);
                     } catch (Exception e) {
                         e.printStackTrace();
-                        Log.e("KDE/Device", "Exception in " + plugin.getDisplayName() + "'s onPackageReceived() in unPairedPackageListeners");
+                        Log.e("KDE/Device", "Exception in " + plugin.getDisplayName() + "'s onPacketReceived() in unPairedPacketListeners");
                     }
                 }
             } else {
@@ -598,70 +604,76 @@ public class Device implements BaseLink.PackageReceiver {
 
     }
 
-    public static abstract class SendPackageStatusCallback {
+    public static abstract class SendPacketStatusCallback {
         public abstract void onSuccess();
+
         public abstract void onFailure(Throwable e);
-        public void onProgressChanged(int percent) { }
+
+        public void onProgressChanged(int percent) {
+        }
     }
 
-    private SendPackageStatusCallback defaultCallback = new SendPackageStatusCallback() {
+    private SendPacketStatusCallback defaultCallback = new SendPacketStatusCallback() {
         @Override
-        public void onSuccess() { }
+        public void onSuccess() {
+        }
+
         @Override
         public void onFailure(Throwable e) {
             if (e != null) {
                 e.printStackTrace();
             } else {
-                Log.e("KDE/sendPackage", "Unknown (null) exception");
+                Log.e("KDE/sendPacket", "Unknown (null) exception");
             }
         }
     };
 
-    public void sendPackage(NetworkPackage np) {
-        sendPackage(np, defaultCallback);
+    public void sendPacket(NetworkPacket np) {
+        sendPacket(np, defaultCallback);
     }
 
-    public boolean sendPackageBlocking(NetworkPackage np) {
-        return sendPackageBlocking(np, defaultCallback);
+    public boolean sendPacketBlocking(NetworkPacket np) {
+        return sendPacketBlocking(np, defaultCallback);
     }
 
     //Async
-    public void sendPackage(final NetworkPackage np, final SendPackageStatusCallback callback) {
+    public void sendPacket(final NetworkPacket np, final SendPacketStatusCallback callback) {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                sendPackageBlocking(np, callback);
+                sendPacketBlocking(np, callback);
             }
         }).start();
     }
 
-    public boolean sendPackageBlocking(final NetworkPackage np, final SendPackageStatusCallback callback) {
+    public boolean sendPacketBlocking(final NetworkPacket np, final SendPacketStatusCallback callback) {
 
         /*
-        if (!m_outgoingCapabilities.contains(np.getType()) && !NetworkPackage.protocolPackageTypes.contains(np.getType())) {
-            Log.e("Device/sendPackage", "Plugin tried to send an undeclared package: " + np.getType());
-            Log.w("Device/sendPackage", "Declared outgoing package types: " + Arrays.toString(m_outgoingCapabilities.toArray()));
+        if (!m_outgoingCapabilities.contains(np.getType()) && !NetworkPacket.protocolPacketTypes.contains(np.getType())) {
+            Log.e("Device/sendPacket", "Plugin tried to send an undeclared package: " + np.getType());
+            Log.w("Device/sendPacket", "Declared outgoing package types: " + Arrays.toString(m_outgoingCapabilities.toArray()));
         }
         */
 
         hackToMakeRetrocompatiblePacketTypes(np);
 
-        boolean useEncryption = (protocolVersion < LanLinkProvider.MIN_VERSION_WITH_SSL_SUPPORT && (!np.getType().equals(NetworkPackage.PACKAGE_TYPE_PAIR) && isPaired()));
+        boolean useEncryption = (protocolVersion < LanLinkProvider.MIN_VERSION_WITH_SSL_SUPPORT && (!np.getType().equals(NetworkPacket.PACKET_TYPE_PAIR) && isPaired()));
 
         boolean success = false;
         //Make a copy to avoid concurrent modification exception if the original list changes
         for (final BaseLink link : links) {
-            if (link == null) continue; //Since we made a copy, maybe somebody destroyed the link in the meanwhile
+            if (link == null)
+                continue; //Since we made a copy, maybe somebody destroyed the link in the meanwhile
             if (useEncryption) {
-                success = link.sendPackageEncrypted(np, callback, publicKey);
+                success = link.sendPacketEncrypted(np, callback, publicKey);
             } else {
-                success = link.sendPackage(np, callback);
+                success = link.sendPacket(np, callback);
             }
             if (success) break; //If the link didn't call sendSuccess(), try the next one
         }
 
         if (!success) {
-            Log.e("KDE/sendPackage", "No device link (of "+links.size()+" available) could send the package. Package "+np.getType()+" to " + name + " lost!");
+            Log.e("KDE/sendPacket", "No device link (of " + links.size() + " available) could send the package. Packet " + np.getType() + " to " + name + " lost!");
         }
 
         return success;
@@ -672,11 +684,11 @@ public class Device implements BaseLink.PackageReceiver {
     //
 
     public <T extends Plugin> T getPlugin(Class<T> pluginClass) {
-        return (T)getPlugin(Plugin.getPluginKey(pluginClass));
+        return (T) getPlugin(Plugin.getPluginKey(pluginClass));
     }
 
     public <T extends Plugin> T getPlugin(Class<T> pluginClass, boolean includeFailed) {
-        return (T)getPlugin(Plugin.getPluginKey(pluginClass), includeFailed);
+        return (T) getPlugin(Plugin.getPluginKey(pluginClass), includeFailed);
     }
 
     public Plugin getPlugin(String pluginKey) {
@@ -713,7 +725,7 @@ public class Device implements BaseLink.PackageReceiver {
 
         final Plugin plugin = PluginFactory.instantiatePluginForDevice(context, pluginKey, this);
         if (plugin == null) {
-            Log.e("KDE/addPlugin","could not instantiate plugin: "+pluginKey);
+            Log.e("KDE/addPlugin", "could not instantiate plugin: " + pluginKey);
             //Can't put a null
             //failedPlugins.put(pluginKey, null);
             return false;
@@ -743,7 +755,7 @@ public class Device implements BaseLink.PackageReceiver {
             failedPlugins.put(pluginKey, plugin);
         }
 
-        if(!plugin.checkRequiredPermissions()){
+        if (!plugin.checkRequiredPermissions()) {
             Log.e("KDE/addPlugin", "No permission " + pluginKey);
             plugins.remove(pluginKey);
             pluginsWithoutPermissions.put(pluginKey, plugin);
@@ -782,21 +794,20 @@ public class Device implements BaseLink.PackageReceiver {
             //Log.e("removePlugin","removed " + pluginKey);
         } catch (Exception e) {
             e.printStackTrace();
-            Log.e("KDE/removePlugin","Exception calling onDestroy for plugin "+pluginKey);
+            Log.e("KDE/removePlugin", "Exception calling onDestroy for plugin " + pluginKey);
         }
 
         return true;
     }
 
     public void setPluginEnabled(String pluginKey, boolean value) {
-        settings.edit().putBoolean(pluginKey,value).apply();
+        settings.edit().putBoolean(pluginKey, value).apply();
         reloadPluginsFromSettings();
     }
 
     public boolean isPluginEnabled(String pluginKey) {
         boolean enabledByDefault = PluginFactory.getPluginInfo(context, pluginKey).isEnabledByDefault();
-        boolean enabled = settings.getBoolean(pluginKey, enabledByDefault);
-        return enabled;
+        return settings.getBoolean(pluginKey, enabledByDefault);
     }
 
     public void reloadPluginsFromSettings() {
@@ -818,7 +829,7 @@ public class Device implements BaseLink.PackageReceiver {
             if (pluginEnabled) {
                 boolean success = addPlugin(pluginKey);
                 if (success) {
-                    for (String packageType : pluginInfo.getSupportedPackageTypes()) {
+                    for (String packageType : pluginInfo.getSupportedPacketTypes()) {
                         packageType = hackToMakeRetrocompatiblePacketTypes(packageType);
                         ArrayList<String> plugins = newPluginsByIncomingInterface.get(packageType);
                         if (plugins == null) plugins = new ArrayList<>();
@@ -843,11 +854,11 @@ public class Device implements BaseLink.PackageReceiver {
         }
     }
 
-    public ConcurrentHashMap<String,Plugin> getLoadedPlugins() {
+    public ConcurrentHashMap<String, Plugin> getLoadedPlugins() {
         return plugins;
     }
 
-    public ConcurrentHashMap<String,Plugin> getFailedPlugins() {
+    public ConcurrentHashMap<String, Plugin> getFailedPlugins() {
         return failedPlugins;
     }
 
@@ -855,7 +866,7 @@ public class Device implements BaseLink.PackageReceiver {
         return pluginsWithoutPermissions;
     }
 
-    public ConcurrentHashMap<String,Plugin> getPluginsWithoutOptionalPermissions() {
+    public ConcurrentHashMap<String, Plugin> getPluginsWithoutOptionalPermissions() {
         return pluginsWithoutOptionalPermissions;
     }
 
@@ -868,7 +879,7 @@ public class Device implements BaseLink.PackageReceiver {
     }
 
     public void disconnect() {
-        for(BaseLink link : links) {
+        for (BaseLink link : links) {
             link.disconnect();
         }
     }
@@ -881,7 +892,7 @@ public class Device implements BaseLink.PackageReceiver {
             return true; //Already paired
         }
 
-        for(BaseLink l : links) {
+        for (BaseLink l : links) {
             if (l.linkShouldBeKeptAlive()) {
                 return true;
             }
@@ -893,10 +904,11 @@ public class Device implements BaseLink.PackageReceiver {
         return m_supportedPlugins;
     }
 
-    public void hackToMakeRetrocompatiblePacketTypes(NetworkPackage np) {
+    public void hackToMakeRetrocompatiblePacketTypes(NetworkPacket np) {
         if (protocolVersion >= 6) return;
-        np.mType = np.getType().replace(".request","");
+        np.mType = np.getType().replace(".request", "");
     }
+
     public String hackToMakeRetrocompatiblePacketTypes(String type) {
         if (protocolVersion >= 6) return type;
         return type.replace(".request", "");

src/org/kde/kdeconnect/Helpers/AppsHelper.java

@@ -40,7 +40,7 @@ public class AppsHelper {
         } catch (final PackageManager.NameNotFoundException e) {
 
             e.printStackTrace();
-            Log.e("AppsHelper","Could not resolve name "+packageName);
+            Log.e("AppsHelper", "Could not resolve name " + packageName);
 
             return null;
 
@@ -53,13 +53,13 @@ public class AppsHelper {
         try {
 
             PackageManager pm = context.getPackageManager();
-            ApplicationInfo ai = pm.getApplicationInfo( packageName, 0);
+            ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
             return pm.getApplicationIcon(ai);
 
         } catch (final PackageManager.NameNotFoundException e) {
 
             e.printStackTrace();
-            Log.e("AppsHelper","Could not find icon for "+packageName);
+            Log.e("AppsHelper", "Could not find icon for " + packageName);
 
             return null;
 
@@ -68,5 +68,4 @@ public class AppsHelper {
     }
 
 
-
 }

src/org/kde/kdeconnect/Helpers/ContactsHelper.java

@@ -51,7 +51,7 @@ public class ContactsHelper {
         try {
             cursor = context.getContentResolver().query(
                     uri,
-                    new String[] {
+                    new String[]{
                             PhoneLookup.DISPLAY_NAME,
                             ContactsContract.PhoneLookup.PHOTO_URI
                             /*, PhoneLookup.TYPE
@@ -75,7 +75,10 @@ public class ContactsHelper {
                 contactInfo.put("photoID", cursor.getString(nameIndex));
             }
 
-            try { cursor.close(); } catch (Exception e) {}
+            try {
+                cursor.close();
+            } catch (Exception e) {
+            }
 
             if (!contactInfo.isEmpty()) {
                 return contactInfo;
@@ -92,7 +95,7 @@ public class ContactsHelper {
         Uri photoUri = Uri.parse(photoId);
 
         InputStream input = null;
-        Base64OutputStream output= null;
+        Base64OutputStream output = null;
         try {
             ByteArrayOutputStream encodedPhoto = new ByteArrayOutputStream();
             output = new Base64OutputStream(encodedPhoto, Base64.DEFAULT);
@@ -107,8 +110,16 @@ public class ContactsHelper {
             Log.e("ContactsHelper", ex.toString());
             return "";
         } finally {
-            try { input.close(); } catch(Exception ignored) { };
-            try { output.close(); } catch(Exception ignored) { };
+            try {
+                input.close();
+            } catch (Exception ignored) {
+            }
+
+            try {
+                output.close();
+            } catch (Exception ignored) {
+            }
+
         }
     }
 }

src/org/kde/kdeconnect/Helpers/DeviceHelper.java

@@ -38,412 +38,413 @@ public class DeviceHelper {
     //from https://github.com/meetup/android-device-names
     //Converted to java using:
     //cat android_models.properties | awk -F'=' '{sub(/ *$/, "", $1)} sub(/^ */, "", $2) { if ($2 != "") print "humanReadableNames.put(\""$1"\",\"" $2 "\");"}' | sed -e 's/\\ /_/g'
-    private final static HashMap<String,String> humanReadableNames = new HashMap<>();
+    private final static HashMap<String, String> humanReadableNames = new HashMap<>();
+
     static {
-        humanReadableNames.put("5860E","Coolpad Quattro 4G");
-        humanReadableNames.put("831C","HTC One M8");
-        humanReadableNames.put("9920","Star Alps S9920");
-        humanReadableNames.put("A0001","OnePlus One");
-        humanReadableNames.put("A1-810","Acer Iconia A1-810");
-        humanReadableNames.put("ADR6300","HTC Droid Incredible");
-        humanReadableNames.put("ADR6330VW","HTC Rhyme");
-        humanReadableNames.put("ADR6350","HTC Droid Incredible 2");
-        humanReadableNames.put("ADR6400L","HTC Thunderbolt");
-        humanReadableNames.put("ADR6410LVW","HTC Droid Incredible 4G");
-        humanReadableNames.put("ADR6425LVW","HTC Rezound 4G");
-        humanReadableNames.put("ALCATEL_ONE_TOUCH_5035X","Alcatel One Touch X Pop");
-        humanReadableNames.put("ALCATEL_ONE_TOUCH_7041X","Alcatel One Touch Pop C7");
-        humanReadableNames.put("ASUS_T00J","Asus ZenFone 5");
-        humanReadableNames.put("ASUS_Transformer_Pad_TF300T","Asus Transformer Pad");
-        humanReadableNames.put("ASUS_Transformer_Pad_TF700T","Asus Transformer Pad");
-        humanReadableNames.put("Aquaris_E4.5","bq Aquaris E4.5");
-        humanReadableNames.put("C1905","Sony Xperia M");
-        humanReadableNames.put("C2105","Sony Xperia L");
-        humanReadableNames.put("C5155","Kyocera Rise");
-        humanReadableNames.put("C5170","Kyocera Hydro");
-        humanReadableNames.put("C5302","Xperia SP");
-        humanReadableNames.put("C5303","Sony Xperia SP");
-        humanReadableNames.put("C5306","Xperia SP");
-        humanReadableNames.put("C6603","Sony Xperia Z");
-        humanReadableNames.put("C6606","Sony Xperia Z");
-        humanReadableNames.put("C6833","Sony Xperia Z Ultra");
-        humanReadableNames.put("C6903","Sony Xperia Z1");
-        humanReadableNames.put("C6916","Sony Xperia Z1S");
-        humanReadableNames.put("CM990","Huawei Evolution III");
-        humanReadableNames.put("CUBOT_ONE","Cubot One");
-        humanReadableNames.put("D2005","Sony Xperia E1");
-        humanReadableNames.put("D2302","Xperia M2");
-        humanReadableNames.put("D2303","Sony Xperia M2");
-        humanReadableNames.put("D2305","Xperia M2");
-        humanReadableNames.put("D2306","Xperia M2");
-        humanReadableNames.put("D2316","Xperia M2");
-        humanReadableNames.put("D5503","Sony Xperia Z1");
-        humanReadableNames.put("D5803","Sony Xperia Z3 Compact");
-        humanReadableNames.put("D5833","Xperia Z3 Compact");
-        humanReadableNames.put("D6503","Sony Xperia Z2");
-        humanReadableNames.put("D6603","Sony Xperia Z3");
-        humanReadableNames.put("D6653","Sony Xperia Z3");
-        humanReadableNames.put("DROID2","Motorola Droid 2");
-        humanReadableNames.put("DROID2_GLOBAL","Motorola Droid 2 Global");
-        humanReadableNames.put("DROID3","Motorola Droid 3");
-        humanReadableNames.put("DROID4","Motorola Droid 4");
-        humanReadableNames.put("DROIDX","Motorola Droid X");
-        humanReadableNames.put("DROID_BIONIC","Motorola Droid Bionic");
-        humanReadableNames.put("DROID_Pro","Motorola Droid Pro");
-        humanReadableNames.put("DROID_RAZR","Motorola Droid Razr");
-        humanReadableNames.put("DROID_RAZR_HD","Motorola Droid Razr HD");
-        humanReadableNames.put("DROID_X2","Motorola Droid X2");
-        humanReadableNames.put("Desire_HD","HTC Desire HD");
-        humanReadableNames.put("Droid","Motorola Droid");
-        humanReadableNames.put("EVO","HTC Evo");
-        humanReadableNames.put("GT-I8160","Samsung Galaxy Ace 2");
-        humanReadableNames.put("GT-I8190","Samsung Galaxy S III Mini");
-        humanReadableNames.put("GT-I8190L","Samsung Galaxy S3 Mini");
-        humanReadableNames.put("GT-I8190N","Samsung Galaxy S III Mini");
-        humanReadableNames.put("GT-I8260","Samsung Galaxy Core");
-        humanReadableNames.put("GT-I8262","Samsung Galaxy Core");
-        humanReadableNames.put("GT-I8550L","Samsung Galaxy Win");
-        humanReadableNames.put("GT-I9000","Samsung Galaxy S");
-        humanReadableNames.put("GT-I9001","Samsung Galaxy S Plus");
-        humanReadableNames.put("GT-I9060","Samsung Galaxy Grand Neo");
-        humanReadableNames.put("GT-I9063T","Samsung Galaxy Grand Neo Duos");
-        humanReadableNames.put("GT-I9070","Samsung Galaxy S Advance");
-        humanReadableNames.put("GT-I9082","Samsung Galaxy Grand");
-        humanReadableNames.put("GT-I9100","Samsung Galaxy S II");
-        humanReadableNames.put("GT-I9100M","Samsung Galaxy S II");
-        humanReadableNames.put("GT-I9100P","Samsung Galaxy S II");
-        humanReadableNames.put("GT-I9100T","Samsung Galaxy S II");
-        humanReadableNames.put("GT-I9105P","Samsung Galaxy S2 Plus");
-        humanReadableNames.put("GT-I9190","Samsung Galaxy S4 Mini");
-        humanReadableNames.put("GT-I9192","Samsung Galaxy S4 Mini Duos");
-        humanReadableNames.put("GT-I9195","Samsung Galaxy S4 Mini");
-        humanReadableNames.put("GT-I9197","Galaxy S4 Mini");
-        humanReadableNames.put("GT-I9198","Galaxy S4 Mini");
-        humanReadableNames.put("GT-I9210","Galaxy S2");
-        humanReadableNames.put("GT-I9295","Samsung Galaxy S4 Active");
-        humanReadableNames.put("GT-I9300","Samsung Galaxy S III");
-        humanReadableNames.put("GT-I9300T","Samsung Galaxy S III");
-        humanReadableNames.put("GT-I9305","Samsung Galaxy S III");
-        humanReadableNames.put("GT-I9305T","Samsung Galaxy S III");
-        humanReadableNames.put("GT-I9500","Samsung Galaxy S4");
-        humanReadableNames.put("GT-I9505","Samsung Galaxy S4");
-        humanReadableNames.put("GT-I9506","Samsung Galaxy S4");
-        humanReadableNames.put("GT-I9507","Samsung Galaxy S4");
-        humanReadableNames.put("GT-N5110","Samsung Galaxy Note 8.0");
-        humanReadableNames.put("GT-N7000","Samsung Galaxy Note");
-        humanReadableNames.put("GT-N7100","Samsung Galaxy Note II");
-        humanReadableNames.put("GT-N7105","Samsung Galaxy Note II");
-        humanReadableNames.put("GT-N7105T","Samsung Galaxy Note II");
-        humanReadableNames.put("GT-N8000","Samsung Galaxy Note 10.1");
-        humanReadableNames.put("GT-N8010","Samsung Galaxy Note 10.1");
-        humanReadableNames.put("GT-N8013","Samsung Galaxy Note 10.1");
-        humanReadableNames.put("GT-P3100","Samsung Galaxy Tab 2");
-        humanReadableNames.put("GT-P3110","Samsung Galaxy Tab 2");
-        humanReadableNames.put("GT-P3113","Samsung Galaxy Tab 2 7.0");
-        humanReadableNames.put("GT-P5110","Samsung Galaxy Tab 2");
-        humanReadableNames.put("GT-P5113","Samsnung Galaxy Tab 2 10.1");
-        humanReadableNames.put("GT-P5210","Samsung Galaxy Tab 3 10.1");
-        humanReadableNames.put("GT-P7510","Samsung Galaxy Tab 10.1");
-        humanReadableNames.put("GT-S5301L","Samsung Galaxy Pocket Plus");
-        humanReadableNames.put("GT-S5360","Samsung Galaxy Y");
-        humanReadableNames.put("GT-S5570","Samsung Galaxy Mini");
-        humanReadableNames.put("GT-S5830","Samsung Galaxy Ace");
-        humanReadableNames.put("GT-S5830i","Samsung Galaxy Ace");
-        humanReadableNames.put("GT-S6310","Samsung Galaxy Young");
-        humanReadableNames.put("GT-S6310N","Samsung Galaxy Young");
-        humanReadableNames.put("GT-S6810P","Samsung Galaxy Fame");
-        humanReadableNames.put("GT-S7560M","Samsung Galaxy Ace II X");
-        humanReadableNames.put("GT-S7562","Samsung Galaxy S Duos");
-        humanReadableNames.put("GT-S7580","Samsung Galaxy Trend Plus");
-        humanReadableNames.put("Galaxy_Nexus","Samsung Galaxy Nexus");
-        humanReadableNames.put("HM_1SW","Xiaomi Redmi");
-        humanReadableNames.put("HTC6435LVW","HTC Droid DNA");
-        humanReadableNames.put("HTC6500LVW","HTC One");
-        humanReadableNames.put("HTC6525LVW","HTC One M8");
-        humanReadableNames.put("HTCEVODesign4G","HTC Evo Design 4G");
-        humanReadableNames.put("HTCEVOV4G","HTC Evo V 4G");
-        humanReadableNames.put("HTCONE","HTC One");
-        humanReadableNames.put("HTC_Desire_500","HTC Desire 500");
-        humanReadableNames.put("HTC_Desire_HD_A9191","HTC Desire HD");
-        humanReadableNames.put("HTC_One_mini","HTC One mini");
-        humanReadableNames.put("HTC_PH39100","HTC Vivid 4G");
-        humanReadableNames.put("HTC_PN071","HTC One");
-        humanReadableNames.put("HTC_Sensation_Z710e","HTC Sensation");
-        humanReadableNames.put("HTC_Sensation_4G","HTC Sensation");
-        humanReadableNames.put("HTC_VLE_U","HTC One S");
-        humanReadableNames.put("HUAWEI_G510-0251","Huawei Ascend G510");
-        humanReadableNames.put("HUAWEI_P6-U06","Huawei Ascend P6");
-        humanReadableNames.put("HUAWEI_Y300-0100","Huawei Ascend Y300");
-        humanReadableNames.put("ISW11SC","Galaxy S2");
-        humanReadableNames.put("KFJWA","Kindle Fire HD 8.9");
-        humanReadableNames.put("KFJWI","Kindle Fire HD 8.9");
-        humanReadableNames.put("KFOT","Kindle Fire");
-        humanReadableNames.put("KFTT","Kindle Fire HD 7");
-        humanReadableNames.put("L-01F","G2");
-        humanReadableNames.put("LG-C800","LG myTouch Q");
-        humanReadableNames.put("LG-D415","LG Optimus L90");
-        humanReadableNames.put("LG-D620","LG G2 Mini");
-        humanReadableNames.put("LG-D686","LG G Pro Lite Dual");
-        humanReadableNames.put("LG-D800","LG G2");
-        humanReadableNames.put("LG-D801","LG G2");
-        humanReadableNames.put("LG-D802","LG G2");
-        humanReadableNames.put("LG-D803","G2");
-        humanReadableNames.put("LG-D805","G2");
-        humanReadableNames.put("LG-D850","LG G3");
-        humanReadableNames.put("LG-D851","LG G3");
-        humanReadableNames.put("LG-D852","G3");
-        humanReadableNames.put("LG-D855","LG G3");
-        humanReadableNames.put("LG-E411g","LG Optimus L1 II");
-        humanReadableNames.put("LG-E425g","LG Optimus L3 II");
-        humanReadableNames.put("LG-E440g","LG Optimus L4 II");
-        humanReadableNames.put("LG-E460","LG Optimus L5 II");
-        humanReadableNames.put("LG-E610","LG Optimus L5");
-        humanReadableNames.put("LG-E612g","LG Optimus L5 Dual");
-        humanReadableNames.put("LG-E739","LG MyTouch e739");
-        humanReadableNames.put("LG-E970","LG Optimus G");
-        humanReadableNames.put("LG-E971","Optimus G");
-        humanReadableNames.put("LG-E980","LG Optimus G Pro");
-        humanReadableNames.put("LG-H815","G4");
-        humanReadableNames.put("LG-LG730","LG Venice");
-        humanReadableNames.put("LG-LS720","LG Optimus F3");
-        humanReadableNames.put("LG-LS840","LG Viper");
-        humanReadableNames.put("LG-LS970","LG Optimus G");
-        humanReadableNames.put("LG-LS980","LG G2");
-        humanReadableNames.put("LG-MS770","LG Motion 4G");
-        humanReadableNames.put("LG-MS910","LG Esteem");
-        humanReadableNames.put("LG-P509","LG Optimus T");
-        humanReadableNames.put("LG-P760","LG Optimus L9");
-        humanReadableNames.put("LG-P768","LG Optimus L9");
-        humanReadableNames.put("LG-P769","LG Optimus L9");
-        humanReadableNames.put("LG-P999","LG G2X P999");
-        humanReadableNames.put("LG-VM696","LG Optimus Elite");
-        humanReadableNames.put("LGL34C","LG Optimus Fuel");
-        humanReadableNames.put("LGL55C","LG LGL55C");
-        humanReadableNames.put("LGLS740","LG Volt");
-        humanReadableNames.put("LGLS990","LG G3");
-        humanReadableNames.put("LGMS323","LG Optimus L70");
-        humanReadableNames.put("LGMS500","LG Optimus F6");
-        humanReadableNames.put("LGMS769","LG Optimus L9");
-        humanReadableNames.put("LS670","LG Optimus S");
-        humanReadableNames.put("LT22i","Sony Xperia P");
-        humanReadableNames.put("LT25i","Sony Xperia V");
-        humanReadableNames.put("LT26i","Sony Xperia S");
-        humanReadableNames.put("LT30p","Sony Xperia T");
-        humanReadableNames.put("MB855","Motorola Photon 4G");
-        humanReadableNames.put("MB860","Motorola Atrix 4G");
-        humanReadableNames.put("MB865","Motorola Atrix 2");
-        humanReadableNames.put("MB886","Motorola Atrix HD");
-        humanReadableNames.put("ME173X","Asus MeMO Pad HD 7");
-        humanReadableNames.put("MI_3W","Xiaomi Mi 3");
-        humanReadableNames.put("MOTWX435KT","Motorola Triumph");
-        humanReadableNames.put("N3","Star NO.1 N3");
-        humanReadableNames.put("N860","ZTE Warp N860");
-        humanReadableNames.put("NEXUS_4","Nexus 4");
-        humanReadableNames.put("NEXUS_5","Nexus 5");
-        humanReadableNames.put("NEXUS_5X","Nexus 5X");
-        humanReadableNames.put("LG-D820","Nexus 5");
-        humanReadableNames.put("LG-D821","Nexus 5");
-        humanReadableNames.put("NEXUS_6","Nexus 6");
-        humanReadableNames.put("NEXUS_6P","Nexus 6P");
-        humanReadableNames.put("Nexus_10","Google Nexus 10");
-        humanReadableNames.put("Nexus_4","Google Nexus 4");
-        humanReadableNames.put("Nexus_7","Asus Nexus 7");
-        humanReadableNames.put("Nexus_S","Samsung Nexus S");
-        humanReadableNames.put("Nexus_S_4G","Samsung Nexus S 4G");
-        humanReadableNames.put("Orange_Daytona","Huawei Ascend G510");
-        humanReadableNames.put("PC36100","HTC Evo 4G");
-        humanReadableNames.put("PG06100","HTC EVO Shift 4G");
-        humanReadableNames.put("PG86100","HTC Evo 3D");
-        humanReadableNames.put("PH44100","HTC Evo Design 4G");
-        humanReadableNames.put("PantechP9070","Pantech Burst");
-        humanReadableNames.put("QMV7A","Verizon Ellipsis 7");
-        humanReadableNames.put("SAMSUNG-SGH-I317","Samsung Galaxy Note II");
-        humanReadableNames.put("SAMSUNG-SGH-I337","Samsung Galaxy S4");
-        humanReadableNames.put("SAMSUNG-SGH-I527","Samsung Galaxy Mega");
-        humanReadableNames.put("SAMSUNG-SGH-I537","Samsung Galaxy S4 Active");
-        humanReadableNames.put("SAMSUNG-SGH-I717","Samsung Galaxy Note");
-        humanReadableNames.put("SAMSUNG-SGH-I727","Samsung Skyrocket");
-        humanReadableNames.put("SAMSUNG-SGH-I747","Samsung Galaxy S III");
-        humanReadableNames.put("SAMSUNG-SGH-I777","Samsung Galaxy S II");
-        humanReadableNames.put("SAMSUNG-SGH-I897","Samsung Captivate");
-        humanReadableNames.put("SAMSUNG-SGH-I927","Samsung Captivate Glide");
-        humanReadableNames.put("SAMSUNG-SGH-I997","Samsung Infuse 4G");
-        humanReadableNames.put("SAMSUNG-SM-G730A","Samsung Galaxy S3 Mini");
-        humanReadableNames.put("SAMSUNG-SM-G870A","Samsung Galaxy S5 Active");
-        humanReadableNames.put("SAMSUNG-SM-G900A","Samsung Galaxy S5");
-        humanReadableNames.put("SAMSUNG-SM-G920A","Samsung Galaxy S6");
-        humanReadableNames.put("SAMSUNG-SM-N900A","Samsung Galaxy Note 3");
-        humanReadableNames.put("SAMSUNG-SM-N910A","Samsung Galaxy Note 4");
-        humanReadableNames.put("SC-02C","Galaxy S2");
-        humanReadableNames.put("SC-03E","Galaxy S3");
-        humanReadableNames.put("SC-04E","Galaxy S4");
-        humanReadableNames.put("SC-06D","Galaxy S3");
-        humanReadableNames.put("SCH-I200","Samsung Galaxy Stellar");
-        humanReadableNames.put("SCH-I337","Galaxy S4");
-        humanReadableNames.put("SCH-I405","Samsung Stratosphere");
-        humanReadableNames.put("SCH-I415","Samsung Galaxy Stratosphere II");
-        humanReadableNames.put("SCH-I435","Samsung Galaxy S4 Mini");
-        humanReadableNames.put("SCH-I500","Samsung Fascinate");
-        humanReadableNames.put("SCH-I510","Samsung Droid Charge");
-        humanReadableNames.put("SCH-I535","Samsung Galaxy S III");
-        humanReadableNames.put("SCH-I545","Samsung Galaxy S4");
-        humanReadableNames.put("SCH-I605","Samsung Galaxy Note II");
-        humanReadableNames.put("SCH-I800","Samsung Galaxy Tab 7.0");
-        humanReadableNames.put("SCH-I939","Galaxy S3");
-        humanReadableNames.put("SCH-I959","Galaxy S4");
-        humanReadableNames.put("SCH-J021","Galaxy S3");
-        humanReadableNames.put("SCH-R530C","Samsung Galaxy S3");
-        humanReadableNames.put("SCH-R530M","Samsung Galaxy S III");
-        humanReadableNames.put("SCH-R530U","Samsung Galaxy S III");
-        humanReadableNames.put("SCH-R720","Samsung Admire");
-        humanReadableNames.put("SCH-R760","Galaxy S2");
-        humanReadableNames.put("SCH-R970","Samsung Galaxy S4");
-        humanReadableNames.put("SCH-S720C","Samsung Proclaim");
-        humanReadableNames.put("SCH-S738C","Samsung Galaxy Centura");
-        humanReadableNames.put("SCH-S968C","Samsung Galaxy S III");
-        humanReadableNames.put("SCL21","Galaxy S3");
-        humanReadableNames.put("SGH-I257M","Samsung Galaxy S4 Mini");
-        humanReadableNames.put("SGH-I317M","Samsung Galaxy Note II");
-        humanReadableNames.put("SGH-I337M","Samsung Galaxy S4");
-        humanReadableNames.put("SGH-I727R","Samsung Galaxy S II");
-        humanReadableNames.put("SGH-I747M","Samsung Galaxy S III");
-        humanReadableNames.put("SGH-I757M","Galaxy S2");
-        humanReadableNames.put("SGH-I777M","Galaxy S2");
-        humanReadableNames.put("SGH-M919","Samsung Galaxy S4");
-        humanReadableNames.put("SGH-M919N","Samsung Galaxy S4");
-        humanReadableNames.put("SGH-N035","Galaxy S3");
-        humanReadableNames.put("SGH-N045","Galaxy S4");
-        humanReadableNames.put("SGH-N064","Galaxy S3");
-        humanReadableNames.put("SGH-T399","Samsung Galaxy Light");
-        humanReadableNames.put("SGH-T399N","Samsung Galaxy Light");
-        humanReadableNames.put("SGH-T599N","Samsung Galaxy Exhibit");
-        humanReadableNames.put("SGH-T679","Samsung Exhibit II");
-        humanReadableNames.put("SGH-T769","Samsung Galaxy S Blaze");
-        humanReadableNames.put("SGH-T889","Samsung Galaxy Note II");
-        humanReadableNames.put("SGH-T959","Samsung Galaxy S Vibrant");
-        humanReadableNames.put("SGH-T959V","Samsung Galaxy S 4G");
-        humanReadableNames.put("SGH-T989","Samsung Galaxy S II");
-        humanReadableNames.put("SGH-T989D","Samsung Galaxy S II");
-        humanReadableNames.put("SGH-T999","Samsung Galaxy S III");
-        humanReadableNames.put("SGH-T999L","Samsung Galaxy S III");
-        humanReadableNames.put("SGH-T999V","Samsung Galaxy S III");
-        humanReadableNames.put("SGP312","Sony Xperia Tablet Z");
-        humanReadableNames.put("SHV-E210K","Samsung Galaxy S3");
-        humanReadableNames.put("SHV-E210S","Samsung Galaxy S III");
-        humanReadableNames.put("SHV-E250K","Samsung Galaxy Note 2");
-        humanReadableNames.put("SHV-E250S","Samsung Galaxy Note II");
-        humanReadableNames.put("SHV-E300","Galaxy S4");
-        humanReadableNames.put("SHW-M250","Galaxy S2");
-        humanReadableNames.put("SM-G3815","Samsung Galaxy Express II");
-        humanReadableNames.put("SM-G386T","Samsung Galaxy Avant");
-        humanReadableNames.put("SM-G386T1","Samsung Galaxy Avant");
-        humanReadableNames.put("SM-G7102","Samsung Galaxy Grand II");
-        humanReadableNames.put("SM-G800F","Samsung Galaxy S5 Mini");
-        humanReadableNames.put("SM-G860P","Samsung Galaxy S5 Sport");
-        humanReadableNames.put("SM-G900F","Samsung Galaxy S5");
-        humanReadableNames.put("SM-G900H","Samsung Galaxy S5");
-        humanReadableNames.put("SM-G900I","Samsung Galaxy S5");
-        humanReadableNames.put("SM-G900P","Samsung Galaxy S5");
-        humanReadableNames.put("SM-G900R4","Galaxy S5");
-        humanReadableNames.put("SM-G900RZWAUSC","Galaxy S5");
-        humanReadableNames.put("SM-G900T","Samsung Galaxy S5");
-        humanReadableNames.put("SM-G900V","Samsung Galaxy S5");
-        humanReadableNames.put("SM-G900W8","Samsung Galaxy S5");
-        humanReadableNames.put("SM-G9200","Galaxy S6");
-        humanReadableNames.put("SM-G920F","Galaxy S6");
-        humanReadableNames.put("SM-G920I","Galaxy S6");
-        humanReadableNames.put("SM-G920P","Samsung Galaxy S6");
-        humanReadableNames.put("SM-G920R","Galaxy S6");
-        humanReadableNames.put("SM-G920T","Samsung Galaxy S6");
-        humanReadableNames.put("SM-G920V","Samsung Galaxy S6");
-        humanReadableNames.put("SM-G920W8","Galaxy S6");
-        humanReadableNames.put("SM-G9250","Galaxy S6 Edge");
-        humanReadableNames.put("SM-G925A","Galaxy S6 Edge");
-        humanReadableNames.put("SM-G925F","Galaxy S6 Edge");
-        humanReadableNames.put("SM-G925P","Galaxy S6 Edge");
-        humanReadableNames.put("SM-G925R","Galaxy S6 Edge");
-        humanReadableNames.put("SM-G925T","Galaxy S6 Edge");
-        humanReadableNames.put("SM-G925V","Galaxy S6 Edge");
-        humanReadableNames.put("SM-G925W8","Galaxy S6 Edge");
-        humanReadableNames.put("SM-N7505","Samsung Galaxy Note 3 Neo");
-        humanReadableNames.put("SM-N900","Samsung Galaxy Note 3");
-        humanReadableNames.put("SM-N9005","Samsung Galaxy Note 3");
-        humanReadableNames.put("SM-N9006","Samsung Galaxy Note 3");
-        humanReadableNames.put("SM-N900P","Samsung Galaxy Note 3");
-        humanReadableNames.put("SM-N900T","Samsung Galaxy Note 3");
-        humanReadableNames.put("SM-N900V","Samsung Galaxy Note 3");
-        humanReadableNames.put("SM-N900W8","Samsung Galaxy Note 3");
-        humanReadableNames.put("SM-N910C","Samsung Galaxy Note 4");
-        humanReadableNames.put("SM-N910F","Samsung Galaxy Note 4");
-        humanReadableNames.put("SM-N910G","Samsung Galaxy Note 4");
-        humanReadableNames.put("SM-N910P","Samsung Galaxy Note 4");
-        humanReadableNames.put("SM-N910T","Samsung Galaxy Note 4");
-        humanReadableNames.put("SM-N910V","Samsung Galaxy Note 4");
-        humanReadableNames.put("SM-N910W8","Samsung Galaxy Note 4");
-        humanReadableNames.put("SM-P600","Samsung Galaxy Note 10.1");
-        humanReadableNames.put("SM-T210R","Samsung Galaxy Tab 3 7.0");
-        humanReadableNames.put("SM-T217S","Samsung Galaxy Tab 3 7.0");
-        humanReadableNames.put("SM-T230NU","Samsung Galaxy Tab 4");
-        humanReadableNames.put("SM-T310","Samsung Galaxy Tab 3 8.0");
-        humanReadableNames.put("SM-T530NU","Samsung Galaxy Tab 4 10.1");
-        humanReadableNames.put("SM-T800","Samsung Galaxy Tab S 10.5");
-        humanReadableNames.put("SPH-D600","Samsung Conquer 4G");
-        humanReadableNames.put("SPH-D700","Samsung Epic 4G");
-        humanReadableNames.put("SPH-D710","Samsung Epic");
-        humanReadableNames.put("SPH-D710BST","Samsung Galaxy S II");
-        humanReadableNames.put("SPH-D710VMUB","Samsung Galaxy S II");
-        humanReadableNames.put("SPH-L300","Samsung Galaxy Victory");
-        humanReadableNames.put("SPH-L520","Samsung Galaxy S4 Mini");
-        humanReadableNames.put("SPH-L710","Samsung Galaxy S III");
-        humanReadableNames.put("SPH-L710T","Samsung Galaxy S III");
-        humanReadableNames.put("SPH-L720","Samsung Galaxy S4");
-        humanReadableNames.put("SPH-L720T","Samsung Galaxy S4");
-        humanReadableNames.put("SPH-L900","Samsung Galaxy Note II");
-        humanReadableNames.put("SPH-M820-BST","Samsung Galaxy Prevail");
-        humanReadableNames.put("SPH-M830","Samsung Galaxy Rush");
-        humanReadableNames.put("SPH-M840","Samsung Galaxy Prevail 2");
-        humanReadableNames.put("SPH-M930BST","Samsung Transform Ultra");
-        humanReadableNames.put("ST21i","Sony Xperia Tipo");
-        humanReadableNames.put("ST25i","Sony Xperia U");
-        humanReadableNames.put("ST26i","Sony Xperia J");
-        humanReadableNames.put("Transformer_Prime_TF201","Asus Transformer Prime");
-        humanReadableNames.put("Transformer_TF101","Asus Transformer");
-        humanReadableNames.put("VM670","LG Optimus V");
-        humanReadableNames.put("VS840_4G","LG Lucid 4G");
-        humanReadableNames.put("VS870_4G","LG Lucid 2");
-        humanReadableNames.put("VS910_4G","LG Revolution 4G");
-        humanReadableNames.put("VS920_4G","LG Spectrum 4G");
-        humanReadableNames.put("VS930_4G","LG Spectrum 2");
-        humanReadableNames.put("VS980_4G","LG G2");
-        humanReadableNames.put("VS985_4G","LG G3 4G");
-        humanReadableNames.put("XT1022","Motorola Moto E");
-        humanReadableNames.put("XT1028","Motorola Moto G");
-        humanReadableNames.put("XT1030","Motorola Droid Mini");
-        humanReadableNames.put("XT1031","Motorola Moto G");
-        humanReadableNames.put("XT1032","Motorola Moto G");
-        humanReadableNames.put("XT1033","Motorola Moto G");
-        humanReadableNames.put("XT1034","Motorola Moto G");
-        humanReadableNames.put("XT1039","Motorola Moto G");
-        humanReadableNames.put("XT1045","Motorola Moto G");
-        humanReadableNames.put("XT1049","Motorola Moto X");
-        humanReadableNames.put("XT1053","Motorola Moto X");
-        humanReadableNames.put("XT1056","Motorola Moto X");
-        humanReadableNames.put("XT1058","Motorola Moto X");
-        humanReadableNames.put("XT1060","Motorola Moto X");
-        humanReadableNames.put("XT1068","Motorola Moto G");
-        humanReadableNames.put("XT1080","Motorola Droid Ultra");
-        humanReadableNames.put("XT1095","Motorola Moto X");
-        humanReadableNames.put("XT1096","Motorola Moto X");
-        humanReadableNames.put("XT1097","Motorola Moto X");
-        humanReadableNames.put("XT1254","Motorola Droid Turbo");
-        humanReadableNames.put("XT897","Motorola Photo Q");
-        humanReadableNames.put("XT907","Motorola Droid Razr M");
-        humanReadableNames.put("Xoom","Motorola Xoom");
-        humanReadableNames.put("Z970","ZTE ZMax");
-        humanReadableNames.put("bq_Aquaris_5","bq Aquaris 5");
-        humanReadableNames.put("bq_Aquaris_5_HD","bq Aquaris 5 HD");
-        humanReadableNames.put("google_sdk","Android Emulator");
-        humanReadableNames.put("myTouch_4G_Slide","HTC myTouch 4G Slide");
+        humanReadableNames.put("5860E", "Coolpad Quattro 4G");
+        humanReadableNames.put("831C", "HTC One M8");
+        humanReadableNames.put("9920", "Star Alps S9920");
+        humanReadableNames.put("A0001", "OnePlus One");
+        humanReadableNames.put("A1-810", "Acer Iconia A1-810");
+        humanReadableNames.put("ADR6300", "HTC Droid Incredible");
+        humanReadableNames.put("ADR6330VW", "HTC Rhyme");
+        humanReadableNames.put("ADR6350", "HTC Droid Incredible 2");
+        humanReadableNames.put("ADR6400L", "HTC Thunderbolt");
+        humanReadableNames.put("ADR6410LVW", "HTC Droid Incredible 4G");
+        humanReadableNames.put("ADR6425LVW", "HTC Rezound 4G");
+        humanReadableNames.put("ALCATEL_ONE_TOUCH_5035X", "Alcatel One Touch X Pop");
+        humanReadableNames.put("ALCATEL_ONE_TOUCH_7041X", "Alcatel One Touch Pop C7");
+        humanReadableNames.put("ASUS_T00J", "Asus ZenFone 5");
+        humanReadableNames.put("ASUS_Transformer_Pad_TF300T", "Asus Transformer Pad");
+        humanReadableNames.put("ASUS_Transformer_Pad_TF700T", "Asus Transformer Pad");
+        humanReadableNames.put("Aquaris_E4.5", "bq Aquaris E4.5");
+        humanReadableNames.put("C1905", "Sony Xperia M");
+        humanReadableNames.put("C2105", "Sony Xperia L");
+        humanReadableNames.put("C5155", "Kyocera Rise");
+        humanReadableNames.put("C5170", "Kyocera Hydro");
+        humanReadableNames.put("C5302", "Xperia SP");
+        humanReadableNames.put("C5303", "Sony Xperia SP");
+        humanReadableNames.put("C5306", "Xperia SP");
+        humanReadableNames.put("C6603", "Sony Xperia Z");
+        humanReadableNames.put("C6606", "Sony Xperia Z");
+        humanReadableNames.put("C6833", "Sony Xperia Z Ultra");
+        humanReadableNames.put("C6903", "Sony Xperia Z1");
+        humanReadableNames.put("C6916", "Sony Xperia Z1S");
+        humanReadableNames.put("CM990", "Huawei Evolution III");
+        humanReadableNames.put("CUBOT_ONE", "Cubot One");
+        humanReadableNames.put("D2005", "Sony Xperia E1");
+        humanReadableNames.put("D2302", "Xperia M2");
+        humanReadableNames.put("D2303", "Sony Xperia M2");
+        humanReadableNames.put("D2305", "Xperia M2");
+        humanReadableNames.put("D2306", "Xperia M2");
+        humanReadableNames.put("D2316", "Xperia M2");
+        humanReadableNames.put("D5503", "Sony Xperia Z1");
+        humanReadableNames.put("D5803", "Sony Xperia Z3 Compact");
+        humanReadableNames.put("D5833", "Xperia Z3 Compact");
+        humanReadableNames.put("D6503", "Sony Xperia Z2");
+        humanReadableNames.put("D6603", "Sony Xperia Z3");
+        humanReadableNames.put("D6653", "Sony Xperia Z3");
+        humanReadableNames.put("DROID2", "Motorola Droid 2");
+        humanReadableNames.put("DROID2_GLOBAL", "Motorola Droid 2 Global");
+        humanReadableNames.put("DROID3", "Motorola Droid 3");
+        humanReadableNames.put("DROID4", "Motorola Droid 4");
+        humanReadableNames.put("DROIDX", "Motorola Droid X");
+        humanReadableNames.put("DROID_BIONIC", "Motorola Droid Bionic");
+        humanReadableNames.put("DROID_Pro", "Motorola Droid Pro");
+        humanReadableNames.put("DROID_RAZR", "Motorola Droid Razr");
+        humanReadableNames.put("DROID_RAZR_HD", "Motorola Droid Razr HD");
+        humanReadableNames.put("DROID_X2", "Motorola Droid X2");
+        humanReadableNames.put("Desire_HD", "HTC Desire HD");
+        humanReadableNames.put("Droid", "Motorola Droid");
+        humanReadableNames.put("EVO", "HTC Evo");
+        humanReadableNames.put("GT-I8160", "Samsung Galaxy Ace 2");
+        humanReadableNames.put("GT-I8190", "Samsung Galaxy S III Mini");
+        humanReadableNames.put("GT-I8190L", "Samsung Galaxy S3 Mini");
+        humanReadableNames.put("GT-I8190N", "Samsung Galaxy S III Mini");
+        humanReadableNames.put("GT-I8260", "Samsung Galaxy Core");
+        humanReadableNames.put("GT-I8262", "Samsung Galaxy Core");
+        humanReadableNames.put("GT-I8550L", "Samsung Galaxy Win");
+        humanReadableNames.put("GT-I9000", "Samsung Galaxy S");
+        humanReadableNames.put("GT-I9001", "Samsung Galaxy S Plus");
+        humanReadableNames.put("GT-I9060", "Samsung Galaxy Grand Neo");
+        humanReadableNames.put("GT-I9063T", "Samsung Galaxy Grand Neo Duos");
+        humanReadableNames.put("GT-I9070", "Samsung Galaxy S Advance");
+        humanReadableNames.put("GT-I9082", "Samsung Galaxy Grand");
+        humanReadableNames.put("GT-I9100", "Samsung Galaxy S II");
+        humanReadableNames.put("GT-I9100M", "Samsung Galaxy S II");
+        humanReadableNames.put("GT-I9100P", "Samsung Galaxy S II");
+        humanReadableNames.put("GT-I9100T", "Samsung Galaxy S II");
+        humanReadableNames.put("GT-I9105P", "Samsung Galaxy S2 Plus");
+        humanReadableNames.put("GT-I9190", "Samsung Galaxy S4 Mini");
+        humanReadableNames.put("GT-I9192", "Samsung Galaxy S4 Mini Duos");
+        humanReadableNames.put("GT-I9195", "Samsung Galaxy S4 Mini");
+        humanReadableNames.put("GT-I9197", "Galaxy S4 Mini");
+        humanReadableNames.put("GT-I9198", "Galaxy S4 Mini");
+        humanReadableNames.put("GT-I9210", "Galaxy S2");
+        humanReadableNames.put("GT-I9295", "Samsung Galaxy S4 Active");
+        humanReadableNames.put("GT-I9300", "Samsung Galaxy S III");
+        humanReadableNames.put("GT-I9300T", "Samsung Galaxy S III");
+        humanReadableNames.put("GT-I9305", "Samsung Galaxy S III");
+        humanReadableNames.put("GT-I9305T", "Samsung Galaxy S III");
+        humanReadableNames.put("GT-I9500", "Samsung Galaxy S4");
+        humanReadableNames.put("GT-I9505", "Samsung Galaxy S4");
+        humanReadableNames.put("GT-I9506", "Samsung Galaxy S4");
+        humanReadableNames.put("GT-I9507", "Samsung Galaxy S4");
+        humanReadableNames.put("GT-N5110", "Samsung Galaxy Note 8.0");
+        humanReadableNames.put("GT-N7000", "Samsung Galaxy Note");
+        humanReadableNames.put("GT-N7100", "Samsung Galaxy Note II");
+        humanReadableNames.put("GT-N7105", "Samsung Galaxy Note II");
+        humanReadableNames.put("GT-N7105T", "Samsung Galaxy Note II");
+        humanReadableNames.put("GT-N8000", "Samsung Galaxy Note 10.1");
+        humanReadableNames.put("GT-N8010", "Samsung Galaxy Note 10.1");
+        humanReadableNames.put("GT-N8013", "Samsung Galaxy Note 10.1");
+        humanReadableNames.put("GT-P3100", "Samsung Galaxy Tab 2");
+        humanReadableNames.put("GT-P3110", "Samsung Galaxy Tab 2");
+        humanReadableNames.put("GT-P3113", "Samsung Galaxy Tab 2 7.0");
+        humanReadableNames.put("GT-P5110", "Samsung Galaxy Tab 2");
+        humanReadableNames.put("GT-P5113", "Samsnung Galaxy Tab 2 10.1");
+        humanReadableNames.put("GT-P5210", "Samsung Galaxy Tab 3 10.1");
+        humanReadableNames.put("GT-P7510", "Samsung Galaxy Tab 10.1");
+        humanReadableNames.put("GT-S5301L", "Samsung Galaxy Pocket Plus");
+        humanReadableNames.put("GT-S5360", "Samsung Galaxy Y");
+        humanReadableNames.put("GT-S5570", "Samsung Galaxy Mini");
+        humanReadableNames.put("GT-S5830", "Samsung Galaxy Ace");
+        humanReadableNames.put("GT-S5830i", "Samsung Galaxy Ace");
+        humanReadableNames.put("GT-S6310", "Samsung Galaxy Young");
+        humanReadableNames.put("GT-S6310N", "Samsung Galaxy Young");
+        humanReadableNames.put("GT-S6810P", "Samsung Galaxy Fame");
+        humanReadableNames.put("GT-S7560M", "Samsung Galaxy Ace II X");
+        humanReadableNames.put("GT-S7562", "Samsung Galaxy S Duos");
+        humanReadableNames.put("GT-S7580", "Samsung Galaxy Trend Plus");
+        humanReadableNames.put("Galaxy_Nexus", "Samsung Galaxy Nexus");
+        humanReadableNames.put("HM_1SW", "Xiaomi Redmi");
+        humanReadableNames.put("HTC6435LVW", "HTC Droid DNA");
+        humanReadableNames.put("HTC6500LVW", "HTC One");
+        humanReadableNames.put("HTC6525LVW", "HTC One M8");
+        humanReadableNames.put("HTCEVODesign4G", "HTC Evo Design 4G");
+        humanReadableNames.put("HTCEVOV4G", "HTC Evo V 4G");
+        humanReadableNames.put("HTCONE", "HTC One");
+        humanReadableNames.put("HTC_Desire_500", "HTC Desire 500");
+        humanReadableNames.put("HTC_Desire_HD_A9191", "HTC Desire HD");
+        humanReadableNames.put("HTC_One_mini", "HTC One mini");
+        humanReadableNames.put("HTC_PH39100", "HTC Vivid 4G");
+        humanReadableNames.put("HTC_PN071", "HTC One");
+        humanReadableNames.put("HTC_Sensation_Z710e", "HTC Sensation");
+        humanReadableNames.put("HTC_Sensation_4G", "HTC Sensation");
+        humanReadableNames.put("HTC_VLE_U", "HTC One S");
+        humanReadableNames.put("HUAWEI_G510-0251", "Huawei Ascend G510");
+        humanReadableNames.put("HUAWEI_P6-U06", "Huawei Ascend P6");
+        humanReadableNames.put("HUAWEI_Y300-0100", "Huawei Ascend Y300");
+        humanReadableNames.put("ISW11SC", "Galaxy S2");
+        humanReadableNames.put("KFJWA", "Kindle Fire HD 8.9");
+        humanReadableNames.put("KFJWI", "Kindle Fire HD 8.9");
+        humanReadableNames.put("KFOT", "Kindle Fire");
+        humanReadableNames.put("KFTT", "Kindle Fire HD 7");
+        humanReadableNames.put("L-01F", "G2");
+        humanReadableNames.put("LG-C800", "LG myTouch Q");
+        humanReadableNames.put("LG-D415", "LG Optimus L90");
+        humanReadableNames.put("LG-D620", "LG G2 Mini");
+        humanReadableNames.put("LG-D686", "LG G Pro Lite Dual");
+        humanReadableNames.put("LG-D800", "LG G2");
+        humanReadableNames.put("LG-D801", "LG G2");
+        humanReadableNames.put("LG-D802", "LG G2");
+        humanReadableNames.put("LG-D803", "G2");
+        humanReadableNames.put("LG-D805", "G2");
+        humanReadableNames.put("LG-D850", "LG G3");
+        humanReadableNames.put("LG-D851", "LG G3");
+        humanReadableNames.put("LG-D852", "G3");
+        humanReadableNames.put("LG-D855", "LG G3");
+        humanReadableNames.put("LG-E411g", "LG Optimus L1 II");
+        humanReadableNames.put("LG-E425g", "LG Optimus L3 II");
+        humanReadableNames.put("LG-E440g", "LG Optimus L4 II");
+        humanReadableNames.put("LG-E460", "LG Optimus L5 II");
+        humanReadableNames.put("LG-E610", "LG Optimus L5");
+        humanReadableNames.put("LG-E612g", "LG Optimus L5 Dual");
+        humanReadableNames.put("LG-E739", "LG MyTouch e739");
+        humanReadableNames.put("LG-E970", "LG Optimus G");
+        humanReadableNames.put("LG-E971", "Optimus G");
+        humanReadableNames.put("LG-E980", "LG Optimus G Pro");
+        humanReadableNames.put("LG-H815", "G4");
+        humanReadableNames.put("LG-LG730", "LG Venice");
+        humanReadableNames.put("LG-LS720", "LG Optimus F3");
+        humanReadableNames.put("LG-LS840", "LG Viper");
+        humanReadableNames.put("LG-LS970", "LG Optimus G");
+        humanReadableNames.put("LG-LS980", "LG G2");
+        humanReadableNames.put("LG-MS770", "LG Motion 4G");
+        humanReadableNames.put("LG-MS910", "LG Esteem");
+        humanReadableNames.put("LG-P509", "LG Optimus T");
+        humanReadableNames.put("LG-P760", "LG Optimus L9");
+        humanReadableNames.put("LG-P768", "LG Optimus L9");
+        humanReadableNames.put("LG-P769", "LG Optimus L9");
+        humanReadableNames.put("LG-P999", "LG G2X P999");
+        humanReadableNames.put("LG-VM696", "LG Optimus Elite");
+        humanReadableNames.put("LGL34C", "LG Optimus Fuel");
+        humanReadableNames.put("LGL55C", "LG LGL55C");
+        humanReadableNames.put("LGLS740", "LG Volt");
+        humanReadableNames.put("LGLS990", "LG G3");
+        humanReadableNames.put("LGMS323", "LG Optimus L70");
+        humanReadableNames.put("LGMS500", "LG Optimus F6");
+        humanReadableNames.put("LGMS769", "LG Optimus L9");
+        humanReadableNames.put("LS670", "LG Optimus S");
+        humanReadableNames.put("LT22i", "Sony Xperia P");
+        humanReadableNames.put("LT25i", "Sony Xperia V");
+        humanReadableNames.put("LT26i", "Sony Xperia S");
+        humanReadableNames.put("LT30p", "Sony Xperia T");
+        humanReadableNames.put("MB855", "Motorola Photon 4G");
+        humanReadableNames.put("MB860", "Motorola Atrix 4G");
+        humanReadableNames.put("MB865", "Motorola Atrix 2");
+        humanReadableNames.put("MB886", "Motorola Atrix HD");
+        humanReadableNames.put("ME173X", "Asus MeMO Pad HD 7");
+        humanReadableNames.put("MI_3W", "Xiaomi Mi 3");
+        humanReadableNames.put("MOTWX435KT", "Motorola Triumph");
+        humanReadableNames.put("N3", "Star NO.1 N3");
+        humanReadableNames.put("N860", "ZTE Warp N860");
+        humanReadableNames.put("NEXUS_4", "Nexus 4");
+        humanReadableNames.put("NEXUS_5", "Nexus 5");
+        humanReadableNames.put("NEXUS_5X", "Nexus 5X");
+        humanReadableNames.put("LG-D820", "Nexus 5");
+        humanReadableNames.put("LG-D821", "Nexus 5");
+        humanReadableNames.put("NEXUS_6", "Nexus 6");
+        humanReadableNames.put("NEXUS_6P", "Nexus 6P");
+        humanReadableNames.put("Nexus_10", "Google Nexus 10");
+        humanReadableNames.put("Nexus_4", "Google Nexus 4");
+        humanReadableNames.put("Nexus_7", "Asus Nexus 7");
+        humanReadableNames.put("Nexus_S", "Samsung Nexus S");
+        humanReadableNames.put("Nexus_S_4G", "Samsung Nexus S 4G");
+        humanReadableNames.put("Orange_Daytona", "Huawei Ascend G510");
+        humanReadableNames.put("PC36100", "HTC Evo 4G");
+        humanReadableNames.put("PG06100", "HTC EVO Shift 4G");
+        humanReadableNames.put("PG86100", "HTC Evo 3D");
+        humanReadableNames.put("PH44100", "HTC Evo Design 4G");
+        humanReadableNames.put("PantechP9070", "Pantech Burst");
+        humanReadableNames.put("QMV7A", "Verizon Ellipsis 7");
+        humanReadableNames.put("SAMSUNG-SGH-I317", "Samsung Galaxy Note II");
+        humanReadableNames.put("SAMSUNG-SGH-I337", "Samsung Galaxy S4");
+        humanReadableNames.put("SAMSUNG-SGH-I527", "Samsung Galaxy Mega");
+        humanReadableNames.put("SAMSUNG-SGH-I537", "Samsung Galaxy S4 Active");
+        humanReadableNames.put("SAMSUNG-SGH-I717", "Samsung Galaxy Note");
+        humanReadableNames.put("SAMSUNG-SGH-I727", "Samsung Skyrocket");
+        humanReadableNames.put("SAMSUNG-SGH-I747", "Samsung Galaxy S III");
+        humanReadableNames.put("SAMSUNG-SGH-I777", "Samsung Galaxy S II");
+        humanReadableNames.put("SAMSUNG-SGH-I897", "Samsung Captivate");
+        humanReadableNames.put("SAMSUNG-SGH-I927", "Samsung Captivate Glide");
+        humanReadableNames.put("SAMSUNG-SGH-I997", "Samsung Infuse 4G");
+        humanReadableNames.put("SAMSUNG-SM-G730A", "Samsung Galaxy S3 Mini");
+        humanReadableNames.put("SAMSUNG-SM-G870A", "Samsung Galaxy S5 Active");
+        humanReadableNames.put("SAMSUNG-SM-G900A", "Samsung Galaxy S5");
+        humanReadableNames.put("SAMSUNG-SM-G920A", "Samsung Galaxy S6");
+        humanReadableNames.put("SAMSUNG-SM-N900A", "Samsung Galaxy Note 3");
+        humanReadableNames.put("SAMSUNG-SM-N910A", "Samsung Galaxy Note 4");
+        humanReadableNames.put("SC-02C", "Galaxy S2");
+        humanReadableNames.put("SC-03E", "Galaxy S3");
+        humanReadableNames.put("SC-04E", "Galaxy S4");
+        humanReadableNames.put("SC-06D", "Galaxy S3");
+        humanReadableNames.put("SCH-I200", "Samsung Galaxy Stellar");
+        humanReadableNames.put("SCH-I337", "Galaxy S4");
+        humanReadableNames.put("SCH-I405", "Samsung Stratosphere");
+        humanReadableNames.put("SCH-I415", "Samsung Galaxy Stratosphere II");
+        humanReadableNames.put("SCH-I435", "Samsung Galaxy S4 Mini");
+        humanReadableNames.put("SCH-I500", "Samsung Fascinate");
+        humanReadableNames.put("SCH-I510", "Samsung Droid Charge");
+        humanReadableNames.put("SCH-I535", "Samsung Galaxy S III");
+        humanReadableNames.put("SCH-I545", "Samsung Galaxy S4");
+        humanReadableNames.put("SCH-I605", "Samsung Galaxy Note II");
+        humanReadableNames.put("SCH-I800", "Samsung Galaxy Tab 7.0");
+        humanReadableNames.put("SCH-I939", "Galaxy S3");
+        humanReadableNames.put("SCH-I959", "Galaxy S4");
+        humanReadableNames.put("SCH-J021", "Galaxy S3");
+        humanReadableNames.put("SCH-R530C", "Samsung Galaxy S3");
+        humanReadableNames.put("SCH-R530M", "Samsung Galaxy S III");
+        humanReadableNames.put("SCH-R530U", "Samsung Galaxy S III");
+        humanReadableNames.put("SCH-R720", "Samsung Admire");
+        humanReadableNames.put("SCH-R760", "Galaxy S2");
+        humanReadableNames.put("SCH-R970", "Samsung Galaxy S4");
+        humanReadableNames.put("SCH-S720C", "Samsung Proclaim");
+        humanReadableNames.put("SCH-S738C", "Samsung Galaxy Centura");
+        humanReadableNames.put("SCH-S968C", "Samsung Galaxy S III");
+        humanReadableNames.put("SCL21", "Galaxy S3");
+        humanReadableNames.put("SGH-I257M", "Samsung Galaxy S4 Mini");
+        humanReadableNames.put("SGH-I317M", "Samsung Galaxy Note II");
+        humanReadableNames.put("SGH-I337M", "Samsung Galaxy S4");
+        humanReadableNames.put("SGH-I727R", "Samsung Galaxy S II");
+        humanReadableNames.put("SGH-I747M", "Samsung Galaxy S III");
+        humanReadableNames.put("SGH-I757M", "Galaxy S2");
+        humanReadableNames.put("SGH-I777M", "Galaxy S2");
+        humanReadableNames.put("SGH-M919", "Samsung Galaxy S4");
+        humanReadableNames.put("SGH-M919N", "Samsung Galaxy S4");
+        humanReadableNames.put("SGH-N035", "Galaxy S3");
+        humanReadableNames.put("SGH-N045", "Galaxy S4");
+        humanReadableNames.put("SGH-N064", "Galaxy S3");
+        humanReadableNames.put("SGH-T399", "Samsung Galaxy Light");
+        humanReadableNames.put("SGH-T399N", "Samsung Galaxy Light");
+        humanReadableNames.put("SGH-T599N", "Samsung Galaxy Exhibit");
+        humanReadableNames.put("SGH-T679", "Samsung Exhibit II");
+        humanReadableNames.put("SGH-T769", "Samsung Galaxy S Blaze");
+        humanReadableNames.put("SGH-T889", "Samsung Galaxy Note II");
+        humanReadableNames.put("SGH-T959", "Samsung Galaxy S Vibrant");
+        humanReadableNames.put("SGH-T959V", "Samsung Galaxy S 4G");
+        humanReadableNames.put("SGH-T989", "Samsung Galaxy S II");
+        humanReadableNames.put("SGH-T989D", "Samsung Galaxy S II");
+        humanReadableNames.put("SGH-T999", "Samsung Galaxy S III");
+        humanReadableNames.put("SGH-T999L", "Samsung Galaxy S III");
+        humanReadableNames.put("SGH-T999V", "Samsung Galaxy S III");
+        humanReadableNames.put("SGP312", "Sony Xperia Tablet Z");
+        humanReadableNames.put("SHV-E210K", "Samsung Galaxy S3");
+        humanReadableNames.put("SHV-E210S", "Samsung Galaxy S III");
+        humanReadableNames.put("SHV-E250K", "Samsung Galaxy Note 2");
+        humanReadableNames.put("SHV-E250S", "Samsung Galaxy Note II");
+        humanReadableNames.put("SHV-E300", "Galaxy S4");
+        humanReadableNames.put("SHW-M250", "Galaxy S2");
+        humanReadableNames.put("SM-G3815", "Samsung Galaxy Express II");
+        humanReadableNames.put("SM-G386T", "Samsung Galaxy Avant");
+        humanReadableNames.put("SM-G386T1", "Samsung Galaxy Avant");
+        humanReadableNames.put("SM-G7102", "Samsung Galaxy Grand II");
+        humanReadableNames.put("SM-G800F", "Samsung Galaxy S5 Mini");
+        humanReadableNames.put("SM-G860P", "Samsung Galaxy S5 Sport");
+        humanReadableNames.put("SM-G900F", "Samsung Galaxy S5");
+        humanReadableNames.put("SM-G900H", "Samsung Galaxy S5");
+        humanReadableNames.put("SM-G900I", "Samsung Galaxy S5");
+        humanReadableNames.put("SM-G900P", "Samsung Galaxy S5");
+        humanReadableNames.put("SM-G900R4", "Galaxy S5");
+        humanReadableNames.put("SM-G900RZWAUSC", "Galaxy S5");
+        humanReadableNames.put("SM-G900T", "Samsung Galaxy S5");
+        humanReadableNames.put("SM-G900V", "Samsung Galaxy S5");
+        humanReadableNames.put("SM-G900W8", "Samsung Galaxy S5");
+        humanReadableNames.put("SM-G9200", "Galaxy S6");
+        humanReadableNames.put("SM-G920F", "Galaxy S6");
+        humanReadableNames.put("SM-G920I", "Galaxy S6");
+        humanReadableNames.put("SM-G920P", "Samsung Galaxy S6");
+        humanReadableNames.put("SM-G920R", "Galaxy S6");
+        humanReadableNames.put("SM-G920T", "Samsung Galaxy S6");
+        humanReadableNames.put("SM-G920V", "Samsung Galaxy S6");
+        humanReadableNames.put("SM-G920W8", "Galaxy S6");
+        humanReadableNames.put("SM-G9250", "Galaxy S6 Edge");
+        humanReadableNames.put("SM-G925A", "Galaxy S6 Edge");
+        humanReadableNames.put("SM-G925F", "Galaxy S6 Edge");
+        humanReadableNames.put("SM-G925P", "Galaxy S6 Edge");
+        humanReadableNames.put("SM-G925R", "Galaxy S6 Edge");
+        humanReadableNames.put("SM-G925T", "Galaxy S6 Edge");
+        humanReadableNames.put("SM-G925V", "Galaxy S6 Edge");
+        humanReadableNames.put("SM-G925W8", "Galaxy S6 Edge");
+        humanReadableNames.put("SM-N7505", "Samsung Galaxy Note 3 Neo");
+        humanReadableNames.put("SM-N900", "Samsung Galaxy Note 3");
+        humanReadableNames.put("SM-N9005", "Samsung Galaxy Note 3");
+        humanReadableNames.put("SM-N9006", "Samsung Galaxy Note 3");
+        humanReadableNames.put("SM-N900P", "Samsung Galaxy Note 3");
+        humanReadableNames.put("SM-N900T", "Samsung Galaxy Note 3");
+        humanReadableNames.put("SM-N900V", "Samsung Galaxy Note 3");
+        humanReadableNames.put("SM-N900W8", "Samsung Galaxy Note 3");
+        humanReadableNames.put("SM-N910C", "Samsung Galaxy Note 4");
+        humanReadableNames.put("SM-N910F", "Samsung Galaxy Note 4");
+        humanReadableNames.put("SM-N910G", "Samsung Galaxy Note 4");
+        humanReadableNames.put("SM-N910P", "Samsung Galaxy Note 4");
+        humanReadableNames.put("SM-N910T", "Samsung Galaxy Note 4");
+        humanReadableNames.put("SM-N910V", "Samsung Galaxy Note 4");
+        humanReadableNames.put("SM-N910W8", "Samsung Galaxy Note 4");
+        humanReadableNames.put("SM-P600", "Samsung Galaxy Note 10.1");
+        humanReadableNames.put("SM-T210R", "Samsung Galaxy Tab 3 7.0");
+        humanReadableNames.put("SM-T217S", "Samsung Galaxy Tab 3 7.0");
+        humanReadableNames.put("SM-T230NU", "Samsung Galaxy Tab 4");
+        humanReadableNames.put("SM-T310", "Samsung Galaxy Tab 3 8.0");
+        humanReadableNames.put("SM-T530NU", "Samsung Galaxy Tab 4 10.1");
+        humanReadableNames.put("SM-T800", "Samsung Galaxy Tab S 10.5");
+        humanReadableNames.put("SPH-D600", "Samsung Conquer 4G");
+        humanReadableNames.put("SPH-D700", "Samsung Epic 4G");
+        humanReadableNames.put("SPH-D710", "Samsung Epic");
+        humanReadableNames.put("SPH-D710BST", "Samsung Galaxy S II");
+        humanReadableNames.put("SPH-D710VMUB", "Samsung Galaxy S II");
+        humanReadableNames.put("SPH-L300", "Samsung Galaxy Victory");
+        humanReadableNames.put("SPH-L520", "Samsung Galaxy S4 Mini");
+        humanReadableNames.put("SPH-L710", "Samsung Galaxy S III");
+        humanReadableNames.put("SPH-L710T", "Samsung Galaxy S III");
+        humanReadableNames.put("SPH-L720", "Samsung Galaxy S4");
+        humanReadableNames.put("SPH-L720T", "Samsung Galaxy S4");
+        humanReadableNames.put("SPH-L900", "Samsung Galaxy Note II");
+        humanReadableNames.put("SPH-M820-BST", "Samsung Galaxy Prevail");
+        humanReadableNames.put("SPH-M830", "Samsung Galaxy Rush");
+        humanReadableNames.put("SPH-M840", "Samsung Galaxy Prevail 2");
+        humanReadableNames.put("SPH-M930BST", "Samsung Transform Ultra");
+        humanReadableNames.put("ST21i", "Sony Xperia Tipo");
+        humanReadableNames.put("ST25i", "Sony Xperia U");
+        humanReadableNames.put("ST26i", "Sony Xperia J");
+        humanReadableNames.put("Transformer_Prime_TF201", "Asus Transformer Prime");
+        humanReadableNames.put("Transformer_TF101", "Asus Transformer");
+        humanReadableNames.put("VM670", "LG Optimus V");
+        humanReadableNames.put("VS840_4G", "LG Lucid 4G");
+        humanReadableNames.put("VS870_4G", "LG Lucid 2");
+        humanReadableNames.put("VS910_4G", "LG Revolution 4G");
+        humanReadableNames.put("VS920_4G", "LG Spectrum 4G");
+        humanReadableNames.put("VS930_4G", "LG Spectrum 2");
+        humanReadableNames.put("VS980_4G", "LG G2");
+        humanReadableNames.put("VS985_4G", "LG G3 4G");
+        humanReadableNames.put("XT1022", "Motorola Moto E");
+        humanReadableNames.put("XT1028", "Motorola Moto G");
+        humanReadableNames.put("XT1030", "Motorola Droid Mini");
+        humanReadableNames.put("XT1031", "Motorola Moto G");
+        humanReadableNames.put("XT1032", "Motorola Moto G");
+        humanReadableNames.put("XT1033", "Motorola Moto G");
+        humanReadableNames.put("XT1034", "Motorola Moto G");
+        humanReadableNames.put("XT1039", "Motorola Moto G");
+        humanReadableNames.put("XT1045", "Motorola Moto G");
+        humanReadableNames.put("XT1049", "Motorola Moto X");
+        humanReadableNames.put("XT1053", "Motorola Moto X");
+        humanReadableNames.put("XT1056", "Motorola Moto X");
+        humanReadableNames.put("XT1058", "Motorola Moto X");
+        humanReadableNames.put("XT1060", "Motorola Moto X");
+        humanReadableNames.put("XT1068", "Motorola Moto G");
+        humanReadableNames.put("XT1080", "Motorola Droid Ultra");
+        humanReadableNames.put("XT1095", "Motorola Moto X");
+        humanReadableNames.put("XT1096", "Motorola Moto X");
+        humanReadableNames.put("XT1097", "Motorola Moto X");
+        humanReadableNames.put("XT1254", "Motorola Droid Turbo");
+        humanReadableNames.put("XT897", "Motorola Photo Q");
+        humanReadableNames.put("XT907", "Motorola Droid Razr M");
+        humanReadableNames.put("Xoom", "Motorola Xoom");
+        humanReadableNames.put("Z970", "ZTE ZMax");
+        humanReadableNames.put("bq_Aquaris_5", "bq Aquaris 5");
+        humanReadableNames.put("bq_Aquaris_5_HD", "bq Aquaris 5 HD");
+        humanReadableNames.put("google_sdk", "Android Emulator");
+        humanReadableNames.put("myTouch_4G_Slide", "HTC myTouch 4G Slide");
 
     }
 
@@ -477,16 +478,15 @@ public class DeviceHelper {
     public static boolean isTablet() {
         Configuration config = Resources.getSystem().getConfiguration();
         //This assumes that the values for the screen sizes are consecutive, so XXLARGE > XLARGE > LARGE
-        boolean isLarge = ((config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE);
-        return isLarge;
+        return ((config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE);
     }
 
     //It returns getAndroidDeviceName() if no user-defined name has been set with setDeviceName().
-    public static String getDeviceName(Context context){
+    public static String getDeviceName(Context context) {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
         // Could use prefrences.contains but would need to check for empty String anyway.
         String deviceName = preferences.getString(KEY_DEVICE_NAME_PREFERENCE, "");
-        if (deviceName.isEmpty()){
+        if (deviceName.isEmpty()) {
             deviceName = DeviceHelper.getAndroidDeviceName();
             Log.i("MainSettingsActivity", "New device name: " + deviceName);
             preferences.edit().putString(KEY_DEVICE_NAME_PREFERENCE, deviceName).apply();
@@ -494,7 +494,7 @@ public class DeviceHelper {
         return deviceName;
     }
 
-    public static void setDeviceName(Context context, String name){
+    public static void setDeviceName(Context context, String name) {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
         preferences.edit().putString(KEY_DEVICE_NAME_PREFERENCE, name).apply();
     }

src/org/kde/kdeconnect/Helpers/FilesHelper.java

@@ -34,8 +34,9 @@ public class FilesHelper {
 
     public static String getFileNameWithoutExt(String filename) {
         int dot = filename.lastIndexOf(".");
-        return (dot < 0)? filename : filename.substring(0, dot);
+        return (dot < 0) ? filename : filename.substring(0, dot);
     }
+
     public static String getMimeTypeFromFile(String file) {
         String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(getFileExt(file));
         if (mime == null) mime = "*/*";
@@ -44,12 +45,12 @@ public class FilesHelper {
 
     public static String findNonExistingNameForNewFile(String path, String filename) {
         int dot = filename.lastIndexOf(".");
-        String name = (dot < 0)? filename : filename.substring(0, dot);
-        String ext = (dot < 0)? "" : filename.substring(filename.lastIndexOf("."));
+        String name = (dot < 0) ? filename : filename.substring(0, dot);
+        String ext = (dot < 0) ? "" : filename.substring(filename.lastIndexOf("."));
 
         int num = 1;
-        while (new File(path+"/"+filename).exists()) {
-            filename = name+" ("+num+")"+ext;
+        while (new File(path + "/" + filename).exists()) {
+            filename = name + " (" + num + ")" + ext;
             num++;
         }
 
@@ -57,6 +58,7 @@ public class FilesHelper {
     }
 
     //Following code from http://activemq.apache.org/maven/5.7.0/kahadb/apidocs/src-html/org/apache/kahadb/util/IOHelper.html
+
     /**
      * Converts any string into a string that is safe to use as a file name.
      * The result will only include ascii characters and numbers, and the "-","_", and "." characters.
@@ -70,7 +72,7 @@ public class FilesHelper {
             valid = valid || (c >= 'A' && c <= 'Z');
             valid = valid || (c >= '0' && c <= '9');
             valid = valid || (c == '_') || (c == '-') || (c == '.');
-            valid = valid || (dirSeparators && ( (c == '/') || (c == '\\')));
+            valid = valid || (dirSeparators && ((c == '/') || (c == '\\')));
 
             if (valid) {
                 rc.append(c);
@@ -78,13 +80,15 @@ public class FilesHelper {
         }
         String result = rc.toString();
         if (result.length() > maxFileLength) {
-            result = result.substring(result.length()-maxFileLength,result.length());
+            result = result.substring(result.length() - maxFileLength, result.length());
         }
         return result;
     }
+
     public static String toFileSystemSafeName(String name, boolean dirSeparators) {
         return toFileSystemSafeName(name, dirSeparators, 255);
     }
+
     public static String toFileSystemSafeName(String name) {
         return toFileSystemSafeName(name, true, 255);
     }
@@ -94,6 +98,6 @@ public class FilesHelper {
     }
 
     public static void LogOpenFileCount() {
-        Log.e("KDE/FileCount",""+GetOpenFileCount());
+        Log.e("KDE/FileCount", "" + GetOpenFileCount());
     }
 }

src/org/kde/kdeconnect/Helpers/ImagesHelper.java

@@ -27,9 +27,9 @@ import android.graphics.drawable.Drawable;
 
 public class ImagesHelper {
 
-    public static Bitmap drawableToBitmap (Drawable drawable) {
+    public static Bitmap drawableToBitmap(Drawable drawable) {
         if (drawable instanceof BitmapDrawable) {
-            return ((BitmapDrawable)drawable).getBitmap();
+            return ((BitmapDrawable) drawable).getBitmap();
         }
 
         Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);

src/org/kde/kdeconnect/Helpers/NetworkHelper.java

@@ -32,7 +32,8 @@ public class NetworkHelper {
                     continue;
                 }
                 //Log.e(info.getTypeName(),""+info.isAvailable());
-                if (info.isAvailable()) return false; //We are connected to at least one non-mobile network
+                if (info.isAvailable())
+                    return false; //We are connected to at least one non-mobile network
             }
             if (mobile) { //We suspect we are on a mobile net
                 try {
@@ -48,7 +49,7 @@ public class NetworkHelper {
                     e.printStackTrace();
                 }
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             Log.d("isOnMobileNetwork", "Something went wrong, but this is non-critical.");
         }

src/org/kde/kdeconnect/Helpers/NotificationHelper.java

@@ -8,7 +8,7 @@ public class NotificationHelper {
     public static void notifyCompat(NotificationManager notificationManager, int notificationId, Notification notification) {
         try {
             notificationManager.notify(notificationId, notification);
-        } catch(Exception e) {
+        } catch (Exception e) {
             //4.1 will throw an exception about not having the VIBRATE permission, ignore it.
             //https://android.googlesource.com/platform/frameworks/base/+/android-4.2.1_r1.2%5E%5E!/
         }
@@ -17,7 +17,7 @@ public class NotificationHelper {
     public static void notifyCompat(NotificationManager notificationManager, String tag, int notificationId, Notification notification) {
         try {
             notificationManager.notify(tag, notificationId, notification);
-        } catch(Exception e) {
+        } catch (Exception e) {
             //4.1 will throw an exception about not having the VIBRATE permission, ignore it.
             //https://android.googlesource.com/platform/frameworks/base/+/android-4.2.1_r1.2%5E%5E!/
         }

src/org/kde/kdeconnect/Helpers/RandomHelper.java

@@ -6,13 +6,13 @@ import java.security.SecureRandom;
 public class RandomHelper {
     public static SecureRandom secureRandom = new SecureRandom();
 
-    private static final char[] symbols = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ"+
-                                           "abcdefghijklmnopqrstuvwxyz"+
-                                           "1234567890").toCharArray();
+    private static final char[] symbols = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
+            "abcdefghijklmnopqrstuvwxyz" +
+            "1234567890").toCharArray();
 
 
     public static String randomString(int length) {
-        char[] buffer= new char[length];
+        char[] buffer = new char[length];
         for (int idx = 0; idx < length; ++idx) {
             buffer[idx] = symbols[secureRandom.nextInt(symbols.length)];
         }

src/org/kde/kdeconnect/Helpers/SecurityHelpers/RsaHelper.java

@@ -28,7 +28,7 @@ import android.util.Log;
 
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 
 import java.nio.charset.Charset;
 import java.security.GeneralSecurityException;
@@ -54,7 +54,7 @@ public class RsaHelper {
                 KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
                 keyGen.initialize(2048);
                 keyPair = keyGen.genKeyPair();
-            } catch(Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
                 Log.e("KDE/initializeRsaKeys", "Exception");
                 return;
@@ -64,50 +64,48 @@ public class RsaHelper {
             byte[] privateKey = keyPair.getPrivate().getEncoded();
 
             SharedPreferences.Editor edit = settings.edit();
-            edit.putString("publicKey", Base64.encodeToString(publicKey, 0).trim()+"\n");
-            edit.putString("privateKey",Base64.encodeToString(privateKey, 0));
+            edit.putString("publicKey", Base64.encodeToString(publicKey, 0).trim() + "\n");
+            edit.putString("privateKey", Base64.encodeToString(privateKey, 0));
             edit.apply();
 
         }
 
     }
 
-    public static PublicKey getPublicKey (Context context) throws Exception{
+    public static PublicKey getPublicKey(Context context) throws Exception {
         try {
             SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
             byte[] publicKeyBytes = Base64.decode(settings.getString("publicKey", ""), 0);
-            PublicKey publicKey = KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
-            return publicKey;
-        }catch (Exception e){
-            throw e;
-        }
-    }
+            return KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
 
-    public static PublicKey getPublicKey(Context context, String deviceId) throws Exception{
-        try {
-            SharedPreferences settings = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
-            byte[] publicKeyBytes = Base64.decode(settings.getString("publicKey", ""), 0);
-            PublicKey publicKey = KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
-            return publicKey;
         } catch (Exception e) {
             throw e;
         }
     }
 
-    public static PrivateKey getPrivateKey(Context context) throws Exception{
+    public static PublicKey getPublicKey(Context context, String deviceId) throws Exception {
+        try {
+            SharedPreferences settings = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
+            byte[] publicKeyBytes = Base64.decode(settings.getString("publicKey", ""), 0);
+            return KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
+        } catch (Exception e) {
+            throw e;
+        }
+    }
+
+    public static PrivateKey getPrivateKey(Context context) throws Exception {
 
         try {
             SharedPreferences globalSettings = PreferenceManager.getDefaultSharedPreferences(context);
             byte[] privateKeyBytes = Base64.decode(globalSettings.getString("privateKey", ""), 0);
-            PrivateKey privateKey = KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(privateKeyBytes));
-            return privateKey;
+            return KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(privateKeyBytes));
         } catch (Exception e) {
             throw e;
         }
 
     }
 
-    public static NetworkPackage encrypt(NetworkPackage np, PublicKey publicKey) throws GeneralSecurityException, JSONException {
+    public static NetworkPacket encrypt(NetworkPacket np, PublicKey publicKey) throws GeneralSecurityException, JSONException {
 
         String serialized = np.serialize();
 
@@ -129,16 +127,16 @@ public class RsaHelper {
             chunks.put(Base64.encodeToString(encryptedChunk, Base64.NO_WRAP));
         }
 
-        //Log.i("NetworkPackage", "Encrypted " + chunks.length()+" chunks");
+        //Log.i("NetworkPacket", "Encrypted " + chunks.length()+" chunks");
 
-        NetworkPackage encrypted = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_ENCRYPTED);
+        NetworkPacket encrypted = new NetworkPacket(NetworkPacket.PACKET_TYPE_ENCRYPTED);
         encrypted.set("data", chunks);
         encrypted.setPayload(np.getPayload(), np.getPayloadSize());
         return encrypted;
 
     }
 
-    public static NetworkPackage decrypt(NetworkPackage np, PrivateKey privateKey)  throws GeneralSecurityException, JSONException {
+    public static NetworkPacket decrypt(NetworkPacket np, PrivateKey privateKey) throws GeneralSecurityException, JSONException {
 
         JSONArray chunks = np.getJSONArray("data");
 
@@ -152,7 +150,7 @@ public class RsaHelper {
             decryptedJson += decryptedChunk;
         }
 
-        NetworkPackage decrypted = NetworkPackage.unserialize(decryptedJson);
+        NetworkPacket decrypted = NetworkPacket.unserialize(decryptedJson);
         decrypted.setPayload(np.getPayload(), np.getPayloadSize());
         return decrypted;
     }

src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java

@@ -64,7 +64,7 @@ import javax.net.ssl.X509TrustManager;
 
 public class SslHelper {
 
-    public enum SslMode{
+    public enum SslMode {
         Client,
         Server
     }
@@ -73,14 +73,14 @@ public class SslHelper {
 
     public static final BouncyCastleProvider BC = new BouncyCastleProvider();
 
-    public static void initialiseCertificate(Context context){
+    public static void initialiseCertificate(Context context) {
         PrivateKey privateKey;
         PublicKey publicKey;
 
         try {
             privateKey = RsaHelper.getPrivateKey(context);
             publicKey = RsaHelper.getPublicKey(context);
-        }catch (Exception e){
+        } catch (Exception e) {
             Log.e("SslHelper", "Error getting keys, can't create certificate");
             return;
         }
@@ -112,10 +112,9 @@ public class SslHelper {
                 edit.putString("certificate", Base64.encodeToString(certificate.getEncoded(), 0));
                 edit.apply();
 
-            } catch(Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
                 Log.e("KDE/initialiseCert", "Exception");
-                return;
             }
 
         } else {
@@ -145,7 +144,7 @@ public class SslHelper {
 
             // Get remote device certificate if trusted
             X509Certificate remoteDeviceCertificate = null;
-            if (isDeviceTrusted){
+            if (isDeviceTrusted) {
                 SharedPreferences devicePreferences = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
                 byte[] certificateBytes = Base64.decode(devicePreferences.getString("certificate", ""), 0);
                 X509CertificateHolder certificateHolder = new X509CertificateHolder(certificateBytes);
@@ -157,7 +156,7 @@ public class SslHelper {
             keyStore.load(null, null);
             keyStore.setKeyEntry("key", privateKey, "".toCharArray(), new Certificate[]{certificate});
             // Set certificate if device trusted
-            if (remoteDeviceCertificate != null){
+            if (remoteDeviceCertificate != null) {
                 keyStore.setCertificateEntry(deviceId, remoteDeviceCertificate);
             }
 
@@ -171,7 +170,7 @@ public class SslHelper {
             trustManagerFactory.init(keyStore);
 
             // Setup custom trust manager if device not trusted
-            TrustManager[] trustAllCerts = new TrustManager[] {new X509TrustManager() {
+            TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
                 public java.security.cert.X509Certificate[] getAcceptedIssuers() {
                     return new X509Certificate[0];
                 }
@@ -190,7 +189,7 @@ public class SslHelper {
             SSLContext tlsContext = SSLContext.getInstance("TLSv1"); //Newer TLS versions are only supported on API 16+
             if (isDeviceTrusted) {
                 tlsContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), RandomHelper.secureRandom);
-            }else {
+            } else {
                 tlsContext.init(keyManagerFactory.getKeyManagers(), trustAllCerts, RandomHelper.secureRandom);
             }
             return tlsContext;
@@ -204,7 +203,7 @@ public class SslHelper {
 
     public static void configureSslSocket(SSLSocket socket, boolean isDeviceTrusted, boolean isClient) {
 
-        socket.setEnabledProtocols(new String[]{ "TLSv1" }); //Newer TLS versions are only supported on API 16+
+        socket.setEnabledProtocols(new String[]{"TLSv1"}); //Newer TLS versions are only supported on API 16+
 
         // These cipher suites are most common of them that are accepted by kde and android during handshake
         ArrayList<String> supportedCiphers = new ArrayList<>();
@@ -224,9 +223,9 @@ public class SslHelper {
         }
         socket.setEnabledCipherSuites(supportedCiphers.toArray(new String[supportedCiphers.size()]));
 
-        if (isClient){
+        if (isClient) {
             socket.setUseClientMode(true);
-        }else{
+        } else {
             socket.setUseClientMode(false);
             if (isDeviceTrusted) {
                 socket.setNeedClientAuth(true);
@@ -239,7 +238,7 @@ public class SslHelper {
 
     public static SSLSocket convertToSslSocket(Context context, Socket socket, String deviceId, boolean isDeviceTrusted, boolean clientMode) throws IOException {
         SSLSocketFactory sslsocketFactory = SslHelper.getSslContext(context, deviceId, isDeviceTrusted).getSocketFactory();
-        SSLSocket sslsocket = (SSLSocket)sslsocketFactory.createSocket(socket, socket.getInetAddress().getHostAddress(), socket.getPort(), true);
+        SSLSocket sslsocket = (SSLSocket) sslsocketFactory.createSocket(socket, socket.getInetAddress().getHostAddress(), socket.getPort(), true);
         SslHelper.configureSslSocket(sslsocket, isDeviceTrusted, clientMode);
         return sslsocket;
     }
@@ -249,7 +248,7 @@ public class SslHelper {
             byte[] hash = MessageDigest.getInstance("SHA-1").digest(certificate.getEncoded());
             Formatter formatter = new Formatter();
             int i;
-            for (i = 0; i < hash.length-1; i++) {
+            for (i = 0; i < hash.length - 1; i++) {
                 formatter.format("%02x:", hash[i]);
             }
             formatter.format("%02x", hash[i]);

src/org/kde/kdeconnect/Helpers/StorageHelper.java

@@ -81,11 +81,11 @@ public class StorageHelper {
         if (storage.exists() && storage.isDirectory()) {
             String mounts = null;
             try {
-                Scanner scanner = new Scanner( new File("/proc/mounts") );
+                Scanner scanner = new Scanner(new File("/proc/mounts"));
                 mounts = scanner.useDelimiter("\\A").next();
                 scanner.close();
                 //Log.e("Mounts",mounts);
-            } catch(Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
 
@@ -98,7 +98,7 @@ public class StorageHelper {
                     try {
                         //Log.e(dir.getAbsolutePath(), dir.getCanonicalPath());
                         path = dir.getCanonicalPath();
-                    } catch(Exception e){
+                    } catch (Exception e) {
                         path = path2;
                     }
                     if (!path.startsWith("/storage/emulated") || dirs.length == 1) {
@@ -120,7 +120,7 @@ public class StorageHelper {
             try {
                 buf_reader = new BufferedReader(new FileReader("/proc/mounts"));
                 String entry;
-                while((entry = buf_reader.readLine()) != null) {
+                while ((entry = buf_reader.readLine()) != null) {
                     //Log.e("getStorageList", entry);
                     if (entry.contains("vfat") || entry.contains("exfat") || entry.contains("ntfs") || entry.contains("/mnt")) {
                         if (entry.contains("/storage/sdcard")) entries.add(0, entry);

src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java

@@ -27,8 +27,7 @@ import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 import android.util.Log;
 
-public class KdeConnectBroadcastReceiver extends BroadcastReceiver
-{
+public class KdeConnectBroadcastReceiver extends BroadcastReceiver {
 
 
     public void onReceive(Context context, Intent intent) {
@@ -37,7 +36,7 @@ public class KdeConnectBroadcastReceiver extends BroadcastReceiver
 
         String action = intent.getAction();
 
-        switch(action) {
+        switch (action) {
             case Intent.ACTION_PACKAGE_REPLACED:
                 Log.i("KdeConnect", "UpdateReceiver");
                 if (!intent.getData().getSchemeSpecificPart().equals(context.getPackageName())) {
@@ -81,12 +80,11 @@ public class KdeConnectBroadcastReceiver extends BroadcastReceiver
                 });
                 break;
             default:
-                Log.i("BroadcastReceiver", "Ignoring broadcast event: "+intent.getAction());
+                Log.i("BroadcastReceiver", "Ignoring broadcast event: " + intent.getAction());
                 break;
         }
 
     }
 
 
-
 }

src/org/kde/kdeconnect/NetworkPacket.java

@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 package org.kde.kdeconnect;
@@ -36,18 +36,18 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-public class NetworkPackage {
+public class NetworkPacket {
 
     public final static int ProtocolVersion = 7;
 
-    public final static String PACKAGE_TYPE_IDENTITY = "kdeconnect.identity";
-    public final static String PACKAGE_TYPE_PAIR = "kdeconnect.pair";
-    public final static String PACKAGE_TYPE_ENCRYPTED = "kdeconnect.encrypted";
+    public final static String PACKET_TYPE_IDENTITY = "kdeconnect.identity";
+    public final static String PACKET_TYPE_PAIR = "kdeconnect.pair";
+    public final static String PACKET_TYPE_ENCRYPTED = "kdeconnect.encrypted";
 
-    public static Set<String> protocolPackageTypes = new HashSet<String>() {{
-        add(PACKAGE_TYPE_IDENTITY);
-        add(PACKAGE_TYPE_PAIR);
-        add(PACKAGE_TYPE_ENCRYPTED);
+    public static Set<String> protocolPacketTypes = new HashSet<String>() {{
+        add(PACKET_TYPE_IDENTITY);
+        add(PACKET_TYPE_PAIR);
+        add(PACKET_TYPE_ENCRYPTED);
     }};
 
     private long mId;
@@ -57,11 +57,11 @@ public class NetworkPackage {
     private JSONObject mPayloadTransferInfo;
     private long mPayloadSize;
 
-    private NetworkPackage() {
+    private NetworkPacket() {
 
     }
 
-    public NetworkPackage(String type) {
+    public NetworkPacket(String type) {
         mId = System.currentTimeMillis();
         mType = type;
         mBody = new JSONObject();
@@ -79,22 +79,85 @@ public class NetworkPackage {
     }
 
     //Most commons getters and setters defined for convenience
-    public String getString(String key) { return mBody.optString(key,""); }
-    public String getString(String key, String defaultValue) { return mBody.optString(key,defaultValue); }
-    public void set(String key, String value) { if (value == null) return; try { mBody.put(key,value); } catch(Exception e) { } }
-    public int getInt(String key) { return mBody.optInt(key,-1); }
-    public int getInt(String key, int defaultValue) { return mBody.optInt(key,defaultValue); }
-    public long getLong(String key) { return mBody.optLong(key,-1); }
-    public long getLong(String key,long defaultValue) { return mBody.optLong(key,defaultValue); }
-    public void set(String key, int value) { try { mBody.put(key,value); } catch(Exception e) { } }
-    public boolean getBoolean(String key) { return mBody.optBoolean(key,false); }
-    public boolean getBoolean(String key, boolean defaultValue) { return mBody.optBoolean(key,defaultValue); }
-    public void set(String key, boolean value) { try { mBody.put(key,value); } catch(Exception e) { } }
-    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 String getString(String key) {
+        return mBody.optString(key, "");
+    }
+
+    public String getString(String key, String defaultValue) {
+        return mBody.optString(key, defaultValue);
+    }
+
+    public void set(String key, String value) {
+        if (value == null) return;
+        try {
+            mBody.put(key, value);
+        } catch (Exception e) {
+        }
+    }
+
+    public int getInt(String key) {
+        return mBody.optInt(key, -1);
+    }
+
+    public int getInt(String key, int defaultValue) {
+        return mBody.optInt(key, defaultValue);
+    }
+
+    public long getLong(String key) {
+        return mBody.optLong(key, -1);
+    }
+
+    public long getLong(String key, long defaultValue) {
+        return mBody.optLong(key, defaultValue);
+    }
+
+    public void set(String key, int value) {
+        try {
+            mBody.put(key, value);
+        } catch (Exception e) {
+        }
+    }
+
+    public boolean getBoolean(String key) {
+        return mBody.optBoolean(key, false);
+    }
+
+    public boolean getBoolean(String key, boolean defaultValue) {
+        return mBody.optBoolean(key, defaultValue);
+    }
+
+    public void set(String key, boolean value) {
+        try {
+            mBody.put(key, value);
+        } catch (Exception e) {
+        }
+    }
+
+    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 Set<String> getStringSet(String key) {
         JSONArray jsonArray = mBody.optJSONArray(key);
@@ -105,22 +168,26 @@ public class NetworkPackage {
             try {
                 String str = jsonArray.getString(i);
                 list.add(str);
-            } catch(Exception e) { }
+            } catch (Exception e) {
+            }
         }
         return list;
     }
+
     public Set<String> getStringSet(String key, Set<String> defaultValue) {
         if (mBody.has(key)) return getStringSet(key);
         else return defaultValue;
     }
+
     public void set(String key, Set<String> value) {
         try {
             JSONArray jsonArray = new JSONArray();
-            for(String str : value) {
+            for (String str : value) {
                 jsonArray.put(str);
             }
-            mBody.put(key,jsonArray);
-        } catch(Exception e) { }
+            mBody.put(key, jsonArray);
+        } catch (Exception e) {
+        }
     }
 
     public List<String> getStringList(String key) {
@@ -132,24 +199,31 @@ public class NetworkPackage {
             try {
                 String str = jsonArray.getString(i);
                 list.add(str);
-            } catch(Exception e) { }
+            } catch (Exception e) {
+            }
         }
         return list;
     }
+
     public List<String> getStringList(String key, List<String> defaultValue) {
         if (mBody.has(key)) return getStringList(key);
         else return defaultValue;
     }
+
     public void set(String key, List<String> value) {
         try {
             JSONArray jsonArray = new JSONArray();
-            for(String str : value) {
+            for (String str : value) {
                 jsonArray.put(str);
             }
-            mBody.put(key,jsonArray);
-        } catch(Exception e) { }
+            mBody.put(key, jsonArray);
+        } catch (Exception e) {
+        }
+    }
+
+    public boolean has(String key) {
+        return mBody.has(key);
     }
-    public boolean has(String key) { return mBody.has(key); }
 
     public String serialize() throws JSONException {
         JSONObject jo = new JSONObject();
@@ -161,13 +235,12 @@ public class NetworkPackage {
             jo.put("payloadTransferInfo", mPayloadTransferInfo);
         }
         //QJSon does not escape slashes, but Java JSONObject does. Converting to QJson format.
-        String json = jo.toString().replace("\\/","/")+"\n";
-        return json;
+        return jo.toString().replace("\\/", "/") + "\n";
     }
 
-    static public NetworkPackage unserialize(String s) throws JSONException {
+    static public NetworkPacket unserialize(String s) throws JSONException {
 
-        NetworkPackage np = new NetworkPackage();
+        NetworkPacket np = new NetworkPacket();
         JSONObject jo = new JSONObject(s);
         np.mId = jo.getLong("id");
         np.mType = jo.getString("type");
@@ -182,21 +255,21 @@ public class NetworkPackage {
         return np;
     }
 
-    static public NetworkPackage createIdentityPackage(Context context) {
+    static public NetworkPacket createIdentityPacket(Context context) {
 
-        NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_IDENTITY);
+        NetworkPacket np = new NetworkPacket(NetworkPacket.PACKET_TYPE_IDENTITY);
 
         String deviceId = DeviceHelper.getDeviceId(context);
         try {
             np.mBody.put("deviceId", deviceId);
             np.mBody.put("deviceName", DeviceHelper.getDeviceName(context));
-            np.mBody.put("protocolVersion", NetworkPackage.ProtocolVersion);
-            np.mBody.put("deviceType", DeviceHelper.isTablet()? "tablet" : "phone");
+            np.mBody.put("protocolVersion", NetworkPacket.ProtocolVersion);
+            np.mBody.put("deviceType", DeviceHelper.isTablet() ? "tablet" : "phone");
             np.mBody.put("incomingCapabilities", new JSONArray(PluginFactory.getIncomingCapabilities(context)));
             np.mBody.put("outgoingCapabilities", new JSONArray(PluginFactory.getOutgoingCapabilities(context)));
         } catch (Exception e) {
             e.printStackTrace();
-            Log.e("NetworkPacakge","Exception on createIdentityPackage");
+            Log.e("NetworkPacakge", "Exception on createIdentityPacket");
         }
 
         return np;

src/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java

@@ -26,21 +26,21 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.BatteryManager;
 
-import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.NetworkPacket;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect_tp.R;
 
 
 public class BatteryPlugin extends Plugin {
 
-    public final static String PACKAGE_TYPE_BATTERY = "kdeconnect.battery";
-    public final static String PACKAGE_TYPE_BATTERY_REQUEST = "kdeconnect.battery.request";
+    public final static String PACKET_TYPE_BATTERY = "kdeconnect.battery";
+    public final static String PACKET_TYPE_BATTERY_REQUEST = "kdeconnect.battery.request";
 
     // keep these fields in sync with kdeconnect-kded:BatteryPlugin.h:ThresholdBatteryEvent
-    private static final int THRESHOLD_EVENT_NONE= 0;
+    private static final int THRESHOLD_EVENT_NONE = 0;
     private static final int THRESHOLD_EVENT_BATTERY_LOW = 1;
 
-    private NetworkPackage batteryInfo = new NetworkPackage(PACKAGE_TYPE_BATTERY);
+    private NetworkPacket batteryInfo = new NetworkPacket(PACKET_TYPE_BATTERY);
 
     @Override
     public String getDisplayName() {
@@ -60,25 +60,24 @@ public class BatteryPlugin extends Plugin {
             int scale = batteryIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 1);
             int plugged = batteryIntent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
 
-            int currentCharge = (level == -1)? batteryInfo.getInt("currentCharge") : level*100 / scale;
-            boolean isCharging = (plugged == -1)? batteryInfo.getBoolean("isCharging") : (0 != plugged);
+            int currentCharge = (level == -1) ? batteryInfo.getInt("currentCharge") : level * 100 / scale;
+            boolean isCharging = (plugged == -1) ? batteryInfo.getBoolean("isCharging") : (0 != plugged);
             boolean lowBattery = Intent.ACTION_BATTERY_LOW.equals(batteryIntent.getAction());
-            int thresholdEvent = lowBattery? THRESHOLD_EVENT_BATTERY_LOW : THRESHOLD_EVENT_NONE;
+            int thresholdEvent = lowBattery ? THRESHOLD_EVENT_BATTERY_LOW : THRESHOLD_EVENT_NONE;
 
             if (isCharging == batteryInfo.getBoolean("isCharging")
-                && currentCharge == batteryInfo.getInt("currentCharge")
-                && thresholdEvent == batteryInfo.getInt("thresholdEvent")
-            ) {
+                    && currentCharge == batteryInfo.getInt("currentCharge")
+                    && thresholdEvent == batteryInfo.getInt("thresholdEvent")
+                    ) {
 
                 //Do not send again if nothing has changed
-                return;
 
             } else {
 
                 batteryInfo.set("currentCharge", currentCharge);
                 batteryInfo.set("isCharging", isCharging);
                 batteryInfo.set("thresholdEvent", thresholdEvent);
-                device.sendPackage(batteryInfo);
+                device.sendPacket(batteryInfo);
 
             }
 
@@ -101,25 +100,23 @@ public class BatteryPlugin extends Plugin {
     }
 
     @Override
-    public boolean onPackageReceived(NetworkPackage np) {
+    public boolean onPacketReceived(NetworkPacket np) {
 
         if (np.getBoolean("request")) {
-            device.sendPackage(batteryInfo);
+            device.sendPacket(batteryInfo);
         }
 
         return true;
     }
 
     @Override
-    public String[] getSupportedPackageTypes() {
-        String[] packetTypes = {PACKAGE_TYPE_BATTERY_REQUEST};
-        return packetTypes;
+    public String[] getSupportedPacketTypes() {
+        return new String[]{PACKET_TYPE_BATTERY_REQUEST};
     }
 
     @Override
-    public String[] getOutgoingPackageTypes() {
-        String[] packetTypes = {PACKAGE_TYPE_BATTERY};
-        return packetTypes;
+    public String[] getOutgoingPacketTypes() {
+        return new String[]{PACKET_TYPE_BATTERY};
     }
 
 }