Release 1.13.7

Only set volume to previousVolume if it has a previous value
onDestroy() would call stopPlaying(), but previousVolume would be 0 (the default value) if startPlaying() had been never called.
2025-09-01 14:45:08 +00:00 · 2020-01-13 17:35:25 +01:00 · 2020-01-13 17:33:15 +01:00 · 2020-01-12 02:48:22 +01:00 · 2020-01-10 12:50:23 +01:00 · 2020-01-10 12:50:14 +01:00
45 changed files with 474 additions and 49 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    package="org.kde.kdeconnect_tp"
-    android:versionCode="11360"
-    android:versionName="1.13.6">
+    android:versionCode="11370"
+    android:versionName="1.13.7">

    <supports-screens
        android:anyDensity="true"
@@ -16,6 +16,7 @@
        android:name="android.hardware.telephony"
        android:required="false" />

+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.INTERNET" />
    <!-- <uses-permission android:name="android.permission.BLUETOOTH" /> -->
@@ -29,12 +30,13 @@
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <uses-permission android:name="android.permission.SEND_SMS" />
    <uses-permission android:name="android.permission.READ_SMS" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

    <application
        android:icon="@drawable/icon"
@@ -276,8 +278,19 @@
                android:name="android.support.PARENT_ACTIVITY"
                android:value="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" />
        </activity>
+
        <activity android:name="org.kde.kdeconnect.Plugins.PhotoPlugin.PhotoActivity" />

+        <activity
+            android:name="org.kde.kdeconnect.UserInterface.TrustedNetworksActivity"
+            android:label="@string/trusted_networks"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+        </activity>
+
+
    </application>

 </manifest>
--- a/res/drawable/ic_warning.xml
+++ b/res/drawable/ic_warning.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+</vector>
--- a/res/layout/pairing_explanation_not_trusted.xml
+++ b/res/layout/pairing_explanation_not_trusted.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:drawablePadding="8dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="12dp"
+    android:text="@string/on_non_trusted_message"
+    android:drawableStart="@drawable/ic_warning"
+    android:drawableTint="?attr/colorControlNormal"
+    android:clickable="false"
+    >
+
+</TextView>
--- a/res/layout/trusted_network_list.xml
+++ b/res/layout/trusted_network_list.xml
@@ -0,0 +1,38 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin">
+
+
+    <CheckBox
+            android:text="@string/allow_all_networks_text"
+            android:layout_width="match_parent"
+            android:checked="true"
+            android:layout_height="wrap_content"
+            android:id="@+id/trust_all_networks_checkBox"/>
+
+    <TextView
+            android:id="@+id/trusted_network_list_empty"
+            android:layout_width="fill_parent"
+            android:layout_height="100dp"
+            android:text="@string/empty_trusted_networks_list_text"
+            android:gravity="center" />
+
+    <ListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+
+    <Button
+        android:id="@android:id/button1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
+
+</LinearLayout>
--- a/res/menu/pairing.xml
+++ b/res/menu/pairing.xml
@@ -14,4 +14,10 @@
        android:title="@string/custom_device_list"
        kdeconnect:showAsAction="never" />

+    <item
+        android:id="@+id/menu_trusted_networks"
+        android:orderInCategory="900"
+        android:title="@string/trusted_networks"
+        kdeconnect:showAsAction="never" />
+
 </menu>
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -123,7 +123,6 @@
  <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>
--- a/res/values-ast/strings.xml
+++ b/res/values-ast/strings.xml
@@ -172,7 +172,6 @@
  <string name="pref_plugin_telepathy">Unviu de SMS</string>
  <string name="pref_plugin_telepathy_desc">Unvia SMS dende l\'ordenador</string>
  <string name="findmyphone_description">Fai qu\'esti preséu suene pa que pueas alcontralu</string>
-  <string name="findmyphone_found">Alcontrélu</string>
  <string name="plugins_need_permission">Dalgunos plugins precisen permisos pa funcionar (tócalos pa más información):</string>
  <string name="permission_explanation">Esti plugin precisa permisos pa funcionar</string>
  <string name="optional_permission_explanation">Precises conceder permisos adicionales p\'activar toles funciones</string>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -205,6 +205,7 @@
  <string name="refresh">Refresca</string>
  <string name="unreachable_description">Aquest dispositiu aparellat no és accessible. Assegureu-vos que està connectat a la mateixa xarxa.</string>
  <string name="no_wifi">No esteu connectat a una xarxa Wi-Fi, per tant, no podreu veure cap dispositiu. Feu clic aquí per activar la Wi-Fi.</string>
+  <string name="on_non_trusted_message">No és una xarxa de confiança: el descobriment automàtic està desactivat.</string>
  <string name="no_file_browser">No hi ha instal·lat cap explorador de fitxers.</string>
  <string name="pref_plugin_telepathy">Envia un SMS</string>
  <string name="pref_plugin_telepathy_desc">Envia missatges de text des de l\'escriptori</string>
@@ -212,7 +213,7 @@
  <string name="findmyphone_title_tablet">Troba la meva tauleta</string>
  <string name="findmyphone_title_tv">Troba la meva TV</string>
  <string name="findmyphone_description">Fa sonar aquest dispositiu perquè el pugueu trobar</string>
-  <string name="findmyphone_found">L\'he trobat</string>
+  <string name="findmyphone_found">S\'ha trobat</string>
  <string name="open">Obre</string>
  <string name="close">Tanca</string>
  <string name="plugins_need_permission">Alguns connectors necessiten permisos per a funcionar (puntegeu per a més informació):</string>
@@ -243,6 +244,7 @@
  <string name="notification_channel_persistent">Indicador de persistent</string>
  <string name="notification_channel_media_control">Control multimèdia</string>
  <string name="notification_channel_filetransfer">Transferència de fitxers</string>
+  <string name="notification_channel_high_priority">Prioritat alta</string>
  <string name="mpris_stop">Atura el reproductor actual</string>
  <string name="copy_url_to_clipboard">Copia l\'URL al porta-retalls</string>
  <string name="clipboard_toast">Copiat al porta-retalls</string>
@@ -276,4 +278,11 @@
  <string name="no_app_for_opening">No s\'ha trobat cap aplicació adequada per obrir aquest fitxer</string>
  <string name="remote_keyboard_service">Teclat remot del KDE Connect</string>
  <string name="presenter_pointer">Apuntador</string>
