Release 1.26.1

Bubble up exceptions instead of using giant, generic try-catch blocks.

The UDP and TCP listener loops are now where we catch all the exceptions that might happen handling the incoming packets.

Also, the creation of worker threads now happens in the listener loops as well instead of the inner functions.

Finally the `broadcastUdpPacket` function has been split in `broadcastUdpIdentityPacket` and `sendUdpIdentityPacket` (the first calls the second).

AndroidManifest.xml

@@ -9,8 +9,8 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="12600"
-    android:versionName="1.26.0">
+    android:versionCode="12601"
+    android:versionName="1.26.1">
 
     <uses-feature
         android:name="android.hardware.telephony"

fastlane/README

@@ -0,0 +1,7 @@
+To upload translations to the Play Store, run from the root of the repo:
+
+```
+fastlane supply --skip_upload_screenshots --skip_upload_images --skip_upload_changelogs --json-key <path to the json key file>
+```
+
+F-Droid reads them directly from this directory for each release tag, so no action is needed.

fastlane/metadata/android/az-AZ/full_description.txt

@@ -0,0 +1,14 @@
+KDE connect cihazlarınız arasında inteqrasiya üçün funksiyalar dəstini təqdim edir:
+
+- Mübadilə yaddaşının paylaşılması: cihazlarınız arasında kopyalayın və yerləşdirin.
+- İstənilən tətbiqdən komputeriniz ilə URL ünvanlarını və faylları paylaşın.
+- Kompyyuterinizdə gələn zənglər və SMS ismarıcları haqqında bildirişlər alın.
+- Virtual toxunma paneli: Telefonunuzun ektranını kompyuterin toxunma paneli kimi istifdə edin.
+- Bildirişlərin eyniləşdirilməsi: Android bildirişlərinizi kompyuterinizin iş masasından ozuyun.
+- Multimedianın məsafədən idarə edilməsi: Linux media oxuducusunu telefonunuzdan idarə edin.
+- WiFi bağlantısı: USB qoşulması və ya Bluetooth qoşulmasına ehtiyyac yoxdur.
+- Ucdan-uca TLC şifrələmə: məlumatlarınızın təhlükəsizliyi qorunur.
+
+Nəzərə alın ki, bu tətbiqin işləməsi üçün kompyuterinizə KDE Connect-i quraşdırmalısınız və sonuncu funksiyaların işləməsi üçün İş masası və Android versiyalarını sonuncu versiyaya eyni şəkildə yeniləməlisiniz.
+
+Bu tətbiq açıq qaynaq layihəsinin bir hissəsidir və ona töhvə verənlərin sayəsində mövcuddur. Mənbə kodunu əldə etmək üçün veb-səhifəyə daxil olun.

fastlane/metadata/android/az-AZ/short_description.txt

@@ -0,0 +1 @@
+KDE Connect kompyuteriniz ilə smartfonunuzu inteqrasiya edir

fastlane/metadata/android/az-AZ/title.txt

@@ -0,0 +1 @@
+KDE Connect

fastlane/metadata/android/en-US/changelogs/12601.txt

@@ -0,0 +1,9 @@
+1.26.1:
+* Fix infinite loop that would cause high CPU usage.
+
+1.26.0:
+* Allow having different widgets for diferent devices.
+* Add stats about network packets sent and received.
+* Add the option to cancel a pairing request after sending it.
+* Fix device name set initially not being human-friendly.
+* Rewrite some of the internals to improve performance.

fastlane/metadata/android/en_GB/full_description.txt

@@ -0,0 +1,14 @@
+KDE Connect provides a set of features to integrate your workflow across devices:
+
+- Shared clipboard: copy and paste between your devices.
+- Share files and URLs to your computer from any app.
+- Get notifications for incoming calls and SMS messages on your PC.
+- Virtual touchpad: Use your phone screen as your computer's touchpad.
+- Notifications sync: Read your Android notifications from the desktop.
+- Multimedia remote control: Use your phone as a remote for Linux media players.
+- WiFi connection: no USB wire or bluetooth needed.
+- End-to-end TLS encryption: your information is safe.
+
+Please note you will need to install KDE Connect on your computer for this app to work, and keep the desktop version up-to-date with the Android version for the latest features to work.
+
+This app is part of an open source project and it exists thanks to all the people who contributed to it. Visit the website to grab the source code.

fastlane/metadata/android/en_GB/short_description.txt

@@ -0,0 +1 @@
+KDE Connect integrates your smartphone and computer

fastlane/metadata/android/en_GB/title.txt

@@ -0,0 +1 @@
+KDE Connect

fastlane/metadata/android/sl/full_description.txt

@@ -0,0 +1,14 @@
+KDE Connect ponuja niz funkcij za integracijo delovnega procesa na različnih napravah:
+
+- skupno odložišče: kopirajte in lepite med napravami;
+- datoteke in URL-je lahko z računalnikom delite iz poljubnega programa;
+- prejemanje obvestil o dohodnih klicih in sporočilih SMS na računalniku;
+- virtualna sledilna plošča: uporabite zaslon telefona kot sledilno tablico na računalniku;
+- sinhronizacija obvestil: preberite obvestila iz sistema Android na namizju;
+- večpredstavnostni daljinski upravljalnik: uporabite telefon kot daljinski upravljalnik za večpredstavnostne predvajalnike na Linuxu;
+- povezava WiFi: ne potrebujete žice USB ali bluetootha;
+- šifriranje TLS od enega konca do drugega: vaši podatki so varni.
+
+Upoštevajte, da morate za delovanje tega programa na računalnik namestiti program KDE Connect in posodobiti namizno različico z različico za Android, da bodo delovale najnovejše funkcije.
+
+Ta program je del odprto-kodnega projekta in obstaja po zaslugi vseh ljudi, ki so prispevali. Obiščite spletno mesto in si zagotovite izvorno kodo.

fastlane/metadata/android/sl/short_description.txt

@@ -0,0 +1 @@
+KDE Connect integrira vaš pametni telefon in računalnik

fastlane/metadata/android/sl/title.txt

@@ -0,0 +1 @@
+KDE Connect

fastlane/metadata/android/zh_CN/full_description.txt

@@ -0,0 +1,14 @@
+KDE Connect 提供了一系列用于整合不同设备的功能特性：
+
+- 剪贴板共享：跨设备复制粘贴内容。
+- 共享任意应用的文件和 URL 到电脑。
+- 在电脑上获取关于来电和短信的通知。
+- 虚拟触摸板：将手机屏幕当作电脑的触摸板使用。
+- 提醒同步：在电脑桌面端读取安卓端的通知。
+- 多媒体远程控制：用智能手机遥控 Linux 媒体播放器。
+- WiFi 连接：无需 USB 线或者蓝牙。
+- 端到端的 TLS 加密：确保您的信息安全。
+
+请注意：您需要在您的电脑上安装 KDE Connect 才能使这款应用正常工作。请保持桌面端和安卓端的 KDE Connect 同步更新到一致的版本以便使用它们的最新功能。
+
+此应用是一个自由开源软件项目的一部分。它的存续有赖于所有为它做出过贡献的人士。请访问项目主页以获取它的源代码。

fastlane/metadata/android/zh_CN/short_description.txt

@@ -0,0 +1 @@
+KDE Connect 可以整合您的智能手机和电脑

fastlane/metadata/android/zh_CN/title.txt

@@ -0,0 +1 @@
+KDE Connect

po/az/kdeconnect-android-store-full.po

@@ -0,0 +1,63 @@
+# Kheyyam <xxmn77@gmail.com>, 2023.
+#. extracted from ./metadata/android/en-US/full_description.txt
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-07 00:47+0000\n"
+"PO-Revision-Date: 2023-06-12 16:45+0400\n"
+"Last-Translator: Kheyyam <xxmn77@gmail.com>\n"
+"Language-Team: Azerbaijani <kde-i18n-doc@kde.org>\n"
+"Language: az\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 23.04.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"KDE Connect provides a set of features to integrate your workflow across "
+"devices:\n"
+"\n"
+"- Shared clipboard: copy and paste between your devices.\n"
+"- Share files and URLs to your computer from any app.\n"
+"- Get notifications for incoming calls and SMS messages on your PC.\n"
+"- Virtual touchpad: Use your phone screen as your computer's touchpad.\n"
+"- Notifications sync: Read your Android notifications from the desktop.\n"
+"- Multimedia remote control: Use your phone as a remote for Linux media "
+"players.\n"
+"- WiFi connection: no USB wire or bluetooth needed.\n"
+"- End-to-end TLS encryption: your information is safe.\n"
+"\n"
+"Please note you will need to install KDE Connect on your computer for this "
+"app to work, and keep the desktop version up-to-date with the Android "
+"version for the latest features to work.\n"
+"\n"
+"This app is part of an open source project and it exists thanks to all the "
+"people who contributed to it. Visit the website to grab the source code."
+msgstr ""
+"KDE connect cihazlarınız arasında inteqrasiya üçün funksiyalar dəstini "
+"təqdim edir:\n"
+"\n"
+"- Mübadilə yaddaşının paylaşılması: cihazlarınız arasında kopyalayın və "
+"yerləşdirin.\n"
+"- İstənilən tətbiqdən komputeriniz ilə URL ünvanlarını və faylları "
+"paylaşın.\n"
+"- Kompyyuterinizdə gələn zənglər və SMS ismarıcları haqqında bildirişlər "
+"alın.\n"
+"- Virtual toxunma paneli: Telefonunuzun ektranını kompyuterin toxunma paneli "
+"kimi istifdə edin.\n"
+"- Bildirişlərin eyniləşdirilməsi: Android bildirişlərinizi kompyuterinizin "
+"iş masasından ozuyun.\n"
+"- Multimedianın məsafədən idarə edilməsi: Linux media oxuducusunu "
+"telefonunuzdan idarə edin.\n"
+"- WiFi bağlantısı: USB qoşulması və ya Bluetooth qoşulmasına ehtiyyac "
+"yoxdur.\n"
+"- Ucdan-uca TLC şifrələmə: məlumatlarınızın təhlükəsizliyi qorunur.\n"
+"\n"
+"Nəzərə alın ki, bu tətbiqin işləməsi üçün kompyuterinizə KDE Connect-i "
+"quraşdırmalısınız və sonuncu funksiyaların işləməsi üçün İş masası və "
+"Android versiyalarını sonuncu versiyaya eyni şəkildə yeniləməlisiniz.\n"
+"\n"
+"Bu tətbiq açıq qaynaq layihəsinin bir hissəsidir və ona töhvə verənlərin "
+"sayəsində mövcuddur. Mənbə kodunu əldə etmək üçün veb-səhifəyə daxil olun."

