Bumped version to release

Swapped branches in if statement caused settings to not be stored in db
SVN_SILENT made messages (after extraction)
2025-09-01 06:35:09 +00:00 · 2016-09-24 20:28:05 +02:00 · 2016-09-24 20:26:23 +02:00 · 2016-09-23 10:40:27 +00:00 · 2016-09-20 12:46:59 +02:00 · 2016-09-20 12:46:28 +02:00
31 changed files with 563 additions and 287 deletions
--- a/AndroidManifest.xml
+++ b/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="1320"
-    android:versionName="1.3.2">
+    android:versionCode="1440"
+    android:versionName="1.4.4">

    <uses-sdk android:minSdkVersion="9"
              android:targetSdkVersion="22" />
@@ -23,7 +23,7 @@
    <uses-permission android:name="android.permission.BATTERY_STATS" />
    <uses-permission android:name="android.permission.READ_PHONE_STATE" android:required="false" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" android:required="false" />
-    <!-- <uses-permission android:name="android.permission.SEND_SMS" android:required="false" /> -->
+    <uses-permission android:name="android.permission.SEND_SMS" android:required="false" />
    <uses-permission android:name="android.permission.READ_CONTACTS" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -187,6 +187,7 @@
                android:value="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" />
        </activity>

+
    </application>

 </manifest>
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.0'
    }
 }

--- a/res/layout/activity_notification_filter.xml
+++ b/res/layout/activity_notification_filter.xml
@@ -1,22 +1,32 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
    tools:context="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity">

    <TextView
        android:text="@string/filter_apps_info"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:paddingBottom="5dp"
        android:id="@+id/tFilter"/>

+    <ProgressBar
+        android:layout_marginTop="64dip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:id="@+id/spinner" />
+
    <ListView
        android:layout_width="fill_parent"
        android:layout_height="fill_parent"
        android:id="@+id/lvFilterApps"
-        android:layout_below="@id/tFilter"/>
+        android:visibility="gone"
+        />

-</RelativeLayout>
+</LinearLayout>
--- a/res/layout/preference_with_button.xml
+++ b/res/layout/preference_with_button.xml
@@ -24,28 +24,23 @@
    android:gravity="center_vertical"
    android:paddingEnd="?android:attr/scrollbarSize"
    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="12dip"
+    android:paddingLeft="12dip"
    android:background="?attr/selectableItemBackground">

-    <!-- Preference should place its actual preference widget here. -->
+    <!-- Preference will place its actual preference widget here. -->
    <LinearLayout android:id="@+android:id/widget_frame"
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:gravity="center_vertical"
        android:orientation="vertical" />

-    <ImageView
-        android:id="@+android:id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        />
-
    <RelativeLayout
        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        android:layout_marginStart="15dip"
-        android:layout_marginLeft="15dip"
-        android:layout_marginEnd="15dip"
+        android:layout_marginStart="12dip"
+        android:layout_marginLeft="12dip"
+        android:layout_marginEnd="4dip"
        android:layout_marginRight="4dip"
        android:layout_marginTop="6dip"
        android:layout_marginBottom="6dip"
--- a/res/values-ast/strings.xml
+++ b/res/values-ast/strings.xml
@@ -4,17 +4,15 @@
  <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_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_mpris">Controles remotos multimedia</string>
-  <string name="pref_plugin_runcommand">Executar comandu</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_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>
@@ -25,34 +23,23 @@
  <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>La más lenta</item>
+    <item>Slowest</item>
    <item>Above Slowest</item>
-    <item>Predeterminada</item>
-    <item>Penriba lo predeterminao</item>
-    <item>La más rápida</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>
@@ -79,8 +66,6 @@
  <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>
@@ -106,7 +91,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>
@@ -137,7 +121,7 @@
  <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>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="pref_plugin_telephony">Notificador de telefonia</string>
+  <string name="pref_plugin_telephony">Notificador de la telefonia</string>
  <string name="pref_plugin_telephony_desc">Envia notificacions pels SMS i les trucades</string>
  <string name="pref_plugin_battery">Informe de la bateria</string>
  <string name="pref_plugin_battery_desc">Informa periòdicament sobre l\'estat de la bateria</string>
@@ -68,7 +68,7 @@
  <string name="error_canceled_by_user">Cancel·lat per l\'usuari</string>
  <string name="error_canceled_by_other_peer">Cancel·lat per l\'altre parell</string>
  <string name="error_invalid_key">S\'ha rebut una clau no vàlida</string>
-  <string name="encryption_info_title">Informació d\'encriptatge</string>
+  <string name="encryption_info_title">Informació de l\'encriptatge</string>
  <string name="encryption_info_msg_no_ssl">L\'altre dispositiu no usa una versió recent del KDE Connect, s\'utilitzarà el mètode d\'encriptatge antic.</string>
  <string name="my_device_fingerprint">L\'empremta digital SHA1 del certificat del vostre dispositiu és:</string>
  <string name="remote_device_fingerprint">L\'empremta digital SHA1 del certificat del dispositiu remot és:</string>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -5,15 +5,21 @@
  <string name="pref_plugin_battery">Hlášení baterie</string>
  <string name="pref_plugin_battery_desc">Periodicky hlásit stav baterky</string>
  <string name="pref_plugin_sftp">Přístup k souborovému systému</string>
+  <string name="pref_plugin_sftp_desc">Umožní vám vzdáleně prohlížet souborový systém tohoto zařízení</string>
  <string name="pref_plugin_clipboard">Synchronizace schránky</string>
  <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_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>
+  <string name="pref_plugin_runcommand_desc">Spouštějte příkazy vzdáleně z vašeho telefonu</string>
  <string name="pref_plugin_ping">Ping</string>
  <string name="pref_plugin_ping_desc">Posílat a přijímat ping</string>
  <string name="pref_plugin_notifications">Synchronizace upozornění</string>
  <string name="pref_plugin_notifications_desc">Zpřístupněte si upozornění z jiných zařízení</string>
+  <string name="pref_plugin_receive_notifications">Přijímat oznámení</string>
+  <string name="pref_plugin_receive_notifications_desc">Přijímat oznámení z jiného zařízení a zobrazovat je v Androidu</string>
  <string name="pref_plugin_sharereceiver">Sdílet s přijmnout</string>
  <string name="pref_plugin_sharereceiver_desc">Sdílet soubory a odkazy mezi zařízeními</string>
  <string name="plugin_not_available">Tato vlastnost není pro vaši verzi Androidu platná</string>
@@ -63,6 +69,9 @@
  <string name="error_canceled_by_other_peer">Přerušeno druhým uživatelem</string>
  <string name="error_invalid_key">Byl přijat neplatný klíč</string>
  <string name="encryption_info_title">Informace o šifrování</string>
+  <string name="encryption_info_msg_no_ssl">Druhé zařízení nepoužívá poslední verzi KDE connect. Bude použita stará metoda šifrování.</string>
+  <string name="my_device_fingerprint">Otisk SHA1 certifikátu vašeho zařízení je:</string>
+  <string name="remote_device_fingerprint">Otisk SHA1 certifikátu vzdáleného zařízení je:</string>
  <string name="pair_requested">Bylo vyžádáno párování</string>
  <string name="pairing_request_from">Požadavek o párování z %1s</string>
  <string name="received_url_title">Přijat odkaz od %1s</string>
@@ -149,6 +158,8 @@
  <string name="pref_plugin_telepathy_desc">Posílejte zprávy ze své pracovní plochy</string>
  <string name="plugin_not_supported">Tento modul zařízení nepodporuje</string>
  <string name="findmyphone_title">Najít můj telefon</string>
+  <string name="findmyphone_title_tablet">Najít můj tablet</string>
+  <string name="findmyphone_description">Prozvoní toto zařízení, takže jej můžete najít</string>
  <string name="findmyphone_found">Nalezeno</string>
  <string name="open">Otevřít</string>
  <string name="close">Zavřít</string>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -5,15 +5,20 @@
  <string name="pref_plugin_battery">Batterirapport</string>
  <string name="pref_plugin_battery_desc">Rapportér batteristatus periodisk</string>
  <string name="pref_plugin_sftp">Filsystem-expose</string>
+  <string name="pref_plugin_sftp_desc">Muliggør at gennemsøge denne enheds filsystem eksternt</string>
  <string name="pref_plugin_clipboard">Synk. af udklipsholder</string>
  <string name="pref_plugin_clipboard_desc">Del indholdet af udklipsholderen</string>
  <string name="pref_plugin_mousepad">Eksternt input</string>