+  <string name="trusted_networks">Xarxes de confiança</string>
+  <string name="trusted_networks_desc">Restringeix el descobriment automàtic a les xarxes conegudes</string>
+  <string name="add_trusted_network">Afegeix %1s</string>
+  <string name="empty_trusted_networks_list_text">Encara no heu afegit cap xarxa de confiança</string>
+  <string name="allow_all_networks_text">Permet totes</string>
+  <string name="location_permission_needed_title">Es requereix permís</string>
+  <string name="location_permission_needed_desc">L\'Android requereix el permís d\'ubicació per identificar la xarxa WiFi</string>
 </resources>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -228,7 +228,6 @@
  <string name="findmyphone_title_tablet">Najít můj tablet</string>
  <string name="findmyphone_title_tv">Najít mou TV</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>
  <string name="plugins_need_permission">Některé moduly potřebují pro práci povolení (ťukněte pro více informací):</string>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -133,7 +133,6 @@
  <string name="findmyphone_title">Find min telefon</string>
  <string name="findmyphone_title_tablet">Find min tablet</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>
  <string name="plugins_need_permission">Nogle plugins kræver tilladelser for at virke (tap for mere info):</string>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -212,7 +212,6 @@
  <string name="findmyphone_title_tablet">Mein Tablet suchen</string>
  <string name="findmyphone_title_tv">Meinen Fernseher suchen</string>
  <string name="findmyphone_description">Ruft dieses Gerät an, damit Sie es finden können</string>
-  <string name="findmyphone_found">Gefunden</string>
  <string name="open">Öffnen</string>
  <string name="close">Schließen</string>
  <string name="plugins_need_permission">Einige Module benötigen zusätzliche Berechtigungen, tippen Sie für weitere Details:</string>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -133,7 +133,6 @@
  <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>
  <string name="plugins_need_permission">Κάποια πρόσθετα απαιτούν δικαιώματα για να λειτουργήσουν (χτυπήστε για περισσότερες πληροφορίες):</string>
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -212,7 +212,6 @@
  <string name="findmyphone_title_tablet">Find my tablet</string>
  <string name="findmyphone_title_tv">Find my TV</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>
  <string name="plugins_need_permission">Some Plugins need permissions to work (tap for more info):</string>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -212,7 +212,6 @@
  <string name="findmyphone_title_tablet">Encontrar mi tableta</string>
  <string name="findmyphone_title_tv">Encontrar mi TV</string>
  <string name="findmyphone_description">Hace sonar este dispositivo para que pueda encontrarlo</string>
-  <string name="findmyphone_found">Encontrado</string>
  <string name="open">Abrir</string>
  <string name="close">Cerrar</string>
  <string name="plugins_need_permission">Algunos complementos necesitan permisos para funcionar (pulse para más información):</string>
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -205,6 +205,7 @@
  <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_wifi">Sul puudub ühendus Wi-Fi võrguga, mistõttu sa ei näe ühtegi seadet. Klõpsa siia Wi-Fi sisselülitamiseks.</string>
+  <string name="on_non_trusted_message">See ei ole usaldusväärne võrk: automaatne tuvastamine on keelatud.</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>
@@ -243,6 +244,7 @@
  <string name="notification_channel_persistent">Püsiindikaator</string>
  <string name="notification_channel_media_control">Meedia juhtimine</string>
  <string name="notification_channel_filetransfer">Failiülekanne</string>
+  <string name="notification_channel_high_priority">Kõrge prioriteediga</string>
  <string name="mpris_stop">Peata aktiivne mängija</string>
  <string name="copy_url_to_clipboard">Kopeeri URL lõikepuhvrisse</string>
  <string name="clipboard_toast">Kopeeriti lõikepuhvrisse</string>
@@ -276,4 +278,11 @@
  <string name="no_app_for_opening">Selle faili avamiseks ei leitud sobivat rakendust</string>
  <string name="remote_keyboard_service">KDE Connecti kaugklaviatuur</string>
  <string name="presenter_pointer">Osutusseade</string>
+  <string name="trusted_networks">Usaldusväärsed võrgud</string>
+  <string name="trusted_networks_desc">Automaatset tuvastamist kasutatakse ainult tuntud võrkudes</string>
+  <string name="add_trusted_network">Lisa %1s</string>
+  <string name="empty_trusted_networks_list_text">Sa ei ole veel lisanud ühtegi usaldusväärset võrku</string>
+  <string name="allow_all_networks_text">Luba kõik</string>
+  <string name="location_permission_needed_title">Õigusenõue</string>
+  <string name="location_permission_needed_desc">Android nõuab asukohaõigust sinu WiFi-võrgu tuvastamiseks</string>
 </resources>
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -212,7 +212,6 @@
  <string name="findmyphone_title_tablet">Bilatu nire tableta</string>
  <string name="findmyphone_title_tv">Aurkitu nire TB</string>
  <string name="findmyphone_description">Gailuaren dei-doinua jotzen du aurki dezazun</string>
-  <string name="findmyphone_found">Aurkituta</string>
  <string name="open">Ireki</string>
  <string name="close">Itxi</string>
  <string name="plugins_need_permission">Plugin batzuek jarduteko baimenak behar dituzte (tak egin informazio gehiagorako):</string>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -211,7 +211,6 @@
  <string name="findmyphone_title_tablet">Löydä tablettini</string>
  <string name="findmyphone_title_tv">Etsi televeisioni</string>
  <string name="findmyphone_description">Laittaa laitteen soimaan, jotta voit löytää sen.</string>
-  <string name="findmyphone_found">Löytyi</string>
  <string name="open">Avaa</string>
  <string name="close">Sulje</string>
  <string name="plugins_need_permission">Jotkin liitännäiset vaativat toimiakseen lisäkäyttöoikeuksia (lisätietoa napsauttamalla):</string>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -212,7 +212,6 @@
  <string name="findmyphone_title_tablet">Trouver ma tablette</string>
  <string name="findmyphone_title_tv">Trouver ma télévision</string>
  <string name="findmyphone_description">Fait sonner le périphérique pour vous aider à le retrouver</string>