po/az/kdeconnect-android-store-short.po

@@ -0,0 +1,19 @@
+# Kheyyam <xxmn77@gmail.com>, 2023.
+#. extracted from ./metadata/android/en-US/short_description.txt
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-07 00:47+0000\n"
+"PO-Revision-Date: 2023-06-12 16:46+0400\n"
+"Last-Translator: Kheyyam <xxmn77@gmail.com>\n"
+"Language-Team: Azerbaijani <kde-i18n-doc@kde.org>\n"
+"Language: az\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 23.04.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "KDE Connect integrates your smartphone and computer"
+msgstr "KDE Connect kompyuteriniz ilə smartfonunuzu inteqrasiya edir"

po/bg/kdeconnect-android-store.po

@@ -1,81 +0,0 @@
-# KDE Connect store listing texts
-# Copyright (C) 2014 Albert Vaca Cintora
-# This file is distributed under the same license as kdeconnect-android.
-#
-# Albert Vaca Cintora <albertvaka@gmail.com>, 2014.
-# Mincho Kondarev <mkondarev@yahoo.de>, 2023.
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-06-30 11:38+0200\n"
-"PO-Revision-Date: 2023-06-08 22:08+0200\n"
-"Last-Translator: Mincho Kondarev <mkondarev@yahoo.de>\n"
-"Language: bg\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language-Team: Bulgarian <kde-i18n-doc@kde.org>\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 23.04.1\n"
-
-#: dummy:1
-msgid "Integrate Android with the KDE Plasma Desktop."
-msgstr "Интеграция на Android с работната среда Plasma на KDE."
-
-#: dummy:2
-msgid ""
-"KDE Connect provides several features to integrate your phone and your"
-" computer:\n"
-"\n"
-"- Share files and URLs to KDE from any app, without wires.\n"
-"- Touchpad emulation: Use your phone screen as your computer's touchpad*.\n"
-"- Notifications sync (4.3+): Read your Android notifications from the"
-" desktop.\n"
-"- Shared clipboard: copy and paste between your phone and your computer.\n"
-"- Multimedia remote control: Use your phone as a remote for Linux media"
-" players.\n"
-"- WiFi connection: no usb wire or bluetooth needed.\n"
-"- RSA Encryption: your information is safe.\n"
-"\n"
-"Please note you will need to install KDE Connect on your computer for this"
-" app to work, and keep the desktop version up-to-date with the Android"
-" version for the latest features to work.\n"
-"\n"
-"*NOTE for Ubuntu users: The Ubuntu folks are not updating their repos as fast"
-" as this app gets updated. Some features will not work if the KDE Connect"
-" version in you desktop doesn't match the one in your phone. To make sure you"
-" always have the latest version on your desktop, use this PPA  repository: "
-" https://code.launchpad.net/~vikoadi/+archive/ubuntu/ppa/ \n"
-"\n"
-"This app is part of an open source project, visit the website to grab the"
-" sources.\n"
-msgstr ""
-"KDE Connect предоставя няколко функции за интегриране на телефона и компютъра"
-" ви:\n"
-"\n"
-"- Споделяне на файлове и URL адреси в KDE от всяко приложение, без кабели.\n"
-"- Емулация на тъчпад: Използвайте екрана на телефона си като тъчпад на"
-" компютъра*.\n"
-"- Синхронизиране на известия (4.3+): Четете известията си за Android от"
-" десктопа.\n"
-"- Споделен клипборд: копирайте и поставяйте между телефона и компютъра.\n"
-"- Мултимедийно дистанционно управление: Използвайте телефона си като"
-" дистанционно управление за Linux мултимедийни плейъри.\n"
-"- WiFi връзка: не е необходим USB кабел или Bluetooth.\n"
-"- RSA криптиране: информацията ви е в безопасност.\n"
-"\n"
-"Моля, обърнете внимание, че за да работи това приложение, трябва да"
-" инсталирате KDE Connect на компютъра си и да поддържате версията за настолни"
-" компютри актуализирана с версията за Android, за да работят най-новите"
-" функции.\n"
-"\n"
-"*Забележка за потребителите на Ubuntu: Ubuntu не актуализира своите хранилища"
-" толкова бързо, колкото се актуализира това приложение. Някои функции няма да"
-" работят, ако версията на KDE Connect в десктопа ви не съвпада с тази в"
-" телефона ви. За да сте сигурни, че винаги имате най-новата версия на"
-" десктопа си, използвайте това PPA хранилище:"
-" https://code.launchpad.net/~vikoadi/+archive/ubuntu/ppa/ \n"
-"\n"
-"Това приложение е част от проект с отворен код, посетете уебсайта, за да"
-" изтеглите изходния код.\n"

po/en_GB/kdeconnect-android-store-full.po

@@ -0,0 +1,57 @@
+# Steve Allewell <steve.allewell@gmail.com>, 2023.
+#. extracted from ./metadata/android/en-US/full_description.txt
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-07 00:47+0000\n"
+"PO-Revision-Date: 2023-06-17 12:11+0100\n"
+"Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
+"Language-Team: British English\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 23.03.70\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+msgid ""
+"KDE Connect provides a set of features to integrate your workflow across "
+"devices:\n"
+"\n"
+"- Shared clipboard: copy and paste between your devices.\n"
+"- Share files and URLs to your computer from any app.\n"
+"- Get notifications for incoming calls and SMS messages on your PC.\n"
+"- Virtual touchpad: Use your phone screen as your computer's touchpad.\n"
+"- Notifications sync: Read your Android notifications from the desktop.\n"
+"- Multimedia remote control: Use your phone as a remote for Linux media "
+"players.\n"
+"- WiFi connection: no USB wire or bluetooth needed.\n"
+"- End-to-end TLS encryption: your information is safe.\n"
+"\n"
+"Please note you will need to install KDE Connect on your computer for this "
+"app to work, and keep the desktop version up-to-date with the Android "
+"version for the latest features to work.\n"
+"\n"
+"This app is part of an open source project and it exists thanks to all the "
+"people who contributed to it. Visit the website to grab the source code."
+msgstr ""
+"KDE Connect provides a set of features to integrate your workflow across "
+"devices:\n"
+"\n"
+"- Shared clipboard: copy and paste between your devices.\n"
+"- Share files and URLs to your computer from any app.\n"
+"- Get notifications for incoming calls and SMS messages on your PC.\n"
+"- Virtual touchpad: Use your phone screen as your computer's touchpad.\n"
+"- Notifications sync: Read your Android notifications from the desktop.\n"
+"- Multimedia remote control: Use your phone as a remote for Linux media "
+"players.\n"
+"- WiFi connection: no USB wire or bluetooth needed.\n"
+"- End-to-end TLS encryption: your information is safe.\n"
+"\n"
+"Please note you will need to install KDE Connect on your computer for this "
+"app to work, and keep the desktop version up-to-date with the Android "
+"version for the latest features to work.\n"
+"\n"
+"This app is part of an open source project and it exists thanks to all the "
+"people who contributed to it. Visit the website to grab the source code."

po/en_GB/kdeconnect-android-store-short.po

@@ -0,0 +1,19 @@
+# Steve Allewell <steve.allewell@gmail.com>, 2023.
+#. extracted from ./metadata/android/en-US/short_description.txt
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-07 00:47+0000\n"
+"PO-Revision-Date: 2023-06-17 12:11+0100\n"
+"Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
+"Language-Team: British English\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 23.03.70\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+msgid "KDE Connect integrates your smartphone and computer"
+msgstr "KDE Connect integrates your smartphone and computer"

po/es/kdeconnect-android-store-short.po

@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 20.04.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 msgid "KDE Connect integrates your smartphone and computer"
 msgstr "KDE Connect integra tu teléfono inteligente y tu equipo"

po/sl/kdeconnect-android-store-full.po

@@ -0,0 +1,65 @@
+# Translations template for KDEConnect.
+# Copyright (C) 2023 KDE
+# This file is distributed under the same license as the KDE project.
+#
+# Martin Srebotnjak <miles@filmsi.net>, 2023.
+#
+#. extracted from ./metadata/android/en-US/full_description.txt
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-07 00:47+0000\n"
+"PO-Revision-Date: 2023-06-14 17:25+0200\n"
+"Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
+"Language-Team: Slovenian <kde-i18n-doc@kde.org>\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.2.1\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+
+msgid ""
+"KDE Connect provides a set of features to integrate your workflow across "
+"devices:\n"
+"\n"
+"- Shared clipboard: copy and paste between your devices.\n"
+"- Share files and URLs to your computer from any app.\n"
+"- Get notifications for incoming calls and SMS messages on your PC.\n"
+"- Virtual touchpad: Use your phone screen as your computer's touchpad.\n"
+"- Notifications sync: Read your Android notifications from the desktop.\n"
+"- Multimedia remote control: Use your phone as a remote for Linux media "
+"players.\n"
+"- WiFi connection: no USB wire or bluetooth needed.\n"
+"- End-to-end TLS encryption: your information is safe.\n"
+"\n"
+"Please note you will need to install KDE Connect on your computer for this "
+"app to work, and keep the desktop version up-to-date with the Android "
+"version for the latest features to work.\n"
+"\n"
+"This app is part of an open source project and it exists thanks to all the "
+"people who contributed to it. Visit the website to grab the source code."
+msgstr ""
+"KDE Connect ponuja niz funkcij za integracijo delovnega procesa na različnih "
+"napravah:\n"
+"\n"
+"- skupno odložišče: kopirajte in lepite med napravami;\n"
+"- datoteke in URL-je lahko z računalnikom delite iz poljubnega programa;\n"
+"- prejemanje obvestil o dohodnih klicih in sporočilih SMS na računalniku;\n"
+"- virtualna sledilna plošča: uporabite zaslon telefona kot sledilno tablico "
+"na računalniku;\n"
+"- sinhronizacija obvestil: preberite obvestila iz sistema Android na "
+"namizju;\n"
+"- večpredstavnostni daljinski upravljalnik: uporabite telefon kot daljinski "
+"upravljalnik za večpredstavnostne predvajalnike na Linuxu;\n"
+"- povezava WiFi: ne potrebujete žice USB ali bluetootha;\n"
+"- šifriranje TLS od enega konca do drugega: vaši podatki so varni.\n"
+"\n"
+"Upoštevajte, da morate za delovanje tega programa na računalnik namestiti "
+"program KDE Connect in posodobiti namizno različico z različico za Android, "
+"da bodo delovale najnovejše funkcije.\n"
+"\n"
+"Ta program je del odprto-kodnega projekta in obstaja po zaslugi vseh ljudi, "
+"ki so prispevali. Obiščite spletno mesto in si zagotovite izvorno kodo."