+  <string name="pref_plugin_mousepad_desc">Brug din telefon eller tablet som mus og tastatur</string>
  <string name="pref_plugin_mpris">Multimediekontroller</string>
+  <string name="pref_plugin_mpris_desc">Giver en fjernbetjening til din medieafspiller</string>
  <string name="pref_plugin_runcommand">Kør kommando</string>
  <string name="pref_plugin_ping">Ping</string>
  <string name="pref_plugin_ping_desc">Send og modtag ping</string>
  <string name="pref_plugin_notifications">Synk. af bekendtgørelser</string>
  <string name="pref_plugin_notifications_desc">Tilgå dine bekendtgørelser fra andre enheder</string>
+  <string name="pref_plugin_receive_notifications">Modtag bekendtgørelser</string>
+  <string name="pref_plugin_receive_notifications_desc">Modtag bekendtgørelser fra den anden enhed og vis dem på Android</string>
  <string name="pref_plugin_sharereceiver">Del og modtag</string>
  <string name="pref_plugin_sharereceiver_desc">Del filer og URL\'er mellem enheder</string>
  <string name="plugin_not_available">Denne funktion er ikke tilgængelig i din Android-version</string>
@@ -28,8 +33,6 @@
  <string name="mousepad_info">Bevæg en finger på skærmen for at flytte musemarkøren. Tap for at klikke og brug to/tre-fingre for højre og midterste museknap. Brug et langt tryk til at trække og slippe.</string>
  <string name="mousepad_double_tap_settings_title">Angiv handling for tap med to fingre</string>
  <string name="mousepad_triple_tap_settings_title">Angiv handling for tap med tre fingre</string>
-  <string name="mousepad_sensitivity_settings_title">Angiv følsomhed for touchpad</string>
-  <string name="mousepad_scroll_direction_title">Omvendt rulleretning</string>
  <string-array name="mousepad_tap_entries">
    <item>Højreklik</item>
    <item>Midterklik</item>
@@ -37,13 +40,12 @@
  </string-array>
  <string name="mousepad_double_default">højre</string>
  <string name="mousepad_triple_default">midter</string>
-  <string name="mousepad_sensitivity_default">standard</string>
  <string-array name="mousepad_sensitivity_entries">
-    <item>Mest langsom</item>
-    <item>Over mest langsom</item>
-    <item>Standard</item>
-    <item>Over standard</item>
-    <item>Hurtigst</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">Forbundne enheder</string>
  <string name="category_not_paired_devices">Tilgængelig enheder</string>
@@ -62,10 +64,6 @@
  <string name="error_canceled_by_user">Annulleret af brugeren</string>
  <string name="error_canceled_by_other_peer">Annulleret af modpart</string>
  <string name="error_invalid_key">Ugyldige nøgle modtaget</string>
-  <string name="encryption_info_title">Krypteringsinfo</string>
-  <string name="encryption_info_msg_no_ssl">Den anden enhed bruger ikke en nylig version af KDE Connect, og bruger dermed den forældede krypteringsmetode.</string>
-  <string name="my_device_fingerprint">SHA1-fingeraftrykket for dit enhedscertifikat er:</string>
-  <string name="remote_device_fingerprint">SHA1-fingeraftrykket for det eksterne enhedscertifikat er:</string>
  <string name="pair_requested">Anmodet om parring</string>
  <string name="pairing_request_from">Parringsanmodning fra %1s</string>
  <string name="received_url_title">Modtog link fra %1s</string>
@@ -151,8 +149,6 @@
  <string name="pref_plugin_telepathy">Send SMS</string>
  <string name="pref_plugin_telepathy_desc">Send SMS-beskeder fra din desktop</string>
  <string name="plugin_not_supported">Dette plugin er ikke understøttet af enheden</string>
-  <string name="findmyphone_title">Find min telefon</string>
+  <string name="findmyphone_description">Ringer til denne enhed, så du kan finde den.</string>
  <string name="findmyphone_found">Fundet</string>
-  <string name="open">Åbn</string>
-  <string name="close">Luk</string>
 </resources>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -9,12 +9,15 @@
  <string name="pref_plugin_clipboard">Abgleich der Zwischenablage</string>
  <string name="pref_plugin_clipboard_desc">Inhalt der Zwischenablage freigeben</string>
  <string name="pref_plugin_mousepad">Ferneingabe</string>
+  <string name="pref_plugin_mousepad_desc">Verwendet Ihr Handy als Tablett, Touchpad und Tastatur</string>
  <string name="pref_plugin_mpris">Multimedia-Bedienung</string>
  <string name="pref_plugin_runcommand">Befehl ausführen</string>
+  <string name="pref_plugin_runcommand_desc">Von Ihrem Telefon oder Tablett Befehle auf anderen Geräten ausführen</string>
  <string name="pref_plugin_ping">Ping</string>
  <string name="pref_plugin_ping_desc">Senden und Empfangen von Pings</string>
  <string name="pref_plugin_notifications">Benachrichtigungs-Abgleich</string>
  <string name="pref_plugin_notifications_desc">Zugriff auf Ihre Benachrichtigungen von anderen Geräten</string>
+  <string name="pref_plugin_receive_notifications">Benachrichtigungen empfangen</string>
  <string name="pref_plugin_sharereceiver">Veröffentlichen und Empfangen</string>
  <string name="pref_plugin_sharereceiver_desc">Dateien und Adressen (URLs) zwischen Geräten teilen</string>
  <string name="plugin_not_available">Diese Funktion ist in Ihrer Android-Version nicht verfügbar</string>
@@ -146,6 +149,8 @@
  <string name="pref_plugin_telepathy_desc">Text-Nachrichten von Ihrer Arbeitsfläche senden</string>
  <string name="plugin_not_supported">Dieses Modul wird durch das Gerät nicht unterstützt</string>
  <string name="findmyphone_title">Mein Telefon suchen</string>
+  <string name="findmyphone_title_tablet">Mein Tablett suchen</string>
+  <string name="findmyphone_description">Ruft dieses Gerät an, um es zu suchen.</string>
  <string name="findmyphone_found">Gefunden</string>
  <string name="open">Öffnen</string>
  <string name="close">Schließen</string>
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -5,15 +5,21 @@
  <string name="pref_plugin_battery">Battery report</string>
  <string name="pref_plugin_battery_desc">Periodically report battery status</string>
  <string name="pref_plugin_sftp">Filesystem expose</string>
+  <string name="pref_plugin_sftp_desc">Allows to browse this device\'s filesystem remotely</string>
  <string name="pref_plugin_clipboard">Clipboard sync</string>
  <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_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>
+  <string name="pref_plugin_runcommand_desc">Trigger remote commands from your phone or tablet</string>
  <string name="pref_plugin_ping">Ping</string>
  <string name="pref_plugin_ping_desc">Send and receive pings</string>
  <string name="pref_plugin_notifications">Notification sync</string>
  <string name="pref_plugin_notifications_desc">Access your notifications from other devices</string>
+  <string name="pref_plugin_receive_notifications">Receive notifications</string>
+  <string name="pref_plugin_receive_notifications_desc">Receive notifications from the other device and display them on Android</string>
  <string name="pref_plugin_sharereceiver">Share and receive</string>
  <string name="pref_plugin_sharereceiver_desc">Share files and URLs between devices</string>
  <string name="plugin_not_available">This feature is not available in your Android version</string>
@@ -62,6 +68,10 @@
  <string name="error_canceled_by_user">Cancelled by user</string>
  <string name="error_canceled_by_other_peer">Cancelled by other peer</string>
  <string name="error_invalid_key">Invalid key received</string>
+  <string name="encryption_info_title">Encryption Info</string>
+  <string name="encryption_info_msg_no_ssl">The other device doesn\'t use a recent version of KDE Connect, using the legacy encryption method.</string>
+  <string name="my_device_fingerprint">SHA1 fingerprint of your device certificate is:</string>
+  <string name="remote_device_fingerprint">SHA1 fingerprint of remote device certificate is:</string>
  <string name="pair_requested">Pair requested</string>
  <string name="pairing_request_from">Pairing request from %1s</string>
  <string name="received_url_title">Received link from %1s</string>
@@ -147,6 +157,9 @@
  <string name="pref_plugin_telepathy">Send SMS</string>
  <string name="pref_plugin_telepathy_desc">Send text messages from your desktop</string>
  <string name="plugin_not_supported">This plugin is not supported by the device</string>