-  <string name="findmyphone_found">Trouvé</string>
  <string name="open">Ouvrir</string>
  <string name="close">Fermer</string>
  <string name="plugins_need_permission">Certains modules externes nécessitent des permissions pour fonctionner (tapez pour plus d\'informations) :</string>
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -212,7 +212,6 @@
  <string name="findmyphone_title_tablet">Atopar a tableta</string>
  <string name="findmyphone_title_tv">Atopar o meu televisor</string>
  <string name="findmyphone_description">Reproduce un son de chamada no dispositivo para que poida atopalo.</string>
-  <string name="findmyphone_found">Atopado</string>
  <string name="open">Abrir</string>
  <string name="close">Pechar</string>
  <string name="plugins_need_permission">Algúns complementos necesitan permisos para funcionar (toque para máis información):</string>
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -133,7 +133,6 @@
  <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>
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -164,7 +164,6 @@
  <string name="findmyphone_title_tablet">Temukan tabletku</string>
  <string name="findmyphone_title_tv">Temukan TV-ku</string>
  <string name="findmyphone_description">Deringkan perangkat ini sehingga kamu bisa menemukannya</string>
-  <string name="findmyphone_found">Ketemu</string>
  <string name="open">Buka</string>
  <string name="close">Tutup</string>
  <string name="plugins_need_permission">Beberapa plugin perlu perizinan untuk kerja (ketuk untuk info selebihnya):</string>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -212,7 +212,6 @@
  <string name="findmyphone_title_tablet">Trova il mio tablet</string>
  <string name="findmyphone_title_tv">Trova il mio televisore</string>
  <string name="findmyphone_description">Fa squillare questo dispositivo per trovarlo</string>
-  <string name="findmyphone_found">Trovato</string>
  <string name="open">Apri</string>
  <string name="close">Chiudi</string>
  <string name="plugins_need_permission">Alcune estensioni hanno bisogno di permessi per funzionare (tocca per maggiori informazioni):</string>
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -204,7 +204,6 @@
  <string name="findmyphone_title_tablet">タブレットを捜索</string>
  <string name="findmyphone_title_tv">TV を捜索</string>
  <string name="findmyphone_description">このデバイスを鳴らすことで捜索できます</string>
-  <string name="findmyphone_found">発見</string>
  <string name="open">開く</string>
  <string name="close">閉じる</string>
  <string name="plugins_need_permission">いくつかのプラグインが機能するには権限が必要です (タップして詳細情報を表示):</string>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -204,7 +204,6 @@
  <string name="findmyphone_title_tablet">내 태블릿 찾기</string>
  <string name="findmyphone_title_tv">내 TV 찾기</string>
  <string name="findmyphone_description">이 장치에서 소리를 울려서 찾는 데 도움을 줍니다</string>
-  <string name="findmyphone_found">찾았음</string>
  <string name="open">열기</string>
  <string name="close">닫기</string>
  <string name="plugins_need_permission">권한이 필요한 플러그인(정보를 보려면 누르기):</string>
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -221,6 +221,7 @@
  <string name="refresh">Įkelti iš naujo</string>
  <string name="unreachable_description">Šis suporuotas įrenginys nepasiekiamas. Įsitikinkite, kad jis yra prijungtas prie to paties tinklo.</string>
  <string name="no_wifi">Nesate prisijungę prie belaidžio (Wi-Fi) tinklo, taigi, galite nematyti jokių įrenginių. Spustelėkite čia, norėdami įjungti belaidį (Wi-Fi).</string>
+  <string name="on_non_trusted_message">Nepatikimas tinklas: automatinis aptikimas yra išjungtas.</string>
  <string name="no_file_browser">Nėra įdiegta jokių failų tvarkytuvių.</string>
  <string name="pref_plugin_telepathy">Siųsti SMS žinutę</string>
  <string name="pref_plugin_telepathy_desc">Siųsti tekstines žinutes iš savo darbalaukio</string>
@@ -228,7 +229,7 @@
  <string name="findmyphone_title_tablet">Rasti planšetę</string>
  <string name="findmyphone_title_tv">Rasti televizorių</string>
  <string name="findmyphone_description">Skambina į šį įrenginį, kad galėtumėte jį rasti</string>
-  <string name="findmyphone_found">Rastas</string>
+  <string name="findmyphone_found">Radau</string>
  <string name="open">Atverti</string>
  <string name="close">Užverti</string>
  <string name="plugins_need_permission">Kai kurie priedai tam, kad veiktų, reikalauja leidimų (bakstelėkite išsamesnei informacijai):</string>
@@ -259,6 +260,7 @@
  <string name="notification_channel_persistent">Pastovus indikatorius</string>
  <string name="notification_channel_media_control">Įvairialypės terpės valdymas</string>
  <string name="notification_channel_filetransfer">Failų persiuntimas</string>
+  <string name="notification_channel_high_priority">Didelė pirmenybė</string>
  <string name="mpris_stop">Stabdyti dabartinę leistuvę</string>
  <string name="copy_url_to_clipboard">Kopijuoti URL į iškarpinę</string>
  <string name="clipboard_toast">Nukopijuota į iškarpinę</string>
@@ -292,4 +294,11 @@
  <string name="no_app_for_opening">Šio failo atvėrimui nerasta jokios tinkamos programėlės</string>
  <string name="remote_keyboard_service">KDE Connect nuotolinė klaviatūra</string>
  <string name="presenter_pointer">Rodyklė</string>
+  <string name="trusted_networks">Patikimi tinklai</string>
+  <string name="trusted_networks_desc">Apriboti automatinį aptikimą iki žinomų tinklų</string>
+  <string name="add_trusted_network">Pridėti %1s</string>
+  <string name="empty_trusted_networks_list_text">Kol kas nesate pridėję jokių patikimų tinklų</string>
+  <string name="allow_all_networks_text">Leisti visus</string>
+  <string name="location_permission_needed_title">Reikalingas leidimas</string>
+  <string name="location_permission_needed_desc">Android reikalauja Vietos leidimo, kad atpažintų jūsų belaidį (WiFi) tinklą</string>
 </resources>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -205,6 +205,7 @@
  <string name="refresh">Vernieuwen</string>
  <string name="unreachable_description">Dit gepaarde apparaat is niet bereikbaar. Ga na dat het is verbonden met uw zelfde netwerk.</string>
  <string name="no_wifi">U bent niet verbonden met een Wi-Fi-netwerk, u zou dus niet in staat kunnen zijn om apparaten te zien. Klik hier om Wi-Fi in te schakelen.</string>
+  <string name="on_non_trusted_message">Niet op een vertrouwd netwerk: automatisch ontdekken is uitgeschakeld.</string>
  <string name="no_file_browser">Er zijn geen bestandsbrowsers geïnstalleerd.</string>
  <string name="pref_plugin_telepathy">SMS verzenden</string>
  <string name="pref_plugin_telepathy_desc">Stuur tekstberichten van uw bureaublad</string>
@@ -243,6 +244,7 @@
  <string name="notification_channel_persistent">Blijvende indicator</string>
  <string name="notification_channel_media_control">Besturing van media</string>
  <string name="notification_channel_filetransfer">Bestandsoverdracht</string>
+  <string name="notification_channel_high_priority">Hoge prioriteit</string>
  <string name="mpris_stop">Stop de huidige speler</string>
  <string name="copy_url_to_clipboard">URL-adres kopiëren naar klembord</string>
  <string name="clipboard_toast">Gekopieerd naar klembord</string>
@@ -276,4 +278,11 @@
  <string name="no_app_for_opening">Geen geschikte toepassing gevonden om dit bestand te openen</string>
  <string name="remote_keyboard_service">KDE Connect Toetsenbord op afstand</string>
  <string name="presenter_pointer">Aanwijzer</string>
+  <string name="trusted_networks">Vertrouwde netwerken</string>
+  <string name="trusted_networks_desc">Automatisch ontdekken beperken tot bekende netwerken</string>
+  <string name="add_trusted_network">%1s toevoegen</string>
+  <string name="empty_trusted_networks_list_text">U hebt nog geen vertrouwd netwerk toegevoegd</string>
+  <string name="allow_all_networks_text">Allen toestaan</string>
+  <string name="location_permission_needed_title">Toestemming vereist</string>
+  <string name="location_permission_needed_desc">Android vereist de toestemming voor locatie om uw WiFi-netwerk te identificeren</string>
 </resources>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -13,7 +13,7 @@
  <string name="pref_plugin_clipboard_desc">Udostępnia zawartość schowka</string>
  <string name="pref_plugin_mousepad">Sterowanie z urządzenia przenośnego</string>
  <string name="pref_plugin_mousepad_desc">Telefon lub tablet służy jako gładzik i klawiatura</string>
-  <string name="pref_plugin_presenter">Sterowanie pokazem przeźroczy</string>
+  <string name="pref_plugin_presenter">Sterowanie prezentacją</string>
  <string name="pref_plugin_presenter_desc">Przełącza przeźrocza przy użyciu telefonu</string>
  <string name="pref_plugin_remotekeyboard">Odbieranie zdalnych naciśnięć klawiszy</string>
  <string name="pref_plugin_remotekeyboard_desc">Odbiera naciśnięcia klawiszy z innego urządzenia</string>
@@ -228,7 +228,6 @@
  <string name="findmyphone_title_tablet">Poszukiwania tabletu</string>
  <string name="findmyphone_title_tv">Poszukiwania telewizora</string>
  <string name="findmyphone_description">Dzwoni na dane urządzenie, aby można je odnaleźć.</string>
-  <string name="findmyphone_found">Znaleziony</string>
  <string name="open">Otwórz</string>
  <string name="close">Zamknij</string>
  <string name="plugins_need_permission">Niektóre wtyczki wymagają uprawnień do swojego działania (stuknij, aby dowiedzieć się więcej)</string>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -205,6 +205,7 @@
  <string name="refresh">Atualizar</string>
  <string name="unreachable_description">Este dispositivo emparelhado não está acessível. Certifique-se de que está conectado à mesma rede que você.</string>
  <string name="no_wifi">Você não está conectado a nenhuma rede Wi-Fi, então não conseguirá ver nenhum dispositivo. Clique aqui para ativar o Wi-Fi.</string>
+  <string name="on_non_trusted_message">Não é uma rede confiável: a descoberta automática está desativada.</string>
  <string name="no_file_browser">Não há gerenciadores de arquivos instalados.</string>
  <string name="pref_plugin_telepathy">Enviar SMS</string>
  <string name="pref_plugin_telepathy_desc">Envia mensagens de texto do seu Desktop</string>
@@ -243,6 +244,7 @@
  <string name="notification_channel_persistent">Indicador persistente</string>
  <string name="notification_channel_media_control">Controle multimídia</string>
  <string name="notification_channel_filetransfer">Transferência de arquivo</string>
+  <string name="notification_channel_high_priority">Prioridade alta</string>
  <string name="mpris_stop">Parar o reprodutor atual</string>
  <string name="copy_url_to_clipboard">Copiar URL para a área de transferência</string>
  <string name="clipboard_toast">Copiado para a área de transferência</string>
@@ -276,4 +278,11 @@
  <string name="no_app_for_opening">Não foi encontrado nenhum aplicativo adequado para abrir este arquivo</string>
  <string name="remote_keyboard_service">Teclado Remoto do KDE Connect</string>
  <string name="presenter_pointer">Ponteiro</string>
+  <string name="trusted_networks">Redes confiáveis</string>
+  <string name="trusted_networks_desc">Restringir a descoberta automática a redes conhecidas</string>
+  <string name="add_trusted_network">Adicionar à %1s</string>
+  <string name="empty_trusted_networks_list_text">Você ainda não adicionou nenhuma rede confiável</string>
+  <string name="allow_all_networks_text">Permitir tudo</string>
+  <string name="location_permission_needed_title">É necessário ter permissão</string>
+  <string name="location_permission_needed_desc">O Android precisa da permissão de Localização para identificar a sua rede Wi-Fi</string>
 </resources>
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -205,6 +205,7 @@
  <string name="refresh">Actualizar</string>
  <string name="unreachable_description">Este dispositivo emparelhado não está acessível. Certifique-se que está ligado à mesma rede que você.</string>
  <string name="no_wifi">Não está ligado a nenhuma rede Wi-Fi, pelo que poderá não conseguir ver nenhuns dispositivos. Carregue aqui para activar o Wi-Fi.</string>
+  <string name="on_non_trusted_message">Não é uma rede fidedigna: a descoberta automática está desactivada.</string>
  <string name="no_file_browser">Não existem gestores de ficheiros instalados.</string>
  <string name="pref_plugin_telepathy">Enviar um SMS</string>
  <string name="pref_plugin_telepathy_desc">Enviar mensagens de texto a partir do seu ambiente de trabalho</string>
@@ -212,7 +213,7 @@
  <string name="findmyphone_title_tablet">Descobrir o meu \'tablet\'</string>
  <string name="findmyphone_title_tv">Descobrir a minha TV</string>
  <string name="findmyphone_description">Toca este dispositivo para que o possa encontrar</string>
-  <string name="findmyphone_found">Encontrado</string>
+  <string name="findmyphone_found">Encontrei</string>
  <string name="open">Abrir</string>
  <string name="close">Fechar</string>
  <string name="plugins_need_permission">Alguns \'plugins\' precisam de permissões para funcionar (toque para mais informações):</string>
@@ -243,6 +244,7 @@
  <string name="notification_channel_persistent">Indicador persistente</string>
  <string name="notification_channel_media_control">Comando multimédia</string>
  <string name="notification_channel_filetransfer">Transferência de ficheiros</string>
+  <string name="notification_channel_high_priority">Alta prioridade</string>
  <string name="mpris_stop">Parar o leitor actual</string>
  <string name="copy_url_to_clipboard">Copiar o URL para a área de transferência</string>
  <string name="clipboard_toast">Copiado para a área de transferência</string>
@@ -276,4 +278,11 @@
  <string name="no_app_for_opening">Não existe nenhuma aplicação adequada para abrir este ficheiro</string>
  <string name="remote_keyboard_service">Teclado Remoto do KDE Connect</string>
  <string name="presenter_pointer">Cursor</string>
+  <string name="trusted_networks">Redes fidedignas</string>
+  <string name="trusted_networks_desc">Restringir a descoberta automática às redes desconhecidas</string>
+  <string name="add_trusted_network">Adicionar a %1s</string>
+  <string name="empty_trusted_networks_list_text">Ainda não adicionou nenhuma rede fidedigna</string>
+  <string name="allow_all_networks_text">Permitir tudo</string>
+  <string name="location_permission_needed_title">É necessária a permissão</string>
+  <string name="location_permission_needed_desc">O Android precisa da permissão de Localização para identificar a sua rede WiFi</string>
 </resources>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -227,7 +227,6 @@
  <string name="findmyphone_title_tablet">Поиск планшета</string>
  <string name="findmyphone_title_tv">Поиск телевизора</string>
  <string name="findmyphone_description">Подача звукового сигнала на устройстве, чтобы вы могли его найти</string>
-  <string name="findmyphone_found">Найден</string>
  <string name="open">Открыть</string>
  <string name="close">Закрыть</string>
  <string name="plugins_need_permission">Некоторым модулям нужны разрешения для работы (нажмите для просмотра подробностей):</string>
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -228,7 +228,6 @@
  <string name="findmyphone_title_tablet">Nájsť môj tablet</string>
  <string name="findmyphone_title_tv">Nájsť môj TV</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>
  <string name="plugins_need_permission">Niektoré Pluginy potrebujú oprávnenia aby fungovali (ťuknite pre viac info):</string>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -205,6 +205,7 @@
  <string name="refresh">Uppdatera</string>
  <string name="unreachable_description">Den här ihopparade apparaten kan inte nås. Försäkra dig om att den är ansluten till samma nätverk.</string>
  <string name="no_wifi">Du är inte ansluten till ett WIFI-nätverk, så du kanske inte kan se alla apparater. Klicka här för att aktivera WIFI.</string>
+  <string name="on_non_trusted_message">Använder inte ett pålitligt nätverk: automatisk upptäckt är inaktiverad.</string>
  <string name="no_file_browser">Det finns inga filbläddrare installerade.</string>
  <string name="pref_plugin_telepathy">Skicka SMS</string>
  <string name="pref_plugin_telepathy_desc">Skicka textmeddelanden från skrivbordet</string>
@@ -243,6 +244,7 @@
  <string name="notification_channel_persistent">Permanent indikering</string>
  <string name="notification_channel_media_control">Kontroll av media</string>
  <string name="notification_channel_filetransfer">Filöverföring</string>
+  <string name="notification_channel_high_priority">Hög prioritet</string>
  <string name="mpris_stop">Stoppa aktuell spelare</string>
  <string name="copy_url_to_clipboard">Kopiera webbadress till klippbordet</string>
  <string name="clipboard_toast">Kopierad till klippbordet</string>
@@ -276,4 +278,11 @@
  <string name="no_app_for_opening">Inget lämpligt program hittades för att öppna filen</string>
  <string name="remote_keyboard_service">KDE-anslut fjärrtangentbord</string>
  <string name="presenter_pointer">Pekare</string>
+  <string name="trusted_networks">Pålitliga nätverk</string>
+  <string name="trusted_networks_desc">Begränsar automatisk upptäckt till kända nätverk</string>
+  <string name="add_trusted_network">Lägg till %1s</string>
+  <string name="empty_trusted_networks_list_text">Du har inte lagt till några pålitliga nätverk ännu</string>
+  <string name="allow_all_networks_text">Tillåt alla</string>
+  <string name="location_permission_needed_title">Rättighet krävs</string>
+  <string name="location_permission_needed_desc">Android kräver platsrättigheter för att identifiera WIFI-nätverk</string>
 </resources>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -211,7 +211,6 @@
  <string name="findmyphone_title_tablet">Tabletimi bul</string>
  <string name="findmyphone_title_tv">TV\'mi bul</string>
  <string name="findmyphone_description">Aygıtı bulmak için onu çaldır</string>
-  <string name="findmyphone_found">Bulundu</string>
  <string name="open">Aç</string>
  <string name="close">Kapat</string>
  <string name="plugins_need_permission">Bazı Eklentiler çalışmak için izne ihtiyaç duyar (daha fazla bilgi için dokunun):</string>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -221,6 +221,7 @@
  <string name="refresh">Оновити</string>
  <string name="unreachable_description">Цей пов’язаний пристрій недоступний. Переконайтеся, що його з’єднано з вашою мережею.</string>
  <string name="no_wifi">Ваш комп\'ютер не з\'єднано із мережею Wi-Fi, отже перегляд пристроїв у мережі неможливий. Натисніть тут, щоб увімкнути Wi-Fi.</string>
+  <string name="on_non_trusted_message">Не є надійною мережею: автовиявлення вимкнено.</string>
  <string name="no_file_browser">Програм для навігації файловою системою не встановлено.</string>
  <string name="pref_plugin_telepathy">Надіслати SMS</string>
  <string name="pref_plugin_telepathy_desc">Надсилати текстові повідомлення з вашої робочої станції</string>
@@ -259,6 +260,7 @@
  <string name="notification_channel_persistent">Постійний індикатор</string>
  <string name="notification_channel_media_control">Керування відтворенням</string>
  <string name="notification_channel_filetransfer">Передавання файлів</string>
+  <string name="notification_channel_high_priority">Високий пріоритет</string>
  <string name="mpris_stop">Зупинити відтворення у поточному програвачі</string>
  <string name="copy_url_to_clipboard">Скопіювати адресу до буфера</string>
  <string name="clipboard_toast">Скопійовано до буфера</string>
@@ -292,4 +294,11 @@
  <string name="no_app_for_opening">Не знайдено відповідної програми для відкриття цього файла</string>
  <string name="remote_keyboard_service">Віддалена клавіатура KDE Connect</string>
  <string name="presenter_pointer">Указка</string>
+  <string name="trusted_networks">Надійні мережі</string>
+  <string name="trusted_networks_desc">Обмежити автовиявлення відомими мережами</string>
+  <string name="add_trusted_network">Додати %1s</string>
+  <string name="empty_trusted_networks_list_text">Вами ще не додано надійних мереж</string>
+  <string name="allow_all_networks_text">Дозволити всі</string>
+  <string name="location_permission_needed_title">Потрібні права доступу</string>
+  <string name="location_permission_needed_desc">Android потрібні права доступу до даних місця перебування для ідентифікації вашої мережі WiFi</string>
 </resources>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -204,7 +204,6 @@
  <string name="findmyphone_title_tablet">找到我的平板电脑</string>
  <string name="findmyphone_title_tv">查找我的电视</string>
  <string name="findmyphone_description">让设备响铃从而找到它</string>
-  <string name="findmyphone_found">找到</string>
  <string name="open">打开</string>
  <string name="close">关闭</string>
  <string name="plugins_need_permission">某些插件需要权限才能工作 (点击以获取更多信息)：</string>
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -204,7 +204,6 @@
  <string name="findmyphone_title_tablet">尋找我的平板</string>
  <string name="findmyphone_title_tv">尋找我的電視</string>
  <string name="findmyphone_description">讓這個裝置發出聲響讓您能找到它</string>
-  <string name="findmyphone_found">找到</string>
  <string name="open">開啟</string>
  <string name="close">關閉</string>
  <string name="plugins_need_permission">部份的外掛程式需要權限才能運作（按一下以取得更多資訊）</string>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -257,6 +257,7 @@
    <string name="refresh">Refresh</string>
    <string name="unreachable_description">This paired device is not reachable. Make sure it is connected to your same network.</string>
    <string name="no_wifi">You\'re not connected to a Wi-Fi network, so you may not be able to see any devices. Click here to enable Wi-Fi.</string>
+    <string name="on_non_trusted_message">Not on a trusted network: autodiscovery is disabled.</string>
    <string name="no_file_browser">There are no file browsers installed.</string>
    <string name="pref_plugin_telepathy">Send SMS</string>
    <string name="pref_plugin_telepathy_desc">Send text messages from your desktop</string>
@@ -338,8 +339,17 @@
    <string name="plugin_photo_desc">Launch the camera app to ease taking and transferring pictures</string>

    <string name="findmyphone_preference_key_ringtone" translatable="false">findmyphone_ringtone</string>
+
    <string name="no_app_for_opening">No suitable app found to open this file</string>
    <string name="remote_keyboard_service">KDE Connect Remote Keyboard</string>
    <string name="presenter_pointer">Pointer</string>

+    <string name="trusted_networks">Trusted networks</string>
+    <string name="trusted_networks_desc">Restrict autodiscovery to known networks</string>
+    <string name="add_trusted_network">Add %1s</string>
+    <string name="empty_trusted_networks_list_text">You haven\'t added any trusted network yet</string>
+    <string name="allow_all_networks_text">Allow all</string>
+
+    <string name="location_permission_needed_title">Permission required</string>
+    <string name="location_permission_needed_desc">Android requires the Location permission to identify your WiFi network</string>
 </resources>
--- a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
+++ b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
@@ -33,6 +33,7 @@ import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.Helpers.DeviceHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Helpers.StringsHelper;
+import org.kde.kdeconnect.Helpers.TrustedNetworkHelper;
 import org.kde.kdeconnect.NetworkPacket;
 import org.kde.kdeconnect.UserInterface.CustomDevicesActivity;

@@ -367,7 +368,16 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
        new Thread(() -> {
            ArrayList<String> iplist = CustomDevicesActivity
                    .getCustomDeviceList(PreferenceManager.getDefaultSharedPreferences(context));
-            iplist.add("255.255.255.255"); //Default: broadcast.
+
+            if (TrustedNetworkHelper.isTrustedNetwork(context)) {
+                iplist.add("255.255.255.255"); //Default: broadcast.
+            } else {
+                Log.i("LanLinkProvider", "Current network isn't trusted, not broadcasting");
+            }
+
+            if (iplist.isEmpty()) {
+                return;
+            }

            NetworkPacket identity = NetworkPacket.createIdentityPacket(context);
            int port = (tcpServer == null || !tcpServer.isBound()) ? MIN_PORT : tcpServer.getLocalPort();
--- a/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java
+++ b/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java
@@ -0,0 +1,93 @@
+package org.kde.kdeconnect.Helpers;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.net.wifi.SupplicantState;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.core.content.ContextCompat;
+
+import org.kde.kdeconnect.UserInterface.PermissionsAlertDialogFragment;
+import org.kde.kdeconnect_tp.R;
+
+public class TrustedNetworkHelper {
+
+    private static final String KEY_CUSTOM_TRUSTED_NETWORKS = "trusted_network_preference";
+    private static final String KEY_CUSTOM_TRUST_ALL_NETWORKS = "trust_all_network_preference";
+    private static final String NETWORK_SSID_DELIMITER = "#_#";
+    private static final String NOT_AVAILABLE_SSID_RESULT = "<unknown ssid>";
+
+
+    private final Context context;
+
+    public TrustedNetworkHelper(Context context) {
+        this.context = context;
+    }
+
+    public List<String> read() {
+        String serializeTrustedNetwork = PreferenceManager.getDefaultSharedPreferences(context).getString(
+                KEY_CUSTOM_TRUSTED_NETWORKS, "");
+        if (serializeTrustedNetwork.isEmpty())
+            return Collections.emptyList();
+        return Arrays.asList(serializeTrustedNetwork.split(NETWORK_SSID_DELIMITER));
+    }
+
+    public void update(List<String> trustedNetworks) {
+        String serialized = TextUtils.join(NETWORK_SSID_DELIMITER, trustedNetworks);
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(
+                KEY_CUSTOM_TRUSTED_NETWORKS, serialized).apply();
+    }
+
+    public boolean allAllowed() {
+        if (!hasPermissions()) {
+            return true;
+        }
+        return PreferenceManager
+                .getDefaultSharedPreferences(context)
+                .getBoolean(KEY_CUSTOM_TRUST_ALL_NETWORKS, Boolean.TRUE);
+    }
+
+    public void allAllowed(boolean isChecked) {
+        PreferenceManager
+                .getDefaultSharedPreferences(context)
+                .edit()
+                .putBoolean(KEY_CUSTOM_TRUST_ALL_NETWORKS, isChecked)
+                .apply();
+    }
+
+    public boolean hasPermissions() {
+        int result = ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION);
+        return (result == PackageManager.PERMISSION_GRANTED);
+    }
+
+    public String currentSSID() {
+        WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        if (wifiManager == null) return "";
+        WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+        if (wifiInfo.getSupplicantState() != SupplicantState.COMPLETED) {
+            return "";
+        }
+        String ssid = wifiInfo.getSSID();
+        if (ssid.equalsIgnoreCase(NOT_AVAILABLE_SSID_RESULT)){
+            return "";
+        }
+        return ssid;
+    }
+
+    public static boolean isTrustedNetwork(Context context) {
+        TrustedNetworkHelper trustedNetworkHelper = new TrustedNetworkHelper(context);
+        if (trustedNetworkHelper.allAllowed()){
+            return true;
+        }
+        return trustedNetworkHelper.read().contains(trustedNetworkHelper.currentSSID());
+    }
+}
--- a/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhonePlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhonePlugin.java
@@ -35,6 +35,7 @@ import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.util.Log;

+import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;

 import org.kde.kdeconnect.Helpers.DeviceHelper;
@@ -48,8 +49,6 @@ import org.kde.kdeconnect_tp.R;

 import java.io.IOException;

-import static android.content.Context.POWER_SERVICE;
-
@PluginFactory.LoadablePlugin
 public class FindMyPhonePlugin extends Plugin {
    public final static String PACKET_TYPE_FINDMYPHONE_REQUEST = "kdeconnect.findmyphone.request";
@@ -58,7 +57,7 @@ public class FindMyPhonePlugin extends Plugin {
    private int notificationId;
    private AudioManager audioManager;
    private MediaPlayer mediaPlayer;
-    private int previousVolume;
+    private int previousVolume = -1;
    private PowerManager powerManager;

    @Override
@@ -85,7 +84,7 @@ public class FindMyPhonePlugin extends Plugin {
        notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
        notificationId = (int) System.currentTimeMillis();
        audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
+        powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);

        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
        Uri ringtone;
@@ -113,7 +112,9 @@ public class FindMyPhonePlugin extends Plugin {

    @Override
    public void onDestroy() {
-        stopPlaying();
+        if (mediaPlayer.isPlaying()) {
+            stopPlaying();
+        }
        audioManager = null;
        mediaPlayer.release();
        mediaPlayer = null;
@@ -138,6 +139,7 @@ public class FindMyPhonePlugin extends Plugin {
        return true;
    }

+    @RequiresApi(16)
    private void showBroadcastNotification() {
        Intent intent = new Intent(context, FindMyPhoneReceiver.class);
        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
@@ -172,7 +174,7 @@ public class FindMyPhonePlugin extends Plugin {
    }

    void startPlaying() {
-        if (!mediaPlayer.isPlaying()) {
+        if (mediaPlayer != null && !mediaPlayer.isPlaying()) {
            // Make sure we are heard even when the phone is silent, restore original volume later
            previousVolume = audioManager.getStreamVolume(AudioManager.STREAM_ALARM);
            audioManager.setStreamVolume(AudioManager.STREAM_ALARM, audioManager.getStreamMaxVolume(AudioManager.STREAM_ALARM), 0);
@@ -186,7 +188,9 @@ public class FindMyPhonePlugin extends Plugin {
    }

    void stopPlaying() {
-        audioManager.setStreamVolume(AudioManager.STREAM_ALARM, previousVolume, 0);
+        if (previousVolume != -1) {
+            audioManager.setStreamVolume(AudioManager.STREAM_ALARM, previousVolume, 0);
+        }
        mediaPlayer.stop();
        try {
            mediaPlayer.prepare();
--- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
@@ -238,7 +238,7 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
        np.set("actions", extractActions(notification, key));

        np.set("id", key);
-        np.set("silent", (notification.flags & NotificationCompat.FLAG_ONLY_ALERT_ONCE) != 0);
+        np.set("onlyOnce", (notification.flags & NotificationCompat.FLAG_ONLY_ALERT_ONCE) != 0);
        np.set("isClearable", statusBarNotification.isClearable());
        np.set("appName", appName == null ? packageName : appName);
        np.set("time", Long.toString(statusBarNotification.getPostTime()));
--- a/src/org/kde/kdeconnect/Plugins/SharePlugin/CompositeReceiveFileJob.java
+++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/CompositeReceiveFileJob.java
@@ -352,6 +352,11 @@ public class CompositeReceiveFileJob extends BackgroundJob<Device, Void> {
            intent.setDataAndType(fileDocument.getUri(), mimeType);
        }

+        // Open files for KDE Itinerary explicitly because Android's activity resolution sucks
+        if (fileDocument.getName().endsWith(".itinerary")) {
+            intent.setClassName("org.kde.itinerary", "org.kde.itinerary.Activity");
+        }
+
        getDevice().getContext().startActivity(intent);
    }
 }
--- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
@@ -41,8 +41,13 @@ import android.view.ViewGroup;
 import android.widget.ListView;
 import android.widget.TextView;

+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
+import org.kde.kdeconnect.Helpers.TrustedNetworkHelper;
 import org.kde.kdeconnect.UserInterface.List.ListAdapter;
 import org.kde.kdeconnect.UserInterface.List.PairingDeviceItem;
 import org.kde.kdeconnect.UserInterface.List.SectionItem;
@@ -51,10 +56,6 @@ import org.kde.kdeconnect_tp.R;
 import java.util.ArrayList;
 import java.util.Collection;

-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-

 /**
 * The view that the user will see when there are no devices paired, or when you choose "add a new device" from the sidebar.
@@ -72,6 +73,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb

    private TextView headerText;
    private TextView noWifiHeader;
+    private TextView notTrustedText;
    private Object networkChangeListener;

    @Override
@@ -91,6 +93,10 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
        mSwipeRefreshLayout.setOnRefreshListener(
                this::updateComputerListAction
        );
+
+        notTrustedText = (TextView) inflater.inflate(R.layout.pairing_explanation_not_trusted, null);
+        notTrustedText.setOnClickListener(null);
+        notTrustedText.setOnLongClickListener(null);
        headerText = (TextView) inflater.inflate(R.layout.pairing_explanation_text, null);
        headerText.setOnClickListener(null);
        headerText.setOnLongClickListener(null);
@@ -179,12 +185,16 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb

            ((ListView) rootView.findViewById(R.id.devices_list)).removeHeaderView(headerText);
            ((ListView) rootView.findViewById(R.id.devices_list)).removeHeaderView(noWifiHeader);
-
+            ((ListView) rootView.findViewById(R.id.devices_list)).removeHeaderView(notTrustedText);
            ConnectivityManager connManager = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
            NetworkInfo wifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
            //Check if we're on Wi-Fi. If we still see a device, don't do anything special
            if (someDevicesReachable || wifi.isConnected()) {
-                ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(headerText);
+                if (TrustedNetworkHelper.isTrustedNetwork(getContext())) {
+                    ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(headerText);
+                } else {
+                    ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(notTrustedText);
+                }
            } else {
                ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(noWifiHeader);
            }
@@ -299,6 +309,10 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
            case R.id.menu_custom_device_list:
                startActivity(new Intent(mActivity, CustomDevicesActivity.class));
                break;
+            case R.id.menu_trusted_networks:
+                startActivity(new Intent(mActivity, TrustedNetworksActivity.class));
+                break;
+
            default:
                break;
        }
--- a/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
@@ -70,10 +70,6 @@ public class SettingsFragment extends PreferenceFragmentCompat {

        screen.addPreference(renameDevice);

-
-        //TODO: Trusted wifi networks settings should go here
-
-
        // Dark mode
        final TwoStatePreference darkThemeSwitch = new SwitchPreferenceCompat(context);
        darkThemeSwitch.setPersistent(false);
@@ -127,6 +123,30 @@ public class SettingsFragment extends PreferenceFragmentCompat {
            screen.addPreference(notificationSwitch);
        }

+
+        // Trusted Networks
+        Preference trustedNetworkPref = new Preference(context);
+        trustedNetworkPref.setPersistent(false);
+        trustedNetworkPref.setTitle(R.string.trusted_networks);
+        trustedNetworkPref.setSummary(R.string.trusted_networks_desc);
+        screen.addPreference(trustedNetworkPref);
+        trustedNetworkPref.setOnPreferenceClickListener(preference -> {
+            startActivity(new Intent(context, TrustedNetworksActivity.class));
+            return true;
+        });
+
+        // Add device by IP
+        Preference devicesByIpPreference = new Preference(context);
+        devicesByIpPreference.setPersistent(false);
+        devicesByIpPreference.setTitle(R.string.custom_device_list);
+        screen.addPreference(devicesByIpPreference);
+        devicesByIpPreference.setOnPreferenceClickListener(preference -> {
+
+            startActivity(new Intent(context, CustomDevicesActivity.class));
+            return true;
+        });
+
+
        // More settings text
        Preference moreSettingsText = new Preference(context);
        moreSettingsText.setPersistent(false);
--- a/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
@@ -0,0 +1,138 @@
+package org.kde.kdeconnect.UserInterface;
+
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.ListView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+
+import org.kde.kdeconnect.Helpers.TrustedNetworkHelper;
+import org.kde.kdeconnect_tp.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TrustedNetworksActivity extends AppCompatActivity {
+
+    private List<String> trustedNetworks;
+
+    private ListView trustedNetworksView;
+    private CheckBox allowAllCheckBox;
+    private TrustedNetworkHelper trustedNetworkHelper;
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        boolean grantedPermission = false;
+        for (int result : grantResults) {
+            if (result == PackageManager.PERMISSION_GRANTED) {
+                grantedPermission = true;
+                break;
+            }
+        }
+        if (grantedPermission) {
+            allowAllCheckBox.setChecked(false);
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        ThemeUtil.setUserPreferredTheme(this);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.trusted_network_list);
+        trustedNetworksView = findViewById(android.R.id.list);
+
+        trustedNetworkHelper = new TrustedNetworkHelper(getApplicationContext());
+        trustedNetworks = new ArrayList<>(trustedNetworkHelper.read());
+
+        allowAllCheckBox = findViewById(R.id.trust_all_networks_checkBox);
+        allowAllCheckBox.setOnCheckedChangeListener((v, isChecked) -> {
+
+            if (trustedNetworkHelper.hasPermissions()) {
+                trustedNetworkHelper.allAllowed(isChecked);
+                updateTrustedNetworkListView();
+                addNetworkButton();
+            } else {
+                allowAllCheckBox.setChecked(true); // Disable unchecking it
+                new PermissionsAlertDialogFragment.Builder()
+                        .setTitle(R.string.location_permission_needed_title)
+                        .setMessage(R.string.location_permission_needed_desc)
+                        .setPositiveButton(R.string.ok)
+                        .setNegativeButton(R.string.cancel)
+                        .setPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION})
+                        .setRequestCode(0)
+                        .create().show(getSupportFragmentManager(), null);
+            }
+        });
+        allowAllCheckBox.setChecked(trustedNetworkHelper.allAllowed());
+
+        updateTrustedNetworkListView();
+    }
+
+    private void updateEmptyListMessage() {
+        boolean isVisible = trustedNetworks.isEmpty() && !trustedNetworkHelper.allAllowed();
+        findViewById(R.id.trusted_network_list_empty)
+                .setVisibility(isVisible ? View.VISIBLE : View.GONE );
+    }
+
+    private void updateTrustedNetworkListView() {
+        Boolean allAllowed = trustedNetworkHelper.allAllowed();
+        updateEmptyListMessage();
+        trustedNetworksView.setVisibility(allAllowed ? View.GONE : View.VISIBLE);
+        if (allAllowed){
+            return;
+        }
+        trustedNetworksView.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, trustedNetworks));
+        trustedNetworksView.setOnItemClickListener((parent, view, position, id) -> {
+            String targetItem = trustedNetworks.get(position);
+            new AlertDialog.Builder(TrustedNetworksActivity.this)
+                .setMessage("Delete " + targetItem + " ?")
+                .setPositiveButton("Yes", (dialog, which) -> {
+                    trustedNetworks.remove(position);
+                    trustedNetworkHelper.update(trustedNetworks);
+                    ((ArrayAdapter) trustedNetworksView.getAdapter()).notifyDataSetChanged();
+                    addNetworkButton();
+                    updateEmptyListMessage();
+                })
+                .setNegativeButton("No", null)
+                .show();
+
+        });
+        addNetworkButton();
+    }
+
+
+    private void addNetworkButton() {
+        Button addButton = findViewById(android.R.id.button1);
+        if (trustedNetworkHelper.allAllowed()) {
+            addButton.setVisibility(View.GONE);
+            return;
+        }
+        final String currentSSID = trustedNetworkHelper.currentSSID();
+        if (!currentSSID.isEmpty() && trustedNetworks.indexOf(currentSSID) == -1) {
+            String buttonText = getString(R.string.add_trusted_network, currentSSID);
+            addButton.setText(buttonText);
+            addButton.setOnClickListener(v -> {
+                if (trustedNetworks.indexOf(currentSSID) != -1){
+                    return;
+                }
+                trustedNetworks.add(currentSSID);
+                trustedNetworkHelper.update(trustedNetworks);
+                ((ArrayAdapter) trustedNetworksView.getAdapter()).notifyDataSetChanged();
+                v.setVisibility(View.GONE);
+                updateEmptyListMessage();
+            });
+            addButton.setVisibility(View.VISIBLE);
+        } else {
+            addButton.setVisibility(View.GONE);
+        }
+    }
+
+}
Author	SHA1	Message	Date
Albert Vaca	8e28580e93	Release 1.13.7	2020-01-13 17:35:25 +01:00
Albert Vaca	10f94781c3	Only set volume to previousVolume if it has a previous value onDestroy() would call stopPlaying(), but previousVolume would be 0 (the default value) if startPlaying() had been never called.	2020-01-13 17:33:15 +01:00
l10n daemon script	2f4dcd1448	GIT_SILENT made messages (after extraction)	2020-01-12 02:48:22 +01:00
Albert Vaca	acbea545d0	Linter fixes	2020-01-10 12:50:23 +01:00
Albert Vaca	aa69b67cfe	Fix NPE	2020-01-10 12:50:14 +01:00
l10n daemon script	9c19fd9b41	GIT_SILENT made messages (after extraction)	2020-01-09 02:41:02 +01:00
Nicolas Fella	bb1f79b5e6	Open .itinerary files always in KDE Itinerary	2020-01-07 19:09:56 +00:00
l10n daemon script	f7c78eeb8c	GIT_SILENT made messages (after extraction)	2020-01-07 02:51:48 +01:00
Albert Vaca Cintora	510028d738	Do not make all ONLY_ALERT_ONCE notifications silent Propagate the flag to the desktop so we can use it there to do what it's supposed to do. Fixes Whatsapp notifications not showing up in the desktop.	2020-01-05 22:48:36 +01:00
Albert Vaca Cintora	b3d91e083a	Merge branch 'albertvaka/trusted-networks' # Conflicts: # AndroidManifest.xml	2020-01-05 22:39:05 +01:00
Albert Vaca Cintora	235e49c80f	Fixes as per code review	2020-01-05 17:27:16 +01:00
Albert Vaca Cintora	1448814ed7	Ask for permission, add to settings and notify in main activity	2019-10-27 23:37:40 +01:00
Juan David Vega	7f8f1bee30	T8539 - Create a new flow to manage trusted networks Summary: I have created a new activity that allows you to trust all networks or add networks one by one to a list when you are connected to that network Test Plan: Test Cases: 1. By default everything should works like it works before, If you uncheck the "Allow all" option in trusted network menu and there isn't any ssid in the trusted network list the app doesn't send the first udp package and log "Current WiFi isn't a Trusted Network" 2. With the "Allow all" uncheck, use "Add: YOUR_SSID_NAME" button to add your current ssid to the trusted networks list, once you added, go back and the app should works as always {F6152314} 1 -> https://youtu.be/ZpCEFTstbJI 2 -> https://youtu.be/cVB1LXlFVyk Reviewers: #kde_connect, jdvr Subscribers: sredman, albertvaka, nicolasfella, apol, kdeconnect Tags: #kde_connect Maniphest Tasks: T8539 Differential Revision: https://phabricator.kde.org/D13505	2019-10-27 22:16:12 +01:00