Bumped version to release

Summary:
There are some minor problems with current implementation: if device configuration changes (screen orientation, etc.) while the "FindMyPhone" ringtone is playing, the activity gets recreated and starts to play a new ringtone again, but the first ringtone is not stopped.
Also if the user leaves the activity the ringtone continues to play, the user has no way to get back to the activity to stop it.

With these changes the ringtone starts playing when the activity becomes visible and stops when the activity is being hidden/destroyed. If the user leaves the activity (without destroying it) and then presses "Ring my phone" button again, the activity becomes visible again and starts to play the ringtone.

There are other ways to improve it that I did not touch: use a Service to play the ringtone (so not to depend on the activity's lifecycle) or handle configuration changes in activity (so it is not recreated on orientation changes).

Test Plan: Activate "Find My Phone" feature and try to turn phone or leave activity.

Reviewers: albertvaka

Reviewed By: albertvaka

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D4548

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="1500"
-    android:versionName="1.5">
+    android:versionCode="1600"
+    android:versionName="1.6">
 
     <uses-sdk android:minSdkVersion="9"
               android:targetSdkVersion="22" />
@@ -42,6 +42,17 @@
             android:enabled="true" >
         </service>
 
+<!--Commented here and in PluginFactory until we release a desktop version with this feature, so we don't get bad "feature not working" reviews-->
+<!--
+        <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" />
+        </service>
+-->
         <activity
             android:name="org.kde.kdeconnect.UserInterface.MaterialActivity"
             android:label="KDE Connect"
@@ -129,6 +140,7 @@
         <activity
             android:name="org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhoneActivity"
             android:label="@string/findmyphone_title"
+            android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
             android:launchMode="singleInstance">
         </activity>

build.gradle

@@ -10,11 +10,11 @@ buildscript {
 apply plugin: 'com.android.application'
 
 android {
-    buildToolsVersion '23.0.3'
-    compileSdkVersion 23
+    buildToolsVersion '25.0.2'
+    compileSdkVersion 25
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 22 //Bumping to 23 means we have to support the new permissions model
+        targetSdkVersion 22 //Bumping to >22 means we have to support the new permissions model
         //multiDexEnabled true
         //testInstrumentationRunner "com.android.test.runner.MultiDexTestRunner"
     }
@@ -71,9 +71,9 @@ dependencies {
         mavenCentral()
     }
 
-    compile 'com.android.support:support-v4:23.4.0'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
+    compile 'com.android.support:support-v4:25.1.1'
+    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:design:25.1.1'
 
     compile '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/values-ar/strings.xml

@@ -5,23 +5,13 @@
   <string name="pref_plugin_battery">تقرير البطّاريّة</string>
   <string name="pref_plugin_battery_desc">بلّغ عن حالة البطّاريّة دوريًّا</string>
   <string name="pref_plugin_sftp">اكشف نظام الملفّات</string>
-  <string name="pref_plugin_sftp_desc">تسمح بتصفّح نظام ملفّات هذا الهاتف عن بعد</string>
   <string name="pref_plugin_clipboard">مزامنة الحافظة</string>
   <string name="pref_plugin_clipboard_desc">شارك محتوى الحافظة</string>
-  <string name="pref_plugin_mousepad">الدّخل البعيد</string>
-  <string name="pref_plugin_mousepad_desc">استخدم الهاتف أو اللوحيّ كفأرة ولوحة مفاتيح</string>
-  <string name="pref_plugin_mpris">تحكّمات الوسائط المتعدّدة</string>
-  <string name="pref_plugin_mpris_desc">توفّر تحكّمًا بعيدًا لمشغّل الوسائط</string>
-  <string name="pref_plugin_runcommand">شغّل أمرًا</string>
-  <string name="pref_plugin_runcommand_desc">تحفّز أوامر عن بعد من الهاتف أو اللوحيّ</string>
+  <string name="pref_plugin_mousepad">الدَّخل البعيد</string>
   <string name="pref_plugin_ping">وخزة</string>
   <string name="pref_plugin_ping_desc">أرسل واستقبل وخزات</string>
   <string name="pref_plugin_notifications">مزامنة الإخطارات</string>
   <string name="pref_plugin_notifications_desc">انفذ إلى إخطاراتك من أجهزة أخرى</string>
-  <string name="pref_plugin_receive_notifications">استقبل الإخطارات</string>
-  <string name="pref_plugin_receive_notifications_desc">استقبل الإخطارات من الجهاز الآخر واعرضها على أندرويد</string>
-  <string name="pref_plugin_sharereceiver">شارك واستقبل</string>
-  <string name="pref_plugin_sharereceiver_desc">شارك الملفّات والعناوين بين الجهازين</string>
   <string name="plugin_not_available">هذه الميزة غير متوفّرة في إصدار أندرويد لديك</string>
   <string name="device_list_empty">لا أجهزة</string>
   <string name="ok">حسنًا</string>
@@ -29,33 +19,24 @@
   <string name="open_settings">افتح الإعدادات</string>
   <string name="no_permissions">عليك إعطاء التّطبيق صلاحيّات للنّفاذ إلى الإخطارات</string>
   <string name="send_ping">أرسل وخزة</string>
-  <string name="open_mpris_controls">تحكّمات الوسائط المتعدّدة</string>
-  <string name="open_mousepad">الدّخل البعيد</string>
-  <string name="mousepad_info">حرّك اصبعًا على الشّاشة لتحريك مؤشّر الفأرة. المس للنّقر واستخدم إصبعين أو ثلاث للزّرّين الأيمن والأوسط. انقر مطوّلًا للسّحب والإفلات.</string>
-  <string name="mousepad_double_tap_settings_title">اضبط إجراء اللمس بإصبعين</string>
-  <string name="mousepad_triple_tap_settings_title">اضبط إجراء اللمس بثلاث أصابع</string>
-  <string name="mousepad_sensitivity_settings_title">اضبط حساسيّة لوحة اللمس</string>
-  <string name="mousepad_scroll_direction_title">اعكس اتّجاه التّمرير</string>
   <string-array name="mousepad_tap_entries">
-    <item>النّقر باليمين</item>
-    <item>النّقر بالوسط</item>
-    <item>لا شيء</item>
+    <item/>
+    <item/>
+    <item>Nothing</item>
   </string-array>
   <string-array name="mousepad_sensitivity_entries">
-    <item>الأبطأ</item>
-    <item>الأقل بطئًا</item>
-    <item>الافتراضيّ</item>
-    <item>الأسرع قليلًا</item>
-    <item>الأسرع</item>
+    <item>Slowest</item>
+    <item>Above Slowest</item>
+    <item>Default</item>
+    <item>Above Default</item>
+    <item>Fastest</item>
   </string-array>
   <string name="category_connected_devices">الأجهزة المقترن بها</string>
   <string name="category_not_paired_devices">الأجهزة المتوفّرة</string>
   <string name="category_remembered_devices">الأجهزة المتذكَّرة</string>
   <string name="plugins_failed_to_load">فشل تحميل الملحقات (المس لمعلومات اكثر):</string>
-  <string name="device_menu_plugins">إعدادات الملحقة</string>
-  <string name="device_menu_unpair">ألغِ الاقتران</string>
+  <string name="device_menu_unpair">أزل الاقتران</string>
   <string name="device_not_reachable">الجهاز المقترن غير قابل الوصول</string>
-  <string name="pair_new_device">اقرن جهازًا جديدًا</string>
   <string name="unknown_device">جهاز مجهول</string>
   <string name="error_not_reachable">الجهاز غير قابل الوصول</string>
   <string name="error_already_requested">طُلب الاقتران بالفعل</string>
@@ -65,24 +46,14 @@
   <string name="error_canceled_by_user">ألغاه المستخدم</string>
   <string name="error_canceled_by_other_peer">ألغاه ندّ آخر</string>
   <string name="error_invalid_key">استُقبل مفتاح غير صالح</string>
-  <string name="encryption_info_title">معلومات التّعمية</string>
-  <string name="encryption_info_msg_no_ssl">لا يستخدم الجهاز الآخر إصدارة حديثة من «كدي المتّصل»، ستُستخدم طريقة التّعمية القديمة.</string>
-  <string name="my_device_fingerprint">بصمة SHA1 لشهادة جهازك هي:</string>
-  <string name="remote_device_fingerprint">بصمة SHA1 لشهادة الجهاز البعيد هي:</string>
   <string name="pair_requested">طُلب الاقتران</string>
   <string name="pairing_request_from">طلب اقتران من %1s</string>
   <string name="received_url_title">استُلمت وصلة من %1s</string>
   <string name="received_url_text">المس لفتح \'%1s\'</string>
   <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_title">استُلم ملفّ من %1s</string>
   <string name="received_file_text">المس لفتح \'%1s\'</string>
-  <string name="sent_file_title">أرسل ملفًّا إلى %1s</string>
-  <string name="sent_file_text">%1s</string>
-  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">المس للإجابة</string>
   <string name="reconnect">أعد الاتّصال</string>
   <string name="right_click">أرسل نقرة باليمين</string>
@@ -103,8 +74,6 @@
   <string name="mpris_next">التّالي</string>
   <string name="mpris_volume">المستوى</string>
   <string name="mpris_settings">إعدادات الوسائط المتعدّدة</string>
-  <string name="mpris_time_settings_title">زرّا التّقدّم والإرجاع</string>
-  <string name="mpris_time_settings_summary">اضبط الوقت عند نقر زرّيّ التّقديم أو الإرجاع.</string>
   <string-array name="mpris_time_entries">
     <item>10 ثوان</item>
     <item>20 ثانية</item>
@@ -123,13 +92,9 @@
   <string name="invalid_device_name">اسم جهاز غير صالح</string>
   <string name="shareplugin_text_saved">استُقبل نصّ، حُفظ إلى الحافظة</string>
   <string name="custom_devices_settings">قائمة أجهزة مخصّصة</string>
-  <string name="pair_device_action">اقرن جهازًا جديدًا</string>
-  <string name="unpair_device_action">ألغِ اقتران %s</string>
   <string name="custom_device_list">أضف أجهزة بميفاق الإنترنت م​إ</string>
   <string name="share_notification_preference">إخطارات مزعجة</string>
   <string name="share_notification_preference_summary">اهتزّ وشغّل صوتًا عند استقبال ملفّ</string>
-  <string name="title_activity_notification_filter">مرشّح الإخطارات</string>
-  <string name="filter_apps_info">ستُزامن الإخطارات من التّطبيقات المحدّدة.</string>
   <string name="sftp_internal_storage">التّخزين الدّاخليّ</string>
   <string name="sftp_all_files">كلّ الملفّات</string>
   <string name="sftp_sdcard_num">بطاقة SD ‏%d</string>
@@ -137,26 +102,7 @@
   <string name="sftp_readonly">(للقراءة فقط)</string>
   <string name="sftp_camera">صور الكاميرا</string>
   <string name="add_host">أضف مضيفًا/م​إ</string>
-  <string name="add_host_hint">اسم المضيف أو عنوان IP</string>
   <string name="no_players_connected">لم يُعثر على مشغّلات</string>
   <string name="custom_dev_list_help">استخدم هذا الخيار فقط إن لم يُكتَشف جهازك آليًّا. أدخِل عنوان م​إ أو اسم المضيف أدناه والمس الزرّ لإضافته إلى القائمة. المس عنصرًا موجودًا لإزالته من القائمة.</string>
   <string name="mpris_player_on_device">%1$s على %2$s</string>
-  <string name="send_files">أرسل ملفّات</string>
-  <string name="pairing_title">أجهزة «كدي المتّصل»</string>
-  <string name="pairing_description">الأجهزة الأخرى التي تشغّل «كدي المتّصل» وعلى نفس الشّبكة ستظهر هنا.</string>
-  <string name="device_paired">اقتُرن الجهاز</string>
-  <string name="device_rename_title">أعد تسمية الجهاز</string>
-  <string name="device_rename_confirm">أعد التّسمية</string>
-  <string name="refresh">أنعش</string>
-  <string name="unreachable_description">الجهاز المقترن هذا لا يمكن الوصول إليه. تأكّد من اتّصاله بنفس الشّبكة.</string>
-  <string name="no_file_browser">لا متصفّحات ملفّات مثبّتة.</string>
-  <string name="pref_plugin_telepathy">أرسل SMS</string>
-  <string name="pref_plugin_telepathy_desc">أرسل رسائل نصّيّة من سطح المكتب</string>
-  <string name="plugin_not_supported">لا يدعم جهازك هذه الملحقة</string>
-  <string name="findmyphone_title">جِد جهازي</string>
-  <string name="findmyphone_title_tablet">جِد جهازي اللوحيّ</string>
-  <string name="findmyphone_description">يرّن هذا الجهاز لتجده</string>
-  <string name="findmyphone_found">وُجد</string>
-  <string name="open">افتح</string>
-  <string name="close">أغلق</string>
 </resources>

res/values-ast/strings.xml

@@ -1,64 +1,45 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="pref_plugin_telephony">Avisador telefónicu</string>
+  <string name="pref_plugin_telephony">Notificador telefónicu</string>
   <string name="pref_plugin_telephony_desc">Unvia avisos pa SMS y llamaes</string>
   <string name="pref_plugin_battery">Informe de batería</string>
   <string name="pref_plugin_battery_desc">Infoma davezu del estáu de la batería</string>
-  <string name="pref_plugin_sftp">Esposición del sistema de ficheros</string>
-  <string name="pref_plugin_sftp_desc">Permite restolar remotamente el sistema de ficheros d\'esti preséu</string>
   <string name="pref_plugin_clipboard">Sincronización del cartafueyu</string>
   <string name="pref_plugin_clipboard_desc">Comparte\'l conteníu del cartafueyu</string>
   <string name="pref_plugin_mousepad">Entrada remota</string>
-  <string name="pref_plugin_mousepad_desc">Usa\'l to preséu como panel táutil y tecláu</string>
   <string name="pref_plugin_mpris">Controles remotos multimedia</string>
-  <string name="pref_plugin_mpris_desc">Forne control multimedia pal to reproductor</string>
-  <string name="pref_plugin_runcommand">Executar comandu</string>
-  <string name="pref_plugin_runcommand_desc">Aiciona comandos remotos dende\'l to preséu</string>
   <string name="pref_plugin_ping">Ping</string>
-  <string name="pref_plugin_ping_desc">Unvia y recibe pings</string>
+  <string name="pref_plugin_ping_desc">Unvia y recibi pings</string>
   <string name="pref_plugin_notifications">Sincronización d\'avisos</string>
   <string name="pref_plugin_notifications_desc">Accede a los tos avisos dende otros preseos</string>
-  <string name="pref_plugin_receive_notifications">Recibir avisos</string>
-  <string name="pref_plugin_receive_notifications_desc">Recibe avisos d\'otru preséu y amuésalos n\'Android</string>
-  <string name="pref_plugin_sharereceiver">Compartir y recibir</string>
+  <string name="pref_plugin_sharereceiver">Unvia y recibi pings</string>
   <string name="pref_plugin_sharereceiver_desc">Comparte ficheros y URLs ente preseos</string>
   <string name="plugin_not_available">Esta carauterística nun ta disponible na to versión d\'Android</string>
   <string name="device_list_empty">Ensin preseos</string>
   <string name="ok">Aceutar</string>
   <string name="cancel">Encaboxar</string>
   <string name="open_settings">Abrir axustes</string>
-  <string name="no_permissions">Precises dar laude p\'acceder a los avisos</string>
+  <string name="no_permissions">Necesites garantizar l\'accesu a los avisos</string>
   <string name="send_ping">Unviar ping</string>
   <string name="open_mpris_controls">Controles multimedia</string>
   <string name="open_mousepad">Entrada remota</string>
-  <string name="mousepad_info">Muevi un deu enriba la pantalla pa mover el mur. Calca pa un clic y usa dos/tres deos pa los botones de drecha y en mediu. Usa un primíu llargu p\'arrastrar y soltar.</string>
-  <string name="mousepad_double_tap_settings_title">Afitar aición de calcu con dos deos</string>
-  <string name="mousepad_triple_tap_settings_title">Afitar aición de calcu con tres deos</string>
-  <string name="mousepad_sensitivity_settings_title">Afitar sensibilidá del panel táutil</string>
-  <string name="mousepad_scroll_direction_title">Direición inversa de desplazamientu</string>
+  <string name="mousepad_info">Muevi un deu enriba la pantalla pa mover el mur. calca pa un clic y usa dos/tres deos pa los motones de drecha y mediu. Usa un primíu llargu pa arrastrar y soltar.</string>
   <string-array name="mousepad_tap_entries">
     <item>Clic drechu</item>
     <item>Clic d\'en mediu</item>
     <item>Nada</item>
   </string-array>
-  <string name="mousepad_double_default">drecha</string>
-  <string name="mousepad_triple_default">d\'en mediu</string>
-  <string name="mousepad_sensitivity_default">por defeutu</string>
   <string-array name="mousepad_sensitivity_entries">
-    <item>Perlenta</item>
-    <item>La más lenta</item>
-    <item>Predeterminada</item>
-    <item>Penriba lo predeterminao</item>
-    <item>La más rápida</item>
+    <item>Slowest</item>
+    <item>Above Slowest</item>
+    <item>Default</item>
+    <item>Above Default</item>
+    <item>Fastest</item>
   </string-array>
   <string name="category_connected_devices">Preseos coneutaos</string>
   <string name="category_not_paired_devices">Preseos disponibles</string>
   <string name="category_remembered_devices">Preseos recordaos</string>
-  <string name="plugins_failed_to_load">Los complementos fallaron al cargase (calca pa más información):</string>
-  <string name="device_menu_plugins">Axustes de complementos</string>
-  <string name="device_menu_unpair">Desempareyar</string>
   <string name="device_not_reachable">El preséu empareyáu nun ye agamable</string>
-  <string name="pair_new_device">Empareyar preséu nuevu</string>
   <string name="unknown_device">Preséu desconocíu</string>
   <string name="error_not_reachable">Nun ye algamable\'l preséu</string>
   <string name="error_already_requested">Empareyamientu yá solicitáu</string>
@@ -68,10 +49,6 @@
   <string name="error_canceled_by_user">Encaboxáu pol usuariu</string>
   <string name="error_canceled_by_other_peer">Encaboxáu pola otra parte</string>
   <string name="error_invalid_key">Recibióse una clave non válida</string>
-  <string name="encryption_info_title">Información de cifráu</string>
-  <string name="encryption_info_msg_no_ssl">L\'otru preséu nun usa una versión recién de KDE Connect. Usando\'l métodu de cifráu heredáu.</string>
-  <string name="my_device_fingerprint">La buelga SHA1 del certificáu del to preséu ye:</string>
-  <string name="remote_device_fingerprint">La buelga SHA1 del certificáu del preséu remotu ye:</string>
   <string name="pair_requested">Solicitóse l\'empareyamientu</string>
   <string name="pairing_request_from">Solicitú d\'empareyamientu de %1s</string>
   <string name="received_url_title">Recibióse l\'enllaz de %1s</string>
@@ -79,20 +56,15 @@
   <string name="incoming_file_title">Ficheru entrante de %1s</string>
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Unviando ficheru a %1s</string>
-  <string name="outgoing_files_title">Unviando ficheros a %1s</string>
   <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Unviáronse %1$d de %2$d ficheros</string>
   <string name="received_file_title">Recibióse\'l ficheru de %1s</string>
   <string name="received_file_fail_title">Fallu al recibir el ficheru de %1s</string>
-  <string name="received_file_text">Calca p\'abrir «%1s»</string>
+  <string name="received_file_text">Tap to open \'%1s\'</string>
   <string name="sent_file_title">Unvióse\'l ficheru a %1s</string>
   <string name="sent_file_text">%1s</string>
-  <string name="sent_file_failed_title">Falló l\'unviu del ficheru a %1s</string>
   <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Calca pa responder</string>
   <string name="reconnect">Reconeutar</string>
-  <string name="right_click">Unviar clic drechu</string>
-  <string name="middle_click">Unviar clic d\'en mediu</string>
   <string name="show_keyboard">Amosar tecláu</string>
   <string name="device_not_paired">Preséu non empareyáu</string>
   <string name="request_pairing">Solicitar empareyamientu</string>
@@ -118,7 +90,6 @@
     <item>1 minutu</item>
     <item>2 minutos</item>
   </string-array>
-  <string name="share_to">Compartir en...</string>
   <string name="protocol_version_older">Esti preséu usa una versión vieya del protocolu</string>
   <string name="protocol_version_newer">Esti preséu usa una versión anovada del protocolu</string>
   <string name="general_settings">Axustes xenerales</string>
@@ -128,16 +99,12 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nome de preséu non válidu</string>
   <string name="shareplugin_text_saved">Recibióse\'l testu y guardóse nel cartafueyu</string>
-  <string name="custom_devices_settings">Llistáu personalizáu de preseos</string>
+  <string name="custom_devices_settings">Llista de preseos personalizada</string>
   <string name="pair_device_action">Empareyar con un preséu nuevu</string>
   <string name="unpair_device_action">Desempareyar %s</string>
   <string name="custom_device_list">Amestar preseos pola IP</string>
   <string name="share_notification_preference">Avisos sonoros</string>
   <string name="share_notification_preference_summary">Fai vibrar y reproduz un soníu al recibir un ficheru</string>
-  <string name="share_destination_customize">Personalizar direutoriu destín</string>
-  <string name="share_destination_customize_summary_disabled">Los ficheros recibíos apaecerán en Descargues</string>
-  <string name="share_destination_customize_summary_enabled">Los ficheros atroxaránse nel direutoriu d\'embaxo</string>
-  <string name="share_destination_folder_preference">Direutoriu destín</string>
   <string name="title_activity_notification_filter">Peñera d\'avisos</string>
   <string name="filter_apps_info">Los avisos sincronizaránse coles aplicaciones esbillaes.</string>
   <string name="sftp_internal_storage">Almacenamientu internu</string>
@@ -149,11 +116,11 @@
   <string name="add_host">Amestar agospiu/IP</string>
   <string name="add_host_hint">Nome d\'agospiu o IP</string>
   <string name="no_players_connected">Nun s\'alcontraron reproductores</string>
-  <string name="custom_dev_list_help">Usa esta opción namái si\'l to preséu nun se deteuta automáticamente. Introduz la direición o\'l nome d\'agospiu y toca\'l botón p\'amestalu al llistáu. Toca un elementu esistente pa desanicialu de la llistáu.</string>
+  <string name="custom_dev_list_help">Usa esta opción namái si\'l to preséu nun se deteuta automáticamente. Introduz la direición o\'l nome d\'agospiu y toca\'l botón p\'amestalu a la llista. Toca un elementu esistente pa desanicialu de la llista.</string>
   <string name="mpris_player_on_device">%1$s en %2$s</string>
   <string name="send_files">Unviar ficheros</string>
   <string name="pairing_title">Preseos KDE Connect</string>
-  <string name="pairing_description">Equí deberíen apaecer otros preseos executando KDE Connect.</string>
+  <string name="pairing_description">Deberíen apaecer equí otros preseos executando KDE Connect.</string>
   <string name="device_paired">Preséu empareyáu</string>
   <string name="device_rename_title">Renomar preséu</string>
   <string name="device_rename_confirm">Renomar</string>
@@ -163,9 +130,6 @@
   <string name="pref_plugin_telepathy">Unviar SMS</string>
   <string name="pref_plugin_telepathy_desc">Unvia mensaxes de testu dende\'l to escritoriu</string>
   <string name="plugin_not_supported">Esti complementu nun ta sofitáu pol preséu</string>
-  <string name="findmyphone_title">Alcuentra\'l mio teléfonu</string>
-  <string name="findmyphone_title_tablet">Alcuentra la mio tableta</string>
-  <string name="findmyphone_description">Fai sonar esti preséu pa que pueas alcontralu.</string>
   <string name="findmyphone_found">Alcontrar</string>
   <string name="open">Abrir</string>
   <string name="close">Zarrar</string>

res/values-ca/strings.xml

@@ -10,6 +10,8 @@
   <string name="pref_plugin_clipboard_desc">Comparteix el contingut del porta-retalls</string>
   <string name="pref_plugin_mousepad">Entrada remota</string>
   <string name="pref_plugin_mousepad_desc">Usa el vostre telèfon o tauleta com un ratolí i un teclat</string>
+  <string name="pref_plugin_remotekeyboard">Rep les pulsacions de tecla remotes</string>
+  <string name="pref_plugin_remotekeyboard_desc">Rep els esdeveniments de pulsacions de tecla des de dispositius remots</string>
   <string name="pref_plugin_mpris">Controls multimèdia</string>
   <string name="pref_plugin_mpris_desc">Proporciona un comandament a distància pel reproductor multimèdia</string>
   <string name="pref_plugin_runcommand">Executa una ordre</string>
@@ -30,6 +32,10 @@
   <string name="no_permissions">Us caldrà concedir permís per accedir a les notificacions</string>
   <string name="send_ping">Envia un ping</string>
   <string name="open_mpris_controls">Control multimèdia</string>
+  <string name="remotekeyboard_editing_only_title">Fes servir les tecles remotes només en editar</string>
+  <string name="remotekeyboard_not_connected">No hi ha cap connexió activa amb el teclat remot, establiu-ne una al «kdeconnect»</string>
+  <string name="remotekeyboard_connected">La connexió amb el teclat remot està activa</string>
+  <string name="remotekeyboard_multiple_connections">Hi ha més d\'una connexió amb un teclat remot, seleccioneu el dispositiu per configurar-lo</string>
   <string name="open_mousepad">Entrada remota</string>
   <string name="mousepad_info">Moveu un dit per la pantalla per a moure el cursor del ratolí. Toqueu per un clic, i empreu dos/tres dits pels botons dret i mig. Empreu un toc llarg per arrossegar i deixar anar.</string>
   <string name="mousepad_double_tap_settings_title">Estableix l\'acció de tocar amb dos dits</string>

res/values-cs/strings.xml

@@ -10,6 +10,8 @@
   <string name="pref_plugin_clipboard_desc">Sdílet obsah schránky</string>
   <string name="pref_plugin_mousepad">Vzdálený vstup</string>
   <string name="pref_plugin_mousepad_desc">Používejte svůj telefon nebo tablet jako touchpad a klávesnici</string>
+  <string name="pref_plugin_remotekeyboard">Přijímat stisky kláves se vzdálených zařízení</string>
+  <string name="pref_plugin_remotekeyboard_desc">Přijímat události stisku kláves ze vzdálených zařízení</string>
   <string name="pref_plugin_mpris">Ovládání multimédií</string>
   <string name="pref_plugin_mpris_desc">Poskytuje dálkové ovládání přehrávačů médií</string>
   <string name="pref_plugin_runcommand">Spustit příkaz</string>
@@ -30,6 +32,10 @@
   <string name="no_permissions">Pro zpřístupnění upozornění potřebujete oprávnění</string>
   <string name="send_ping">Poslat ping</string>
   <string name="open_mpris_controls">Ovládání multimédií</string>
+  <string name="remotekeyboard_editing_only_title">Ovládat vzdálené klávesy při editaci</string>
+  <string name="remotekeyboard_not_connected">Není k dispozici žádné vzdálené připojení klávesnice. Nastavte nějaké pomocí kdeconnect</string>
+  <string name="remotekeyboard_connected">Vzdálené připojení klávesnice je aktivní</string>
+  <string name="remotekeyboard_multiple_connections">Je k dispozici více než jedno připojení klávesnice. Vyberte zařízení pro jeho nastavení.</string>
   <string name="open_mousepad">Vzdálený vstup</string>
   <string name="mousepad_info">Pohybujte prstem po obrazovce pro pohybování kurzorem myši. Ťukněte pro kliknutí a použijte dva/tři prsty jako pravé a prostřední tlačítko. Pro přetažení dlouze podržte.</string>
   <string name="mousepad_double_tap_settings_title">Nastavit činnost pro ťuknutí dvěma prsty</string>
@@ -79,12 +85,15 @@
   <string name="incoming_file_title">Příchozí soubor od %1s</string>
   <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>
   <string name="sent_file_title">Soubor byl odeslán do %1s</string>
   <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Odesílání souborů na %1s selhalo</string>
   <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Ťukněte pro odpovězení</string>
   <string name="reconnect">Znovu připojit</string>
@@ -131,6 +140,10 @@
   <string name="custom_device_list">Přidat zařízení podle IP</string>
   <string name="share_notification_preference">Hlasitá upozornění</string>
   <string name="share_notification_preference_summary">Vibrovat a přehrát melodii při přijímání souboru</string>
+  <string name="share_destination_customize">Přizpůsobte si cílový adresář</string>
+  <string name="share_destination_customize_summary_disabled">Přijaté soubory se objeví v Downloads</string>
+  <string name="share_destination_customize_summary_enabled">Soubory budou ukládány v adresáři níže</string>
+  <string name="share_destination_folder_preference">Cílový adresář</string>
   <string name="title_activity_notification_filter">Filtr upozornění</string>
   <string name="filter_apps_info">Upozorňování mezi vybranými aplikacemi bude synchronizováno.</string>
   <string name="sftp_internal_storage">Interní úložiště</string>

res/values-da/strings.xml

@@ -49,7 +49,7 @@
     <item>Over mest langsom</item>
     <item>Standard</item>
     <item>Over standard</item>
-    <item>Hurtigst</item>
+    <item>Hurtigste</item>
   </string-array>
   <string name="category_connected_devices">Forbundne enheder</string>
   <string name="category_not_paired_devices">Tilgængelig enheder</string>
@@ -79,15 +79,12 @@
   <string name="incoming_file_title">Indkommende fil fra %1s</string>
   <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>
   <string name="sent_file_title">Fil sendt til %1s</string>
   <string name="sent_file_text">%1s</string>
-  <string name="sent_file_failed_title">Kunne ikke sende filen til %1s</string>
   <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Tap for at svare</string>
   <string name="reconnect">Forbind igen</string>
@@ -134,10 +131,6 @@
   <string name="custom_device_list">Tilføj enheder via IP</string>
   <string name="share_notification_preference">Støjende bekendtgørelser</string>
   <string name="share_notification_preference_summary">Vibrér og afspil en lyd når en fil modtages</string>
-  <string name="share_destination_customize">Tilpas destinationsmappe</string>
-  <string name="share_destination_customize_summary_disabled">Modtagne filer vil dukke op i Downloads</string>
-  <string name="share_destination_customize_summary_enabled">Filer vil blive gemt i mappen nedenfor</string>
-  <string name="share_destination_folder_preference">Destinationsmappe</string>
   <string name="title_activity_notification_filter">Bekendtgørelsesfilter</string>
   <string name="filter_apps_info">Bekendtgørelser vil blive synkroniseret for de valgte apps.</string>
   <string name="sftp_internal_storage">Intern lagring</string>

res/values-en-rGB/strings.xml

@@ -10,6 +10,8 @@
   <string name="pref_plugin_clipboard_desc">Share the clipboard content</string>
   <string name="pref_plugin_mousepad">Remote input</string>
   <string name="pref_plugin_mousepad_desc">Use your phone or tablet as a touchpad and keyboard</string>
+  <string name="pref_plugin_remotekeyboard">Receive remote keypresses</string>
+  <string name="pref_plugin_remotekeyboard_desc">Receive keypress events from remote devices</string>
   <string name="pref_plugin_mpris">Multimedia controls</string>
   <string name="pref_plugin_mpris_desc">Provides a remote control for your media player</string>
   <string name="pref_plugin_runcommand">Run Command</string>
@@ -30,6 +32,10 @@
   <string name="no_permissions">You need to grant permission to access notifications</string>
   <string name="send_ping">Send ping</string>
   <string name="open_mpris_controls">Multimedia control</string>
+  <string name="remotekeyboard_editing_only_title">Handle remote keys only when editing</string>
+  <string name="remotekeyboard_not_connected">There is no active remote keyboard connection, establish one in kdeconnect</string>
+  <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 a long press to drag\'n drop.</string>
   <string name="mousepad_double_tap_settings_title">Set two finger tap action</string>
@@ -134,6 +140,10 @@
   <string name="custom_device_list">Add devices by IP</string>
   <string name="share_notification_preference">Noisy notifications</string>
   <string name="share_notification_preference_summary">Vibrate and play a sound when receiving a file</string>
+  <string name="share_destination_customize">Customise destination directory</string>
+  <string name="share_destination_customize_summary_disabled">Received files will appear in Downloads</string>
+  <string name="share_destination_customize_summary_enabled">Files will be stored in the directory below</string>
+  <string name="share_destination_folder_preference">Destination directory</string>
   <string name="title_activity_notification_filter">Notification filter</string>
   <string name="filter_apps_info">Notifications will be synchronised for the selected apps.</string>
   <string name="sftp_internal_storage">Internal storage</string>

res/values-es/strings.xml

@@ -79,12 +79,15 @@
   <string name="incoming_file_title">Archivo entrante desde %1s</string>
   <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>
   <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>
   <string name="sent_file_title">Archivo enviado a %1s</string>
   <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Fallo al enviar el archivo a %1s</string>
   <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Pulse para responder</string>
   <string name="reconnect">Reconectar</string>
@@ -131,6 +134,10 @@
   <string name="custom_device_list">Añadir dispositivos por IP</string>
   <string name="share_notification_preference">Notificaciones ruidosas</string>
   <string name="share_notification_preference_summary">Vibrar y reproducir un sonido cuando se reciba un archivo</string>
+  <string name="share_destination_customize">Personalizar directorio destino</string>
+  <string name="share_destination_customize_summary_disabled">Los archivos recibidos aparecerán en Descargas</string>
+  <string name="share_destination_customize_summary_enabled">Los archivos se almacenarán en el directorio indicado más abajo</string>
+  <string name="share_destination_folder_preference">Directorio destino</string>
   <string name="title_activity_notification_filter">Filtro de notificaciones</string>
   <string name="filter_apps_info">Las notificaciones se sincronizarán en las aplicaciones seleccionadas.</string>
   <string name="sftp_internal_storage">Almacenamiento interno</string>

res/values-et/strings.xml

@@ -79,12 +79,15 @@
   <string name="incoming_file_title">Saabuv fail seadmest %1s</string>
   <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>
   <string name="sent_file_title">Fail saadeti seadmesse %1s</string>
   <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Faili saatmine seadmesse %1s nurjus</string>
   <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Koputa vastamiseks</string>
   <string name="reconnect">Ühenda uuesti</string>
@@ -131,6 +134,10 @@
   <string name="custom_device_list">Lisa seadmeid IP järgi</string>
   <string name="share_notification_preference">Mürarikkad märguanded</string>
   <string name="share_notification_preference_summary">Vibreerimine ja heli esitamine faili saamisel</string>
+  <string name="share_destination_customize">Sihtkataloogi kohandamine</string>
+  <string name="share_destination_customize_summary_disabled">Saadud failid salvestatakse kataloogi Allalaaditud</string>
+  <string name="share_destination_customize_summary_enabled">Failid salvestatakse allmääratud kataloogi</string>
+  <string name="share_destination_folder_preference">Sihtkataloog</string>
   <string name="title_activity_notification_filter">Märguannete filter</string>
   <string name="filter_apps_info">Valitud rakenduste märguanded sünkroonitakse</string>
   <string name="sftp_internal_storage">Sisemine salvesti</string>

res/values-gl/strings.xml

@@ -28,8 +28,6 @@
   <string name="mousepad_info">Mova un dedo na pantalla para mover o cursor. Toque para facer clic, e use dous ou tres dedos para os botóns secundario e central. Prema durante un tempo para arrastrar e soltar.</string>
   <string name="mousepad_double_tap_settings_title">Definir a acción de tocar con dous dedos</string>
   <string name="mousepad_triple_tap_settings_title">Definir a acción de tocar con tres dedos</string>
-  <string name="mousepad_sensitivity_settings_title">Definir a sensibilidade do punteiro táctil</string>
-  <string name="mousepad_scroll_direction_title">Inverter a dirección de desprazamento</string>
   <string-array name="mousepad_tap_entries">
     <item>Clic dereito</item>
     <item>Clic central</item>
@@ -37,13 +35,12 @@
   </string-array>
   <string name="mousepad_double_default">dereita</string>
   <string name="mousepad_triple_default">medio</string>
-  <string name="mousepad_sensitivity_default">predeterminado</string>
   <string-array name="mousepad_sensitivity_entries">
-    <item>O máis lento</item>
-    <item>Lento</item>
-    <item>Predeterminado</item>
-    <item>Rápido</item>
-    <item>O mais rápido</item>
+    <item>Slowest</item>
+    <item>Above Slowest</item>
+    <item>Default</item>
+    <item>Above Default</item>
+    <item>Fastest</item>
   </string-array>
   <string name="category_connected_devices">Dispositivos conectados</string>
   <string name="category_not_paired_devices">Dispositivos dispoñíbeis</string>

res/values-it/strings.xml

@@ -10,6 +10,8 @@
   <string name="pref_plugin_clipboard_desc">Condividi il contenuto degli appunti</string>
   <string name="pref_plugin_mousepad">Impulso remoto</string>
   <string name="pref_plugin_mousepad_desc">Usa il tuo telefono o il tablet come touchpad e tastiera</string>
+  <string name="pref_plugin_remotekeyboard">Ricevi pressioni dei tasti da remoto</string>
+  <string name="pref_plugin_remotekeyboard_desc">Ricevi eventi di pressione dei tasti da dispositivi remoti</string>
   <string name="pref_plugin_mpris">Controlli multimediali</string>
   <string name="pref_plugin_mpris_desc">Fornisce un controllo remoto per il tuo lettore multimediale</string>
   <string name="pref_plugin_runcommand">Esegui comando</string>
@@ -30,6 +32,10 @@
   <string name="no_permissions">Devi concedere i permessi per l\'accesso alle notifiche</string>
   <string name="send_ping">Invia ping</string>
   <string name="open_mpris_controls">Controllo multimediale</string>
+  <string name="remotekeyboard_editing_only_title">Gestisci i tasti remoti solo durante la modifica</string>
+  <string name="remotekeyboard_not_connected">Non c\'è una connessione attiva della tastiera remota, stabiliscine una da kdeconnect</string>
+  <string name="remotekeyboard_connected">La connessione della tastiera remota è attiva</string>
+  <string name="remotekeyboard_multiple_connections">Ci sono più connessioni di tastiere remote, seleziona il dispositivo da configurare</string>
   <string name="open_mousepad">Impulso remoto</string>
   <string name="mousepad_info">Muovi un dito sullo schermo per spostare il puntatore del mouse. Tocca per un clic e usa due/tre dita per i pulsanti destro e centrale. Utilizza una pressione lunga per trascinare e rilasciare.</string>
   <string name="mousepad_double_tap_settings_title">Imposta azione per il tocco a due dita</string>

res/values-ko/strings.xml

@@ -5,15 +5,21 @@
   <string name="pref_plugin_battery">배터리 보고</string>
   <string name="pref_plugin_battery_desc">주기적으로 배터리 상태 보고</string>
   <string name="pref_plugin_sftp">파일 시스템 보기</string>
+  <string name="pref_plugin_sftp_desc">원격으로 이 장치의 파일 시스템 보기</string>
   <string name="pref_plugin_clipboard">클립보드 동기화</string>
   <string name="pref_plugin_clipboard_desc">클립보드 내용 동기화</string>
   <string name="pref_plugin_mousepad">원격 입력</string>
+  <string name="pref_plugin_mousepad_desc">내 휴대폰이나 태블릿을 터치패드와 키보드로 사용하기</string>
   <string name="pref_plugin_mpris">멀티미디어 제어</string>
+  <string name="pref_plugin_mpris_desc">내 미디어 재생기 원격 제어</string>
   <string name="pref_plugin_runcommand">명령 실행</string>
+  <string name="pref_plugin_runcommand_desc">내 휴대폰이나 태블릿에서 원격 명령 실행</string>
   <string name="pref_plugin_ping">핑</string>
   <string name="pref_plugin_ping_desc">핑 보내고 받기</string>
   <string name="pref_plugin_notifications">알림 동기화</string>
   <string name="pref_plugin_notifications_desc">다른 장치에서 알림 보기</string>
+  <string name="pref_plugin_receive_notifications">알림 받기</string>
+  <string name="pref_plugin_receive_notifications_desc">다른 장치의 알림을 받아서 안드로이드 알림에 표시</string>
   <string name="pref_plugin_sharereceiver">공유하고 받기</string>
   <string name="pref_plugin_sharereceiver_desc">장치끼리 파일과 URL 공유</string>
   <string name="plugin_not_available">현재 안드로이드 버전에서 사용할 수 없습니다</string>
@@ -28,6 +34,8 @@
   <string name="mousepad_info">화면에서 손가락을 움직이면 마우스 커서를 움직입니다. 화면을 누르면 왼쪽 단추를 누르고, 두 손가락과 세 손가락으로 누르면 오른쪽/가운데 단추를 누릅니다. 드래그 앤 드롭을 사용하려면 길게 누르십시오.</string>
   <string name="mousepad_double_tap_settings_title">두 손가락으로 눌렀을 때 동작 설정</string>
   <string name="mousepad_triple_tap_settings_title">세 손가락으로 눌렀을 때 동작 설정</string>
+  <string name="mousepad_sensitivity_settings_title">터치패드 감도 설정</string>
+  <string name="mousepad_scroll_direction_title">스크롤 방향 뒤집기</string>
   <string-array name="mousepad_tap_entries">
     <item>오른쪽 단추 누름</item>
     <item>가운데 단추 누름</item>
@@ -35,12 +43,13 @@
   </string-array>
   <string name="mousepad_double_default">오른쪽</string>
   <string name="mousepad_triple_default">가운데</string>
+  <string name="mousepad_sensitivity_default">기본값</string>
   <string-array name="mousepad_sensitivity_entries">
-    <item>Slowest</item>
-    <item>Above Slowest</item>
-    <item>Default</item>
-    <item>Above Default</item>
-    <item>Fastest</item>
+    <item>느리게</item>
+    <item>느리게 이상</item>
+    <item>기본값</item>
+    <item>기본값 이상</item>
+    <item>빠르게</item>
   </string-array>
   <string name="category_connected_devices">연결된 장치</string>
   <string name="category_not_paired_devices">사용 가능한 장치</string>
@@ -49,6 +58,7 @@
   <string name="device_menu_plugins">플러그인 설정</string>
   <string name="device_menu_unpair">연결 해제</string>
   <string name="device_not_reachable">연결된 장치에 도달할 수 없음</string>
+  <string name="pair_new_device">새 장치 연결</string>
   <string name="unknown_device">알 수 없는 장치</string>
   <string name="error_not_reachable">장치에 접근할 수 없음</string>
   <string name="error_already_requested">연결이 이미 요청됨</string>
@@ -58,6 +68,10 @@
   <string name="error_canceled_by_user">사용자가 취소함</string>
   <string name="error_canceled_by_other_peer">다른 쪽에서 취소함</string>
   <string name="error_invalid_key">잘못된 키 받음</string>
+  <string name="encryption_info_title">암호화 정보</string>
+  <string name="encryption_info_msg_no_ssl">다른 장치에서 KDE Connect의 최근 버전을 실행하고 있지 않아서 레거시 암호화를 사용합니다.</string>
+  <string name="my_device_fingerprint">내 장치 인증서의 SHA1 지문:</string>
+  <string name="remote_device_fingerprint">원격 장치 인증서의 SHA1 지문:</string>
   <string name="pair_requested">연결 요청됨</string>
   <string name="pairing_request_from">%1s에서 연결 요청</string>
   <string name="received_url_title">%1s에서 링크 받음</string>
@@ -65,12 +79,15 @@
   <string name="incoming_file_title">%1s에서 파일 보냄</string>
   <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>
   <string name="sent_file_title">%1s(으)로 파일 보냄</string>
   <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">파일을 %1s(으)로 보낼 수 없음</string>
   <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">눌러서 응답하기</string>
   <string name="reconnect">다시 연결</string>
@@ -117,6 +134,10 @@
   <string name="custom_device_list">IP로 장치 추가</string>
   <string name="share_notification_preference">시끄러운 알림</string>
   <string name="share_notification_preference_summary">파일을 받았을 때 진동과 소리로 알림</string>
+  <string name="share_destination_customize">대상 디렉터리 사용자 정의</string>
+  <string name="share_destination_customize_summary_disabled">받은 파일을 다운로드 디렉터리에 저장함</string>
+  <string name="share_destination_customize_summary_enabled">받은 파일을 아래 디렉터리에 저장함</string>
+  <string name="share_destination_folder_preference">대상 디렉터리</string>
   <string name="title_activity_notification_filter">알림 필터</string>
   <string name="filter_apps_info">선택한 앱의 알림을 동기화합니다.</string>
   <string name="sftp_internal_storage">내부 저장소</string>
@@ -142,6 +163,9 @@
   <string name="pref_plugin_telepathy">SMS 보내기</string>
   <string name="pref_plugin_telepathy_desc">데스크톱에서 문자 메시지 보내기</string>
   <string name="plugin_not_supported">장치에서 이 플러그인을 지원하지 않습니다</string>
+  <string name="findmyphone_title">내 휴대폰 찾기</string>
+  <string name="findmyphone_title_tablet">내 태블릿 찾기</string>
+  <string name="findmyphone_description">이 장치에서 소리를 울려서 찾는 데 도움을 줍니다</string>
   <string name="findmyphone_found">찾았음</string>
   <string name="open">열기</string>
   <string name="close">닫기</string>

res/values-lt/strings.xml

@@ -41,11 +41,14 @@
   <string name="error_already_requested">Jau paprašyta suporuoti</string>
   <string name="error_already_paired">Įrenginys jau suporuotas</string>
   <string name="error_could_not_send_package">Nepavyksta išsiųsti paketo</string>
-  <string name="error_timed_out">Skirtasis laikas baigėsi</string>
   <string name="error_canceled_by_user">Naudotojas atšaukė užduotį</string>
   <string name="error_canceled_by_other_peer">Porininkas atšaukė užduotį</string>
   <string name="error_invalid_key">Gautas netinkamas raktas</string>
   <string name="pair_requested">Paprašyta suporuoti</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_text">%1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Norėdami atsakyti, palieskite</string>
   <string name="reconnect">Prisijungti iš naujo</string>
   <string name="show_keyboard">Rodyti klaviatūrą</string>
@@ -83,6 +86,7 @@
   <string name="pair_device_action">Suporuoti naują įrenginį</string>
   <string name="unpair_device_action">Atrišti %s</string>
   <string name="custom_device_list">Pridėti įrenginį pagal IP</string>
+  <string name="sftp_internal_storage">Vidinė saugykla</string>
   <string name="sftp_all_files">Visi failai</string>
   <string name="sftp_sdcard_num">SD kortelė %d</string>
   <string name="sftp_sdcard">SD kortelė</string>
@@ -96,12 +100,9 @@
   <string name="pairing_description">Čia turėtų pasirodyti to kiti paties tinklo įrenginiai, kuriuose veikia „KDE Connect“</string>
   <string name="device_paired">Įrenginys suporuotas</string>
   <string name="device_rename_title">Pervadinti įrenginį</string>
-  <string name="device_rename_confirm">Pervadinti</string>
   <string name="refresh">Atnaujinti</string>
   <string name="unreachable_description">Šis suporuotas įrenginys nepasiekiamas. Patikrinkite, ar jis prisijungęs prie to paties tinklo.</string>
   <string name="pref_plugin_telepathy">Siųsti SMS</string>
   <string name="plugin_not_supported">Telefonas nepalaiko šio papildinio</string>
   <string name="findmyphone_found">Radau</string>
-  <string name="open">Atverti</string>
-  <string name="close">Užverti</string>
 </resources>

res/values-nl/strings.xml

@@ -10,6 +10,8 @@
   <string name="pref_plugin_clipboard_desc">De inhoud van het klembord delen</string>
   <string name="pref_plugin_mousepad">Invoer op afstand</string>
   <string name="pref_plugin_mousepad_desc">Uw telefoon of tablet gebruiken als een touchpad en toetsenbord</string>
+  <string name="pref_plugin_remotekeyboard">Toetsaanslagen van afstand ontvangen</string>
+  <string name="pref_plugin_remotekeyboard_desc">Toetsaanslaggebeurtenissen ontvangen van externe apparaten</string>
   <string name="pref_plugin_mpris">Bediening van multimedia</string>
   <string name="pref_plugin_mpris_desc">Biedt een afstandsbediening voor uw mediaspeler</string>
   <string name="pref_plugin_runcommand">Commando uitvoeren</string>
@@ -30,6 +32,10 @@
   <string name="no_permissions">U moet toestemming geven voor toegang tot meldingen</string>
   <string name="send_ping">Ping verzenden</string>
   <string name="open_mpris_controls">Bediening van multimedia</string>
+  <string name="remotekeyboard_editing_only_title">Behandel toetsen op afstand alleen bij bewerken</string>
+  <string name="remotekeyboard_not_connected">Er is geen actieve verbinding met een toetsenbord op afstand, maak er een in kdeconnect</string>
+  <string name="remotekeyboard_connected">Verbinding met toetsenbord op afstand is actief</string>
+  <string name="remotekeyboard_multiple_connections">Er is meer dan een verbinding met een toetsenbord op afstand, selecteer het te configureren apparaat</string>
   <string name="open_mousepad">Invoer op afstand</string>
   <string name="mousepad_info">Veeg met een vinger op het scherm om de muiscursor te verplaatsen. Tik om te klikken en gebruik twee/drie vingers voor rechter en middelste knop. Druk lang voor slepen en loslaten.</string>
   <string name="mousepad_double_tap_settings_title">Tikactie met twee vingers instellen</string>
@@ -79,15 +85,15 @@
   <string name="incoming_file_title">Inkomend bestand van %1s</string>
   <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_files_title">Bestanden verzenden naar %1s</string>
   <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">Verzonden %1$d uit %2$d bestanden</string>
+  <string name="outgoing_files_text">Verzonden %1$d van %2$d bestanden</string>
   <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>
   <string name="sent_file_title">Bestand verzonden naar %1s</string>
   <string name="sent_file_text">%1s</string>
-  <string name="sent_file_failed_title">Verzenden van bestand naar %1s is mislukt</string>
+  <string name="sent_file_failed_title">Verzenden van bestanden naar %1s is mislukt</string>
   <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Tap om te antwoorden</string>
   <string name="reconnect">Opnieuw verbinden</string>
@@ -134,7 +140,7 @@
   <string name="custom_device_list">Voeg apparaten toe per IP-adres</string>
   <string name="share_notification_preference">Luidruchtige meldingen</string>
   <string name="share_notification_preference_summary">Vibreer en speel een geluidje bij ontvangen van een bestand</string>
-  <string name="share_destination_customize">De bestemmingsmap aanpassen</string>
+  <string name="share_destination_customize">Pas bestemmingsmap aan</string>
   <string name="share_destination_customize_summary_disabled">Ontvangen bestanden zullen in Downloads verschijnen</string>
   <string name="share_destination_customize_summary_enabled">Bestanden zullen opgeslagen worden in de onderstaande map</string>
   <string name="share_destination_folder_preference">Bestemmingsmap</string>

res/values-pl/strings.xml

@@ -79,12 +79,15 @@
   <string name="incoming_file_title">Plik przychodzący od %1s</string>
   <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>
   <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>
   <string name="sent_file_title">Plik wysłano do %1s</string>
   <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Nie udało się wyłanie pliku do %1s</string>
   <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Stuknij, aby odpowiedzieć</string>
   <string name="reconnect">Połącz ponownie</string>
@@ -131,6 +134,10 @@
   <string name="custom_device_list">Dodaj urządzenia po numerze IP</string>
   <string name="share_notification_preference">Hałaśliwe powiadomienia</string>
   <string name="share_notification_preference_summary">Zadrżyj i odegraj dźwięk przy odebraniu pliku</string>
+  <string name="share_destination_customize">Własny katalog docelowy</string>
+  <string name="share_destination_customize_summary_disabled">Pobrane pliki ukażą się w Pobranych</string>
+  <string name="share_destination_customize_summary_enabled">Pliki zostaną zapisane w poniższym katalogu</string>
+  <string name="share_destination_folder_preference">Katalog docelowy</string>
   <string name="title_activity_notification_filter">Filtr powiadomień</string>
   <string name="filter_apps_info">Powiadomienia zostaną zsynchronizowane z wybranymi aplikacjami.</string>
   <string name="sftp_internal_storage">"Pamięć wewnętrzna "</string>

res/values-pt/strings.xml

@@ -10,6 +10,8 @@
   <string name="pref_plugin_clipboard_desc">Partilhar o conteúdo da área de transferência</string>
   <string name="pref_plugin_mousepad">Introdução remota de dados</string>
   <string name="pref_plugin_mousepad_desc">Usar o seu telefone ou \'tablet\' como um rato ou teclado</string>
+  <string name="pref_plugin_remotekeyboard">Receber as teclas remotamente</string>
+  <string name="pref_plugin_remotekeyboard_desc">Receber eventos de teclas dos dispositivos remotos</string>
   <string name="pref_plugin_mpris">Comandos multimédia</string>
   <string name="pref_plugin_mpris_desc">Oferece um comando à distância para o seu leitor multimédia</string>
   <string name="pref_plugin_runcommand">Executar um Comando</string>
@@ -30,6 +32,10 @@
   <string name="no_permissions">Precisa de dar permissões de acesso às notificações</string>
   <string name="send_ping">Enviar um pedido de contacto</string>
   <string name="open_mpris_controls">Comando multimédia</string>
+  <string name="remotekeyboard_editing_only_title">Lidar com as teclas remotas apenas na edição</string>
+  <string name="remotekeyboard_not_connected">Não existe nenhuma ligação activa a teclados remotos - crie uma no \'kdeconnect\'</string>
+  <string name="remotekeyboard_connected">A ligação ao teclado remoto está activa</string>
+  <string name="remotekeyboard_multiple_connections">Existe mais que uma ligação a teclados remotos; seleccione o dispositivo a configurar</string>
   <string name="open_mousepad">Introdução remota de dados</string>
   <string name="mousepad_info">Mova um dedo pelo ecrã para mover o cursor do rato. Dê um toque para carregar no botão esquerdo e use dois/três dedos para os botões direito e do meio. Use uma pressão longa para arrastar e largar.</string>
   <string name="mousepad_double_tap_settings_title">Definir a acção do toque com dois dedos</string>

res/values-sk/strings.xml

@@ -10,6 +10,8 @@
   <string name="pref_plugin_clipboard_desc">Zdieľať obsah schránky</string>
   <string name="pref_plugin_mousepad">Vzdialený vstup</string>
   <string name="pref_plugin_mousepad_desc">Použiť váš telefón alebo tablet ako touchpad a klávesnicu</string>
+  <string name="pref_plugin_remotekeyboard">Prijímať vzdialené stlačenia klávesov</string>
+  <string name="pref_plugin_remotekeyboard_desc">Prijímať udalosti stlačení klávesov od vzdialených zariadení</string>
   <string name="pref_plugin_mpris">Multimediálne ovládače</string>
   <string name="pref_plugin_mpris_desc">Poskytuje vzdialené ovládanie pre váš prehrávač médií</string>
   <string name="pref_plugin_runcommand">Spustiť príkaz</string>
@@ -30,6 +32,10 @@
   <string name="no_permissions">Musíte povoliť oprávnenia na prístup k pripomienkam</string>
   <string name="send_ping">Poslať ping</string>
   <string name="open_mpris_controls">Multimediálny ovládač</string>
+  <string name="remotekeyboard_editing_only_title">Spracúva vzdialené klávesy len pri editácii</string>
+  <string name="remotekeyboard_not_connected">Nie sú žiadne aktívne pripojenia vzdialenej klávesnice, vytvorte nejaké v Kdeconnect</string>
+  <string name="remotekeyboard_connected">Vzdialené pripojenie klávesnice je aktívne</string>
+  <string name="remotekeyboard_multiple_connections">Je viac ako jedno vzdialené pripojenie klávesnice, vyberte zariadenie na nastavenie</string>
   <string name="open_mousepad">Vzdialený vstup</string>
   <string name="mousepad_info">Posúvajte prst na obrazovke na posun kurzora. Ťuknutie vyvolá klik a použite dva/tri prsty pre pravé a stredné tlačidlo. Použite dlhé stlačenie pre drag and drop.</string>
   <string name="mousepad_double_tap_settings_title">Nastaviť akciu dvoch prstov</string>
@@ -79,12 +85,15 @@
   <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_files_title">Posielam súbor pre %1s</string>
   <string name="outgoing_file_text">%1s</string>
+  <string name="outgoing_files_text">Poslať %1$d z %2$d súborov</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>
   <string name="sent_file_title">Poslať súbor pre %1s</string>
   <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Zlyhalo poslanie súboru %1s</string>
   <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Tapnite na odpoveď</string>
   <string name="reconnect">Znovu pripojiť</string>
@@ -131,6 +140,10 @@
   <string name="custom_device_list">Pridať zariadenia podľa IP</string>
   <string name="share_notification_preference">Hlučné pripomienky</string>
   <string name="share_notification_preference_summary">Vibrovať a prehrať zvuk pri prijatí súboru</string>
+  <string name="share_destination_customize">Prispôsobiť cieľový adresár</string>
+  <string name="share_destination_customize_summary_disabled">Prijaté súbory sa objavia v Preberaniach</string>
+  <string name="share_destination_customize_summary_enabled">Súbory sa uložia v adresári dolu</string>
+  <string name="share_destination_folder_preference">Cieľový adresár</string>
   <string name="title_activity_notification_filter">Filter upozornení</string>
   <string name="filter_apps_info">Upozornenia budú synchronizované pre vybrané aplikácie.</string>
   <string name="sftp_internal_storage">Interné úložisko</string>

res/values-uk/strings.xml

@@ -10,6 +10,8 @@
   <string name="pref_plugin_clipboard_desc">Спільне використання буфера обміну даними</string>
   <string name="pref_plugin_mousepad">Дистанційне введення</string>
   <string name="pref_plugin_mousepad_desc">Скористайтеся телефоном або планшетом як замінником сенсорної панелі і клавіатури</string>
+  <string name="pref_plugin_remotekeyboard">Отримувати віддалені натискання клавіш</string>
+  <string name="pref_plugin_remotekeyboard_desc">Отримувати події натискання клавіш з віддаленого пристрою</string>
   <string name="pref_plugin_mpris">Керування відтворенням</string>
   <string name="pref_plugin_mpris_desc">Надає можливість віддаленого керування вашим мультимедійним програвачем</string>
   <string name="pref_plugin_runcommand">Виконати команду</string>
@@ -30,6 +32,10 @@
   <string name="no_permissions">Вам слід надати доступ до сповіщень</string>
   <string name="send_ping">Надіслати сигнал підтримання зв’язку</string>
   <string name="open_mpris_controls">Керування відтворенням</string>
+  <string name="remotekeyboard_editing_only_title">Обробляти віддалені клавіші лише під час редагування</string>
+  <string name="remotekeyboard_not_connected">Немає активних з’єднань із віддаленою клавіатурою. Встановіть таке з’єднання у kdeconnect.</string>
+  <string name="remotekeyboard_connected">З’єднання з віддаленою клавіатурою є активним</string>
+  <string name="remotekeyboard_multiple_connections">Існує декілька з’єднань із віддаленою клавіатурою. Виберіть пристрій для налаштовування.</string>
   <string name="open_mousepad">Дистанційне введення</string>
   <string name="mousepad_info">Проведіть по екрану пальцем, щоб пересунути вказівник миші. Дотик одним пальцем означатиме клацання, дотиком двома або трьома пальцями можна імітувати праву і середню кнопки. Для перетягування зі скиданням скористайтеся тривалим натисканням.</string>
   <string name="mousepad_double_tap_settings_title">Встановлення дії для торкання двома пальцями</string>

res/values-zh-rCN/strings.xml

@@ -5,15 +5,23 @@
   <string name="pref_plugin_battery">电池报告</string>
   <string name="pref_plugin_battery_desc">定期报告电池状态</string>
   <string name="pref_plugin_sftp">开放文件系统</string>
+  <string name="pref_plugin_sftp_desc">允许远程浏览设备的文件系统</string>
   <string name="pref_plugin_clipboard">剪贴板同步</string>
   <string name="pref_plugin_clipboard_desc">共享剪贴板内容</string>
   <string name="pref_plugin_mousepad">远程输入</string>
+  <string name="pref_plugin_mousepad_desc">将您的手机用或平板电脑用作触摸板和键盘</string>
+  <string name="pref_plugin_remotekeyboard">接收远程按键</string>
+  <string name="pref_plugin_remotekeyboard_desc">从远程设备接收按键事件</string>
   <string name="pref_plugin_mpris">多媒体控制</string>
+  <string name="pref_plugin_mpris_desc">媒体播放器的遥控器</string>
   <string name="pref_plugin_runcommand">执行命令</string>
+  <string name="pref_plugin_runcommand_desc">触发您的手机或平板电脑的远程命令</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">发送和接受ping</string>
   <string name="pref_plugin_notifications">通知同步</string>
   <string name="pref_plugin_notifications_desc">从其他设备访问你的通知</string>
+  <string name="pref_plugin_receive_notifications">接收通知</string>
+  <string name="pref_plugin_receive_notifications_desc">从其他设备接收通知并显示在 Android 上</string>
   <string name="pref_plugin_sharereceiver">分享和接收</string>
   <string name="pref_plugin_sharereceiver_desc">在设备间共享文件和 URL</string>
   <string name="plugin_not_available">该特性不适用于您的Android版本</string>
@@ -24,10 +32,16 @@
   <string name="no_permissions">你需要授予权限以便访问通知</string>
   <string name="send_ping">发送ping</string>
   <string name="open_mpris_controls">多媒体控制</string>
+  <string name="remotekeyboard_editing_only_title">只有在编辑时才接受远程按键</string>
+  <string name="remotekeyboard_not_connected">没有活动的远程键盘链接，请在 KDE Connect 中连接</string>
+  <string name="remotekeyboard_connected">远程键盘连接已启用</string>
+  <string name="remotekeyboard_multiple_connections">发现多个远程键盘连接，请选择设备进行配置</string>
   <string name="open_mousepad">远程输入</string>
   <string name="mousepad_info">在屏幕上移动手指来移动光标。轻击代表左键，双指或三指点击代表右键或中键。用长按来拖放。</string>
   <string name="mousepad_double_tap_settings_title">设置双指点击动作</string>
   <string name="mousepad_triple_tap_settings_title">设置三指点击动作</string>
+  <string name="mousepad_sensitivity_settings_title">设置触摸板灵敏度</string>
+  <string name="mousepad_scroll_direction_title">滚动方向反向</string>
   <string-array name="mousepad_tap_entries">
     <item>右键点击</item>
     <item>中键点击</item>
@@ -35,12 +49,13 @@
   </string-array>
   <string name="mousepad_double_default">右</string>
   <string name="mousepad_triple_default">中</string>
+  <string name="mousepad_sensitivity_default">默认</string>
   <string-array name="mousepad_sensitivity_entries">
-    <item>Slowest</item>
-    <item>Above Slowest</item>
-    <item>Default</item>
-    <item>Above Default</item>
-    <item>Fastest</item>
+    <item>最慢</item>
+    <item>高于最慢</item>
+    <item>默认</item>
+    <item>高于默认</item>
+    <item>最快</item>
   </string-array>
   <string name="category_connected_devices">已连接设备</string>
   <string name="category_not_paired_devices">可用设备</string>
@@ -59,6 +74,10 @@
   <string name="error_canceled_by_user">已被用户取消</string>
   <string name="error_canceled_by_other_peer">已被另一方取消</string>
   <string name="error_invalid_key">收到无效密钥</string>
+  <string name="encryption_info_title">加密信息</string>
+  <string name="encryption_info_msg_no_ssl">另一设备没有使用最新的 KDE Connect，使用旧版加密方法。</string>
+  <string name="my_device_fingerprint">您的设备证书的 SHA1 指纹是：</string>
+  <string name="remote_device_fingerprint">远程设备证书的 SHA1 指纹是：</string>
   <string name="pair_requested">已请求配对</string>
   <string name="pairing_request_from">来自%1s的配对请求</string>
   <string name="received_url_title">已从%1s接收链接</string>
@@ -66,12 +85,15 @@
   <string name="incoming_file_title">来自%1s的文件</string>
   <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>
   <string name="sent_file_title">发送文件到%1s</string>
   <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">向 %1s 发送文件失败</string>
   <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">点击以应答</string>
   <string name="reconnect">重新连接</string>
@@ -118,6 +140,10 @@
   <string name="custom_device_list">通过IP增加设备</string>
   <string name="share_notification_preference">出声通知</string>
   <string name="share_notification_preference_summary">当收到文件时震动并播放声音</string>
+  <string name="share_destination_customize">配置目标目录</string>
+  <string name="share_destination_customize_summary_disabled">接收的文件会出现在“Downloads”中</string>
+  <string name="share_destination_customize_summary_enabled">文件将会被存储在以下目录中</string>
+  <string name="share_destination_folder_preference">目标目录</string>
   <string name="title_activity_notification_filter">通知过滤器</string>
   <string name="filter_apps_info">所选软件的通知将会被同步。</string>
   <string name="sftp_internal_storage">内部存储</string>
@@ -143,7 +169,7 @@
   <string name="pref_plugin_telepathy">发送短消息</string>
   <string name="pref_plugin_telepathy_desc">从桌面发送短消息</string>
   <string name="plugin_not_supported">设备不支持此插件</string>
+  <string name="findmyphone_title">找到我的手机</string>
+  <string name="findmyphone_description">让设备响铃从而找到它</string>
   <string name="findmyphone_found">找到</string>
-  <string name="open">打开</string>
-  <string name="close">关闭</string>
 </resources>

res/values/dimens.xml

@@ -2,4 +2,5 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="key_height">48dip</dimen>
 </resources>

res/values/strings.xml

@@ -11,6 +11,8 @@
     <string name="pref_plugin_clipboard_desc">Share the clipboard content</string>
     <string name="pref_plugin_mousepad">Remote input</string>
     <string name="pref_plugin_mousepad_desc">Use your phone or tablet as a touchpad and keyboard</string>
+    <string name="pref_plugin_remotekeyboard">Receive remote keypresses</string>
+    <string name="pref_plugin_remotekeyboard_desc">Receive keypress events from remote devices</string>
     <string name="pref_plugin_mpris">Multimedia controls</string>
     <string name="pref_plugin_mpris_desc">Provides a remote control for your media player</string>
     <string name="pref_plugin_runcommand">Run Command</string>
@@ -31,6 +33,11 @@
     <string name="no_permissions">You need to grant permission to access notifications</string>
     <string name="send_ping">Send ping</string>
     <string name="open_mpris_controls">Multimedia control</string>
+    <string name="remotekeyboard_editing_only" translatable="false">remotekeyboard_editing_only</string>
+    <string name="remotekeyboard_editing_only_title" translatable="true">Handle remote keys only when editing</string>
+    <string name="remotekeyboard_not_connected" translatable="true">There is no active remote keyboard connection, establish one in kdeconnect</string>
+    <string name="remotekeyboard_connected" translatable="true">Remote keyboard connection is active</string>
+    <string name="remotekeyboard_multiple_connections" translatable="true">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 a long press to drag\'n drop.</string>
     <string name="mousepad_double_tap_settings_title">Set two finger tap action</string>

res/xml/remotekeyboardplugin_keyboard.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:keyHeight="@dimen/key_height"
+    android:horizontalGap="0px"
+    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>
+</Keyboard>

res/xml/remotekeyboardplugin_method.xml

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

res/xml/remotekeyboardplugin_preferences.xml

@@ -0,0 +1,11 @@
+<?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">
+
+    <CheckBoxPreference
+        android:id="@+id/remotekeyboard_editing_only"
+        android:key="@string/remotekeyboard_editing_only"
+        android:title="@string/remotekeyboard_editing_only_title"
+        android:defaultValue="true" />
+</PreferenceScreen>

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

@@ -39,7 +39,7 @@ import java.util.TimerTask;
 
 public class LanPairingHandler extends BasePairingHandler {
 
-    private Timer mPairingTimer;
+    Timer mPairingTimer;
 
     public LanPairingHandler(Device device, final PairingHandlerCallback callback) {
         super(device, callback);
@@ -169,7 +169,7 @@ public class LanPairingHandler extends BasePairingHandler {
         mDevice.sendPackage(createPairPackage(), statusCallback);
     }
 
-    public void hidePairingNotification() {
+    void hidePairingNotification() {
         mDevice.hidePairingNotification();
         if (mPairingTimer != null) {
             mPairingTimer .cancel();
@@ -207,7 +207,7 @@ public class LanPairingHandler extends BasePairingHandler {
         mDevice.sendPackage(np);
     }
 
-    public void pairingDone() {
+    void pairingDone() {
         // Store device information needed to create a Device object in a future
         //Log.e("KDE/PairingDone", "Pairing Done");
         SharedPreferences.Editor editor = mDevice.getContext().getSharedPreferences(mDevice.getDeviceId(), Context.MODE_PRIVATE).edit();

src/org/kde/kdeconnect/Device.java

@@ -368,7 +368,23 @@ public class Device implements BaseLink.PackageReceiver {
         Intent intent = new Intent(getContext(), MaterialActivity.class);
         intent.putExtra("deviceId", getDeviceId());
         intent.putExtra("notificationId", notificationId);
-        PendingIntent pendingIntent = PendingIntent.getActivity(getContext(), 0, intent, PendingIntent.FLAG_ONE_SHOT);
+        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);
+
+        acceptIntent.putExtra("deviceId", getDeviceId());
+        acceptIntent.putExtra("notificationId", notificationId);
+        acceptIntent.setAction("action "+System.currentTimeMillis());
+        acceptIntent.putExtra(MaterialActivity.PAIR_REQUEST_STATUS, MaterialActivity.PAIRING_ACCEPTED);
+
+        rejectIntent.putExtra("deviceId", getDeviceId());
+        rejectIntent.putExtra("notificationId", notificationId);
+        rejectIntent.setAction("action "+System.currentTimeMillis());
+        rejectIntent.putExtra(MaterialActivity.PAIR_REQUEST_STATUS, MaterialActivity.PAIRING_REJECTED);
+
+        PendingIntent acceptedPendingIntent = PendingIntent.getActivity(getContext(), 2, acceptIntent, PendingIntent.FLAG_ONE_SHOT);
+        PendingIntent rejectedPendingIntent = PendingIntent.getActivity(getContext(), 4, rejectIntent, PendingIntent.FLAG_ONE_SHOT);
 
         Resources res = getContext().getResources();
 
@@ -378,6 +394,8 @@ public class Device implements BaseLink.PackageReceiver {
                 .setContentIntent(pendingIntent)
                 .setTicker(res.getString(R.string.pair_requested))
                 .setSmallIcon(R.drawable.ic_notification)
+                .addAction(R.drawable.ic_accept_pairing, res.getString(R.string.pairing_accept), acceptedPendingIntent)
+                .addAction(R.drawable.ic_reject_pairing, res.getString(R.string.pairing_reject), rejectedPendingIntent)
                 .setAutoCancel(true)
                 .setDefaults(Notification.DEFAULT_ALL)
                 .build();

src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneActivity.java

@@ -8,6 +8,7 @@ import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -20,7 +21,12 @@ public class FindMyPhoneActivity extends Activity {
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        finish(); //If this activity was already open and we received the ring packet again, just finish it
+
+        if(ringtone != null) {
+            // If this activity was already open and we received the ring packet again, just finish it
+            finish();
+        }
+        // otherwise the activity will become active again
     }
 
     @Override
@@ -33,8 +39,28 @@ public class FindMyPhoneActivity extends Activity {
                         WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
                         WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
 
+        findViewById(R.id.bFindMyPhone).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+
         Uri ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
         ringtone = RingtoneManager.getRingtone(getApplicationContext(), ringtoneUri);
+        if (ringtone == null) {
+            ringtoneUri = RingtoneManager.getValidRingtoneUri(getApplicationContext());
+            if (ringtoneUri == null) {
+                Log.e("FindMyPhone", "Could not find a ringtone to play!");
+                return;
+            }
+            ringtone = RingtoneManager.getRingtone(getApplicationContext(), ringtoneUri);
+        }
 
         if (android.os.Build.VERSION.SDK_INT >= 21) {
             AudioAttributes.Builder b = new AudioAttributes.Builder();
@@ -45,18 +71,16 @@ public class FindMyPhoneActivity extends Activity {
         }
 
         ringtone.play();
-
-        findViewById(R.id.bFindMyPhone).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        });
     }
 
     @Override
-    public void finish() {
-        ringtone.stop();
-        super.finish();
+    protected void onStop() {
+        super.onStop();
+
+        if(ringtone != null) {
+            ringtone.stop();
+            ringtone = null;
+        }
     }
+
 }

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

@@ -224,7 +224,7 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
             if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
                 try {
                     Bundle extras = notification.extras;
-                    String extraTitle = extras.getString(TITLE_KEY);
+                    String extraTitle = extras.getCharSequence(TITLE_KEY).toString();
                     String extraText = null;
                     Object extraTextExtra = extras.get(TEXT_KEY);
                     if (extraTextExtra != null) extraText = extraTextExtra.toString();

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

@@ -33,6 +33,7 @@ import org.kde.kdeconnect.Plugins.MprisPlugin.MprisPlugin;
 import org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationsPlugin;
 import org.kde.kdeconnect.Plugins.PingPlugin.PingPlugin;
 import org.kde.kdeconnect.Plugins.ReceiveNotificationsPlugin.ReceiveNotificationsPlugin;
+import org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardPlugin;
 import org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandPlugin;
 import org.kde.kdeconnect.Plugins.SftpPlugin.SftpPlugin;
 import org.kde.kdeconnect.Plugins.SharePlugin.SharePlugin;
@@ -124,6 +125,8 @@ public class PluginFactory {
         PluginFactory.registerPlugin(TelepathyPlugin.class);
         PluginFactory.registerPlugin(FindMyPhonePlugin.class);
         PluginFactory.registerPlugin(RunCommandPlugin.class);
+        //Commented here and in AndroidManifest until we release a desktop version with this feature, so we don't get bad "feature not working" reviews
+        //PluginFactory.registerPlugin(RemoteKeyboardPlugin.class);
     }
 
     public static PluginInfo getPluginInfo(Context context, String pluginKey) {

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

@@ -0,0 +1,398 @@
+/*
+ * Copyright 2017 Holger Kaelberer <holger.k@elberer.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/>.
+ */
+
+package org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin;
+
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.SystemClock;
+import android.preference.PreferenceManager;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.util.Pair;
+import android.util.Log;
+import android.util.SparseIntArray;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.ExtractedText;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.view.inputmethod.InputConnection;
+
+import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.Plugins.Plugin;
+import org.kde.kdeconnect_tp.R;
+
+import java.util.ArrayList;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class RemoteKeyboardPlugin extends Plugin {
+
+    public final static String PACKAGE_TYPE_MOUSEPAD_REQUEST = "kdeconnect.mousepad.request";
+    public final static String PACKAGE_TYPE_MOUSEPAD_ECHO = "kdeconnect.mousepad.echo";
+    public final static String PACKAGE_TYPE_MOUSEPAD_KEYBOARDSTATE = "kdeconnect.mousepad.keyboardstate";
+
+    /**
+     * Track and expose plugin instances to allow for a 'connected'-indicator in the IME:
+     */
+    private static ArrayList<RemoteKeyboardPlugin> instances = new ArrayList<RemoteKeyboardPlugin>();
+    private static ReentrantLock instancesLock = new ReentrantLock(true);
+    public static ArrayList<RemoteKeyboardPlugin> getInstances() {
+        return instances;
+    }
+    public static ArrayList<RemoteKeyboardPlugin> acquireInstances() {
+        instancesLock.lock();
+        return getInstances();
+    }
+    public static ArrayList<RemoteKeyboardPlugin> releaseInstances() {
+        instancesLock.unlock();
+        return getInstances();
+    }
+    public static boolean isConnected() {
+        return instances.size() > 0;
+    }
+
+    private static SparseIntArray specialKeyMap = new SparseIntArray();
+
+    static {
+        int i = 0;
+        specialKeyMap.put(++i, KeyEvent.KEYCODE_DEL);              // 1
+        specialKeyMap.put(++i, KeyEvent.KEYCODE_TAB);              // 2
+        ++i; //specialKeyMap.put(++i, KeyEvent.KEYCODE_ENTER, 12); // 3 is not used
+        specialKeyMap.put(++i, KeyEvent.KEYCODE_DPAD_LEFT);        // 4
+        specialKeyMap.put(++i, KeyEvent.KEYCODE_DPAD_UP);          // 5
+        specialKeyMap.put(++i, KeyEvent.KEYCODE_DPAD_RIGHT);       // 6
+        specialKeyMap.put(++i, KeyEvent.KEYCODE_DPAD_DOWN);        // 7
+        specialKeyMap.put(++i, KeyEvent.KEYCODE_PAGE_UP);          // 8
+        specialKeyMap.put(++i, KeyEvent.KEYCODE_PAGE_DOWN);        // 9
+        if (Build.VERSION.SDK_INT >= 11) {
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_MOVE_HOME);    // 10
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_MOVE_END);     // 11
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_ENTER); // 12
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_FORWARD_DEL);  // 13
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_ESCAPE);       // 14
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_SYSRQ);        // 15
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_SCROLL_LOCK);  // 16
+            ++i;           // 17
+            ++i;           // 18
+            ++i;           // 19
+            ++i;           // 20
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F1);           // 21
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F2);           // 22
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F3);           // 23
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F4);           // 24
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F5);           // 25
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F6);           // 26
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F7);           // 27
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F8);           // 28
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F9);           // 29
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F10);          // 30
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F11);          // 31
+            specialKeyMap.put(++i, KeyEvent.KEYCODE_F12);          // 21
+        }
+    }
+
+    @Override
+    public boolean onCreate() {
+        Log.d("RemoteKeyboardPlugin", "Creating for device " + device.getName());
+        acquireInstances();
+        try {
+            instances.add(this);
+        } finally {
+            releaseInstances();
+        }
+        if (RemoteKeyboardService.instance != null)
+            RemoteKeyboardService.instance.handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    RemoteKeyboardService.instance.updateInputView();
+                }
+            });
+        return true;
+    }
+
+    @Override
+    public void onDestroy() {
+        acquireInstances();
+        try {
+            if (instances.contains(this)) {
+                instances.remove(this);
+                if (instances.size() < 1 && RemoteKeyboardService.instance != null)
+                    RemoteKeyboardService.instance.handler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            RemoteKeyboardService.instance.updateInputView();
+                        }
+                    });
+            }
+        } finally {
+            releaseInstances();
+        }
+
+        Log.d("RemoteKeyboardPlugin", "Destroying for device " + device.getName());
+    }
+
+    @Override
+    public String getDisplayName() {
+        return context.getString(R.string.pref_plugin_remotekeyboard);
+    }
+
+    @Override
+    public String getDescription() {
+        return context.getString(R.string.pref_plugin_remotekeyboard_desc);
+    }
+
+    @Override
+    public Drawable getIcon() {
+        return ContextCompat.getDrawable(context, R.drawable.ic_action_keyboard);
+    }
+
+    @Override
+    public boolean hasSettings() {
+        return true;
+    }
+
+    @Override
+    public boolean hasMainActivity() {
+        return false;
+    }
+
+    @Override
+    public String[] getSupportedPackageTypes() {
+        return new String[]{PACKAGE_TYPE_MOUSEPAD_REQUEST};
+    }
+
+    @Override
+    public String[] getOutgoingPackageTypes() {
+        return new String[]{PACKAGE_TYPE_MOUSEPAD_ECHO, PACKAGE_TYPE_MOUSEPAD_KEYBOARDSTATE};
+    }
+
+    private boolean isValidSpecialKey(int key) {
+        return (specialKeyMap.get(key, 0) > 0);
+    }
+
+    private int getCharPos(ExtractedText extractedText, char ch, boolean forward) {
+        int pos = -1;
+        if (extractedText != null) {
+            if (!forward)  // backward
+                pos = extractedText.text.toString().lastIndexOf(" ", extractedText.selectionEnd - 2);
+            else
+                pos = extractedText.text.toString().indexOf(" ", extractedText.selectionEnd + 1);
+            return pos;
+        }
+        return pos;
+    }
+
+    private int currentTextLength(ExtractedText extractedText) {
+        if (extractedText != null)
+            return extractedText.text.length();
+        return -1;
+    }
+
+    private int currentCursorPos(ExtractedText extractedText) {
+        if (extractedText != null)
+            return extractedText.selectionEnd;
+        return -1;
+    }
+
+    private Pair<Integer,Integer> currentSelection(ExtractedText extractedText) {
+        if (extractedText != null)
+            return new Pair<>(extractedText.selectionStart, extractedText.selectionEnd);
+        return new Pair<>(-1, -1);
+    }
+
+    private boolean handleSpecialKey(int key, boolean shift, boolean ctrl, boolean alt) {
+        int keyEvent = specialKeyMap.get(key, 0);
+        if (keyEvent == 0)
+            return false;
+        InputConnection inputConn = RemoteKeyboardService.instance.getCurrentInputConnection();
+//        Log.d("RemoteKeyboardPlugin", "Handling special key " + key + " translated to " + keyEvent + " shift=" + shift + " ctrl=" + ctrl + " alt=" + alt);
+
+        // special sequences:
+        if (ctrl && (keyEvent == KeyEvent.KEYCODE_DPAD_RIGHT)) {
+            // Ctrl + right -> next word
+            ExtractedText extractedText = inputConn.getExtractedText(new ExtractedTextRequest(), 0);
+            int pos = getCharPos(extractedText, ' ', keyEvent == KeyEvent.KEYCODE_DPAD_RIGHT);
+            if (pos == -1)
+                pos = currentTextLength(extractedText);
+            else
+                pos++;
+            int startPos = pos;
+            int endPos = pos;
+            if (shift) { // Shift -> select word (otherwise jump)
+                Pair<Integer,Integer> sel = currentSelection(extractedText);
+                int cursor = currentCursorPos(extractedText);
+//                Log.d("RemoteKeyboardPlugin", "Selection (to right): " + sel.first + " / " + sel.second + " cursor: " + cursor);
+                startPos = cursor;
+                if (sel.first < cursor ||   // active selection from left to right -> grow
+                    sel.first > sel.second) // active selection from right to left -> shrink
+                    startPos = sel.first;
+            }
+            inputConn.setSelection(startPos, endPos);
+        } else if (ctrl && keyEvent == KeyEvent.KEYCODE_DPAD_LEFT) {
+            // Ctrl + left -> previous word
+            ExtractedText extractedText = inputConn.getExtractedText(new ExtractedTextRequest(), 0);
+            int pos = getCharPos(extractedText, ' ', keyEvent == KeyEvent.KEYCODE_DPAD_RIGHT);
+            if (pos == -1)
+                pos = 0;
+            else
+                pos++;
+            int startPos = pos;
+            int endPos = pos;
+            if (shift) {
+                Pair<Integer,Integer> sel = currentSelection(extractedText);
+                int cursor = currentCursorPos(extractedText);
+//                Log.d("RemoteKeyboardPlugin", "Selection (to left): " + sel.first + " / " + sel.second + " cursor: " + cursor);
+                startPos = cursor;
+                if (cursor < sel.first ||    // active selection from right to left -> grow
+                    sel.first < sel.second)  // active selection from right to left -> shrink
+                    startPos = sel.first;
+            }
+            inputConn.setSelection(startPos, endPos);
+        } else if (shift
+                && (keyEvent == KeyEvent.KEYCODE_DPAD_LEFT
+                || keyEvent == KeyEvent.KEYCODE_DPAD_RIGHT
+                || keyEvent == KeyEvent.KEYCODE_DPAD_UP
+                || keyEvent == KeyEvent.KEYCODE_DPAD_DOWN
+                || keyEvent == KeyEvent.KEYCODE_MOVE_HOME
+                || keyEvent == KeyEvent.KEYCODE_MOVE_END)) {
+            // Shift + up/down/left/right/home/end
+            long now = SystemClock.uptimeMillis();
+            inputConn.sendKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_SHIFT_LEFT, 0, 0));
+            inputConn.sendKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_DOWN, keyEvent, 0, KeyEvent.META_SHIFT_LEFT_ON));
+            inputConn.sendKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_UP, keyEvent, 0, KeyEvent.META_SHIFT_LEFT_ON));
+            inputConn.sendKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_SHIFT_LEFT, 0, 0));
+        } else if (keyEvent == KeyEvent.KEYCODE_NUMPAD_ENTER
+                || keyEvent == KeyEvent.KEYCODE_ENTER) {
+            // Enter key
+            EditorInfo editorInfo = RemoteKeyboardService.instance.getCurrentInputEditorInfo();
+//            Log.d("RemoteKeyboardPlugin", "Enter: " + editorInfo.imeOptions);
+            if (editorInfo != null
+                    && (((editorInfo.imeOptions & EditorInfo.IME_FLAG_NO_ENTER_ACTION) == 0)
+                        || ctrl)) {  // Ctrl+Return overrides IME_FLAG_NO_ENTER_ACTION (FIXME: make configurable?)
+                // check for special DONE/GO/etc actions first:
+                int[] actions = { EditorInfo.IME_ACTION_GO, EditorInfo.IME_ACTION_NEXT,
+                        EditorInfo.IME_ACTION_SEND, EditorInfo.IME_ACTION_SEARCH,
+                        EditorInfo.IME_ACTION_DONE};  // note: DONE should be last or we might hide the ime instead of "go"
+                for (int i = 0; i < actions.length; i++) {
+                    if ((editorInfo.imeOptions & actions[i]) == actions[i]) {
+//                        Log.d("RemoteKeyboardPlugin", "Enter-action: " + actions[i]);
+                        inputConn.performEditorAction(actions[i]);
+                        return true;
+                    }
+                }
+            } else {
+                // else: fall back to regular Enter-event:
+//                Log.d("RemoteKeyboardPlugin", "Enter: normal keypress");
+                inputConn.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, keyEvent));
+                inputConn.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, keyEvent));
+            }
+        } else {
+            // default handling:
+            inputConn.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, keyEvent));
+            inputConn.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, keyEvent));
+        }
+
+        return true;
+    }
+
+    private boolean handleVisibleKey(String key, boolean shift, boolean ctrl, boolean alt) {
+//        Log.d("RemoteKeyboardPlugin", "Handling visible key " + key + " shift=" + shift + " ctrl=" + ctrl + " alt=" + alt + " " + key.equalsIgnoreCase("c") + " " + key.length());
+
+        if (key.isEmpty())
+            return false;
+
+        InputConnection inputConn = RemoteKeyboardService.instance.getCurrentInputConnection();
+        if (inputConn == null)
+            return false;
+
+        // ctrl+c/v/x
+        if (key.equalsIgnoreCase("c") && ctrl) {
+            return inputConn.performContextMenuAction(android.R.id.copy);
+        } else if (key.equalsIgnoreCase("v") && ctrl)
+            return inputConn.performContextMenuAction(android.R.id.paste);
+        else if (key.equalsIgnoreCase("x") && ctrl)
+            return inputConn.performContextMenuAction(android.R.id.cut);
+        else if (key.equalsIgnoreCase("a") && ctrl)
+            return inputConn.performContextMenuAction(android.R.id.selectAll);
+
+//        Log.d("RemoteKeyboardPlugin", "Committing visible key '" + key + "'");
+        inputConn.commitText(key, key.length());
+        return true;
+    }
+
+    private boolean handleEvent(NetworkPackage np) {
+        if (np.has("specialKey") && isValidSpecialKey(np.getInt("specialKey")))
+            return handleSpecialKey(np.getInt("specialKey"), np.getBoolean("shift"),
+                    np.getBoolean("ctrl"), np.getBoolean("alt"));
+
+        // try visible key
+        return handleVisibleKey(np.getString("key"), np.getBoolean("shift"),
+                np.getBoolean("ctrl"), np.getBoolean("alt"));
+    }
+
+    @Override
+    public boolean onPackageReceived(NetworkPackage np) {
+
+        if (!np.getType().equals(PACKAGE_TYPE_MOUSEPAD_REQUEST)
+                || (!np.has("key") && !np.has("specialKey"))) {  // expect at least key OR specialKey
+            Log.e("RemoteKeyboardPlugin", "Invalid package for remotekeyboard plugin!");
+            return false;
+        }
+
+        if (RemoteKeyboardService.instance == null) {
+            Log.i("RemoteKeyboardPlugin", "Remote keyboard is not the currently selected input method, dropping key");
+            return false;
+        }
+
+        if (!RemoteKeyboardService.instance.visible &&
+                PreferenceManager.getDefaultSharedPreferences(context).getBoolean(context.getString(R.string.remotekeyboard_editing_only), true)) {
+            Log.i("RemoteKeyboardPlugin", "Remote keyboard is currently not visible, dropping key");
+            return false;
+        }
+
+        if (!handleEvent(np)) {
+            Log.i("RemoteKeyboardPlugin", "Could not handle event!");
+            return false;
+        }
+
+        if (np.getBoolean("sendAck")) {
+            NetworkPackage reply = new NetworkPackage(PACKAGE_TYPE_MOUSEPAD_ECHO);
+            reply.set("key", np.getString("key"));
+            if (np.has("specialKey"))
+                reply.set("specialKey", np.getInt("specialKey"));
+            if (np.has("shift"))
+                reply.set("shift", np.getBoolean("shift"));
+            if (np.has("ctrl"))
+                reply.set("ctrl", np.getBoolean("ctrl"));
+            if (np.has("alt"))
+                reply.set("alt", np.getBoolean("alt"));
+            reply.set("isAck", true);
+            device.sendPackage(reply);
+        }
+
+        return true;
+    }
+
+    public void notifyKeyboardState(boolean state) {
+        Log.d("RemoteKeyboardPlugin", "Keyboardstate changed to " + state);
+        NetworkPackage np = new NetworkPackage(PACKAGE_TYPE_MOUSEPAD_KEYBOARDSTATE);
+        np.set("state", state);
+        device.sendPackage(np);
+    }
+}