+  <string name="findmyphone_title">Find my phone</string>
+  <string name="findmyphone_title_tablet">Find my tablet</string>
+  <string name="findmyphone_description">Rings this device so you can find it</string>
  <string name="findmyphone_found">Found</string>
  <string name="open">Open</string>
  <string name="close">Close</string>
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -0,0 +1,166 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">Telefoni märguanded</string>
+  <string name="pref_plugin_telephony_desc">SMS-ide ja kõnede märguannete saatmine</string>
+  <string name="pref_plugin_battery">Aku aruanne</string>
+  <string name="pref_plugin_battery_desc">Perioodiline aku olekust teavitamine</string>
+  <string name="pref_plugin_sftp">Failisüsteemi sirvimine</string>
+  <string name="pref_plugin_sftp_desc">Seadme failisüsteemi eemalt sirvimise võimaldamine</string>
+  <string name="pref_plugin_clipboard">Lõikepuhvri sünkroonimine</string>
+  <string name="pref_plugin_clipboard_desc">Lõikepuhvri sisu jagamine</string>
+  <string name="pref_plugin_mousepad">Kaugsisestus</string>
+  <string name="pref_plugin_mousepad_desc">Telefoni või tahvli kasutamine puuteplaadi ja klaviatuurina</string>
+  <string name="pref_plugin_mpris">Multimeedia juhtimine</string>
+  <string name="pref_plugin_mpris_desc">Meediamängija kaugjuhtimise võimaldamine</string>
+  <string name="pref_plugin_runcommand">Käsu käivitamine</string>
+  <string name="pref_plugin_runcommand_desc">Telefonist või tahvlist kaugkäskude käivitamine</string>
+  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_ping_desc">Pingide saatmine ja vastuvõtmine</string>
+  <string name="pref_plugin_notifications">Märguannete sünkroonimine</string>
+  <string name="pref_plugin_notifications_desc">Märguannete nägemine teistes seadmetes</string>
+  <string name="pref_plugin_receive_notifications">Märguannete vastuvõtmine</string>
+  <string name="pref_plugin_receive_notifications_desc">Märguannete vastuvõtmine teisest seadmest ja nende näitamine Androidis</string>
+  <string name="pref_plugin_sharereceiver">Jagamine ja vastuvõtmine</string>
+  <string name="pref_plugin_sharereceiver_desc">Failide ja URL-ide jagamine seadmete vahel</string>
+  <string name="plugin_not_available">See omadus ei ole sinu Androidi versioonis veel saadaval</string>
+  <string name="device_list_empty">Seadmed puuduvad</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Loobu</string>
+  <string name="open_settings">Ava seadistused</string>
+  <string name="no_permissions">Märguannete nägemiseks tuleb anda vastavad õigused</string>
+  <string name="send_ping">Saada ping</string>
+  <string name="open_mpris_controls">Multimeedia juhtimine</string>
+  <string name="open_mousepad">Kaugsisestus</string>
+  <string name="mousepad_info">Hiirekursori liigutamiseks liiguta sõrme ekraanil. Koputa klõpsamiseks ja kasuta kaht või kolme sõrme parema ja keskmise nupu jaoks. Pika vajutusega saab lohistada.</string>
+  <string name="mousepad_double_tap_settings_title">Kahe sõrmega koputamise toimingu määramine</string>
+  <string name="mousepad_triple_tap_settings_title">Kolme sõrmega koputamise toimingu määramine</string>
+  <string name="mousepad_sensitivity_settings_title">Puutepadja tundlikkuse määramine</string>
+  <string name="mousepad_scroll_direction_title">Vastupidi kerimise suund</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Paremklõps</item>
+    <item>Keskklõps</item>
+    <item>Ei tee midagi</item>
+  </string-array>
+  <string name="mousepad_double_default">parem</string>
+  <string name="mousepad_triple_default">keskmine</string>
+  <string name="mousepad_sensitivity_default">vaikimisi</string>
+  <string-array name="mousepad_sensitivity_entries">
+    <item>Kõige aeglasem</item>
+    <item>Kõige aeglasemast kiirem</item>
+    <item>Vaikimisi</item>
+    <item>Keskmisest kiirem</item>
+    <item>Kõige kiirem</item>
+  </string-array>
+  <string name="category_connected_devices">Ühendatud seadmed</string>
+  <string name="category_not_paired_devices">Saadaolevad seadmed</string>
+  <string name="category_remembered_devices">Meeldejäetud seadmed</string>
+  <string name="plugins_failed_to_load">Pluginate laadimine nurjus (koputa rohkema teabe saamiseks)</string>
+  <string name="device_menu_plugins">Plugina seadistused</string>
+  <string name="device_menu_unpair">Eemalda paardumine</string>
+  <string name="device_not_reachable">Paardunud seade pole saadaval</string>
+  <string name="pair_new_device">Paarita uus seade</string>
+  <string name="unknown_device">Tundmatu seade</string>
+  <string name="error_not_reachable">Seade pole saadaval</string>
+  <string name="error_already_requested">Paardumist on juba soovitud</string>
+  <string name="error_already_paired">Seade on juba paaritatud</string>
+  <string name="error_could_not_send_package">Paketi saatmine nurjus</string>
+  <string name="error_timed_out">Ajaületus</string>
+  <string name="error_canceled_by_user">Kasutaja katkestas</string>
+  <string name="error_canceled_by_other_peer">Teine pool katkestas</string>
+  <string name="error_invalid_key">Saadi vigane võti</string>
+  <string name="encryption_info_title">Krüptimise teave</string>
+  <string name="encryption_info_msg_no_ssl">Teine seade ei kasuta KDE Connecti uusimat versiooni ja tarvitab krüptimisel pärandmeetodit.</string>
+  <string name="my_device_fingerprint">Sinu seadme sertifikaadi SHA1 sõrmejälg on:</string>
+  <string name="remote_device_fingerprint">Kaugseadme sertifikaadi SHA1 sõrmejälg on:</string>
+  <string name="pair_requested">Paardumise soov</string>
+  <string name="pairing_request_from">Paardumise soov seadmest %1s</string>
+  <string name="received_url_title">Lingi saamine seadmest %1s</string>
+  <string name="received_url_text">Koputa \"%1s\" avamiseks</string>
+  <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_file_text">%1s</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 %1s saatmine nurjus</string>
+  <string name="sent_file_failed_text">%1s</string>
+  <string name="tap_to_answer">Koputa vastamiseks</string>
+  <string name="reconnect">Ühenda uuesti</string>
+  <string name="right_click">Saada paremklõps</string>
+  <string name="middle_click">Saada keskklõps</string>
+  <string name="show_keyboard">Näita klaviatuuri</string>
+  <string name="device_not_paired">Seadmed pole paaritatud</string>
+  <string name="request_pairing">Soovi paardumist</string>
+  <string name="pairing_accept">Nõustu</string>
+  <string name="pairing_reject">Keeldu</string>
+  <string name="device">Seade</string>
+  <string name="pair_device">Paarita seade</string>
+  <string name="remote_control">Kaugjuhtimine</string>
+  <string name="settings">KDE Connecti seadistused</string>
+  <string name="mpris_play">Esita</string>
+  <string name="mpris_previous">Eelmine</string>
+  <string name="mpris_rew">Keri tagasi</string>
+  <string name="mpris_ff">Kiiresti edasi</string>
+  <string name="mpris_next">Järgmine</string>
+  <string name="mpris_volume">Helitugevus</string>
+  <string name="mpris_settings">Multimeedia seadistused</string>
+  <string name="mpris_time_settings_title">Edasi-tagasikerimise nupud</string>
+  <string name="mpris_time_settings_summary">Kiire edasi-tagasikerimise aeg vajutamisel</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekundit</item>
+    <item>20 sekundit</item>
+    <item>30 sekundit</item>
+    <item>1 minut</item>
+    <item>2 minutit</item>
+  </string-array>
+  <string name="share_to">Jaga...</string>
+  <string name="protocol_version_older">See seade kasutab vana protokolli versiooni</string>
+  <string name="protocol_version_newer">See seade kasutab uuemat protokolli versiooni</string>
+  <string name="general_settings">Üldised seadistused</string>
+  <string name="plugin_settings">Seadistused</string>
+  <string name="plugin_settings_with_name">%s seadistused</string>
+  <string name="device_name">Seadme nimi</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Vigane seadme nimi</string>
+  <string name="shareplugin_text_saved">Saadi tekst, salvestati lõikepuhvrisse</string>
+  <string name="custom_devices_settings">Kohandatud seadmete loend</string>
+  <string name="pair_device_action">Paarita uus seade</string>
+  <string name="unpair_device_action">Eemalda %s paardumine</string>
+  <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="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>
+  <string name="sftp_all_files">Kõik failid</string>
+  <string name="sftp_sdcard_num">SD-kaart %d</string>
+  <string name="sftp_sdcard">SD-kaart</string>
+  <string name="sftp_readonly">(kirjutuskaitstud)</string>
+  <string name="sftp_camera">Kaamera pildid</string>
+  <string name="add_host">Lisa masin/IP</string>
+  <string name="add_host_hint">Masinanimi või IP</string>
+  <string name="no_players_connected">Ühtegi mängijat ei leitud</string>
+  <string name="custom_dev_list_help">Seda tuleks kasutada ainult siis, kui sinu seadet ei tuvastatud automaatselt. Sisesta allpool IP-aadress või masinanimi ja puuduta nuppu selle lisamiseks loendisse. Puuduta olemasolevat kirjet selle eemaldamiseks loendist.</string>
+  <string name="mpris_player_on_device">%1$s seadmes %2$s</string>
+  <string name="send_files">Saada faile</string>
+  <string name="pairing_title">KDE Connecti seadmed</string>
+  <string name="pairing_description">Siin näeb teisi seadmeid samas võrgus, kus töötab KDE Connect</string>
+  <string name="device_paired">Seade on paaritatud</string>
+  <string name="device_rename_title">Muuda seadme nime</string>
+  <string name="device_rename_confirm">Muuda nime</string>
+  <string name="refresh">Värskenda</string>
+  <string name="unreachable_description">See paardunud seade pole saadaval. Kontrolli, kas see on ikka ühendatud sinuga samasse võrku.</string>
+  <string name="no_file_browser">Ühtegi failisirvijat pole paigaldatud</string>
+  <string name="pref_plugin_telepathy">Saada SMS</string>
+  <string name="pref_plugin_telepathy_desc">Tekstisõnumite saatmine oma töölaualt</string>
+  <string name="plugin_not_supported">Seade ei toeta seda pluginat</string>
+  <string name="findmyphone_title">Leia mu telefon</string>
+  <string name="findmyphone_title_tablet">Leia mu tahvel</string>
+  <string name="findmyphone_description">Seadmele helistamine, et see üles leida</string>
+  <string name="findmyphone_found">Leitud</string>
+  <string name="open">Ava</string>
+  <string name="close">Sulge</string>
+</resources>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -28,8 +28,6 @@
  <string name="mousepad_info">Liikuta hiiren osoitinta liikuttamalla sormeasi näytöllä. Napsauta napauttamalla yhdellä sormella, käytä oikeaa painiketta kahdella sormella ja keskipainiketta kolmella. Vedä ja pudota painamalla pitkään.</string>
  <string name="mousepad_double_tap_settings_title">Aseta kahden sormen napautuksen toiminto</string>
  <string name="mousepad_triple_tap_settings_title">Aseta kolmen sormen napautuksen toiminto</string>