po/sl/kdeconnect-android-store-short.po

@@ -0,0 +1,25 @@
+# Translations template for KDEConnect.
+# Copyright (C) 2023 KDE
+# This file is distributed under the same license as the KDE project.
+#
+# Martin Srebotnjak <miles@filmsi.net>, 2023.
+#
+#. extracted from ./metadata/android/en-US/short_description.txt
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-07 00:47+0000\n"
+"PO-Revision-Date: 2023-06-14 17:26+0200\n"
+"Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
+"Language-Team: Slovenian <kde-i18n-doc@kde.org>\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.2.1\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+
+msgid "KDE Connect integrates your smartphone and computer"
+msgstr "KDE Connect integrira vaš pametni telefon in računalnik"

po/zh_CN/kdeconnect-android-store-full.po

@@ -0,0 +1,59 @@
+#. extracted from ./metadata/android/en-US/full_description.txt
+msgid ""
+msgstr ""
+"Project-Id-Version: kdeorg\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-07 00:47+0000\n"
+"PO-Revision-Date: 2023-06-17 04:11\n"
+"Last-Translator: \n"
+"Language-Team: Chinese Simplified\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 2.5.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Project-ID: 269464\n"
+"X-Crowdin-Language: zh-CN\n"
+"X-Crowdin-File: /kf5-trunk/messages/kdeconnect-android/kdeconnect-android-"
+"store-full.pot\n"
+"X-Crowdin-File-ID: 43897\n"
+
+msgid ""
+"KDE Connect provides a set of features to integrate your workflow across "
+"devices:\n"
+"\n"
+"- Shared clipboard: copy and paste between your devices.\n"
+"- Share files and URLs to your computer from any app.\n"
+"- Get notifications for incoming calls and SMS messages on your PC.\n"
+"- Virtual touchpad: Use your phone screen as your computer's touchpad.\n"
+"- Notifications sync: Read your Android notifications from the desktop.\n"
+"- Multimedia remote control: Use your phone as a remote for Linux media "
+"players.\n"
+"- WiFi connection: no USB wire or bluetooth needed.\n"
+"- End-to-end TLS encryption: your information is safe.\n"
+"\n"
+"Please note you will need to install KDE Connect on your computer for this "
+"app to work, and keep the desktop version up-to-date with the Android "
+"version for the latest features to work.\n"
+"\n"
+"This app is part of an open source project and it exists thanks to all the "
+"people who contributed to it. Visit the website to grab the source code."
+msgstr ""
+"KDE Connect 提供了一系列用于整合不同设备的功能特性：\n"
+"\n"
+"- 剪贴板共享：跨设备复制粘贴内容。\n"
+"- 共享任意应用的文件和 URL 到电脑。\n"
+"- 在电脑上获取关于来电和短信的通知。\n"
+"- 虚拟触摸板：将手机屏幕当作电脑的触摸板使用。\n"
+"- 提醒同步：在电脑桌面端读取安卓端的通知。\n"
+"- 多媒体远程控制：用智能手机遥控 Linux 媒体播放器。\n"
+"- WiFi 连接：无需 USB 线或者蓝牙。\n"
+"- 端到端的 TLS 加密：确保您的信息安全。\n"
+"\n"
+"请注意：您需要在您的电脑上安装 KDE Connect 才能使这款应用正常工作。请保持桌面"
+"端和安卓端的 KDE Connect 同步更新到一致的版本以便使用它们的最新功能。\n"
+"\n"
+"此应用是一个自由开源软件项目的一部分。它的存续有赖于所有为它做出过贡献的人"
+"士。请访问项目主页以获取它的源代码。"

po/zh_CN/kdeconnect-android-store-short.po

@@ -0,0 +1,24 @@
+#. extracted from ./metadata/android/en-US/short_description.txt
+msgid ""
+msgstr ""
+"Project-Id-Version: kdeorg\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-07 00:47+0000\n"
+"PO-Revision-Date: 2023-06-17 04:11\n"
+"Last-Translator: \n"
+"Language-Team: Chinese Simplified\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 2.5.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Project-ID: 269464\n"
+"X-Crowdin-Language: zh-CN\n"
+"X-Crowdin-File: /kf5-trunk/messages/kdeconnect-android/kdeconnect-android-"
+"store-short.pot\n"
+"X-Crowdin-File-ID: 43899\n"
+
+msgid "KDE Connect integrates your smartphone and computer"
+msgstr "KDE Connect 可以整合您的智能手机和电脑"

res/values-az/strings.xml

@@ -108,6 +108,7 @@
   <string name="device_menu_plugins">Plaqin ayarları</string>
   <string name="device_menu_unpair">Ayırmaq</string>
   <string name="pair_new_device">Yeni cihaz qoşmaq</string>
+  <string name="cancel_pairing">Qoşulmanı ləğv edin</string>
   <string name="unknown_device">Naməlum Cihaz</string>
   <string name="error_not_reachable">Cihaz əlçatmazdır</string>
   <string name="error_already_paired">Cihaz artıq qoşulub</string>
@@ -393,6 +394,7 @@
   <string name="holger_kaelberer_task">Uzaq klaviatura əlavəsi və xəta sazlamaları</string>
   <string name="saikrishna_arcot_task">Uzaq daxiletmə əlavəsində klaviaturanın istifadəsini dəstəklənməsi, xəta sazlamaları və əsas yaxşılaşdırmalar</string>
   <string name="everyone_else">İllər boyu KDE Connect\'ə töhfə verən hər kəs</string>
-  <string name="send_clipboard">Mübadilə buferinə göndərin</string>
+  <string name="send_clipboard">Mübadilə yaddaşını göndərin</string>
   <string name="tap_to_execute">İcra etmək üçün vurun</string>
+  <string name="plugin_stats">Plaqin statistikası</string>
 </resources>

res/values-cs/strings.xml

@@ -101,7 +101,7 @@
   <string name="view_status_title">Stav</string>
   <string name="battery_status_format">Baterie: %d%%</string>
   <string name="battery_status_low_format">Baterie: %d%% Téměř vybitá baterie</string>
-  <string name="battery_status_charging_format">Battery: %d%% nabíjí se</string>
+  <string name="battery_status_charging_format">Baterie: %d%% nabíjí se</string>
   <string name="category_connected_devices">Připojená zařízení</string>
   <string name="category_not_paired_devices">Dostupná zařízení</string>
   <string name="category_remembered_devices">Zapamatovaná zařízení</string>
@@ -116,7 +116,7 @@
   <string name="error_canceled_by_user">Přerušeno uživatelem</string>
   <string name="error_canceled_by_other_peer">Přerušeno druhým uživatelem</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="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 SHA256 certifikátu vašeho zařízení je:</string>
   <string name="remote_device_fingerprint">Otisk certifikátu SHA256 vzdáleného zařízení je:</string>
   <string name="pair_requested">Bylo vyžádáno párování</string>
@@ -274,7 +274,7 @@
   <string name="contacts_permission_explanation">Pro sdílení knihy kontaktů s pracovním prostředím, musíte udělit přístup ke kontaktům</string>
   <string name="select_ringtone">Vybrat vyzváněcí tón</string>
   <string name="telephony_pref_blocked_title">Blokovaná čísla</string>
-  <string name="telephony_pref_blocked_dialog_desc">Nezobrazovat volnání a SMS z těchto čísel. Prosím, zadejte pouze jedno slovo na řádek.</string>
+  <string name="telephony_pref_blocked_dialog_desc">Nezobrazovat volání a SMS z těchto čísel. Prosím, zadejte pouze jedno slovo na řádek.</string>
   <string name="mpris_coverart_description">Obal současného média</string>
   <string name="device_icon_description">Ikona zařízení</string>
   <string name="settings_icon_description">Ikona nastavení</string>

res/values-en-rGB/strings.xml

@@ -108,6 +108,7 @@
   <string name="device_menu_plugins">Plugin settings</string>
   <string name="device_menu_unpair">Unpair</string>
   <string name="pair_new_device">Pair new device</string>
+  <string name="cancel_pairing">Cancel pairing</string>
   <string name="unknown_device">Unknown device</string>
   <string name="error_not_reachable">Device not reachable</string>
   <string name="error_already_paired">Device already paired</string>
@@ -395,4 +396,5 @@
   <string name="everyone_else">Everyone else who has contributed to KDE Connect over the years</string>
   <string name="send_clipboard">Send clipboard</string>
   <string name="tap_to_execute">Tap to execute</string>
+  <string name="plugin_stats">Plugin stats</string>
 </resources>

res/values-gl/strings.xml

@@ -33,7 +33,7 @@
   <string name="pref_plugin_notifications">Sincronización de notificacións</string>
   <string name="pref_plugin_notifications_desc">Acceda ás súas notificacións desde outros dispositivos</string>
   <string name="pref_plugin_receive_notifications">Recibir notificacións</string>
-  <string name="pref_plugin_receive_notifications_desc">Recibir notificacións do outro dispositivo e mostralas en Android</string>
+  <string name="pref_plugin_receive_notifications_desc">Recibir notificacións do outro dispositivo e amosalas en Android</string>
   <string name="pref_plugin_sharereceiver">Compartir e recibir</string>
   <string name="pref_plugin_sharereceiver_desc">Comparta ficheiros e enderezos URL entre dispositivos</string>
   <string name="device_list_empty">Non hai dispositivos.</string>