src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardService.java

@@ -0,0 +1,233 @@
+/*
+ * Copyright 2017 Holger Kaelberer <holger.k@elberer.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/>.
+ */
+
+package org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin;
+
+import android.content.Context;
+import android.content.Intent;
+import android.inputmethodservice.InputMethodService;
+import android.inputmethodservice.Keyboard;
+import android.inputmethodservice.KeyboardView;
+import android.inputmethodservice.KeyboardView.OnKeyboardActionListener;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Toast;
+
+import org.kde.kdeconnect.UserInterface.MaterialActivity;
+import org.kde.kdeconnect.UserInterface.PluginSettingsActivity;
+import org.kde.kdeconnect_tp.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RemoteKeyboardService
+        extends InputMethodService
+        implements OnKeyboardActionListener {
+
+    /**
+     * Reference to our instance
+     * null if this InputMethod is not currently selected.
+     */
+    public static RemoteKeyboardService instance = null;
+
+    /**
+     * Whether input is currently accepted
+     * Implies visible == true
+     */
+    public boolean active = false;
+
+    /**
+     * Whether this InputMethod is currently visible.
+     */
+    public boolean visible = false;
+
+    KeyboardView inputView = null;
+    private final int StatusKeyIdx = 3;
+    private final int connectedIcon = R.drawable.ic_phonelink_white_36dp;
+    private final int disconnectedIcon = R.drawable.ic_phonelink_off_white_36dp;
+
+    Handler handler;
+
+    void updateInputView() {
+        if (inputView == null)
+            return;
+        Keyboard currentKeyboard = inputView.getKeyboard();
+        List<Keyboard.Key> keys = currentKeyboard.getKeys();
+        boolean connected = RemoteKeyboardPlugin.isConnected();
+//        Log.d("RemoteKeyboardService", "Updating keyboard connection icon, connected=" + connected);
+        keys.get(StatusKeyIdx).icon = getResources().getDrawable(connected ? connectedIcon : disconnectedIcon);
+        inputView.invalidateKey(StatusKeyIdx);
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        active = false;
+        visible = false;
+        instance = this;
+        handler = new Handler();
+        Log.d("RemoteKeyboardService", "Remote keyboard initialized");
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        instance = null;
+        Log.d("RemoteKeyboardService", "Destroyed");
+    }
+
+    @Override
+    public void onInitializeInterface() {
+        super.onInitializeInterface();
+    }
+
+    @Override
+    public View onCreateInputView() {
+//        Log.d("RemoteKeyboardService", "onCreateInputView connected=" + RemoteKeyboardPlugin.isConnected());
+        inputView = new KeyboardView(this, null);
+        inputView.setKeyboard(new Keyboard(this, R.xml.remotekeyboardplugin_keyboard));
+        inputView.setPreviewEnabled(false);
+        inputView.setOnKeyboardActionListener(this);
+        updateInputView();
+        return inputView;
+    }
+
+    @Override
+    public void onStartInputView(EditorInfo attribute, boolean restarting) {
+//        Log.d("RemoteKeyboardService", "onStartInputView");
+        super.onStartInputView(attribute, restarting);
+        visible = true;
+        ArrayList<RemoteKeyboardPlugin> instances = RemoteKeyboardPlugin.acquireInstances();
+        try {
+            for (RemoteKeyboardPlugin i: instances)
+                i.notifyKeyboardState(true);
+        } finally {
+            RemoteKeyboardPlugin.releaseInstances();
+        }
+    }
+
+    @Override
+    public void onFinishInputView(boolean finishingInput) {
+//        Log.d("RemoteKeyboardService", "onFinishInputView");
+        super.onFinishInputView(finishingInput);
+        visible = false;
+        ArrayList<RemoteKeyboardPlugin> instances = RemoteKeyboardPlugin.acquireInstances();
+        try {
+            for (RemoteKeyboardPlugin i: instances)
+                i.notifyKeyboardState(false);
+        } finally {
+            RemoteKeyboardPlugin.releaseInstances();
+        }
+    }
+
+    @Override
+    public void onStartInput(EditorInfo attribute, boolean restarting) {
+//        Log.d("RemoteKeyboardService", "onStartInput");
+        super.onStartInput(attribute, restarting);
+        active = true;
+    }
+
+    @Override
+    public void onFinishInput() {
+//        Log.d("RemoteKeyboardService", "onFinishInput");
+        super.onFinishInput();
+        active = false;
+    }
+
+    @Override
+    public void onPress(int primaryCode) {
+        switch (primaryCode) {
+            case 0: {  // "hide keyboard"
+                requestHideSelf(0);
+                break;
+            }
+            case 1: { // "settings"
+                ArrayList<RemoteKeyboardPlugin> instances = RemoteKeyboardPlugin.acquireInstances();
+                try {
+                    if (instances.size() == 1) {  // single instance of RemoteKeyboardPlugin -> access its settings
+                        RemoteKeyboardPlugin plugin = instances.get(0);
+                        if (plugin != null) {
+                            Intent intent = new Intent(this, PluginSettingsActivity.class);
+                            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            intent.putExtra("plugin_display_name", plugin.getDisplayName());
+                            intent.putExtra("plugin_key", plugin.getPluginKey());
+                            startActivity(intent);
+                        }
+                    } else { // != 1 instance of plugin -> show main activity view
+                        Intent intent = new Intent(this, MaterialActivity.class);
+                        intent.putExtra("forceOverview", true);
+                        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        startActivity(intent);
+                        if (instances.size() < 1)
+                            Toast.makeText(this, R.string.remotekeyboard_not_connected, Toast.LENGTH_SHORT).show();
+                        else // instances.size() > 1
+                            Toast.makeText(this, R.string.remotekeyboard_multiple_connections, Toast.LENGTH_SHORT).show();
+                    }
+                } finally {
+                    RemoteKeyboardPlugin.releaseInstances();
+                }
+                break;
+            }
+            case 2: { // "keyboard"
+                InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.showInputMethodPicker();
+                break;
+            }
+            case 3: { // "connected"?
+                if (RemoteKeyboardPlugin.isConnected())
+                    Toast.makeText(this, R.string.remotekeyboard_connected, Toast.LENGTH_SHORT).show();
+                else
+                    Toast.makeText(this, R.string.remotekeyboard_not_connected, Toast.LENGTH_SHORT).show();
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void onKey(int primaryCode, int[] keyCodes) {
+    }
+
+    @Override
+    public void onText(CharSequence text) {
+    }
+
+    @Override
+    public void swipeRight() {
+    }
+
+    @Override
+    public void swipeLeft() {
+    }
+
+    @Override
+    public void swipeDown() {
+    }
+
+    @Override
+    public void swipeUp() {
+    }
+
+    @Override
+    public void onRelease(int primaryCode) {
+    }
+}

src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/THANKS

@@ -0,0 +1,3 @@
+Besides the official Android examples about implementing IMEs I learned a lot about using
+the Android APIs around InputConnection from the excellent "Remote Keyboard" app from onyxbits
+(http://www.onyxbits.de/remotekeyboard). Thanks!

src/org/kde/kdeconnect/Plugins/SharePlugin/SendFileActivity.java

@@ -21,8 +21,10 @@
 package org.kde.kdeconnect.Plugins.SharePlugin;
 
 import android.app.Activity;
+import android.content.ClipData;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
@@ -47,6 +49,9 @@ public class SendFileActivity extends ActionBarActivity {
 
         Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
         intent.setType("*/*");
+        if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2)) {
+            intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+        }
         intent.addCategory(Intent.CATEGORY_OPENABLE);
         try {
             startActivityForResult(
@@ -62,23 +67,39 @@ public class SendFileActivity extends ActionBarActivity {
         switch (requestCode) {
             case Activity.RESULT_FIRST_USER:
                 if (resultCode == RESULT_OK) {
-                    final Uri uri = data.getData();
-                    Log.i("SendFileActivity", "File Uri: " + uri.toString());
-                    BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
-                        @Override
-                        public void onServiceStart(BackgroundService service) {
-                            Device device = service.getDevice(mDeviceId);
-                            if (device == null) {
-                                Log.e("SendFileActivity", "Device is null");
-                                finish();
-                                return;
-                            }
-                            ArrayList<Uri> uris = new ArrayList<>();
-                            uris.add(uri);
-                            SharePlugin.queuedSendUriList(getApplicationContext(), device, uris);
 
+                    final ArrayList<Uri> uris = new ArrayList<>();
+
+                    Uri uri = data.getData();
+                    if (uri != null) {
+                        uris.add(uri);
+                    }
+
+                    if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2)) {
+                        ClipData clipdata = data.getClipData();
+                        if (clipdata != null) {
+                            for (int i = 0; i < clipdata.getItemCount(); i++) {
+                                uris.add(clipdata.getItemAt(i).getUri());
+                            }
                         }
-                    });
+                    }
+
+                    if (uris.isEmpty()) {
+                        Log.w("SendFileActivity", "No files to send?");
+                    } else {
+                        BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
+                            @Override
+                            public void onServiceStart(BackgroundService service) {
+                                Device device = service.getDevice(mDeviceId);
+                                if (device == null) {
+                                    Log.e("SendFileActivity", "Device is null");
+                                    finish();
+                                    return;
+                                }
+                                SharePlugin.queuedSendUriList(getApplicationContext(), device, uris);
+                            }
+                        });
+                    }
                 }
                 finish();
                 break;

src/org/kde/kdeconnect/Plugins/SharePlugin/ShareSettingsActivity.java

@@ -35,7 +35,7 @@ public class ShareSettingsActivity extends PluginSettingsActivity {
         final CheckBoxPreference customDownloads = (CheckBoxPreference) findPreference("share_destination_custom");
         filePicker = findPreference("share_destination_folder_preference");
 
-        if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)) {
+        if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)) {
             customDownloads.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {

src/org/kde/kdeconnect/UserInterface/DeviceFragment.java

@@ -60,14 +60,15 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class DeviceFragment extends Fragment {
 
-    private static final String ARG_DEVICE_ID = "deviceId";
-    private View rootView;
-    static private String mDeviceId; //Static because if we get here by using the back button in the action bar, the extra deviceId will not be set.
-    private Device device;
+    static final String ARG_DEVICE_ID = "deviceId";
 
-    private TextView errorHeader;
+    View rootView;
+    static String mDeviceId; //Static because if we get here by using the back button in the action bar, the extra deviceId will not be set.
+    Device device;
 
-    private MaterialActivity mActivity;
+    TextView errorHeader;
+
+    MaterialActivity mActivity;
 
     public DeviceFragment() { }
 
@@ -84,6 +85,13 @@ public class DeviceFragment extends Fragment {
         this.setArguments(args);
     }
 
+    public DeviceFragment(String deviceId, MaterialActivity activity){
+        this.mActivity = activity;
+        Bundle args = new Bundle();
+        args.putString(ARG_DEVICE_ID, deviceId);
+        this.setArguments(args);
+    }
+
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
@@ -183,8 +191,7 @@ public class DeviceFragment extends Fragment {
         return rootView;
     }
 
-
-    private final Device.PluginsChangedListener pluginsChangedListener = new Device.PluginsChangedListener() {
+    final Device.PluginsChangedListener pluginsChangedListener = new Device.PluginsChangedListener() {
         @Override
         public void onPluginsChanged(final Device device) {
             refreshUI();
@@ -418,7 +425,7 @@ public class DeviceFragment extends Fragment {
 
     }
 
-    private final Device.PairingCallback pairingCallback = new Device.PairingCallback() {
+    final Device.PairingCallback pairingCallback = new Device.PairingCallback() {
 
         @Override
         public void incomingRequest() {
@@ -435,6 +442,7 @@ public class DeviceFragment extends Fragment {
             mActivity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
+                    if (rootView == null) return;
                     ((TextView) rootView.findViewById(R.id.pair_message)).setText(error);
                     rootView.findViewById(R.id.pair_progress).setVisibility(View.GONE);
                     rootView.findViewById(R.id.pair_button).setVisibility(View.VISIBLE);
@@ -449,6 +457,7 @@ public class DeviceFragment extends Fragment {
             mActivity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
+                    if (rootView == null) return;
                     ((TextView) rootView.findViewById(R.id.pair_message)).setText(R.string.device_not_paired);
                     rootView.findViewById(R.id.pair_progress).setVisibility(View.GONE);
                     rootView.findViewById(R.id.pair_button).setVisibility(View.VISIBLE);
@@ -460,4 +469,45 @@ public class DeviceFragment extends Fragment {
 
     };
 
+    public static void acceptPairing(final String devId, final MaterialActivity activity){
+        final DeviceFragment frag = new DeviceFragment(devId, activity);
+        BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
+            public void onServiceStart(BackgroundService service) {
+                Device dev = service.getDevice(devId);
+                activity.getSupportActionBar().setTitle(dev.getName());
+
+                dev.addPairingCallback(frag.pairingCallback);
+                dev.addPluginsChangedListener(frag.pluginsChangedListener);
+
+                frag.device = dev;
+                frag.device.acceptPairing();
+
+                frag.refreshUI();
+
+            }
+        });
+    }
+
+    public static void rejectPairing(final String devId, final MaterialActivity activity){
+        final DeviceFragment frag = new DeviceFragment(devId, activity);
+        BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
+            public void onServiceStart(BackgroundService service) {
+                Device dev = service.getDevice(devId);
+                activity.getSupportActionBar().setTitle(dev.getName());
+
+                dev.addPairingCallback(frag.pairingCallback);
+                dev.addPluginsChangedListener(frag.pluginsChangedListener);
+
+                frag.device = dev;
+
+                //Remove listener so buttons don't show for a while before changing the view
+                frag.device.removePluginsChangedListener(frag.pluginsChangedListener);
+                frag.device.removePairingCallback(frag.pairingCallback);
+                frag.device.rejectPairing();
+                activity.onDeviceSelected(null);
+
+                frag.refreshUI();
+            }
+        });
+    }
 }

src/org/kde/kdeconnect/UserInterface/MaterialActivity.java

@@ -38,6 +38,10 @@ public class MaterialActivity extends AppCompatActivity {
 
     public static final int RESULT_NEEDS_RELOAD = Activity.RESULT_FIRST_USER;
 
+    public static final String PAIR_REQUEST_STATUS = "pair_req_status";
+    public static final String PAIRING_ACCEPTED = "accepted";
+    public static final String PAIRING_REJECTED = "rejected";
+
     private NavigationView mNavigationView;
     private DrawerLayout mDrawerLayout;
 
@@ -102,9 +106,16 @@ public class MaterialActivity extends AppCompatActivity {
         preferences = getSharedPreferences(STATE_SELECTED_DEVICE, Context.MODE_PRIVATE);
 
         String savedDevice;
-        if (getIntent().hasExtra("deviceId")) {
+        String pairStatus = "";
+        if (getIntent().hasExtra("forceOverview")) {
+            Log.i("MaterialActivity", "Requested to start main overview");
+            savedDevice = null;
+        } else if (getIntent().hasExtra("deviceId")) {
             Log.i("MaterialActivity", "Loading selected device from parameter");
             savedDevice = getIntent().getStringExtra("deviceId");
+            if(getIntent().hasExtra(PAIR_REQUEST_STATUS)){
+                pairStatus = getIntent().getStringExtra(PAIR_REQUEST_STATUS);
+            }
         } else if (savedInstanceState != null) {
             Log.i("MaterialActivity", "Loading selected device from saved activity state");
             savedDevice = savedInstanceState.getString(STATE_SELECTED_DEVICE);
@@ -112,8 +123,31 @@ public class MaterialActivity extends AppCompatActivity {
             Log.i("MaterialActivity", "Loading selected device from persistent storage");
             savedDevice = preferences.getString(STATE_SELECTED_DEVICE, null);
         }
+        //if pairStatus is not empty, then the decision has been made...
+        if (!pairStatus.equals("")) {
+            Log.i("MaterialActivity", "pair status is "+pairStatus);
+            onNewDeviceSelected(savedDevice, pairStatus);
+        }
         onDeviceSelected(savedDevice);
+    }
 
+    //like onNewDeviceSelected but assumes that the new device is simply requesting to be paired
+    //and can't be null
+    private void onNewDeviceSelected(String deviceId, String pairStatus){
+        mCurrentDevice = deviceId;
+
+        preferences.edit().putString(STATE_SELECTED_DEVICE, mCurrentDevice).apply();
+
+        for (HashMap.Entry<MenuItem, String> entry : mMapMenuToDeviceId.entrySet()) {
+            boolean selected = TextUtils.equals(entry.getValue(), deviceId); //null-safe
+            entry.getKey().setChecked(selected);
+        }
+
+        if (pairStatus.equals(PAIRING_ACCEPTED)) {
+            DeviceFragment.acceptPairing(deviceId, this);
+        } else {
+            DeviceFragment.rejectPairing(deviceId, this);
+        }
     }
 
     @Override

tests/org/kde/kdeconnect/LanLinkTest.java

@@ -92,7 +92,7 @@ public class LanLinkTest extends AndroidTestCase {
 
         goodLanLink.sendPackage(testPackage, callback);
 
-        Mockito.verify(callback).sendSuccess();
+        Mockito.verify(callback).onSuccess();
     }
 
     public void testSendPackageFail() throws JSONException {
@@ -105,7 +105,7 @@ public class LanLinkTest extends AndroidTestCase {
 
         badLanLink.sendPackage(testPackage, callback);
 
-        Mockito.verify(callback).sendFailure(Mockito.any(RuntimeException.class));
+        Mockito.verify(callback).onFailure(Mockito.any(RuntimeException.class));
 
     }
 
@@ -250,7 +250,7 @@ public class LanLinkTest extends AndroidTestCase {
         }
         assertEquals(new String(data), new String(downloader.getOutputStream().toByteArray()));
 
-        Mockito.verify(callback).sendSuccess();
+        Mockito.verify(callback).onSuccess();
 
     }
 }