-  <string name="mousepad_sensitivity_settings_title">Aseta kosketuslevyn herkkyys</string>
-  <string name="mousepad_scroll_direction_title">Käänteinen vierityssuunta</string>
  <string-array name="mousepad_tap_entries">
    <item>Oikea napsautus</item>
    <item>Keskinapsautus</item>
@@ -37,13 +35,12 @@
  </string-array>
  <string name="mousepad_double_default">Oikea painike</string>
  <string name="mousepad_triple_default">Keskipainike</string>
-  <string name="mousepad_sensitivity_default">oletus</string>
  <string-array name="mousepad_sensitivity_entries">
-    <item>Hitain</item>
-    <item>Hitainta suurempi</item>
-    <item>Oletus</item>
-    <item>Oletusta suurempi</item>
-    <item>Nopein</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">Yhdistetyt laitteet</string>
  <string name="category_not_paired_devices">Saatavilla olevat laitteet</string>
--- a/res/values-gl/strings.xml
+++ b/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>
--- a/res/values-lt/strings.xml
+++ b/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>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -5,15 +5,19 @@
  <string name="pref_plugin_battery">Relatório da bateria</string>
  <string name="pref_plugin_battery_desc">Informação periódica do status da bateria</string>
  <string name="pref_plugin_sftp">Exposição do sistema de arquivos</string>
+  <string name="pref_plugin_sftp_desc">Permite navegar no sistema de arquivos deste telefone remotamente</string>
  <string name="pref_plugin_clipboard">Sincronização da área de transferência</string>
  <string name="pref_plugin_clipboard_desc">Compartilha o conteúdo da área de transferência</string>
  <string name="pref_plugin_mousepad">Introdução de dados remota</string>
+  <string name="pref_plugin_mousepad_desc">Use seu telefone ou tablet como mouse e teclado</string>
  <string name="pref_plugin_mpris">Controle multimídia</string>
+  <string name="pref_plugin_mpris_desc">Fornece um controle remoto de seu reprodutor de mídia</string>
  <string name="pref_plugin_runcommand">Executar comando</string>
  <string name="pref_plugin_ping">Ping</string>
  <string name="pref_plugin_ping_desc">Envia e recebe pings</string>
  <string name="pref_plugin_notifications">Sincronização de notificações</string>
  <string name="pref_plugin_notifications_desc">Acesse suas notificações a partir de outros dispositivos</string>
+  <string name="pref_plugin_receive_notifications">Receber notificações</string>
  <string name="pref_plugin_sharereceiver">Compartilhar e receber</string>
  <string name="pref_plugin_sharereceiver_desc">Compartilha arquivos e URLs entre os dispositivos</string>
  <string name="plugin_not_available">Esta funcionalidade não está disponível na sua versão do Android</string>
@@ -62,6 +66,7 @@
  <string name="error_canceled_by_user">Cancelado pelo usuário</string>
  <string name="error_canceled_by_other_peer">Cancelado pelo outro dispositivo</string>
  <string name="error_invalid_key">Chave inválida recebida</string>
+  <string name="encryption_info_title">Informação da criptografia</string>
  <string name="pair_requested">Solicitação de emparelhamento</string>
  <string name="pairing_request_from">Emparelhamento solicitado por %1s</string>
  <string name="received_url_title">Link recebido de %1s</string>
@@ -147,6 +152,8 @@
  <string name="pref_plugin_telepathy">Enviar SMS</string>
  <string name="pref_plugin_telepathy_desc">Enviar mensagens de texto do seu Desktop</string>
  <string name="plugin_not_supported">Este plugin não é suportado pelo dispositivo</string>
+  <string name="findmyphone_title">Encontrar meu telefone</string>
+  <string name="findmyphone_title_tablet">Encontrar meu tablet</string>
  <string name="findmyphone_found">Encontrado</string>
  <string name="open">Abrir</string>
  <string name="close">Fechar</string>
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -19,7 +19,7 @@
  <string name="pref_plugin_notifications">Sincronização da notificação</string>
  <string name="pref_plugin_notifications_desc">Aceder às suas notificações a partir de outros dispositivos</string>
  <string name="pref_plugin_receive_notifications">Receber as notificações</string>
-  <string name="pref_plugin_receive_notifications_desc">Receber as notificações de outros dispositivos e mostrá-las no Android</string>
+  <string name="pref_plugin_receive_notifications_desc">Receber as notificações do outro dispositivo e mostrá-las no Android</string>
  <string name="pref_plugin_sharereceiver">Partilhar e receber</string>
  <string name="pref_plugin_sharereceiver_desc">Partilhar ficheiros e URL\'s entre dispositivos</string>
  <string name="plugin_not_available">Esta funcionalidade não está disponível na sua versão do Android</string>
@@ -43,13 +43,13 @@
  </string-array>
  <string name="mousepad_double_default">direita</string>
  <string name="mousepad_triple_default">meio</string>
-  <string name="mousepad_sensitivity_default">predefinição</string>
+  <string name="mousepad_sensitivity_default">por omissão</string>
  <string-array name="mousepad_sensitivity_entries">
-    <item>Mais Lento</item>
-    <item>Ainda Mais Lento</item>
+    <item>Mais Lenta</item>
+    <item>Ainda Mais Lenta</item>
    <item>Predefinição</item>
    <item>Acima da Predefinição</item>
-    <item>Mais Rápido</item>
+    <item>Mais Rápida</item>
  </string-array>
  <string name="category_connected_devices">Dispositivos ligados</string>
  <string name="category_not_paired_devices">Dispositivos disponíveis</string>
@@ -68,8 +68,8 @@
  <string name="error_canceled_by_user">Cancelado pelo utilizador</string>
  <string name="error_canceled_by_other_peer">Cancelado pela outra máquina</string>
  <string name="error_invalid_key">Chave inválida recebida</string>