@@ -42,7 +42,7 @@
   <string name="cancel">Cancelar</string>
   <string name="open_settings">Abrir a configuración</string>
   <string name="no_permissions">Debe conceder permisos para acceder ás notificacións</string>
-  <string name="no_permission_mprisreceiver">Para poder controlar os seus reprodutores de son e vídeo ten que garantir acceso ás notificacións</string>
+  <string name="no_permission_mprisreceiver">Para poder controlar os seus reprodutores multimedia ten que garantir acceso ás notificacións</string>
   <string name="no_permissions_remotekeyboard">Para recibir presións de tecla ten que activar o teclado remoto de KDE Connect</string>
   <string name="send_ping">Enviar un ping</string>
   <string name="open_mpris_controls">Control multimedia</string>
@@ -57,7 +57,7 @@
   <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_mouse_buttons_title">Mostrar os botóns do rato</string>
+  <string name="mousepad_mouse_buttons_title">Amosar os botóns do rato</string>
   <string name="mousepad_acceleration_profile_settings_title">Definir a aceleración do punteiro</string>
   <string name="mousepad_scroll_direction_title">Inverter a dirección de desprazamento</string>
   <string name="gyro_mouse_enabled_title">Activar o rato de xiroscopio</string>
@@ -159,7 +159,7 @@
   <string name="tap_to_answer">Toque para contestar</string>
   <string name="right_click">Enviar un clic secundario</string>
   <string name="middle_click">Enviar un clic central</string>
-  <string name="show_keyboard">Mostrar o teclado</string>
+  <string name="show_keyboard">Amosar o teclado</string>
   <string name="device_not_paired">O dispositivo non está emparellado</string>
   <string name="request_pairing">Solicitar emparellarse</string>
   <string name="pairing_accept">Aceptar</string>
@@ -183,7 +183,7 @@
     <item>1 minuto</item>
     <item>2 minutos</item>
   </string-array>
-  <string name="mpris_notification_settings_title">Mostrar a notificación de control de reprodución.</string>
+  <string name="mpris_notification_settings_title">Amosar a notificación de control de reprodución.</string>
   <string name="mpris_notification_settings_summary">Permitir controlar os reprodutores sen abrir KDE Connect</string>
   <string name="share_to">Compartir con…</string>
   <string name="protocol_version_newer">Este dispositivo usa unha versión máis nova do protocolo.</string>
@@ -215,9 +215,9 @@
   <string name="sftp_storage_preference_storage_location">Lugar de almacenamento</string>
   <string name="sftp_storage_preference_storage_location_already_configured">Este lugar xa está configurado</string>
   <string name="sftp_storage_preference_click_to_select">premer para seleccionar</string>
-  <string name="sftp_storage_preference_display_name">Nome para mostrar</string>
-  <string name="sftp_storage_preference_display_name_already_used">Este nome para mostrar xa está a usarse</string>
-  <string name="sftp_storage_preference_display_name_cannot_be_empty">O nome para mostrar non pode estar baleiro</string>
+  <string name="sftp_storage_preference_display_name">Nome para amosar</string>
+  <string name="sftp_storage_preference_display_name_already_used">Este nome para amosar xa está a usarse</string>
+  <string name="sftp_storage_preference_display_name_cannot_be_empty">O nome para amosar non pode estar baleiro</string>
   <string name="sftp_action_mode_menu_delete">Eliminar</string>
   <string name="sftp_no_storage_locations_configured">Non se configuraron localizacións de almacenamento</string>
   <string name="sftp_saf_permission_explanation">Para acceder a ficheiro remotamente ten que configurar lugares de almacenamento</string>
@@ -242,7 +242,7 @@
   <string name="findmyphone_title">Atopar o móbil</string>
   <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_description">Reproduce un ton de chamada no dispositivo para que poida atopalo.</string>
   <string name="findmyphone_found">Atopeino</string>
   <string name="open">Abrir</string>
   <string name="close">Pechar</string>
@@ -256,9 +256,9 @@
   <string name="telephony_permission_explanation">Para ver as chamadas de teléfono no escritorio ten que dar permiso aos rexistros de chamadas telefónicas e ao estado do teléfono</string>
   <string name="telephony_optional_permission_explanation">Para ver o nome dun contacto en vez dun número de teléfono ten que dar acceso aos contactos do teléfono.</string>
   <string name="contacts_permission_explanation">Para compartir o caderno de contactos co escritorio ten que dar permiso de contactos</string>
-  <string name="select_ringtone">Seleccione un son de chamada</string>
+  <string name="select_ringtone">Seleccione un ton de chamada</string>
   <string name="telephony_pref_blocked_title">Números bloqueados</string>
-  <string name="telephony_pref_blocked_dialog_desc">Non mostrar chamadas nin SMS destes números. Indique un número por liña.</string>
+  <string name="telephony_pref_blocked_dialog_desc">Non amosar chamadas nin SMS destes números. Indique un número por liña.</string>
   <string name="mpris_coverart_description">Portada da obra actual.</string>
   <string name="device_icon_description">Icona do dispositivo.</string>
   <string name="settings_icon_description">Icona da configuración.</string>
@@ -295,8 +295,8 @@
   <string name="settings_rename">Nome do dispositivo</string>
   <string name="settings_dark_mode">Tema escuro</string>
   <string name="settings_more_settings_title">Máis opcións</string>
-  <string name="settings_more_settings_text">As opcións específicas dun dispositivo están en «Configuración dos complementos» no dispositivo.</string>
-  <string name="setting_persistent_notification">Mostrar unha notificación persistente</string>
+  <string name="settings_more_settings_text">As opcións específicas dun dispositivo atópanse en «Configuración dos complementos» no dispositivo.</string>
+  <string name="setting_persistent_notification">Amosar unha notificación persistente</string>
   <string name="setting_persistent_notification_oreo">Notificación persistente</string>
   <string name="setting_persistent_notification_description">Toque para activar ou desactivar na configuración de notificacións</string>
   <string name="extra_options">Opcións adicionais</string>
@@ -381,7 +381,7 @@
   <string name="open_compose_send">Escribir texto</string>
   <string name="about_kde_about">"&lt;h1&gt;Sobre&lt;/h1&gt; &lt;p&gt;KDE é unha comunidade internacional de persoas dedicadas á enxeñaría de software, á arte, á documentación, á tradución e á creación, todas elas comprometidas co desenvolvemento de &lt;a href=https://www.gnu.org/philosophy/free-sw.html&gt;software libre&lt;/a&gt;. KDE produce o ambiente de escritorio Plasma, centos de aplicacións, e as moitas bibliotecas de software sobre as que estas están construídas.&lt;/p&gt; &lt;p&gt;KDE é un esforzo cooperativo: non hai unha única entidade que controle a súa dirección ou os seus produtos. No seu lugar, xuntámonos para traballar no obxectivo común de construír o mellor software libre do mundo.  Todas as persoas son benvidas a &lt;a href=https://community.kde.org/Get_Involved&gt;unirse e colaborar&lt;/a&gt; en KDE, incluída vostede.&lt;/p&gt; Visite &lt;a href=https://www.kde.org/&gt;https://www.kde.org/&lt;/a&gt; para máis información sobre a comunidade KDE e o software que produce."</string>
   <string name="about_kde_report_bugs_or_wishes">&lt;h1&gt;Informe de fallos ou pida melloras&lt;/h1&gt; &lt;p&gt;O software sempre pode mellorarse, e o equipo de KDE está preparado para facelo. Porén, vostede, a persoa usuaria, ten que avisarnos cando algo non funciona como espera ou podería mellorarse.&lt;/p&gt; &lt;p&gt;KDE ten un sistema de seguimento de fallos. Visite &lt;a href=https://bugs.kde.org/&gt;https://bugs.kde.org/&lt;/a&gt; ou use o botón de «Informar dun fallo» da pantalla de información para informar dun fallo.&lt;/p&gt; Se ten unha suxestión de mellora tamén pode usar o sistema de seguimento de fallos para rexistrala. Asegúrese nese caso de usar a severidade «Lista de desexos».</string>
-  <string name="about_kde_join_kde">&lt;h1&gt;Únase a KDE&lt;/h1&gt; &lt;p&gt;Non necesita coñecementos de enxeñaría de software para formar parte do equipo de KDE. Pode unirse aos equipos nacionais que traducen as interfaces dos programas. Pode crear imaxes, temas, sons, e mellorar a documentación. Vostede decide!&lt;/p&gt; &lt;p&gt;Visite &lt;a href=https://community.kde.org/Get_Involved&gt;https://community.kde.org/Get_Involved&lt;/a&gt; para informarse sobre os proxectos nos que pode participar.&lt;/p&gt; Se necesita máis información ou documentación, atopará o que necesita en &lt;a href=https://techbase.kde.org/&gt;https://techbase.kde.org/&lt;/a&gt;.</string>
+  <string name="about_kde_join_kde">&lt;h1&gt;Únase a KDE&lt;/h1&gt; &lt;p&gt;Non necesita saber desenvolver software para formar parte do equipo de KDE. Pode unirse aos equipos nacionais que traducen as interfaces dos programas. Pode crear imaxes, temas, sons, e mellorar a documentación. Vostede decide!&lt;/p&gt; &lt;p&gt;Visite &lt;a href=https://community.kde.org/Get_Involved&gt;https://community.kde.org/Get_Involved&lt;/a&gt; para informarse sobre os proxectos nos que pode participar.&lt;/p&gt; Se necesita máis información ou documentación, ten o que necesita en &lt;a href=https://techbase.kde.org/&gt;https://techbase.kde.org/&lt;/a&gt;.</string>
   <string name="about_kde_support_kde">&lt;h1&gt;Apoie KDE&lt;/h1&gt; &lt;p&gt;O software de KDE está e estará sempre dispoñíbel de balde, porén crealo ten custos.&lt;/p&gt; &lt;p&gt;Para apoiar o seu desenvolvemento, a comunidade KDE formou o KDE e.V., unha organización sen ánimo de lucro fundada legalmente na Alemaña. KDE e.V. representa á comunidade KDE en asuntos legais e financeiros. Consulte &lt;a href=https://ev.kde.org/&gt;https://ev.kde.org/&lt;/a&gt; para máis información sobre KDE e.V.&lt;/p&gt; &lt;p&gt;KDE benefíciase de moitos tipos de contribucións, incluídas as monetarias. Usamos os fondos para cubrir gastos derivados de colaborar. A maiores, os fondos úsanse para asistencia legal e para organizar conferencias e encontros.&lt;/p&gt; &lt;p&gt;Animámoslle a apoiar os nosos esforzos cunha doazón monetaria, mediante un dos sistemas detallados en &lt;a href=https://www.kde.org/community/donations/&gt;https://www.kde.org/community/donations/&lt;/a&gt;.&lt;/p&gt; Moitas grazas de antemán polo seu apoio.</string>
   <string name="maintainer_and_developer">Mantemento e desenvolvemento</string>
   <string name="developer">Desenvolvemento</string>

res/values-ia/strings.xml

@@ -194,4 +194,5 @@
   <string name="everyone_else">Alcun altere qui ha contribuite a KDE Connect durante le annos</string>
   <string name="send_clipboard">Invia Area de transferentia</string>
   <string name="tap_to_execute">Toccaper executar</string>
+  <string name="plugin_stats">"Statisticas de plugin "</string>
 </resources>

res/values-zh-rCN/strings.xml

@@ -108,6 +108,7 @@
   <string name="device_menu_plugins">插件设置</string>
   <string name="device_menu_unpair">取消配对</string>
   <string name="pair_new_device">配对新设备</string>
+  <string name="cancel_pairing">取消配对</string>
   <string name="unknown_device">未知设备</string>
   <string name="error_not_reachable">设备不可及</string>
   <string name="error_already_paired">设备已配对</string>
@@ -387,4 +388,5 @@
   <string name="everyone_else">以及多年来为 KDE Connect 作出过贡献的其他所有人</string>
   <string name="send_clipboard">发送剪贴板</string>
   <string name="tap_to_execute">轻触执行</string>
+  <string name="plugin_stats">插件状态</string>
 </resources>

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

@@ -61,7 +61,7 @@ public abstract class BaseLink {
     }
 
     public void disconnect() {
-        linkProvider.connectionLost(this);
+        linkProvider.onConnectionLost(this);
     }
 
     //TO OVERRIDE, should be sync. If sendPayloadFromSameThread is false, it should only block to send the packet but start a separate thread to send the payload.

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

@@ -33,24 +33,29 @@ public abstract class BaseLinkProvider {
         return connectionReceivers.remove(cr);
     }
 