-  <string name="encryption_info_title">Dados de Encriptação</string>
-  <string name="encryption_info_msg_no_ssl">O outro dispositivo não usa uma versão recente do KDE Connect; será usado o método antigo de encriptação.</string>
+  <string name="encryption_info_title">Informação de Encriptação</string>
+  <string name="encryption_info_msg_no_ssl">O outro dispositivo não usa uma versão recente do KDE Connect; a ser usado o método de encriptação antigo.</string>
  <string name="my_device_fingerprint">A impressão digital SHA1 do certificado do seu dispositivo é:</string>
  <string name="remote_device_fingerprint">A impressão digital SHA1 do certificado do dispositivo remoto é:</string>
  <string name="pair_requested">Emparelhamento pedido</string>
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -5,15 +5,21 @@
  <string name="pref_plugin_battery">Oznam o batérii</string>
  <string name="pref_plugin_battery_desc">Periodicky oznamovať stav batérie</string>
  <string name="pref_plugin_sftp">Odhaliť súborový systém</string>
+  <string name="pref_plugin_sftp_desc">Umožní prehliadač súborový systém zariadenia vzdialene</string>
  <string name="pref_plugin_clipboard">Synchronizácia schránky</string>
  <string name="pref_plugin_clipboard_desc">Zdieľať obsah schránky</string>
  <string name="pref_plugin_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_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>
+  <string name="pref_plugin_runcommand_desc">Vyvolať vzdialené príkazy z vášho mobilu alebo tabletu</string>
  <string name="pref_plugin_ping">Ping</string>
  <string name="pref_plugin_ping_desc">Poslať a prijať pingy</string>
  <string name="pref_plugin_notifications">Synchronizácia pripomienok</string>
  <string name="pref_plugin_notifications_desc">Prístup k vašim pripomienkam z iných zariadení</string>
+  <string name="pref_plugin_receive_notifications">Prijať upozornenia</string>
+  <string name="pref_plugin_receive_notifications_desc">Prístup k pripomienkam z iných zariadení a zobrazenie ich na Androide</string>
  <string name="pref_plugin_sharereceiver">Zdieľať a prijať</string>
  <string name="pref_plugin_sharereceiver_desc">Zdieľať súbory a medzi zariadeniami</string>
  <string name="plugin_not_available">Táto funkcia nie je dostupná vo vašej verzii Androidu</string>
@@ -152,6 +158,8 @@
  <string name="pref_plugin_telepathy_desc">Posielať textové správy z vášho počítača</string>
  <string name="plugin_not_supported">Tento plugin nie je podporovaný zariadením</string>
  <string name="findmyphone_title">Nájsť môj telefón</string>
+  <string name="findmyphone_title_tablet">Nájsť môj tablet</string>
+  <string name="findmyphone_description">Prezvoní vaše zariadenie, aby ste ho našli</string>
  <string name="findmyphone_found">Nájdené</string>
  <string name="open">Otvoriť</string>
  <string name="close">Zavrieť</string>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -145,6 +145,4 @@
  <string name="pref_plugin_telepathy_desc">从桌面发送短消息</string>
  <string name="plugin_not_supported">设备不支持此插件</string>
  <string name="findmyphone_found">找到</string>
-  <string name="open">打开</string>
-  <string name="close">关闭</string>
 </resources>
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string-array name="mousepad_tap_entries">
+    <item>Right click</item>
+    <item>Middle click</item>
+    <item>Nothing</item>
+  </string-array>
+  <string-array name="mousepad_sensitivity_entries">
+    <item>Slowest</item>
+    <item>Above Slowest</item>
+    <item>Default</item>
+    <item>Above Default</item>
+    <item>Fastest</item>
+  </string-array>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
+</resources>
--- a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
+++ b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
@@ -198,6 +198,20 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                SharedPreferences preferences = context.getSharedPreferences("trusted_devices", Context.MODE_PRIVATE);
                boolean isDeviceTrusted = preferences.getBoolean(deviceId, false);

+                if (isDeviceTrusted && !SslHelper.isCertificateStored(context, deviceId)) {
+                    //Device paired with and old version, we can't use it as we lack the certificate
+                    BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
+                        @Override
+                        public void onServiceStart(BackgroundService service) {
+                            Device device = service.getDevice(deviceId);
+                            if (device == null) return;
+                            device.unpair();
+                            //Retry as unpaired
+                            identityPackageReceived(identityPackage, socket, connectionStarted);
+                        }
+                    });
+                }
+
                Log.i("KDE/LanLinkProvider","Starting SSL handshake with " + identityPackage.getString("deviceName") + " trusted:"+isDeviceTrusted);

                final SSLSocket sslsocket = SslHelper.convertToSslSocket(context, socket, deviceId, isDeviceTrusted, clientMode);
@@ -233,14 +247,11 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                        } catch (Exception e) {
                            Log.e("KDE/LanLinkProvider","Handshake failed with " + identityPackage.getString("deviceName"));
                            e.printStackTrace();
-                            BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
-                                @Override
-                                public void onServiceStart(BackgroundService service) {
-                                    Device device = service.getDevice(deviceId);
-                                    if (device == null) return;
-                                    device.unpair();
-                                }
-                            });
+
+                            //String[] ciphers = sslsocket.getSupportedCipherSuites();
+                            //for (String cipher : ciphers) {
+                            //    Log.i("SupportedCiphers","cipher: " + cipher);
+                            //}
                        }
                    }
                }).start();
--- a/src/org/kde/kdeconnect/Device.java
+++ b/src/org/kde/kdeconnect/Device.java
@@ -146,6 +146,9 @@ public class Device implements BaseLink.PackageReceiver {
            Log.e("KDE/Device","Exception deserializing stored public key for device");
        }

+        //Assume every plugin is supported until addLink is called and we can get the actual list
+        m_supportedPlugins = new Vector<>(PluginFactory.getAvailablePlugins());
+
        //Do not load plugins yet, the device is not present
        //reloadPluginsFromSettings();
    }
@@ -284,7 +287,6 @@ public class Device implements BaseLink.PackageReceiver {
        SharedPreferences preferences = context.getSharedPreferences("trusted_devices", Context.MODE_PRIVATE);
        preferences.edit().remove(deviceId).apply();

-        // FIXME : We delete all device info here, but the xml file still persists
        SharedPreferences devicePreferences = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
        devicePreferences.edit().clear().apply();

--- a/src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java
+++ b/src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java
@@ -131,6 +131,12 @@ public class SslHelper {
        }
    }