-    //These two should be called when the provider links to a new computer
-    protected void connectionAccepted(@NonNull final String deviceId,
+    /**
+     * To be called from the child classes when a link to a new device is established
+     */
+    protected void onConnectionReceived(@NonNull final String deviceId,
                                       @NonNull final Certificate certificate,
                                       @NonNull final NetworkPacket identityPacket,
                                       @NonNull final BaseLink link) {
-        //Log.i("KDE/LinkProvider", "connectionAccepted");
+        //Log.i("KDE/LinkProvider", "onConnectionReceived");
         for(ConnectionReceiver cr : connectionReceivers) {
             cr.onConnectionReceived(deviceId, certificate, identityPacket, link);
         }
     }
-    protected void connectionLost(BaseLink link) {
+
+    /**
+     * To be called from the child classes when a link to an existing device is disconnected
+     */
+    public void onConnectionLost(BaseLink link) {
         //Log.i("KDE/LinkProvider", "connectionLost");
         for(ConnectionReceiver cr : connectionReceivers) {
             cr.onConnectionLost(link);
         }
     }
 
-    //To override
     public abstract void onStart();
     public abstract void onStop();
     public abstract void onNetworkChange();

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

@@ -44,7 +44,7 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
     private static final int REQUEST_ENABLE_BT = 48;
 
     private final Context context;
-    private final Map<String, BluetoothLink> visibleComputers = new HashMap<>();
+    private final Map<String, BluetoothLink> visibleDevices = new HashMap<>();
     private final Map<BluetoothDevice, BluetoothSocket> sockets = new HashMap<>();
 
     private final BluetoothAdapter bluetoothAdapter;
@@ -59,13 +59,13 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
         Certificate certificate = SslHelper.parseCertificate(certificateBytes);
 
         Log.i("BluetoothLinkProvider", "addLink to " + deviceId);
-        BluetoothLink oldLink = visibleComputers.get(deviceId);
+        BluetoothLink oldLink = visibleDevices.get(deviceId);
         if (oldLink == link) {
             Log.e("BluetoothLinkProvider", "oldLink == link. This should not happen!");
             return;
         }
-        visibleComputers.put(deviceId, link);
-        connectionAccepted(deviceId, certificate, identityPacket, link);
+        visibleDevices.put(deviceId, link);
+        onConnectionReceived(deviceId, certificate, identityPacket, link);
         link.startListening();
         if (oldLink != null) {
             Log.i("BluetoothLinkProvider", "Removing old connection to same device");
@@ -129,8 +129,8 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
 
     public void disconnectedLink(BluetoothLink link, String deviceId, BluetoothDevice remoteAddress) {
         sockets.remove(remoteAddress);
-        visibleComputers.remove(deviceId);
-        connectionLost(link);
+        visibleDevices.remove(deviceId);
+        onConnectionLost(link);
     }
 
     private class ServerRunnable implements Runnable {
@@ -367,7 +367,7 @@ public class BluetoothLinkProvider extends BaseLinkProvider {
                     return;
                 }
 
-                if (visibleComputers.containsKey(identityPacket.getString("deviceId"))) {
+                if (visibleDevices.containsKey(identityPacket.getString("deviceId"))) {
                     return;
                 }
 

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

@@ -14,6 +14,7 @@ import androidx.annotation.WorkerThread;
 
 import org.json.JSONObject;
 import org.kde.kdeconnect.Backends.BaseLink;
+import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Helpers.ThreadHelper;
@@ -37,18 +38,12 @@ import kotlin.text.Charsets;
 
 public class LanLink extends BaseLink {
 
-    public interface LinkDisconnectedCallback {
-        void linkDisconnected(LanLink brokenLink);
-    }
-
     public enum ConnectionStarted {
         Locally, Remotely
     }
 
     private volatile SSLSocket socket = null;
 
-    private final LinkDisconnectedCallback callback;
-
     @Override
     public void disconnect() {
         Log.i("LanLink/Disconnect","socket:"+ socket.hashCode());
@@ -96,7 +91,7 @@ public class LanLink extends BaseLink {
                 boolean thereIsaANewSocket = (newSocket != socket);
                 if (!thereIsaANewSocket) {
                     Log.i("LanLink", "Socket closed and there's no new socket, disconnecting device");
-                    callback.linkDisconnected(LanLink.this);
+                    getLinkProvider().onConnectionLost(LanLink.this);
                 }
             }
         });
@@ -104,19 +99,16 @@ public class LanLink extends BaseLink {
         return oldSocket;
     }
 
-    public LanLink(Context context, String deviceId, LanLinkProvider linkProvider, SSLSocket socket) throws IOException {
+    public LanLink(Context context, String deviceId, BaseLinkProvider linkProvider, SSLSocket socket) throws IOException {
         super(context, deviceId, linkProvider);
-        callback = linkProvider;
         reset(socket);
     }
 
-
     @Override
     public String getName() {
         return "LanLink";
     }
 
-    //Blocking, do not call from main thread
     @WorkerThread
     @Override
     public boolean sendPacket(@NonNull NetworkPacket np, @NonNull final Device.SendPacketStatusCallback callback, boolean sendPayloadFromSameThread) {
@@ -172,9 +164,7 @@ public class LanLink extends BaseLink {
             }
             return true;
         } catch (Exception e) {
-            if (callback != null) {
-                callback.onFailure(e);
-            }
+            callback.onFailure(e);
             return false;
         } finally  {
             //Make sure we close the payload stream, if any

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

@@ -11,6 +11,9 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
+import androidx.annotation.WorkerThread;
+
+import org.json.JSONException;
 import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.Device;
@@ -33,11 +36,11 @@ import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
+import java.net.UnknownHostException;
 import java.security.cert.Certificate;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.List;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocket;
@@ -45,22 +48,24 @@ import javax.net.ssl.SSLSocket;
 import kotlin.text.Charsets;
 
 /**
- * This BaseLinkProvider creates {@link LanLink}s to other devices on the same
+ * This LanLinkProvider creates {@link LanLink}s to other devices on the same
  * WiFi network. The first packet sent over a socket must be an
  * {@link NetworkPacket#createIdentityPacket(Context)}.
  *
  * @see #identityPacketReceived(NetworkPacket, Socket, LanLink.ConnectionStarted)
  */
-public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDisconnectedCallback {
+public class LanLinkProvider extends BaseLinkProvider {
 
     private final static int UDP_PORT = 1716;
     private final static int MIN_PORT = 1716;
     private final static int MAX_PORT = 1764;
     final static int PAYLOAD_TRANSFER_MIN_PORT = 1739;
 
+    final static int MAX_UDP_PACKET_SIZE = 1024 * 512;
+
     private final Context context;
 
-    private final HashMap<String, LanLink> visibleComputers = new HashMap<>();  //Links by device id
+    private final HashMap<String, LanLink> visibleDevices = new HashMap<>();  //Links by device id
 
     private ServerSocket tcpServer;
     private DatagramSocket udpServer;
@@ -70,18 +75,15 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
 
     private boolean listening = false;
 
-    // To prevent infinte loop between Android < IceCream because both device can only broadcast identity packet but cannot connect via TCP
-    private final ArrayList<InetAddress> reverseConnectionBlackList = new ArrayList<>();
-
-    @Override // SocketClosedCallback
-    public void linkDisconnected(LanLink brokenLink) {
-        String deviceId = brokenLink.getDeviceId();
-        visibleComputers.remove(deviceId);
-        connectionLost(brokenLink);
+    public void onConnectionLost(BaseLink link) {
+        String deviceId = link.getDeviceId();
+        visibleDevices.remove(deviceId);
+        super.onConnectionLost(link);
     }
 
-    //They received my UDP broadcast and are connecting to me. The first thing they sned should be their identity.
-    private void tcpPacketReceived(Socket socket) {
+    //They received my UDP broadcast and are connecting to me. The first thing they send should be their identity packet.
+    @WorkerThread
+    private void tcpPacketReceived(Socket socket) throws IOException {
 
         NetworkPacket networkPacket;
         try {
@@ -104,57 +106,39 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
     }
 
     //I've received their broadcast and should connect to their TCP socket and send my identity.
-    private void udpPacketReceived(DatagramPacket packet) {
+    @WorkerThread
+    private void udpPacketReceived(DatagramPacket packet) throws JSONException, IOException {
 
         final InetAddress address = packet.getAddress();
 
-        try {
-
-            String message = new String(packet.getData(), Charsets.UTF_8);
-            final NetworkPacket identityPacket = NetworkPacket.unserialize(message);
-            final String deviceId = identityPacket.getString("deviceId");
-            if (!identityPacket.getType().equals(NetworkPacket.PACKET_TYPE_IDENTITY)) {
-                Log.e("KDE/LanLinkProvider", "Expecting an UDP identity packet");
+        String message = new String(packet.getData(), Charsets.UTF_8);
+        final NetworkPacket identityPacket = NetworkPacket.unserialize(message);
+        final String deviceId = identityPacket.getString("deviceId");
+        if (!identityPacket.getType().equals(NetworkPacket.PACKET_TYPE_IDENTITY)) {
+            Log.e("KDE/LanLinkProvider", "Expecting an UDP identity packet");
+            return;
+        } else {
+            String myId = DeviceHelper.getDeviceId(context);
+            if (deviceId.equals(myId)) {
+                //Ignore my own broadcast
                 return;
-            } else {
-                String myId = DeviceHelper.getDeviceId(context);
-                if (deviceId.equals(myId)) {
-                    //Ignore my own broadcast
-                    return;
-                }
-            }
-
-            Log.i("KDE/LanLinkProvider", "Broadcast identity packet received from " + identityPacket.getString("deviceName"));
-
-            int tcpPort = identityPacket.getInt("tcpPort", MIN_PORT);
-
-            SocketFactory socketFactory = SocketFactory.getDefault();
-            Socket socket = socketFactory.createSocket(address, tcpPort);
-            configureSocket(socket);
-
-            OutputStream out = socket.getOutputStream();
-            NetworkPacket myIdentity = NetworkPacket.createIdentityPacket(context);
-            out.write(myIdentity.serialize().getBytes());
-            out.flush();
-
-            identityPacketReceived(identityPacket, socket, LanLink.ConnectionStarted.Remotely);
-
-        } catch (Exception e) {
-            Log.e("KDE/LanLinkProvider", "Cannot connect to " + address, e);
-            if (!reverseConnectionBlackList.contains(address)) {
-                Log.w("KDE/LanLinkProvider", "Blacklisting " + address);
-                reverseConnectionBlackList.add(address);
-                new Timer().schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        reverseConnectionBlackList.remove(address);
-                    }
-                }, 5 * 1000);
-
-                // Try to cause a reverse connection
-                onNetworkChange();
             }
         }
+
+        Log.i("KDE/LanLinkProvider", "Broadcast identity packet received from " + identityPacket.getString("deviceName"));
+
+        int tcpPort = identityPacket.getInt("tcpPort", MIN_PORT);
+
+        SocketFactory socketFactory = SocketFactory.getDefault();
+        Socket socket = socketFactory.createSocket(address, tcpPort);
+        configureSocket(socket);
+
+        OutputStream out = socket.getOutputStream();
+        NetworkPacket myIdentity = NetworkPacket.createIdentityPacket(context);
+        out.write(myIdentity.serialize().getBytes());
+        out.flush();
+
+        identityPacketReceived(identityPacket, socket, LanLink.ConnectionStarted.Remotely);
     }
 
     private void configureSocket(Socket socket) {
@@ -169,6 +153,8 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
      * Called when a new 'identity' packet is received. Those are passed here by
      * {@link #tcpPacketReceived(Socket)} and {@link #udpPacketReceived(DatagramPacket)}.
      * <p>
+     * Should be called on a new thread since it blocks until the handshake is completed.
+     * </p><p>
      * If the remote device should be connected, this calls {@link #addLink}.
      * Otherwise, if there was an Exception, we unpair from that device.
      * </p>
@@ -177,7 +163,8 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
      * @param socket            a new Socket, which should be used to receive packets from the remote device
      * @param connectionStarted which side started this connection
      */
-    private void identityPacketReceived(final NetworkPacket identityPacket, final Socket socket, final LanLink.ConnectionStarted connectionStarted) {
+    @WorkerThread
+    private void identityPacketReceived(final NetworkPacket identityPacket, final Socket socket, final LanLink.ConnectionStarted connectionStarted) throws IOException {
 
         String myId = DeviceHelper.getDeviceId(context);
         final String deviceId = identityPacket.getString("deviceId");
@@ -189,68 +176,47 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         // If I'm the TCP server I will be the SSL client and viceversa.
         final boolean clientMode = (connectionStarted == LanLink.ConnectionStarted.Locally);
 
-        // Do the SSL handshake
-        try {
-            SharedPreferences preferences = context.getSharedPreferences("trusted_devices", Context.MODE_PRIVATE);
-            boolean isDeviceTrusted = preferences.getBoolean(deviceId, false);
+        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
+        if (isDeviceTrusted && !SslHelper.isCertificateStored(context, deviceId)) {
+            //Device paired with and old version, we can't use it as we lack the certificate
+            Device device = KdeConnect.getInstance().getDevice(deviceId);
+            if (device == null) {
+                return;
+            }
+            device.unpair();
+            //Retry as unpaired
+            identityPacketReceived(identityPacket, socket, connectionStarted);
+        }
+
+        Log.i("KDE/LanLinkProvider", "Starting SSL handshake with " + identityPacket.getString("deviceName") + " trusted:" + isDeviceTrusted);
+
+        final SSLSocket sslSocket = SslHelper.convertToSslSocket(context, socket, deviceId, isDeviceTrusted, clientMode);
+        sslSocket.addHandshakeCompletedListener(event -> {
+            String mode = clientMode ? "client" : "server";
+            try {
+                Certificate certificate = event.getPeerCertificates()[0];
+                Log.i("KDE/LanLinkProvider", "Handshake as " + mode + " successful with " + identityPacket.getString("deviceName") + " secured with " + event.getCipherSuite());
+                addLink(deviceId, certificate, identityPacket, sslSocket);
+            } catch (Exception e) {
+                Log.e("KDE/LanLinkProvider", "Handshake as " + mode + " failed with " + identityPacket.getString("deviceName"), e);
                 Device device = KdeConnect.getInstance().getDevice(deviceId);
                 if (device == null) {
                     return;
                 }
                 device.unpair();
-                //Retry as unpaired
-                identityPacketReceived(identityPacket, socket, connectionStarted);
             }
+        });
 
-            Log.i("KDE/LanLinkProvider", "Starting SSL handshake with " + identityPacket.getString("deviceName") + " trusted:" + isDeviceTrusted);
-
-            final SSLSocket sslsocket = SslHelper.convertToSslSocket(context, socket, deviceId, isDeviceTrusted, clientMode);
-            sslsocket.addHandshakeCompletedListener(event -> {
-                String mode = clientMode ? "client" : "server";
-                try {
-                    Certificate certificate = event.getPeerCertificates()[0];
-                    Log.i("KDE/LanLinkProvider", "Handshake as " + mode + " successful with " + identityPacket.getString("deviceName") + " secured with " + event.getCipherSuite());
-                    addLink(deviceId, certificate, identityPacket, sslsocket);
-                } catch (Exception e) {
-                    Log.e("KDE/LanLinkProvider", "Handshake as " + mode + " failed with " + identityPacket.getString("deviceName"), e);
-                    Device device = KdeConnect.getInstance().getDevice(deviceId);
-                    if (device == null) {
-                        return;
-                    }
-                    device.unpair();
-                }
-            });
-            //Handshake is blocking, so do it on another thread and free this thread to keep receiving new connection
-            ThreadHelper.execute(() -> {
-                try {
-                    synchronized (this) {
-                        sslsocket.startHandshake();
-                    }
-                } catch (Exception e) {
-                    Log.e("KDE/LanLinkProvider", "Handshake failed with " + identityPacket.getString("deviceName"), e);
-
-                    //String[] ciphers = sslsocket.getSupportedCipherSuites();
-                    //for (String cipher : ciphers) {
-                    //    Log.i("SupportedCiphers","cipher: " + cipher);
-                    //}
-                }
-            });
-        } catch (Exception e) {
-            Log.e("LanLink", "Exception", e);
-        }
-
+        //Handshake is blocking, so do it on another thread and free this thread to keep receiving new connection
+        Log.d("LanLinkProvider", "Starting handshake");
+        sslSocket.startHandshake();
+        Log.d("LanLinkProvider", "Handshake done");
     }
 
     /**
-     * Add or update a link in the {@link #visibleComputers} map. This method is synchronized, which ensures that only one
-     * link is operated on at a time.
-     * <p>
-     * Without synchronization, the call to {@link SslHelper#parseCertificate(byte[])} in
-     * {@link Device#addLink(NetworkPacket, BaseLink)} crashes on some devices running Oreo 8.1 (SDK level 27).
-     * </p>
+     * Add or update a link in the {@link #visibleDevices} map.
      *
      * @param deviceId         remote device id
      * @param certificate      remote device certificate
@@ -259,18 +225,17 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
      * @throws IOException if an exception is thrown by {@link LanLink#reset(SSLSocket)}
      */
     private void addLink(String deviceId, Certificate certificate, final NetworkPacket identityPacket, SSLSocket socket) throws IOException {
-        LanLink currentLink = visibleComputers.get(deviceId);
+        LanLink currentLink = visibleDevices.get(deviceId);
         if (currentLink != null) {
             //Update old link
             Log.i("KDE/LanLinkProvider", "Reusing same link for device " + deviceId);
             final Socket oldSocket = currentLink.reset(socket);
-            //Log.e("KDE/LanLinkProvider", "Replacing socket. old: "+ oldSocket.hashCode() + " - new: "+ socket.hashCode());
         } else {
             Log.i("KDE/LanLinkProvider", "Creating a new link for device " + deviceId);
             //Let's create the link
             LanLink link = new LanLink(context, deviceId, this, socket);
-            visibleComputers.put(deviceId, link);
-            connectionAccepted(deviceId, certificate, identityPacket, link);
+            visibleDevices.put(deviceId, link);
+            onConnectionReceived(deviceId, certificate, identityPacket, link);
         }
     }
 
@@ -296,14 +261,19 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         ThreadHelper.execute(() -> {
             Log.i("UdpListener", "Starting UDP listener");
             while (listening) {
-                final int bufferSize = 1024 * 512;
-                byte[] data = new byte[bufferSize];
-                DatagramPacket packet = new DatagramPacket(data, bufferSize);
                 try {
+                    DatagramPacket packet = new DatagramPacket(new byte[MAX_UDP_PACKET_SIZE], MAX_UDP_PACKET_SIZE);
                     udpServer.receive(packet);
-                    udpPacketReceived(packet);
-                } catch (Exception e) {
+                    ThreadHelper.execute(() -> {
+                        try {
+                            udpPacketReceived(packet);
+                        } catch (JSONException | IOException e) {
+                            Log.e("LanLinkProvider", "Exception receiving incoming UDP connection", e);
+                        }
+                    });
+                } catch (IOException e) {
                     Log.e("LanLinkProvider", "UdpReceive exception", e);
+                    onNetworkChange(); // Trigger a UDP broadcast to try to get them to connect to us instead
                 }
             }
             Log.w("UdpListener", "Stopping UDP listener");
@@ -322,7 +292,13 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                 try {
                     Socket socket = tcpServer.accept();
                     configureSocket(socket);
-                    tcpPacketReceived(socket);
+                    ThreadHelper.execute(() -> {
+                        try {
+                            tcpPacketReceived(socket);
+                        } catch (IOException e) {
+                            Log.e("LanLinkProvider", "Exception receiving incoming TCP connection", e);
+                        }
+                    });
                 } catch (Exception e) {
                     Log.e("LanLinkProvider", "TcpReceive exception", e);
                 }
@@ -351,7 +327,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         throw new RuntimeException("This should not be reachable");
     }
 
-    private void broadcastUdpPacket() {
+    private void broadcastUdpIdentityPacket() {
         if (System.currentTimeMillis() < lastBroadcast + delayBetweenBroadcasts) {
             Log.i("LanLinkProvider", "broadcastUdpPacket: relax cowboy");
             return;
@@ -359,57 +335,72 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         lastBroadcast = System.currentTimeMillis();
 
         ThreadHelper.execute(() -> {
-            ArrayList<String> iplist = CustomDevicesActivity
+            List<String> ipStringList = CustomDevicesActivity
                     .getCustomDeviceList(PreferenceManager.getDefaultSharedPreferences(context));
 
             if (TrustedNetworkHelper.isTrustedNetwork(context)) {
-                iplist.add("255.255.255.255"); //Default: broadcast.
+                ipStringList.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);
-            if (tcpServer == null || !tcpServer.isBound()) {
-                Log.i("LanLinkProvider", "Won't broadcast UDP packet if TCP socket is not ready yet");
-                return;
-            }
-            int port = tcpServer.getLocalPort();
-            identity.set("tcpPort", port);
-            DatagramSocket socket = null;
-            byte[] bytes = null;
-            try {
-                socket = new DatagramSocket();
-                socket.setReuseAddress(true);
-                socket.setBroadcast(true);
-                bytes = identity.serialize().getBytes(Charsets.UTF_8);
-            } catch (Exception e) {
-                Log.e("KDE/LanLinkProvider", "Failed to create DatagramSocket", e);
-            }
-
-            if (bytes != null) {
-                Log.i("KDE/LanLinkProvider","Sending broadcast to "+iplist.size()+" ips");
-                for (String ipstr : iplist) {
-                    try {
-                        InetAddress client = InetAddress.getByName(ipstr);
-                        socket.send(new DatagramPacket(bytes, bytes.length, client, MIN_PORT));
-                        //Log.i("KDE/LanLinkProvider","Udp identity packet sent to address "+client);
-                    } catch (Exception e) {
-                        Log.e("KDE/LanLinkProvider", "Sending udp identity packet failed. Invalid address? (" + ipstr + ")", e);
-                    }
+            ArrayList<InetAddress> ipList = new ArrayList<>();
+            for (String ip : ipStringList) {
+                try {
+                    ipList.add(InetAddress.getByName(ip));
+                } catch (UnknownHostException e) {
+                    e.printStackTrace();
                 }
             }
 
-            if (socket != null) {
-                socket.close();
+            if (ipList.isEmpty()) {
+                return;
             }
 
+            sendUdpIdentityPacket(ipList);
         });
     }
 
+    @WorkerThread
+    public void sendUdpIdentityPacket(List<InetAddress> ipList) {
+        if (tcpServer == null || !tcpServer.isBound()) {
+            Log.i("LanLinkProvider", "Won't broadcast UDP packet if TCP socket is not ready yet");
+            return;
+        }
+
+        NetworkPacket identity = NetworkPacket.createIdentityPacket(context);
+        identity.set("tcpPort", tcpServer.getLocalPort());
+
+        byte[] bytes;
+        try {
+            bytes = identity.serialize().getBytes(Charsets.UTF_8);
+        } catch (JSONException e) {
+            Log.e("KDE/LanLinkProvider", "Failed to serialize identity packet", e);
+            return;
+        }
+
+        DatagramSocket socket;
+        try {
+            socket = new DatagramSocket();
+            socket.setReuseAddress(true);
+            socket.setBroadcast(true);
+        } catch (SocketException e) {
+            Log.e("KDE/LanLinkProvider", "Failed to create DatagramSocket", e);
+            return;
+        }
+
+        for (InetAddress ip : ipList) {
+            try {
+                socket.send(new DatagramPacket(bytes, bytes.length, ip, MIN_PORT));
+                //Log.i("KDE/LanLinkProvider","Udp identity packet sent to address "+client);
+            } catch (IOException e) {
+                Log.e("KDE/LanLinkProvider", "Sending udp identity packet failed. Invalid address? (" + ip.toString() + ")", e);
+            }
+        }
+
+        socket.close();
+    }
+
     @Override
     public void onStart() {
         //Log.i("KDE/LanLinkProvider", "onStart");
@@ -420,13 +411,13 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
             setupUdpListener();
             setupTcpListener();
 
-            broadcastUdpPacket();
+            broadcastUdpIdentityPacket();
         }
     }
 
     @Override
     public void onNetworkChange() {
-        broadcastUdpPacket();
+        broadcastUdpIdentityPacket();
     }
 
     @Override

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

@@ -34,7 +34,7 @@ public class LoopbackLinkProvider extends BaseLinkProvider {
     public void onNetworkChange() {
         NetworkPacket np = NetworkPacket.createIdentityPacket(context);
         String deviceId = DeviceHelper.getDeviceId(context);
-        connectionAccepted(deviceId, SslHelper.certificate, np, new LoopbackLink(context, this));
+        onConnectionReceived(deviceId, SslHelper.certificate, np, new LoopbackLink(context, this));
     }
 
     @Override

src/org/kde/kdeconnect/BackgroundService.java

@@ -64,6 +64,8 @@ public class BackgroundService extends Service {
         return instance;
     }
 
+    private static boolean initialized = false;
+
     // This indicates when connected over wifi/usb/bluetooth/(anything other than cellular)
     private final MutableLiveData<Boolean> connectedToNonCellularNetwork = new MutableLiveData<>();
     public LiveData<Boolean> isConnectedToNonCellularNetwork() {
@@ -88,6 +90,10 @@ public class BackgroundService extends Service {
     }
 
     public void onNetworkChange() {
+        if (!initialized) {
+            Log.d("KDE/BackgroundService", "ignoring onNetworkChange called before the service is initialized");
+            return;
+        }
         Log.d("KDE/BackgroundService", "onNetworkChange");
         for (BaseLinkProvider a : linkProviders) {
             a.onNetworkChange();
@@ -145,6 +151,7 @@ public class BackgroundService extends Service {
         for (BaseLinkProvider a : linkProviders) {
             a.onStart();
         }
+        initialized = true;
     }
 
     private static NetworkRequest.Builder getNonCellularNetworkRequestBuilder() {
@@ -248,6 +255,7 @@ public class BackgroundService extends Service {
     @Override
     public void onDestroy() {
         Log.d("KdeConnect/BgService", "onDestroy");
+        initialized = false;
         for (BaseLinkProvider a : linkProviders) {
             a.onStop();
         }

src/org/kde/kdeconnect/Device.java

@@ -34,7 +34,6 @@ import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect.Plugins.PluginFactory;
 import org.kde.kdeconnect.UserInterface.MainActivity;
-import org.kde.kdeconnect.UserInterface.PairingHandler;
 import org.kde.kdeconnect_tp.R;
 
 import java.io.IOException;
@@ -616,16 +615,16 @@ public class Device implements BaseLink.PacketReceiver {
         if (existing != null) {
 
             if (!existing.isCompatible()) {
-                Log.i("KDE/addPlugin", "Minimum requirements (e.g. API level) not fulfilled " + pluginKey);
+                Log.d("KDE/addPlugin", "Minimum requirements (e.g. API level) not fulfilled " + pluginKey);
                 return false;
             }
 
             //Log.w("KDE/addPlugin","plugin already present:" + pluginKey);
             if (existing.checkOptionalPermissions()) {
-                Log.i("KDE/addPlugin", "Optional Permissions OK " + pluginKey);
+                Log.d("KDE/addPlugin", "Optional Permissions OK " + pluginKey);
                 pluginsWithoutOptionalPermissions.remove(pluginKey);
             } else {
-                Log.e("KDE/addPlugin", "No optional permission " + pluginKey);
+                Log.d("KDE/addPlugin", "No optional permission " + pluginKey);
                 pluginsWithoutOptionalPermissions.put(pluginKey, existing);
             }
             return true;
@@ -638,25 +637,25 @@ public class Device implements BaseLink.PacketReceiver {
         }
 
         if (!plugin.isCompatible()) {
-            Log.i("KDE/addPlugin", "Minimum requirements (e.g. API level) not fulfilled " + pluginKey);
+            Log.d("KDE/addPlugin", "Minimum requirements (e.g. API level) not fulfilled " + pluginKey);
             return false;
         }
 
         plugins.put(pluginKey, plugin);
 
         if (!plugin.checkRequiredPermissions()) {
-            Log.e("KDE/addPlugin", "No permission " + pluginKey);
+            Log.d("KDE/addPlugin", "No permission " + pluginKey);
             plugins.remove(pluginKey);
             pluginsWithoutPermissions.put(pluginKey, plugin);
             return false;
         } else {
-            Log.i("KDE/addPlugin", "Permissions OK " + pluginKey);
+            Log.d("KDE/addPlugin", "Permissions OK " + pluginKey);
             pluginsWithoutPermissions.remove(pluginKey);
             if (plugin.checkOptionalPermissions()) {
-                Log.i("KDE/addPlugin", "Optional Permissions OK " + pluginKey);
+                Log.d("KDE/addPlugin", "Optional Permissions OK " + pluginKey);
                 pluginsWithoutOptionalPermissions.remove(pluginKey);
             } else {
-                Log.e("KDE/addPlugin", "No optional permission " + pluginKey);
+                Log.d("KDE/addPlugin", "No optional permission " + pluginKey);
                 pluginsWithoutOptionalPermissions.put(pluginKey, plugin);
             }
         }

src/org/kde/kdeconnect/KdeConnect.java

@@ -22,7 +22,6 @@ import org.kde.kdeconnect.Helpers.SecurityHelpers.RsaHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect.Plugins.PluginFactory;
-import org.kde.kdeconnect.UserInterface.PairingHandler;
 import org.kde.kdeconnect.UserInterface.ThemeUtil;
 
 import java.security.cert.Certificate;
@@ -77,6 +76,7 @@ public class KdeConnect extends Application {
     }
 
     private void onDeviceListChanged() {
+        Log.i("MainActivity","Device list changed, notifying "+ deviceListChangedCallbacks.size() +" observers.");
         for (DeviceListChangedCallback callback : deviceListChangedCallbacks.values()) {
             callback.onDeviceListChanged();
         }
@@ -170,21 +170,22 @@ public class KdeConnect extends Application {
 
         @Override
         public void onConnectionLost(BaseLink link) {
-            Device d = devices.get(link.getDeviceId());
+            Device device = devices.get(link.getDeviceId());
             Log.i("KDE/onConnectionLost", "removeLink, deviceId: " + link.getDeviceId());
-            if (d != null) {
-                d.removeLink(link);
-                if (!d.isReachable() && !d.isPaired()) {
+            if (device != null) {
+                device.removeLink(link);
+                if (!device.isReachable() && !device.isPaired()) {
                     //Log.e("onConnectionLost","Removing connection device because it was not paired");
                     devices.remove(link.getDeviceId());
-                    d.removePairingCallback(devicePairingCallback);
+                    device.removePairingCallback(devicePairingCallback);
                 }
             } else {
-                //Log.d("KDE/onConnectionLost","Removing connection to unknown device");
+                Log.d("KDE/onConnectionLost","Removing connection to unknown device");
             }
             onDeviceListChanged();
         }
     };
+
     public BaseLinkProvider.ConnectionReceiver getConnectionListener() {
         return connectionListener;
     }

src/org/kde/kdeconnect/NetworkPacket.java

@@ -167,7 +167,7 @@ public class NetworkPacket {
         }
     }
 
-    private Set<String> getStringSet(String key) {
+    public Set<String> getStringSet(String key) {
         JSONArray jsonArray = mBody.optJSONArray(key);
         if (jsonArray == null) return null;
         Set<String> list = new HashSet<>();

src/org/kde/kdeconnect/PairingHandler.java

@@ -4,12 +4,10 @@
  * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
  */
 
-package org.kde.kdeconnect.UserInterface;
+package org.kde.kdeconnect;
 
 import android.util.Log;
 
-import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.NetworkPacket;
 import org.kde.kdeconnect_tp.R;
 
 import java.util.Timer;
@@ -62,10 +60,15 @@ public class PairingHandler {
                     Log.w("PairingHandler", "Ignoring second pairing request before the first one timed out");
                     break;
                 case Paired:
-                    Log.w("PairingHandler", "Auto-accepting pairing request from a device we already trusted");
-                    acceptPairing();
-                    break;
                 case NotPaired:
+                    if (mPairState == PairState.Paired) {
+                        Log.w("PairingHandler", "Received pairing request from a device we already trusted.");
+                        // It would be nice to auto-accept the pairing request here, but since the pairing accept and pairing request
+                        // messages are identical, this could create an infinite loop if both devices are "accepting" each other pairs.
+                        // Instead, unpair and handle as if "NotPaired".
+                        mPairState = PairState.NotPaired;
+                        mCallback.unpaired();
+                    }
                     mPairState = PairState.RequestedByPeer;
 
                     mPairingTimer = new Timer();
@@ -89,13 +92,14 @@ public class PairingHandler {
                     break;
                 case Requested: // We started pairing and got rejected
                 case RequestedByPeer: // They stared pairing, then cancelled
+                    mPairState = PairState.NotPaired;
                     mCallback.pairingFailed(mDevice.getContext().getString(R.string.error_canceled_by_other_peer));
                     break;
                 case Paired:
+                    mPairState = PairState.NotPaired;
                     mCallback.unpaired();
                     break;
             }
-            mPairState = PairState.NotPaired;
         }
     }
 
@@ -191,9 +195,11 @@ public class PairingHandler {
 
     public void unpair() {
         mPairState = PairState.NotPaired;
-        NetworkPacket np = new NetworkPacket(NetworkPacket.PACKET_TYPE_PAIR);
-        np.set("pair", false);
-        mDevice.sendPacket(np);
+        if (mDevice.isReachable()) {
+            NetworkPacket np = new NetworkPacket(NetworkPacket.PACKET_TYPE_PAIR);
+            np.set("pair", false);
+            mDevice.sendPacket(np);
+        }
         mCallback.unpaired();
     }
 

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

@@ -168,7 +168,7 @@ public class PluginFactory {
             //Check incoming against outgoing
             if (Collections.disjoint(outgoing, info.getSupportedPacketTypes())
                     && Collections.disjoint(incoming, info.getOutgoingPacketTypes())) {
-                Log.i("PluginFactory", "Won't load " + pluginId + " because of unmatched capabilities");
+                Log.d("PluginFactory", "Won't load " + pluginId + " because of unmatched capabilities");
                 continue; //No capabilities in common, do not load this plugin
             }
             plugins.add(pluginId);

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

@@ -1,117 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2014 The Android Open Source Project 
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.kde.kdeconnect.UserInterface;
-
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.preference.PreferenceActivity;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.appcompat.widget.Toolbar;
-
-/**
- * A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls
- * to be used with AppCompat.
- * <p>
- * This technique can be used with an {@link android.app.Activity} class, not just
- * {@link android.preference.PreferenceActivity}.
- */
-public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
-
-    private AppCompatDelegate mDelegate;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        getDelegate().installViewFactory();
-        getDelegate().onCreate(savedInstanceState);
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        getDelegate().onPostCreate(savedInstanceState);
-    }
-
-    public ActionBar getSupportActionBar() {
-        return getDelegate().getSupportActionBar();
-    }
-
-    public void setSupportActionBar(@Nullable Toolbar toolbar) {
-        getDelegate().setSupportActionBar(toolbar);
-    }
-
-    @NonNull
-    @Override
-    public MenuInflater getMenuInflater() {
-        return getDelegate().getMenuInflater();
-    }
-
-    @Override
-    public void setContentView(@LayoutRes int layoutResID) {
-        getDelegate().setContentView(layoutResID);
-    }
-
-    @Override
-    public void setContentView(View view) {
-        getDelegate().setContentView(view);
-    }
-
-    @Override
-    public void setContentView(View view, ViewGroup.LayoutParams params) {
-        getDelegate().setContentView(view, params);
-    }
-
-    @Override
-    public void addContentView(View view, ViewGroup.LayoutParams params) {
-        getDelegate().addContentView(view, params);
-    }
-
-    @Override
-    protected void onPostResume() {
-        super.onPostResume();
-        getDelegate().onPostResume();
-    }
-
-    @Override
-    protected void onTitleChanged(CharSequence title, int color) {
-        super.onTitleChanged(title, color);
-        getDelegate().setTitle(title);
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        getDelegate().onConfigurationChanged(newConfig);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        getDelegate().onDestroy();
-    }
-
-    @Override
-    public void invalidateOptionsMenu() {
-        getDelegate().invalidateOptionsMenu();
-    }
-
-    private AppCompatDelegate getDelegate() {
-        if (mDelegate == null) {
-            mDelegate = AppCompatDelegate.create(this, null);
-        }
-        return mDelegate;
-    }
-
-
-}

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

@@ -34,6 +34,7 @@ import org.kde.kdeconnect.Device
 import org.kde.kdeconnect.Device.PluginsChangedListener
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper
 import org.kde.kdeconnect.KdeConnect
+import org.kde.kdeconnect.PairingHandler
 import org.kde.kdeconnect.Plugins.BatteryPlugin.BatteryPlugin
 import org.kde.kdeconnect.Plugins.MprisPlugin.MprisPlugin
 import org.kde.kdeconnect.Plugins.Plugin

tests/org/kde/kdeconnect/DeviceTest.java

@@ -9,7 +9,6 @@ package org.kde.kdeconnect;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -33,7 +32,6 @@ import org.kde.kdeconnect.Backends.LanBackend.LanLinkProvider;
 import org.kde.kdeconnect.Helpers.DeviceHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.RsaHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
-import org.kde.kdeconnect.UserInterface.PairingHandler;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -41,10 +39,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
 import java.security.cert.Certificate;
-import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 
 @RunWith(PowerMockRunner.class)