+    public static boolean isCertificateStored(Context context, String deviceId) {
+        SharedPreferences devicePreferences = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
+        String cert = devicePreferences.getString("certificate", "");
+        return !cert.isEmpty();
+    }
+
    public static SSLContext getSslContext(Context context, String deviceId, boolean isDeviceTrusted) {
        //TODO: Cache
        try {
@@ -203,13 +209,17 @@ public class SslHelper {
        // These cipher suites are most common of them that are accepted by kde and android during handshake
        ArrayList<String> supportedCiphers = new ArrayList<>();
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            supportedCiphers.add("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384");
-            supportedCiphers.add("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256");
-            supportedCiphers.add("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA");
+            supportedCiphers.add("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384");  // API 20+
+            supportedCiphers.add("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256");  // API 20+
+            supportedCiphers.add("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA");       // API 11+
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+            supportedCiphers.add("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA");  // API 11+
+            supportedCiphers.add("SSL_RSA_WITH_RC4_128_SHA");            // API 9+
+            supportedCiphers.add("SSL_RSA_WITH_RC4_128_MD5");            // API 9+
        } else {
            // Following ciphers are for and due to old devices
-            supportedCiphers.add("SSL_RSA_WITH_RC4_128_SHA");
-            supportedCiphers.add("SSL_RSA_WITH_RC4_128_MD5");
+            supportedCiphers.add("SSL_RSA_WITH_RC4_128_SHA");  // API 9+
+            supportedCiphers.add("SSL_RSA_WITH_RC4_128_MD5");  // API 9+
        }
        socket.setEnabledCipherSuites(supportedCiphers.toArray(new String[supportedCiphers.size()]));

--- a/src/org/kde/kdeconnect/Helpers/StringsHelper.java
+++ b/src/org/kde/kdeconnect/Helpers/StringsHelper.java
@@ -6,4 +6,11 @@ public class StringsHelper {

    public static final Charset UTF8 = Charset.forName("UTF-8");

+    public static int compare(String a, String b) {
+        if (a == b) return 0;
+        if (a == null) return -1;
+        if (b == null) return 1;
+        return a.compareToIgnoreCase(b);
+    }
+
 }
--- a/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java
+++ b/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java
@@ -28,12 +28,15 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;

-import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.NetworkPackage;
+import java.util.HashSet;

@TargetApi(Build.VERSION_CODES.HONEYCOMB)
 public class ClipboardListener {

+    public interface ClipboardObserver {
+        void clipboardChanged(String content);
+    }
+    private HashSet<ClipboardObserver> observers = new HashSet<>();

    private final Context context;
    private String currentContent;
@@ -41,9 +44,26 @@ public class ClipboardListener {
    private ClipboardManager cm = null;
    private ClipboardManager.OnPrimaryClipChangedListener listener;

-    ClipboardListener(final Context ctx, final Device device) {
+    private static ClipboardListener _instance = null;
+    public static ClipboardListener instance(Context context) {
+        if (_instance == null) {
+            _instance = new ClipboardListener(context);
+        }
+        return _instance;
+    }
+
+    public void registerObserver(ClipboardObserver observer) {
+        observers.add(observer);
+    }
+
+    public void removeObserver(ClipboardObserver observer) {
+        observers.remove(observer);
+    }
+
+    ClipboardListener(final Context ctx) {
        context = ctx;
-        if(android.os.Build.VERSION.SDK_INT < 11) {
+
+        if(android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
            return;
        }

@@ -59,11 +79,14 @@ public class ClipboardListener {
                            ClipData.Item item = cm.getPrimaryClip().getItemAt(0);
                            String content = item.coerceToText(context).toString();

-                            if (!content.equals(currentContent)) {
-                                NetworkPackage np = new NetworkPackage(ClipboardPlugin.PACKAGE_TYPE_CLIPBOARD);
-                                np.set("content", content);
-                                device.sendPackage(np);
-                                currentContent = content;
+                            if (content.equals(currentContent)) {
+                                return;
+                            }
+
+                            currentContent = content;
+
+                            for (ClipboardObserver observer : observers) {
+                                observer.clipboardChanged(content);
                            }

                        } catch (Exception e) {
@@ -76,18 +99,10 @@ public class ClipboardListener {
        });
    }

-    public void stop() {
-        if(android.os.Build.VERSION.SDK_INT < 11) {
-            return;
-        }
-
-        cm.removePrimaryClipChangedListener(listener);
-    }
-
    @SuppressWarnings("deprecation")
    public void setText(String text) {
        currentContent = text;
-        if(android.os.Build.VERSION.SDK_INT < 11) {
+        if(android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
            android.text.ClipboardManager clipboard = (android.text.ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
            clipboard.setText(text);
        }
--- a/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java
@@ -20,6 +20,8 @@

 package org.kde.kdeconnect.Plugins.ClibpoardPlugin;

+import android.os.Build;
+
 import org.kde.kdeconnect.NetworkPackage;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect_tp.R;
@@ -41,28 +43,34 @@ public class ClipboardPlugin extends Plugin {
    @Override
    public boolean isEnabledByDefault() {
        //Disabled by default due to just one direction sync(incoming clipboard change) in early version of android.
-        return (android.os.Build.VERSION.SDK_INT >= 11);
+        return (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB);
    }

-    private ClipboardListener listener;
+    @Override
+    public boolean onPackageReceived(NetworkPackage np) {
+        String content = np.getString("content");
+        ClipboardListener.instance(context).setText(content);
+        return true;
+    }
+
+    private ClipboardListener.ClipboardObserver observer = new ClipboardListener.ClipboardObserver() {
+        @Override
+        public void clipboardChanged(String content) {
+            NetworkPackage np = new NetworkPackage(ClipboardPlugin.PACKAGE_TYPE_CLIPBOARD);
+            np.set("content", content);
+            device.sendPackage(np);
+        }
+    };

    @Override
    public boolean onCreate() {
-        listener = new ClipboardListener(context, device);
+        ClipboardListener.instance(context).registerObserver(observer);
        return true;
    }

    @Override
    public void onDestroy() {
-        listener.stop();
-    }
-
-    @Override
-    public boolean onPackageReceived(NetworkPackage np) {
-
-        String content = np.getString("content");
-        listener.setText(content);
-        return true;
+        ClipboardListener.instance(context).removeObserver(observer);
    }

    @Override
--- a/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneActivity.java
@@ -1,6 +1,7 @@
 package org.kde.kdeconnect.Plugins.FindMyPhonePlugin;

 import android.app.Activity;
+import android.content.Intent;
 import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.Ringtone;
@@ -16,6 +17,12 @@ import org.kde.kdeconnect_tp.R;
 public class FindMyPhoneActivity extends Activity {
    Ringtone ringtone;

+    @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
+    }
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
--- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/AppDatabase.java
+++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/AppDatabase.java
@@ -26,26 +26,32 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;

+import java.util.HashSet;
+
 public class AppDatabase {

-    public static final String KEY_ROW_ID = "id";
-    public static final String KEY_NAME = "app";
-    public static final String KEY_PACKAGE_NAME = "packageName";
-    public static final String KEY_IS_ENABLED = "isEnabled";
+    static final private HashSet<String> disabledByDefault = new HashSet<>();
+    static {
+        disabledByDefault.add("com.android.messaging"); //We already have sms notifications in the telephony plugin
+        disabledByDefault.add("com.google.android.googlequicksearchbox"); //Google Now notifications re-spawn every few minutes
+    }

-    private static final String DATABASE_NAME = "Applications";
-    private static final String DATABASE_TABLE = "Applications";
-    private static final int DATABASE_VERSION = 1;
+    static final String KEY_PACKAGE_NAME = "packageName";
+    static final String KEY_IS_ENABLED = "isEnabled";

-    private final Context ourContext;
-    private SQLiteDatabase ourDatabase;
-    private DbHelper ourHelper;
+    static final String DATABASE_NAME = "Applications";
+    static final String DATABASE_TABLE = "Applications";
+    static final int DATABASE_VERSION = 2;
+
+    final Context ourContext;
+    SQLiteDatabase ourDatabase;
+    DbHelper ourHelper;

    public AppDatabase(Context c) {
        ourContext = c;
    }

-    private static class DbHelper extends SQLiteOpenHelper{
+    private static class DbHelper extends SQLiteOpenHelper {

        public DbHelper(Context context) {
            super(context, DATABASE_NAME, null, DATABASE_VERSION);
@@ -53,73 +59,57 @@ public class AppDatabase {

        @Override
        public void onCreate(SQLiteDatabase db) {
-            db.execSQL("CREATE TABLE " + DATABASE_TABLE + "(" + KEY_ROW_ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
-                    + KEY_NAME + " TEXT NOT NULL, " + KEY_PACKAGE_NAME + " TEXT NOT NULL, " + KEY_IS_ENABLED + " TEXT NOT NULL); ");
+            db.execSQL("CREATE TABLE " + DATABASE_TABLE + "(" + KEY_PACKAGE_NAME + " TEXT PRIMARY KEY NOT NULL, " + KEY_IS_ENABLED + " TEXT NOT NULL); ");
        }

        @Override
        public void onUpgrade(SQLiteDatabase db, int i, int i2) {
            db.execSQL("DROP TABLE IF EXISTS "+ DATABASE_TABLE);
            onCreate(db);
-
        }

    }

-    public void open(){
+    public void open() {
        ourHelper = new DbHelper(ourContext);
        ourDatabase = ourHelper.getWritableDatabase();
    }

-
-    public void close(){
+    public void close() {
        ourHelper.close();
    }

-    public Cursor getAllApplications()
-    {
-        String[] columns = new String []{KEY_ROW_ID,KEY_NAME,KEY_PACKAGE_NAME,KEY_IS_ENABLED};
-        Cursor res = ourDatabase.query(DATABASE_TABLE,columns,null,null,null,null,KEY_NAME);
-        return res;
-    }
+    public void setEnabled(String packageName, boolean isEnabled) {
+        String[] columns = new String []{KEY_IS_ENABLED};
+        Cursor res = ourDatabase.query(DATABASE_TABLE, columns, KEY_PACKAGE_NAME + " =? ",new String[]{packageName},null,null,null);

-    public long create(String appName, String packageName, boolean isEnabled) {
        ContentValues cv = new ContentValues();
-        cv.put(KEY_NAME, appName);
-        cv.put(KEY_PACKAGE_NAME, packageName);
        cv.put(KEY_IS_ENABLED, isEnabled?"true":"false");
-        return ourDatabase.insert(DATABASE_TABLE, null, cv);
-    }
-
-    public long update(String packageName, boolean isEnabled) {
-        ContentValues cvUpdate = new ContentValues();
-        cvUpdate.put(KEY_IS_ENABLED, isEnabled?"true":"false");
-        return ourDatabase.update(DATABASE_TABLE,cvUpdate,KEY_PACKAGE_NAME + "=?",new String[]{packageName});
-    }
-
-    public boolean exists(String packageName) {
-        String[] columns = new String []{KEY_ROW_ID};
-        Cursor res =  ourDatabase.query(DATABASE_TABLE,columns,KEY_PACKAGE_NAME + " =? ",new String[]{packageName},null,null,null);
-        int count = res.getCount();
+        if (res.getCount() > 0) {
+            ourDatabase.update(DATABASE_TABLE, cv, KEY_PACKAGE_NAME + "=?",new String[]{packageName});
+        } else {
+            cv.put(KEY_PACKAGE_NAME, packageName);
+            ourDatabase.insert(DATABASE_TABLE, null, cv);
+        }
        res.close();
-        return (count != 0);
    }

-    public boolean isEnabled(String packageName){
+    public boolean isEnabled(String packageName) {
        String[] columns = new String []{KEY_IS_ENABLED};
        Cursor res =  ourDatabase.query(DATABASE_TABLE,columns,KEY_PACKAGE_NAME + " =? ",new String[]{packageName},null,null,null);
-        boolean result = true; //Apps are enabled by default
+        boolean result;
        if (res.getCount() > 0) {
            res.moveToFirst();
            result = (res.getString(res.getColumnIndex(KEY_IS_ENABLED))).equals("true");
+        } else {
+            result = getDefaultStatus(packageName);
        }
        res.close();
        return result;
    }

-    public void delete(String packageName){
-        ourDatabase.delete(DATABASE_TABLE,KEY_PACKAGE_NAME + " =? ",new String[]{packageName} );
+    private boolean getDefaultStatus(String packageName) {
+        return !disabledByDefault.contains(packageName);
    }

-
 }
--- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java
@@ -22,142 +22,144 @@ package org.kde.kdeconnect.Plugins.NotificationsPlugin;

 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.database.Cursor;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
+import android.widget.CheckedTextView;
 import android.widget.ListView;

 import org.kde.kdeconnect.BackgroundService;
+import org.kde.kdeconnect.Helpers.StringsHelper;
 import org.kde.kdeconnect_tp.R;

+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;

 public class NotificationFilterActivity extends ActionBarActivity {

-    private AppDatabase appDatabase;
+    AppDatabase appDatabase;
+
+    static class AppListInfo {
+        String pkg;
+        String name;
+        Drawable icon;
+        boolean isEnabled;
+    }
+
+    AppListInfo[] apps;
+
+    class AppListAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return apps.length;
+        }
+
+        @Override
+        public AppListInfo getItem(int position) {
+            return apps[position];
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        public View getView(int position, View view, ViewGroup parent) {
+            if (view == null) {
+                LayoutInflater inflater = getLayoutInflater();
+                view = inflater.inflate(android.R.layout.simple_list_item_multiple_choice, null, true);
+            }
+            CheckedTextView checkedTextView = (CheckedTextView)view;
+            checkedTextView.setText(apps[position].name);
+            checkedTextView.setCompoundDrawablesWithIntrinsicBounds(apps[position].icon, null, null, null);
+            checkedTextView.setCompoundDrawablePadding((int)(8*getResources().getDisplayMetrics().density));
+
+            return view;
+        }
+
+    }

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_notification_filter);
-        final ListView listView = (ListView)findViewById(R.id.lvFilterApps);
-        appDatabase = new AppDatabase(this);
+        appDatabase = new AppDatabase(NotificationFilterActivity.this);

-        deleteUninstalledApps();
-        addNewlyInstalledApps();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {

-        appDatabase.open();
-        Cursor res = appDatabase.getAllApplications();
-        res.moveToFirst();
+                PackageManager packageManager = getPackageManager();
+                List<ApplicationInfo> appList = packageManager.getInstalledApplications(0);
+                int count = appList.size();

-        String[] appName = new String[res.getCount()];
-        final String[] pkgName = new String[res.getCount()];
-        Boolean[] isFiltered = new Boolean[res.getCount()];
+                apps = new AppListInfo[count];
+                appDatabase.open();
+                for (int i = 0; i < count; i++) {
+                    ApplicationInfo appInfo = appList.get(i);
+                    apps[i] = new AppListInfo();
+                    apps[i].pkg = appInfo.packageName;
+                    apps[i].name = appInfo.loadLabel(packageManager).toString();
+                    apps[i].icon = resizeIcon(appInfo.loadIcon(packageManager), 48);
+                    apps[i].isEnabled = appDatabase.isEnabled(appInfo.packageName);
+                }
+                appDatabase.close();

-        int i = 0;
-        while(!res.isAfterLast()){
-            appName[i] = res.getString(res.getColumnIndex(AppDatabase.KEY_NAME));
-            pkgName[i] = res.getString(res.getColumnIndex(AppDatabase.KEY_PACKAGE_NAME));
-            isFiltered[i] = res.getString(res.getColumnIndex(AppDatabase.KEY_IS_ENABLED)).equals("true");
-            res.moveToNext();
-            i++;
-        }
-        res.close();
-        appDatabase.close();
+                Arrays.sort(apps, new Comparator<AppListInfo>() {
+                    @Override
+                    public int compare(AppListInfo lhs, AppListInfo rhs) {
+                        return StringsHelper.compare(lhs.name, rhs.name);
+                    }
+                });

-        ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
-                android.R.layout.simple_list_item_multiple_choice, android.R.id.text1, appName);
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        displayAppList();
+                    }
+                });
+            }
+        }).start();
+
+    }
+
+    void displayAppList() {
+
+        final ListView listView = (ListView) findViewById(R.id.lvFilterApps);
+        AppListAdapter adapter = new AppListAdapter();
        listView.setAdapter(adapter);
        listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-        for (i = 0 ; i < isFiltered.length; i++){
-            if (isFiltered[i]) {
-                listView.setItemChecked(i, true);
-            }
-        }
        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
            @Override
            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                boolean checked = listView.isItemChecked(i);
-                //Log.e("NotificationFilterActivity", pkgName[i] + ":" + checked);
                appDatabase.open();
-                appDatabase.update(pkgName[i], checked);
+                appDatabase.setEnabled(apps[i].pkg, checked);
                appDatabase.close();
+                apps[i].isEnabled = checked;
            }
        });

-    }
-
-    // Delete apps from database which are uninstalled
-    private void deleteUninstalledApps(){
-        Cursor res;
-        appDatabase.open();
-        res = appDatabase.getAllApplications();
-        if (res != null) {
-            res.moveToFirst();
-            while (!res.isAfterLast()) {
-                String packageName = res.getString(res.getColumnIndex(AppDatabase.KEY_PACKAGE_NAME));
-                if (!isPackageInstalled(packageName)) {
-                    appDatabase.delete(packageName);
-                }
-                res.moveToNext();
-            }
-            res.close();
-        }
-        appDatabase.close();
-
-    }
-
-    // Adding newly installed apps in database
-    private void addNewlyInstalledApps() {
-
-        List<ApplicationInfo> PackList = getPackageManager().getInstalledApplications(0);
-        appDatabase.open();
-
-        for (int i=0; i < PackList.size(); i++)
-        {
-            ApplicationInfo PackInfo = PackList.get(i);
-
-            String appName = PackInfo.loadLabel(getPackageManager()).toString();
-            String packageName = PackInfo.packageName;
-
-            if ( (PackInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0 ) {
-
-                if (!appDatabase.exists(packageName)) {
-                    appDatabase.create(appName, packageName, true);
-                }
-                //Log.e("App FLAG_UPDATED_SYSTEM_APP: " + Integer.toString(i), appName);
-
-            } else if ( (PackInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-
-                //ignore these apps
-
-            } else {
-
-                if (!appDatabase.exists(packageName)) {
-                    appDatabase.create(appName, packageName, true);
-                }
-                //Log.e("App : " + Integer.toString(i), appName);
-
-            }
+        for (int i = 0 ; i < apps.length; i++) {
+            listView.setItemChecked(i, apps[i].isEnabled);
        }

-        appDatabase.close();
+        listView.setVisibility(View.VISIBLE);
+        findViewById(R.id.spinner).setVisibility(View.GONE);

    }

-    private boolean isPackageInstalled(String packageName){
-        PackageManager pm = getPackageManager();
-        try {
-            pm.getPackageInfo(packageName, PackageManager.GET_META_DATA);
-        } catch (Exception e) {
-            return false;
-        }
-        return true;
-    }
-
    @Override
    protected void onStart() {
        super.onStart();
@@ -170,4 +172,19 @@ public class NotificationFilterActivity extends ActionBarActivity {
        BackgroundService.removeGuiInUseCounter(this);
    }

+    Drawable resizeIcon(Drawable icon, int maxSize) {
+        Resources res = getResources();
+
+        //Convert to display pixels
+        maxSize = (int)(maxSize*res.getDisplayMetrics().density);
+
+        Bitmap bitmap = Bitmap.createBitmap(maxSize, maxSize, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        icon.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        icon.draw(canvas);
+
+        return new BitmapDrawable(res, bitmap);
+
+
+    }
 }
--- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
@@ -170,11 +170,6 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
            return;
        }

-        if (packageName.equals("com.google.android.googlequicksearchbox")) {
-            //HACK: Hide Google Now notifications that keep constantly popping up (and without text because we don't know how to read them properly)
-            return;
-        }
-
        NetworkPackage np = new NetworkPackage(PACKAGE_TYPE_NOTIFICATION);

        if (packageName.equals("org.kde.kdeconnect_tp"))
--- a/src/org/kde/kdeconnect/Plugins/PluginFactory.java
+++ b/src/org/kde/kdeconnect/Plugins/PluginFactory.java
@@ -36,6 +36,7 @@ import org.kde.kdeconnect.Plugins.ReceiveNotificationsPlugin.ReceiveNotification
 import org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandPlugin;
 import org.kde.kdeconnect.Plugins.SftpPlugin.SftpPlugin;
 import org.kde.kdeconnect.Plugins.SharePlugin.SharePlugin;
+import org.kde.kdeconnect.Plugins.TelepathyPlugin.TelepathyPlugin;
 import org.kde.kdeconnect.Plugins.TelephonyPlugin.TelephonyPlugin;

 import java.util.Collections;
@@ -110,7 +111,6 @@ public class PluginFactory {
    private static final Map<String, PluginInfo> pluginInfoCache = new TreeMap<>();

    static {
-        //TODO: Use reflection to find all subclasses of Plugin, instead of adding them manually
        PluginFactory.registerPlugin(TelephonyPlugin.class);
        PluginFactory.registerPlugin(PingPlugin.class);
        PluginFactory.registerPlugin(MprisPlugin.class);
@@ -121,7 +121,7 @@ public class PluginFactory {
        PluginFactory.registerPlugin(ReceiveNotificationsPlugin.class);
        PluginFactory.registerPlugin(MousePadPlugin.class);
        PluginFactory.registerPlugin(SharePlugin.class);
-        //PluginFactory.registerPlugin(TelepathyPlugin.class);
+        PluginFactory.registerPlugin(TelepathyPlugin.class);
        PluginFactory.registerPlugin(FindMyPhonePlugin.class);
        PluginFactory.registerPlugin(RunCommandPlugin.class);
    }
--- a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
@@ -242,7 +242,7 @@ public class DeviceFragment extends Fragment {
            }
        });

-        if (device.isPaired()) {
+        if (device.isPaired() && device.isReachable()) {

            menu.add(R.string.encryption_info_title).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
                @Override
@@ -266,6 +266,9 @@ public class DeviceFragment extends Fragment {
                    return true;
                }
            });
+        }
+
+        if (device.isPaired()) {

            menu.add(R.string.device_menu_unpair).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
                @Override
Author	SHA1	Message	Date
Albert Vaca	2e3fabb3e5	Bumped version to release	2016-09-24 20:28:05 +02:00
Albert Vaca	c7b754a36e	Swapped branches in if statement caused settings to not be stored in db	2016-09-24 20:26:23 +02:00
l10n daemon script	347c34927d	SVN_SILENT made messages (after extraction)	2016-09-23 10:40:27 +00:00
Albert Vaca	e9013e7995	Android Studio 2.2 complains if we use an old version of the gradle plugin	2016-09-20 12:46:59 +02:00
Albert Vaca	3b5a7deebe	Rewritten the Notification Filter. - Now we display every app in the phone. - We show the app icon next to the name. - Some apps can now be disabled by default. Disabled notifications for the default Android messaging app, as SMS notifications are already handled by the telephony plugin. BUG: 367930	2016-09-20 12:46:28 +02:00
Albert Vaca	ac04f5a610	Oops	2016-09-20 11:08:59 +02:00
Albert Vaca	efce35366b	Bumped version to release	2016-09-20 10:54:44 +02:00
Albert Vaca	1a32f8142d	Do not unpair on every handshake error. Sometimes we get stupid errors like "connection closed by peer". BUG: 368812	2016-09-20 10:53:10 +02:00
Albert Vaca	103f24c140	Reduce logging	2016-09-20 10:51:37 +02:00
Albert Vaca	66cdb77bbd	Fixed margins of notification filter activity	2016-09-20 10:48:06 +02:00
Albert Vaca	91eefcc65a	Fixed margins in the settings activity	2016-09-19 16:16:30 +02:00
Albert Vaca	b25ec2d133	Added cipher list for Android versions between 11 and 21. BUG: 368172	2016-09-19 16:16:30 +02:00
l10n daemon script	e2e78cb562	SVN_SILENT made messages (after extraction)	2016-09-19 10:16:29 +00:00
l10n daemon script	8b0b65178b	SVN_SILENT made messages (after extraction)	2016-09-18 10:38:50 +00:00
l10n daemon script	34d8a771d7	SVN_SILENT made messages (after extraction)	2016-09-14 10:29:43 +00:00
Albert Vaca	7f3afd194b	Trying to debug a "no shared ciphers" issue some users are experiencing.	2016-09-13 16:56:23 +02:00
Albert Vaca	ef79b04d1a	Bumped version to release	2016-09-11 21:47:49 +02:00
Albert Vaca	62bf2ccab7	Fixed clipboard propagation loop bug Now ClipboardListener is a singleton BUG: 362596	2016-09-11 21:40:07 +02:00
Albert Vaca	901440f78a	Don't return an empty list of supported plugins If we don't know it yet return them all.	2016-09-06 10:53:24 +02:00
Albert Vaca	e9a64dc99a	Don't show the Encryption Info menu if we are not connected with the device We don't know the actual encryption used unless we have a device link.	2016-09-06 10:53:24 +02:00
l10n daemon script	23f7eb90ba	SVN_SILENT made messages (after extraction)	2016-08-31 10:22:15 +00:00
Albert Vaca	a8838b57bb	What XML file?	2016-08-29 11:49:25 +02:00
Albert Vaca	2989fe5ab3	Bump version to release	2016-08-29 11:49:04 +02:00
Albert Vaca	9c40374b00	Unpair only when there is no certificate Unpairing on every error was a bit too aggressive. BUG: 367937	2016-08-29 11:48:30 +02:00
Albert Vaca	1b369d0bf8	Bumped version to release	2016-08-26 19:13:04 +02:00
Albert Vaca	f093326f93	Re-enabled SMS plugin	2016-08-26 19:13:04 +02:00
Albert Vaca	b43e0628c2	FindMyPhone: Calling ring twice now stop the ringing BUG: 366253	2016-08-26 11:04:56 +02:00
Albert Vaca	fdd6de5cee	Gradle 2.1.3 fixes a privilege escalation vulnerability in 2.1.2	2016-08-26 11:02:54 +02:00
Albert Vaca	816d47026e	Bumped version to release	2016-08-25 18:08:16 +02:00
Albert Vaca	14e97545e4	Unpair on error	2016-08-25 18:06:56 +02:00
l10n daemon script	1d5efe36f0	SVN_SILENT made messages (after extraction)	2016-08-19 10:33:47 +00:00
l10n daemon script	9478f5bb39	SVN_SILENT made messages (after extraction)	2016-08-15 10:10:03 +00:00
l10n daemon script	1f0e7f9705	SVN_SILENT made messages (after extraction)	2016-08-13 10:45:06 +00:00
l10n daemon script	fe4f099663	SVN_SILENT made messages (after extraction)	2016-08-11 10:52:48 +00:00
l10n daemon script	7272c0abf1	SVN_SILENT made messages (after extraction)	2016-08-10 10:28:10 +00:00
l10n daemon script	cbb1f3d806	SVN_SILENT made messages (after extraction)	2016-08-08 10:28:30 +00:00
l10n daemon script	37669e2be0	SVN_SILENT made messages (after extraction)	2016-08-06 11:10:46 +00:00
l10n daemon script	25527af4ad	SVN_SILENT made messages (after extraction)	2016-08-05 10:08:52 +00:00
l10n daemon script	6c7cb63af9	SVN_SILENT made messages (after extraction)	2016-08-04 11:04:58 +00:00